Rev 1568: Integrate LockDirs into new format,
etc in /home/pqm/archives/thelove/bzr/+trunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Mon Mar 6 07:44:26 GMT 2006
------------------------------------------------------------
revno: 1568
revision-id: pqm at pqm.ubuntu.com-20060306074417-344f1d83d99b9730
parent: pqm at pqm.ubuntu.com-20060306072155-3b9e4092ba9bb0e4
parent: mbp at sourcefrog.net-20060306071109-6b35534e38610c43
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-03-06 07:44:17 +0000
message:
Integrate LockDirs into new format, etc
added:
bzrlib/tests/blackbox/test_break_lock.py test_break_lock.py-20060303014503-a90e07d38d042d1d
modified:
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/lock.py lock.py-20050527050856-ec090bb51bc03349
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/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
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_permissions.py test_permissions.py-20051215004520-ccf475789c80e80c
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060306071109-6b35534e38610c43
parent: mbp at sourcefrog.net-20060306050135-9e422a1633679d5f
parent: pqm at pqm.ubuntu.com-20060306055608-93469ab6701dbe6b
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Mon 2006-03-06 18:11:09 +1100
message:
[merge] bzr.dev
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060306050135-9e422a1633679d5f
parent: mbp at sourcefrog.net-20060306044359-f977728599659b6d
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Mon 2006-03-06 16:01:35 +1100
message:
Lock type is now mandatory for LockableFiles constructor
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060306044359-f977728599659b6d
parent: mbp at sourcefrog.net-20060306043017-2e9a7d43ee9c5745
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Mon 2006-03-06 15:43:59 +1100
message:
Add tests that MetaDir repositories use LockDirs
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060306043017-2e9a7d43ee9c5745
parent: mbp at sourcefrog.net-20060306041536-a1643b5f998c23a3
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Mon 2006-03-06 15:30:17 +1100
message:
Locks protecting LockableFiles must now be explicitly created before use.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060306041536-a1643b5f998c23a3
parent: mbp at sourcefrog.net-20060306040920-2495398d281bcf7c
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Mon 2006-03-06 15:15:36 +1100
message:
New LockableFiles.create_lock() method
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060306040920-2495398d281bcf7c
parent: mbp at sourcefrog.net-20060306035718-a50bae3c32eec48a
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Mon 2006-03-06 15:09:20 +1100
message:
Pass file/mode bits through to creation of lock files/dirs
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060306035718-a50bae3c32eec48a
parent: mbp at sourcefrog.net-20060303095652-a0f4f293dad83a04
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Mon 2006-03-06 14:57:18 +1100
message:
Change LockDirs to format "lock-name/held/info"
For the moment, auto-create the top-level directory when it's needed.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060303095652-a0f4f293dad83a04
parent: mbp at sourcefrog.net-20060303094402-10a3f11f73a89b52
parent: pqm at pqm.ubuntu.com-20060303070344-03bb9a021c0d964c
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Fri 2006-03-03 20:56:52 +1100
message:
[merge] sync from bzr.dev
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060303094402-10a3f11f73a89b52
parent: mbp at sourcefrog.net-20060303093828-eeaecf4e3fc4fc15
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Fri 2006-03-03 20:44:02 +1100
message:
Format 7 repo now uses LockDir!
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060303093828-eeaecf4e3fc4fc15
parent: mbp at sourcefrog.net-20060303091109-5b0f5c943f01010f
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Fri 2006-03-03 20:38:28 +1100
message:
[revert] broken changes
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060303091109-5b0f5c943f01010f
parent: mbp at sourcefrog.net-20060303091046-6453abf08938f714
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Fri 2006-03-03 20:11:09 +1100
message:
Add LockDir.read_lock fake method
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060303091046-6453abf08938f714
parent: mbp at sourcefrog.net-20060303085534-d24a8118f4ce571a
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Fri 2006-03-03 20:10:46 +1100
message:
Add LockableFiles __repr__
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060303085534-d24a8118f4ce571a
parent: mbp at sourcefrog.net-20060303084631-ec3a92888fd7e1da
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Fri 2006-03-03 19:55:34 +1100
message:
Add some tests that format7 repo creates the right lock type
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060303084631-ec3a92888fd7e1da
parent: mbp at sourcefrog.net-20060303081957-ae86308d5780543d
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Fri 2006-03-03 19:46:31 +1100
message:
doc
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060303081957-ae86308d5780543d
parent: mbp at sourcefrog.net-20060303081608-cf9e7db53336fa32
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Fri 2006-03-03 19:19:57 +1100
message:
Fix up LockableFiles deprecation warning
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060303081608-cf9e7db53336fa32
parent: mbp at sourcefrog.net-20060303073926-585e6df99328e014
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Fri 2006-03-03 19:16:08 +1100
message:
Use LockDirs for repo format 7
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060303073926-585e6df99328e014
parent: mbp at sourcefrog.net-20060303073547-e406d0326abae2fd
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Fri 2006-03-03 18:39:26 +1100
message:
Fix some LockableFiles deprecation warnings
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060303073547-e406d0326abae2fd
parent: mbp at sourcefrog.net-20060303073124-c0741f11f36d7236
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Fri 2006-03-03 18:35:47 +1100
message:
cleanup LockableFiles
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060303073124-c0741f11f36d7236
parent: mbp at sourcefrog.net-20060303064348-d7f474286e006c48
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Fri 2006-03-03 18:31:24 +1100
message:
doc
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060303064348-d7f474286e006c48
parent: mbp at sourcefrog.net-20060303062253-b33bb76fa2aef670
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Fri 2006-03-03 17:43:48 +1100
message:
Clean up Transport-based locks for old branches
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060303062253-b33bb76fa2aef670
parent: mbp at sourcefrog.net-20060303060711-51b8200efda1847b
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Fri 2006-03-03 17:22:53 +1100
message:
LockableFiles can now call LockDir directly
no need for a little translator class
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060303060711-51b8200efda1847b
parent: mbp at sourcefrog.net-20060303034620-2e8a5754ce60eb31
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Fri 2006-03-03 17:07:11 +1100
message:
Get LockableFiles tests running against LockDir
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060303034620-2e8a5754ce60eb31
parent: mbp at sourcefrog.net-20060303032719-fe7e3137a22cab49
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Fri 2006-03-03 14:46:20 +1100
message:
Start to parameterize LockableFiles test cases.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060303032719-fe7e3137a22cab49
parent: mbp at sourcefrog.net-20060303031901-7396bd883db4d262
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Fri 2006-03-03 14:27:19 +1100
message:
Add new LockableFiles.LockDirStrategy; not used yet
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060303031901-7396bd883db4d262
parent: mbp at sourcefrog.net-20060303025457-8db5ec00a8ecba35
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Fri 2006-03-03 14:19:01 +1100
message:
Factor locking strategy out of LockableFiles so that we can use LockDirs in new formats.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060303025457-8db5ec00a8ecba35
parent: mbp at sourcefrog.net-20060303024703-fef1181ba3398271
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Fri 2006-03-03 13:54:57 +1100
message:
More lock docs
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060303024703-fef1181ba3398271
parent: mbp at sourcefrog.net-20060303023253-b1a0010503c25e76
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Fri 2006-03-03 13:47:03 +1100
message:
More explanation for LockableFiles
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060303023253-b1a0010503c25e76
parent: mbp at sourcefrog.net-20060303021815-872742b7b3357302
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Fri 2006-03-03 13:32:53 +1100
message:
comment out currently unimplemented tests
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060303021815-872742b7b3357302
parent: mbp at sourcefrog.net-20060303021419-cefbdc88b396592a
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Fri 2006-03-03 13:18:15 +1100
message:
Clean up duplicate BranchNotLocked error and rename to ObjectNotLocked
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060303021419-cefbdc88b396592a
parent: mbp at sourcefrog.net-20060303015140-f9a0f2c223f45ca7
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Fri 2006-03-03 13:14:19 +1100
message:
Start break-lock --show
Add LockableFiles.is_locked()
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060303015140-f9a0f2c223f45ca7
parent: mbp at sourcefrog.net-20060222070612-c108852197fc0ca4
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Fri 2006-03-03 12:51:40 +1100
message:
Stub lock-breaking command
More information about the bazaar-commits
mailing list