Rev 1460: Merge jam-integration. in
/home/robertc/source/baz/integration/
Robert Collins
robertc at robertcollins.net
Fri Feb 17 04:47:23 GMT 2006
------------------------------------------------------------
revno: 1460
revision-id: robertc at robertcollins.net-20060217044707-8c15dab107f79a40
parent: robertc at robertcollins.net-20060214065221-23180801f3c7cb18
parent: john at arbash-meinel.com-20060217035556-b86991407ef095d9
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Fri 2006-02-17 15:47:07 +1100
message:
Merge jam-integration.
added:
bzrlib/sign_my_commits.py sign_my_commits.py-20060215152201-5a6363365180e671
bzrlib/tests/blackbox/test_help.py test_help.py-20060216004358-4ee8a2a338f75a62
bzrlib/tests/blackbox/test_logformats.py test_logformats.py-20060216104208-ba5a16c83480b7e4
bzrlib/tests/blackbox/test_re_sign.py test_re_sign.py-20060214165921-4d04eba231454693
bzrlib/tests/blackbox/test_sign_my_commits.py test_sign_my_commits.py-20060215152957-270238a1ffacc841
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/store/__init__.py store.py-20050309040759-164dc5173d6406c2
bzrlib/store/weave.py weavestore.py-20050907094258-88262e0434babab9
bzrlib/testament.py testament.py-20051011100429-6d319a18183b13c8
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_permissions.py test_permissions.py-20051215004520-ccf475789c80e80c
bzrlib/tests/test_testament.py testtestament.py-20051011100429-5df1657310caa929
------------------------------------------------------------
merged: john at arbash-meinel.com-20060217035556-b86991407ef095d9
parent: john at arbash-meinel.com-20060217024753-edfa0e845eed8993
parent: john at arbash-meinel.com-20060217020102-a26538d2b32bff80
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Thu 2006-02-16 21:55:56 -0600
message:
[merge] jam-pending: add sign-my-commits, fix repository.clone, add progress bars.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060217020102-a26538d2b32bff80
parent: john at arbash-meinel.com-20060216171015-1c017977993fbe9b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Thu 2006-02-16 20:01:02 -0600
message:
cleanups from Robert
------------------------------------------------------------
merged: john at arbash-meinel.com-20060216171015-1c017977993fbe9b
parent: john at arbash-meinel.com-20060216170909-155c5aa4a20620dc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Thu 2006-02-16 11:10:15 -0600
message:
Adding progress bars to copy_all and copy_multi, fixing ordering of repository.clone() to pull inventories after weaves.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060216170909-155c5aa4a20620dc
parent: john at arbash-meinel.com-20060216170234-28b00293a6fdb5bf
parent: john at arbash-meinel.com-20060215223111-db659aff6ab35804
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Thu 2006-02-16 11:09:09 -0600
message:
[merge] bump up sign-my-commits
------------------------------------------------------------
merged: john at arbash-meinel.com-20060215223111-db659aff6ab35804
parent: john at arbash-meinel.com-20060215154209-1db9dff063341810
parent: john at arbash-meinel.com-20060215220155-08afc2aced7548dc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Wed 2006-02-15 16:31:11 -0600
message:
[merge] jam-integration, along with BzrDir changes
------------------------------------------------------------
merged: john at arbash-meinel.com-20060215220155-08afc2aced7548dc
parent: john at arbash-meinel.com-20060214181443-42056ee264cc28fe
parent: robertc at robertcollins.net-20060214065221-23180801f3c7cb18
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Wed 2006-02-15 16:01:55 -0600
message:
[merge] robertc's integration branch: add BzrDir, and checkouts
------------------------------------------------------------
merged: john at arbash-meinel.com-20060214181443-42056ee264cc28fe
parent: john at arbash-meinel.com-20060213214027-f87283ba0fa50538
parent: john at arbash-meinel.com-20060214170602-5959f911674708c9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Tue 2006-02-14 12:14:43 -0600
message:
[merge] jam-pending: allow bzr re-sign to take multiple arguments
------------------------------------------------------------
merged: john at arbash-meinel.com-20060214170602-5959f911674708c9
parent: john at arbash-meinel.com-20060214170148-2765fe23e7309b93
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Tue 2006-02-14 11:06:02 -0600
message:
Updated NEWS
------------------------------------------------------------
merged: john at arbash-meinel.com-20060214170148-2765fe23e7309b93
parent: john at arbash-meinel.com-20060213214027-f87283ba0fa50538
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Tue 2006-02-14 11:01:48 -0600
message:
Updating bzr re-sign to allow multiple arguments, and updating tests
------------------------------------------------------------
merged: john at arbash-meinel.com-20060215154209-1db9dff063341810
parent: john at arbash-meinel.com-20060215153329-5d70f0eda01f5cfe
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Wed 2006-02-15 09:42:09 -0600
message:
Adding sign-my-commits as a builtin, along with some simple tests.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060215153329-5d70f0eda01f5cfe
parent: john at arbash-meinel.com-20060215151844-ce3e3efccd19da3f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Wed 2006-02-15 09:33:29 -0600
message:
Fix doc bug
------------------------------------------------------------
merged: john at arbash-meinel.com-20060215151844-ce3e3efccd19da3f
parent: john at arbash-meinel.com-20060214183630-bf533b848ea5edce
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Wed 2006-02-15 09:18:44 -0600
message:
Reverting gpg changes, should not be mainline, see gpg_uses_tempfile plugin.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060214183630-bf533b848ea5edce
parent: john at arbash-meinel.com-20060214170602-5959f911674708c9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Tue 2006-02-14 12:36:30 -0600
message:
Updated gpg to use a named file, rather than using stdin, so that gpg-agent will work properly
------------------------------------------------------------
merged: john at arbash-meinel.com-20060216170234-28b00293a6fdb5bf
parent: john at arbash-meinel.com-20060216164908-3b469d969279998a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Thu 2006-02-16 11:02:34 -0600
message:
small cleanup of test
------------------------------------------------------------
merged: john at arbash-meinel.com-20060216164908-3b469d969279998a
parent: john at arbash-meinel.com-20060216164307-5a0d008322cbf1d8
parent: marienz at gentoo.org-20060213232429-dd6f4ee24918e675
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Thu 2006-02-16 10:49:08 -0600
message:
[merge] Marien Zwart: make testament actually support unicode strings.
------------------------------------------------------------
merged: marienz at gentoo.org-20060213232429-dd6f4ee24918e675
parent: marienz at gentoo.org-20060212234125-9d198c5d818af110
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr.dev
timestamp: Tue 2006-02-14 00:24:29 +0100
message:
Move the encoding step into the test to make it more obvious we are comparing bytestrings.
------------------------------------------------------------
merged: marienz at gentoo.org-20060212234125-9d198c5d818af110
parent: marienz at gentoo.org-20060212224024-782d3bcc922d980c
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr.dev
timestamp: Mon 2006-02-13 00:41:25 +0100
message:
Whitespace cleanup (pep 3)
------------------------------------------------------------
merged: marienz at gentoo.org-20060212224024-782d3bcc922d980c
parent: marienz at gentoo.org-20060212223951-4827a2850a0da0e6
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr.dev
timestamp: Sun 2006-02-12 23:40:24 +0100
message:
Remove a useless local function.
------------------------------------------------------------
merged: marienz at gentoo.org-20060212223951-4827a2850a0da0e6
parent: mbp at sourcefrog.net-20060201130813-1240ac51411d1330
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr.dev
timestamp: Sun 2006-02-12 23:39:51 +0100
message:
Make Testament.as_text_lines return utf-8 instead of unicode objects and add a test for this.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060216164307-5a0d008322cbf1d8
parent: john at arbash-meinel.com-20060215220155-08afc2aced7548dc
parent: erik at bagfors.nu-20060216104622-46a6394829db2ee8
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Thu 2006-02-16 10:43:07 -0600
message:
[merge] bzr.log.plugins: add --log-format to 'bzr log', allow a default to be set in config
------------------------------------------------------------
merged: erik at bagfors.nu-20060216104622-46a6394829db2ee8
parent: erik at bagfors.nu-20060216104544-42f90be7bc2e5856
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: bzr.log.plugins
timestamp: Thu 2006-02-16 11:46:22 +0100
message:
reformat NEWS
------------------------------------------------------------
merged: erik at bagfors.nu-20060216104544-42f90be7bc2e5856
parent: erik at bagfors.nu-20060216104359-444d0956bed3a1f7
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: bzr.log.plugins
timestamp: Thu 2006-02-16 11:45:44 +0100
message:
bugfix, typo bug
------------------------------------------------------------
merged: erik at bagfors.nu-20060216104359-444d0956bed3a1f7
parent: erik at bagfors.nu-20060215204913-66b12988b85e0b57
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: bzr.log.plugins
timestamp: Thu 2006-02-16 11:43:59 +0100
message:
blackbox tests for default log format and log-format arguments
------------------------------------------------------------
merged: erik at bagfors.nu-20060215204913-66b12988b85e0b57
parent: erik at bagfors.nu-20060210212329-0b949820c96ebe15
parent: john at arbash-meinel.com-20060213214027-f87283ba0fa50538
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: bzr.log.plugins
timestamp: Wed 2006-02-15 21:49:13 +0100
message:
[merge] jam-integration
------------------------------------------------------------
merged: erik at bagfors.nu-20060210212329-0b949820c96ebe15
parent: erik at bagfors.nu-20060206201243-3f60d7473fcf9ef3
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: bzr.log.plugins
timestamp: Fri 2006-02-10 22:23:29 +0100
message:
log_formatter => log_format for "named" formatters
The name of a formatter is now called log_format and is exposed
as "log-format" and not "log-formatter" to the user for more consitency
------------------------------------------------------------
merged: erik at bagfors.nu-20060206201243-3f60d7473fcf9ef3
parent: erik at bagfors.nu-20060206201150-73d89be9e6320dad
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: bzr.log.plugins
timestamp: Mon 2006-02-06 21:12:43 +0100
message:
tests for config log_formatter
------------------------------------------------------------
merged: erik at bagfors.nu-20060206201150-73d89be9e6320dad
parent: erik at bagfors.nu-20060204115126-c9ee420cc8876c25
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: bzr.log.plugins
timestamp: Mon 2006-02-06 21:11:50 +0100
message:
fix in help, log_format -> log_formatter
------------------------------------------------------------
merged: erik at bagfors.nu-20060204115126-c9ee420cc8876c25
parent: erik at bagfors.nu-20060204114014-ef72c583019c8342
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: bzr.log.plugins
timestamp: Sat 2006-02-04 12:51:26 +0100
message:
Make default formatter work for the missing command
Also, removed debugging
------------------------------------------------------------
merged: erik at bagfors.nu-20060204114014-ef72c583019c8342
parent: erik at bagfors.nu-20060204113623-016da21eeb5723ca
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: bzr.log.plugins
timestamp: Sat 2006-02-04 12:40:14 +0100
message:
update NEWS
------------------------------------------------------------
merged: erik at bagfors.nu-20060204113623-016da21eeb5723ca
parent: erik at bagfors.nu-20060203213448-af43e1511444f3fd
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: bzr.log.plugins
timestamp: Sat 2006-02-04 12:36:23 +0100
message:
Support for setting the default log format at a configuration option
Also, removed the possibility for plugins to set the default formatter
------------------------------------------------------------
merged: erik at bagfors.nu-20060203213448-af43e1511444f3fd
parent: erik at bagfors.nu-20060203195457-046f39c916b2ee12
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: bzr.log.plugins
timestamp: Fri 2006-02-03 22:34:48 +0100
message:
cover the missing command with formatters as well
------------------------------------------------------------
merged: erik at bagfors.nu-20060203195457-046f39c916b2ee12
parent: erik at bagfors.nu-20060203195059-1cf8ff5aa68de0ea
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: bzr.log.plugins
timestamp: Fri 2006-02-03 20:54:57 +0100
message:
Made "unknown log formatter" error message work
------------------------------------------------------------
merged: erik at bagfors.nu-20060203195059-1cf8ff5aa68de0ea
parent: mbp at sourcefrog.net-20060201130813-1240ac51411d1330
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: bzr.log.plugins
timestamp: Fri 2006-02-03 20:50:59 +0100
message:
Support for plugins to register log formatters and set default formatter
Also, change one command line option for "log"
------------------------------------------------------------
merged: john at arbash-meinel.com-20060217024753-edfa0e845eed8993
parent: john at arbash-meinel.com-20060216170234-28b00293a6fdb5bf
parent: michael at ellerman.id.au-20060216005059-dde4ec75b1b58ebf
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Thu 2006-02-16 20:47:53 -0600
message:
[merge] Michael Ellerman: support 'bzr log -r ..' and add tests, also clarify 'bzr help --long'
------------------------------------------------------------
merged: michael at ellerman.id.au-20060216005059-dde4ec75b1b58ebf
parent: michael at ellerman.id.au-20060216004340-37abb307ac2b63cf
committer: Michael Ellerman <michael at ellerman.id.au>
branch nick: mpe
timestamp: Thu 2006-02-16 11:50:59 +1100
message:
Add custom description for help's --long option, this fixes bug #31217.
There were no real tests for help, so add a bunch of black box tests
to confirm all the various incantations work.
------------------------------------------------------------
merged: michael at ellerman.id.au-20060216004340-37abb307ac2b63cf
parent: michael at ellerman.id.au-20060215050736-2b2c17f50a210b4d
committer: Michael Ellerman <michael at ellerman.id.au>
branch nick: mpe
timestamp: Thu 2006-02-16 11:43:40 +1100
message:
Make bzr log -r .. work, fixes bug #4609. Add a bunch of tests to make sure
it doesn't break in future.
------------------------------------------------------------
merged: michael at ellerman.id.au-20060215050736-2b2c17f50a210b4d
parent: mbp at sourcefrog.net-20060201130813-1240ac51411d1330
parent: john at arbash-meinel.com-20060214181443-42056ee264cc28fe
committer: Michael Ellerman <michael at ellerman.id.au>
branch nick: revision-ranges
timestamp: Wed 2006-02-15 16:07:36 +1100
message:
Merge JAM Integration
More information about the bazaar-commits
mailing list