Rev 1626: Merge bzr.dev. in /home/robertc/source/baz/integration/
Robert Collins
robertc at robertcollins.net
Wed Apr 12 06:35:39 BST 2006
------------------------------------------------------------
revno: 1626
revision-id: robertc at robertcollins.net-20060412053532-74cf4362ebd83f29
parent: robertc at robertcollins.net-20060412045734-3e03b7af0860a5a9
parent: pqm at pqm.ubuntu.com-20060412032139-5508773d6a1cd4ae
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2006-04-12 15:35:32 +1000
message:
Merge bzr.dev.
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/info.py info.py-20050323235939-6bbfe7d9700b0b9b
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060412032139-5508773d6a1cd4ae
parent: pqm at pqm.ubuntu.com-20060411084133-90aab62d72535e57
parent: aaron.bentley at utoronto.ca-20060412030132-a1cf79509acb12a9
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-04-12 04:21:39 +0100
message:
Remove debug path printing
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060412030132-a1cf79509acb12a9
parent: abentley at panoramicfeedback.com-20060410134102-08b1929145cda317
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: revert-missing
timestamp: Tue 2006-04-11 23:01:32 -0400
message:
Fixed revert with missing files
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060411084133-90aab62d72535e57
parent: pqm at pqm.ubuntu.com-20060411070422-9167eccbd3e561a2
parent: mbp at sourcefrog.net-20060411081134-5a78a9fea699c274
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-04-11 09:41:33 +0100
message:
(olaf) much improved bzr info output
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060411081134-5a78a9fea699c274
parent: pqm at pqm.ubuntu.com-20060410135440-f18f47545bf15172
parent: olaf at conradi.org-20060411013408-b42419dc665020f2
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.info
timestamp: Tue 2006-04-11 18:11:34 +1000
message:
[merge] improved bzr info output, showing formats and bindings (olaf)
------------------------------------------------------------
merged: olaf at conradi.org-20060411013408-b42419dc665020f2
parent: olaf at conradi.org-20060411012820-461358428338485e
parent: pqm at pqm.ubuntu.com-20060410135440-f18f47545bf15172
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Tue 2006-04-11 03:34:08 +0200
message:
Merge bzr.dev
------------------------------------------------------------
merged: olaf at conradi.org-20060411012820-461358428338485e
parent: olaf at conradi.org-20060406131811-a3d8f57b90e38dc7
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Tue 2006-04-11 03:28:20 +0200
message:
Make bzr info command work on both local and remote locations. Support
branches and repositories, next to working trees.
------------------------------------------------------------
merged: olaf at conradi.org-20060406131811-a3d8f57b90e38dc7
parent: olaf at conradi.org-20060406130740-9b753774d590c5a4
parent: pqm at pqm.ubuntu.com-20060406115819-479ae52584747faa
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Thu 2006-04-06 15:18:11 +0200
message:
Merge bzr.dev
------------------------------------------------------------
merged: olaf at conradi.org-20060406130740-9b753774d590c5a4
parent: olaf at conradi.org-20060406011556-047190542aada4bc
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Thu 2006-04-06 15:07:40 +0200
message:
New call get_format_description to give a user-friendly description of a
format.
------------------------------------------------------------
merged: olaf at conradi.org-20060406011556-047190542aada4bc
parent: olaf at conradi.org-20060403112157-8ff209d3a3d67285
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Thu 2006-04-06 03:15:56 +0200
message:
Move to using bzrlib API for blackbox test cases.
------------------------------------------------------------
merged: olaf at conradi.org-20060403112157-8ff209d3a3d67285
parent: olaf at conradi.org-20060402015042-0dad313bcc337a41
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Mon 2006-04-03 13:21:57 +0200
message:
Remove indirection in branch.repository as it is available as repository
variable already.
------------------------------------------------------------
merged: olaf at conradi.org-20060402015042-0dad313bcc337a41
parent: olaf at conradi.org-20060402014232-96a3295ba29af142
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Sun 2006-04-02 03:50:42 +0200
message:
Add NEWS entry.
------------------------------------------------------------
merged: olaf at conradi.org-20060402014232-96a3295ba29af142
parent: olaf at conradi.org-20060402012957-4b35c41c185956af
parent: pqm at pqm.ubuntu.com-20060331004321-2171d32febcbfe4d
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Sun 2006-04-02 03:42:32 +0200
message:
Merge bzr.dev
------------------------------------------------------------
merged: olaf at conradi.org-20060402012957-4b35c41c185956af
parent: olaf at conradi.org-20060402011712-80946e4af8b00745
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Sun 2006-04-02 03:29:57 +0200
message:
Move to using kibi for binary prefix as per standard IEEE 1541.
KiB is 2^10, kB is 10^3. Sizes should be in KiB, rates in kB/s.
------------------------------------------------------------
merged: olaf at conradi.org-20060402011712-80946e4af8b00745
parent: olaf at conradi.org-20060402011514-74bf98c5cd8a068a
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Sun 2006-04-02 03:17:12 +0200
message:
Remove debug information.
------------------------------------------------------------
merged: olaf at conradi.org-20060402011514-74bf98c5cd8a068a
parent: olaf at conradi.org-20060402005003-17121db0dc14aea9
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Sun 2006-04-02 03:15:14 +0200
message:
Fixed bug in test case where datestring_last returned the first.
------------------------------------------------------------
merged: olaf at conradi.org-20060402005003-17121db0dc14aea9
parent: olaf at conradi.org-20060402001835-5f88729b8b9eec35
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Sun 2006-04-02 02:50:03 +0200
message:
Test cases exposed a bug in missing revisions count of working tree. It
had an off-by-one error when comparing length of a list with its index
(which starts from 0). Fix is to use branch for the lookup of the revno
of working tree's last revision and substract that. This keeps revno
calculation behind branch API and makes the exception check redundant.
------------------------------------------------------------
merged: olaf at conradi.org-20060402001835-5f88729b8b9eec35
parent: olaf at conradi.org-20060402001642-5924672bed717065
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Sun 2006-04-02 02:18:35 +0200
message:
Add blackbox test case for command bzr info.
------------------------------------------------------------
merged: olaf at conradi.org-20060402001642-5924672bed717065
parent: olaf at conradi.org-20060402001220-145d2693284f8e32
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Sun 2006-04-02 02:16:42 +0200
message:
Remove unused variable count_version_dirs from info.py.
------------------------------------------------------------
merged: olaf at conradi.org-20060402001220-145d2693284f8e32
parent: olaf at conradi.org-20060402000757-1491b92e9083fb3a
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Sun 2006-04-02 02:12:20 +0200
message:
Adjust formatting. Start sections with a capital letter.
------------------------------------------------------------
merged: olaf at conradi.org-20060402000757-1491b92e9083fb3a
parent: olaf at conradi.org-20060331134440-18db1428f8bcf0d9
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Sun 2006-04-02 02:07:57 +0200
message:
PEP8ify
------------------------------------------------------------
merged: olaf at conradi.org-20060331134440-18db1428f8bcf0d9
parent: olaf at conradi.org-20060331121838-5e4aa9a666d6c9e7
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Fri 2006-03-31 15:44:40 +0200
message:
Tweak output.
------------------------------------------------------------
merged: olaf at conradi.org-20060331121838-5e4aa9a666d6c9e7
parent: olaf at conradi.org-20060331013553-2a7f9c58932dda95
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Fri 2006-03-31 14:18:38 +0200
message:
Only lightweight checkouts are referred to as checkout.
------------------------------------------------------------
merged: olaf at conradi.org-20060331013553-2a7f9c58932dda95
parent: olaf at conradi.org-20060327020559-18b30f9afcc0d55e
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Fri 2006-03-31 03:35:53 +0200
message:
Simplify construct detection. Make terms in user interface consistent.
Checkout now uses terms of bound branches.
------------------------------------------------------------
merged: olaf at conradi.org-20060327020559-18b30f9afcc0d55e
parent: olaf at conradi.org-20060327005459-3a894a56f25ed35d
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Mon 2006-03-27 04:05:59 +0200
message:
Add missing locations and formats to one construct.
------------------------------------------------------------
merged: olaf at conradi.org-20060327005459-3a894a56f25ed35d
parent: olaf at conradi.org-20060326234109-19892fb98876e2f4
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Mon 2006-03-27 02:54:59 +0200
message:
Implemented table of constructs from BzrInfo specification.
------------------------------------------------------------
merged: olaf at conradi.org-20060326234109-19892fb98876e2f4
parent: pqm at pqm.ubuntu.com-20060323202841-c460fdfe30972b21
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Mon 2006-03-27 01:41:09 +0200
message:
Add temporary --debug option to command info to test on various
constructs of bzr branches.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060411070422-9167eccbd3e561a2
parent: pqm at pqm.ubuntu.com-20060410135440-f18f47545bf15172
parent: mbp at sourcefrog.net-20060407042600-4b21f86b7f57fe34
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-04-11 08:04:22 +0100
message:
(mbp) better help message for bzr format
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060407042600-4b21f86b7f57fe34
parent: mbp at sourcefrog.net-20060407032213-ece971e214895f41
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Fri 2006-04-07 14:26:00 +1000
message:
Better help for --format options (Jos Backus)
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060410135440-f18f47545bf15172
parent: pqm at pqm.ubuntu.com-20060410052637-9c6229889bc13061
parent: abentley at panoramicfeedback.com-20060410134102-08b1929145cda317
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-04-10 14:54:40 +0100
message:
Remove debug path printing
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060410134102-08b1929145cda317
parent: abentley at panoramicfeedback.com-20060410133955-c73b8e2aa3ddc84c
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Mon 2006-04-10 09:41:02 -0400
message:
Remove debug path printing
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060410133955-c73b8e2aa3ddc84c
parent: aaron.bentley at utoronto.ca-20060409170533-f5f4d5209111f095
parent: pqm at pqm.ubuntu.com-20060410052637-9c6229889bc13061
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Mon 2006-04-10 09:39:55 -0400
message:
Merge dev
More information about the bazaar-commits
mailing list