Rev 1698: Merge break-lock command. in
/home/robertc/source/baz/integration/
Robert Collins
robertc at robertcollins.net
Fri May 5 05:43:47 BST 2006
------------------------------------------------------------
revno: 1698
revision-id: robertc at robertcollins.net-20060505044335-0e785bae0df1047e
parent: pqm at pqm.ubuntu.com-20060504081215-e807a459c8bcb379
parent: robertc at robertcollins.net-20060505040931-20b87352d3434037
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Fri 2006-05-05 14:43:35 +1000
message:
Merge break-lock command.
added:
bzrlib/tests/branch_implementations/test_break_lock.py test_break_lock.py-20060504111902-9aae411dbe9aadd2
bzrlib/tests/repository_implementations/test_break_lock.py test_break_lock.py-20060504111704-ee09a107f9f42e43
bzrlib/tests/workingtree_implementations/test_break_lock.py test_break_lock.py-20060504115740-233e245df546fd42
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/lockable_files.py control_files.py-20051111201905-bb88546e799d669f
bzrlib/lockdir.py lockdir.py-20060220222025-98258adf27fbdda3
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_break_lock.py test_break_lock.py-20060303014503-a90e07d38d042d1d
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/test_lockable_files.py test_lockable_files.py-20051225183927-365c7fd99591caf1
bzrlib/tests/test_lockdir.py test_lockdir.py-20060220222025-33d4221569a3d600
bzrlib/tests/test_ui.py test_ui.py-20051130162854-458e667a7414af09
bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
bzrlib/ui/__init__.py ui.py-20050824083933-8cf663c763ba53a9
bzrlib/ui/text.py text.py-20051130153916-2e438cffc8afc478
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
merged: robertc at robertcollins.net-20060505040931-20b87352d3434037
parent: robertc at robertcollins.net-20060505040351-7322a57e9085748b
committer: Robert Collins <robertc at robertcollins.net>
branch nick: break-lock
timestamp: Fri 2006-05-05 14:09:31 +1000
message:
Test break lock on old format branches.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060505040351-7322a57e9085748b
parent: robertc at robertcollins.net-20060505040011-da8649051797224e
committer: Robert Collins <robertc at robertcollins.net>
branch nick: break-lock
timestamp: Fri 2006-05-05 14:03:51 +1000
message:
Ensure that answering no to break lock leaves the locks in place. This is currently simple - ask for everything always.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060505040011-da8649051797224e
parent: robertc at robertcollins.net-20060505004425-55597abf11998087
committer: Robert Collins <robertc at robertcollins.net>
branch nick: break-lock
timestamp: Fri 2006-05-05 14:00:11 +1000
message:
Review comments.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060505004425-55597abf11998087
parent: robertc at robertcollins.net-20060504140823-29fc10b61b2db894
parent: pqm at pqm.ubuntu.com-20060504081215-e807a459c8bcb379
committer: Robert Collins <robertc at robertcollins.net>
branch nick: break-lock
timestamp: Fri 2006-05-05 10:44:25 +1000
message:
Merge HEAD.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060504140823-29fc10b61b2db894
parent: robertc at robertcollins.net-20060504135532-f0152b27530fd30c
parent: robertc at robertcollins.net-20060503235739-fbc2d4eed5d5c754
committer: Robert Collins <robertc at robertcollins.net>
branch nick: break-lock
timestamp: Fri 2006-05-05 00:08:23 +1000
message:
Merge HEAD.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060504135532-f0152b27530fd30c
parent: robertc at robertcollins.net-20060504134651-e6ced8954d74a342
committer: Robert Collins <robertc at robertcollins.net>
branch nick: break-lock
timestamp: Thu 2006-05-04 23:55:32 +1000
message:
Hook in the full break-lock ui.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060504134651-e6ced8954d74a342
parent: robertc at robertcollins.net-20060504132631-ab199c12d7427f82
committer: Robert Collins <robertc at robertcollins.net>
branch nick: break-lock
timestamp: Thu 2006-05-04 23:46:51 +1000
message:
Teach TestCase.run_bzr_captured about the ui factories.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060504132631-ab199c12d7427f82
parent: robertc at robertcollins.net-20060504130128-32da543d660b7061
committer: Robert Collins <robertc at robertcollins.net>
branch nick: break-lock
timestamp: Thu 2006-05-04 23:26:31 +1000
message:
Branch.break_lock should handle bound branches too
------------------------------------------------------------
merged: robertc at robertcollins.net-20060504130128-32da543d660b7061
parent: robertc at robertcollins.net-20060504115351-79122d06d443d4a8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: break-lock
timestamp: Thu 2006-05-04 23:01:28 +1000
message:
Teach WorkingTree about break-lock.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060504115351-79122d06d443d4a8
parent: robertc at robertcollins.net-20060504111736-b61e8e7c87c3aaaa
committer: Robert Collins <robertc at robertcollins.net>
branch nick: break-lock
timestamp: Thu 2006-05-04 21:53:51 +1000
message:
Teach Branch about break_lock.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060504111736-b61e8e7c87c3aaaa
parent: robertc at robertcollins.net-20060504103613-bf4d13f925aa8520
committer: Robert Collins <robertc at robertcollins.net>
branch nick: break-lock
timestamp: Thu 2006-05-04 21:17:36 +1000
message:
Teach Repository about break_lock.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060504103613-bf4d13f925aa8520
parent: robertc at robertcollins.net-20060504101340-18fa61cb9cf268fb
committer: Robert Collins <robertc at robertcollins.net>
branch nick: break-lock
timestamp: Thu 2006-05-04 20:36:13 +1000
message:
Extend LockableFiles to support break_lock() calls.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060504101340-18fa61cb9cf268fb
parent: robertc at robertcollins.net-20060504083932-009bfa89993005aa
committer: Robert Collins <robertc at robertcollins.net>
branch nick: break-lock
timestamp: Thu 2006-05-04 20:13:40 +1000
message:
Add break_lock utility function to LockDir.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060504083932-009bfa89993005aa
parent: robertc at robertcollins.net-20060504061106-dea34f7ad6b4855a
committer: Robert Collins <robertc at robertcollins.net>
branch nick: break-lock
timestamp: Thu 2006-05-04 18:39:32 +1000
message:
Add bzrlib.ui.ui_factory.get_boolean().
------------------------------------------------------------
merged: robertc at robertcollins.net-20060504061106-dea34f7ad6b4855a
parent: robertc at robertcollins.net-20060504013148-74208691b1b4857e
committer: Robert Collins <robertc at robertcollins.net>
branch nick: break-lock
timestamp: Thu 2006-05-04 16:11:06 +1000
message:
Make LockDir.unlock check the lock is still intact.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060504013148-74208691b1b4857e
parent: robertc at robertcollins.net-20060428055433-be86bc92d5efd816
committer: Robert Collins <robertc at robertcollins.net>
branch nick: break-lock
timestamp: Thu 2006-05-04 11:31:48 +1000
message:
Add stdin parameter to run_bzr and run_bzr_captured.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060428055433-be86bc92d5efd816
parent: pqm at pqm.ubuntu.com-20060427011433-95634ee1da8a2049
committer: Robert Collins <robertc at robertcollins.net>
branch nick: break-lock
timestamp: Fri 2006-04-28 15:54:33 +1000
message:
Document what the break-lock commands should be like
More information about the bazaar-commits
mailing list