Rev 1672: (mbp, olaf) lock info, metaweave format name,
docs in /home/pqm/archives/thelove/bzr/+trunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Thu May 4 09:12:16 BST 2006
------------------------------------------------------------
revno: 1672
revision-id: pqm at pqm.ubuntu.com-20060504081215-e807a459c8bcb379
parent: pqm at pqm.ubuntu.com-20060504062622-8826ecc9fcd7e700
parent: mbp at sourcefrog.net-20060504065938-0e2871ad0d76f3a2
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-05-04 09:12:15 +0100
message:
(mbp,olaf) lock info, metaweave format name, docs
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/help.py help.py-20050505025907-4dd7a6d63912f894
bzrlib/info.py info.py-20050323235939-6bbfe7d9700b0b9b
bzrlib/lockable_files.py control_files.py-20051111201905-bb88546e799d669f
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/blackbox/test_bound_branches.py test_bound_branches.py-20051109215527-2373188ad566c205
bzrlib/tests/blackbox/test_conflicts.py test_conflicts.py-20060228151432-9723ebb925b999cf
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
bzrlib/tests/blackbox/test_shared_repository.py test_shared_repository.py-20060317053531-ed30c0d79325e483
bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060504065938-0e2871ad0d76f3a2
parent: mbp at sourcefrog.net-20060504033443-abe6c9e566087691
parent: pqm at pqm.ubuntu.com-20060504062622-8826ecc9fcd7e700
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Thu 2006-05-04 16:59:38 +1000
message:
[merge] bzr.dev
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060504033443-abe6c9e566087691
parent: mbp at sourcefrog.net-20060504024031-82abe45d799c9350
parent: olaf at conradi.org-20060503130122-b40b41c13fdbcb75
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Thu 2006-05-04 13:34:43 +1000
message:
[merge olaf] Change format name to metaweave
------------------------------------------------------------
merged: olaf at conradi.org-20060503130122-b40b41c13fdbcb75
parent: olaf at conradi.org-20060428192651-37c092ebd9b0cee9
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.metaweave
timestamp: Wed 2006-05-03 15:01:22 +0200
message:
Do mention the older formats inside help for commands 'init', 'init-repo'
and 'upgrade'.
------------------------------------------------------------
merged: olaf at conradi.org-20060428192651-37c092ebd9b0cee9
parent: olaf at conradi.org-20060428134126-f5eaeeecc25e735e
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.metaweave
timestamp: Fri 2006-04-28 21:26:51 +0200
message:
Rename format 'metadir' to 'default'. Only mention format 'knit' in help
for commands 'init' and 'init-repo'. Fix test cases accordingly.
------------------------------------------------------------
merged: olaf at conradi.org-20060428134126-f5eaeeecc25e735e
parent: pqm at pqm.ubuntu.com-20060427055036-db71ba9c9889cbbd
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.metaweave
timestamp: Fri 2006-04-28 15:41:26 +0200
message:
For campatability, make old format for weave repository inside metadir
available as 'metaweave' format.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060504024031-82abe45d799c9350
parent: mbp at sourcefrog.net-20060504023547-6ff07ce73c778717
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Thu 2006-05-04 12:40:31 +1000
message:
Remove backup warning from bzr help
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060504023547-6ff07ce73c778717
parent: mbp at sourcefrog.net-20060503080505-dd3f40f3ee57b137
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Thu 2006-05-04 12:35:47 +1000
message:
doc
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060503080505-dd3f40f3ee57b137
parent: pqm at pqm.ubuntu.com-20060429091950-d5ec09cd6e7c591a
parent: olaf at conradi.org-20060501131509-e7c2f9d82251c34b
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Wed 2006-05-03 18:05:05 +1000
message:
[merge] bzr info and lock improvements (olaf)
------------------------------------------------------------
merged: olaf at conradi.org-20060501131509-e7c2f9d82251c34b
parent: olaf at conradi.org-20060501123226-16a739a5ffc22999
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Mon 2006-05-01 15:15:09 +0200
message:
Querying os locks is not supported, adjusted test case to verify bzr
info does not show the locking section when using a deprecated format.
------------------------------------------------------------
merged: olaf at conradi.org-20060501123226-16a739a5ffc22999
parent: olaf at conradi.org-20060501115811-f45d107ae4772add
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Mon 2006-05-01 14:32:26 +0200
message:
Modify related locations section of bzr info to keep closer to the left
side of the screen when only one location for parent or push is set.
------------------------------------------------------------
merged: olaf at conradi.org-20060501115811-f45d107ae4772add
parent: olaf at conradi.org-20060501074321-0d39d1f35b124dc2
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Mon 2006-05-01 13:58:11 +0200
message:
Removed _countiter() from info.py. It was never used, not even in the
revision which introduced it.
------------------------------------------------------------
merged: olaf at conradi.org-20060501074321-0d39d1f35b124dc2
parent: olaf at conradi.org-20060501072514-243b86368e363af7
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Mon 2006-05-01 09:43:21 +0200
message:
Add NEWS entry, change text of skipped test for os style locks.
------------------------------------------------------------
merged: olaf at conradi.org-20060501072514-243b86368e363af7
parent: olaf at conradi.org-20060430220956-edb2a743c28c3a33
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Mon 2006-05-01 09:25:14 +0200
message:
Fix alignment of nested parenthesis.
------------------------------------------------------------
merged: olaf at conradi.org-20060430220956-edb2a743c28c3a33
parent: olaf at conradi.org-20060430204240-80a7db1d50a50e6b
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Mon 2006-05-01 00:09:56 +0200
message:
Change test_info_locking_oslocks() for locking the working tree.
------------------------------------------------------------
merged: olaf at conradi.org-20060430204240-80a7db1d50a50e6b
parent: olaf at conradi.org-20060430204147-79d4b73937a803fa
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Sun 2006-04-30 22:42:40 +0200
message:
Fixed test case with bzr update inside test_info, it now uses the API.
------------------------------------------------------------
merged: olaf at conradi.org-20060430204147-79d4b73937a803fa
parent: olaf at conradi.org-20060430155515-115cf13f3d7925a6
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Sun 2006-04-30 22:41:47 +0200
message:
Fix import line of bzrlib.errors. BzrError was not imported, the other
was inconsistently referenced. LockDir is not needed any more.
------------------------------------------------------------
merged: olaf at conradi.org-20060430155515-115cf13f3d7925a6
parent: olaf at conradi.org-20060429231005-a1523dc3a8feb494
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Sun 2006-04-30 17:55:15 +0200
message:
Mark peek() for oslock style locks as NotImplemented. Added one simple
test case for when they are.
------------------------------------------------------------
merged: olaf at conradi.org-20060429231005-a1523dc3a8feb494
parent: olaf at conradi.org-20060429204730-01bbbe1e6e372e61
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Sun 2006-04-30 01:10:05 +0200
message:
Rename is_transport_locked() to get_physical_lock_status() as the
transport is abstracted away from. Prefixed with get_ as it might take
some time to return.
------------------------------------------------------------
merged: olaf at conradi.org-20060429204730-01bbbe1e6e372e61
parent: olaf at conradi.org-20060428064355-74d873ac81abd0e3
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Sat 2006-04-29 22:47:30 +0200
message:
Implemented locking status for formats using LockDir.
* Add is_transport_locked() to class LockableFiles and make it
available through classes WorkingTree, Branch and Repository.
* Complete the test case for all permutations of locking.
* Re-enabled the read locks inside the info command.
------------------------------------------------------------
merged: olaf at conradi.org-20060428064355-74d873ac81abd0e3
parent: olaf at conradi.org-20060421154716-9bc46986533d72e0
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Fri 2006-04-28 08:43:55 +0200
message:
Add initial support for showing locking information in bzr info.
* Add outline for test case.
* Add is_locked() to Branch and WorkingTree classes.
* Add new section 'Locked locations' to bzr info.
* Removed read locks from info command, maybe re-add them to those functions
that need them.
------------------------------------------------------------
merged: olaf at conradi.org-20060421154716-9bc46986533d72e0
parent: olaf at conradi.org-20060420131557-780ada3c14298063
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Fri 2006-04-21 17:47:16 +0200
message:
Simplified construct detection in location overview a lot.
Renamed bound branches to checkouts and added prefix light to lightweight
checkouts.
------------------------------------------------------------
merged: olaf at conradi.org-20060420131557-780ada3c14298063
parent: olaf at conradi.org-20060420092440-554262e77a2a6ab5
parent: pqm at pqm.ubuntu.com-20060420082224-da4345a35c42e545
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Thu 2006-04-20 13:15:57 +0000
message:
Merge bzr.dev
------------------------------------------------------------
merged: olaf at conradi.org-20060420092440-554262e77a2a6ab5
parent: olaf at conradi.org-20060420090043-3ba383f1eca3122a
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Thu 2006-04-20 11:24:40 +0200
message:
Minor update for knit being the new default format.
------------------------------------------------------------
merged: olaf at conradi.org-20060420090043-3ba383f1eca3122a
parent: olaf at conradi.org-20060419192853-3dc5c06815c8b097
parent: pqm at pqm.ubuntu.com-20060420080929-dff63a32df0b3e0b
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Thu 2006-04-20 11:00:43 +0200
message:
Merge bzr.dev
------------------------------------------------------------
merged: olaf at conradi.org-20060419192853-3dc5c06815c8b097
parent: olaf at conradi.org-20060419191753-07e830c241a31f9b
parent: pqm at pqm.ubuntu.com-20060419084239-730ca2dccc3bea14
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Wed 2006-04-19 21:28:53 +0200
message:
Merge bzr.dev
------------------------------------------------------------
merged: olaf at conradi.org-20060419191753-07e830c241a31f9b
parent: olaf at conradi.org-20060415024104-6e567ea171f22924
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Wed 2006-04-19 21:17:53 +0200
message:
Show paths relative to shared repository if applicable. This gives a
more compact and easier overview of locations. Moved parent and push
location to a seperate section called related branches.
------------------------------------------------------------
merged: olaf at conradi.org-20060415024104-6e567ea171f22924
parent: olaf at conradi.org-20060414123139-a8479b3e99b56a28
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Sat 2006-04-15 04:41:04 +0200
message:
Add updated help message for bzr info.
------------------------------------------------------------
merged: olaf at conradi.org-20060414123139-a8479b3e99b56a28
parent: olaf at conradi.org-20060414120606-a7f4b6c53b8d402b
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Fri 2006-04-14 14:31:39 +0200
message:
Test case for bzr info on a non-existing branch.
------------------------------------------------------------
merged: olaf at conradi.org-20060414120606-a7f4b6c53b8d402b
parent: olaf at conradi.org-20060414115912-8eefdc1c709ecad4
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Fri 2006-04-14 14:06:06 +0200
message:
Fix comments and a docstring.
------------------------------------------------------------
merged: olaf at conradi.org-20060414115912-8eefdc1c709ecad4
parent: olaf at conradi.org-20060414103626-e4d25342681c17f8
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Fri 2006-04-14 13:59:12 +0200
message:
Show shared repository location for bzr info on a repository with a
working tree inside the root.
------------------------------------------------------------
merged: olaf at conradi.org-20060414103626-e4d25342681c17f8
parent: olaf at conradi.org-20060411013408-b42419dc665020f2
parent: pqm at pqm.ubuntu.com-20060414013800-bd0ac9b0d1f8ba7b
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Fri 2006-04-14 12:36:26 +0200
message:
Merge bzr.dev
More information about the bazaar-commits
mailing list