Rev 2330: Add support for merge directives in /home/pqm/archives/thelove/bzr/+trunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Fri Mar 9 22:57:23 GMT 2007
------------------------------------------------------------
revno: 2330
revision-id: pqm at pqm.ubuntu.com-20070309225721-d395866527ca9a47
parent: pqm at pqm.ubuntu.com-20070309212715-07aacbc78b3e2dc0
parent: abentley at panoramicfeedback.com-20070309224147-m7or85t0o86c0t34
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-03-09 22:57:21 +0000
message:
Add support for merge directives
added:
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/tests/blackbox/test_merge_directive.py test_merge_directive-20070302012039-zh7uhy39biairtn0-1
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
bzrlib/tests/test_timestamp.py test_timestamp.py-20070306153932-r3ejn242c20asagv-1
bzrlib/timestamp.py timestamp.py-20070306142322-ttbb9oulf3jotljd-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/bundle_data.py read_changeset.py-20050619171944-c0d95aa685537640
bzrlib/bundle/serializer/__init__.py __init__.py-20051118175413-86b97db0b618feef
bzrlib/bundle/serializer/v08.py v06.py-20051119041339-ee43f97270b01823
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/gpg.py gpg.py-20051017065112-8654536d415dacc6
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/rio.py rio.py-20051128032247-770b120b34dfff60
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_re_sign.py test_re_sign.py-20060214165921-4d04eba231454693
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_options.py testoptions.py-20051014093702-96457cfc86319a8f
bzrlib/tests/test_rio.py test_rio.py-20051128032247-dcd1082dfc86d3d3
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20070309224147-m7or85t0o86c0t34
parent: abentley at panoramicfeedback.com-20070309220446-584nkt937ce2t6x5
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Fri 2007-03-09 17:41:47 -0500
message:
Fix patch time formatting
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20070309220446-584nkt937ce2t6x5
parent: abentley at panoramicfeedback.com-20070309220228-fsmagyzqizejudw2
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Fri 2007-03-09 17:04:46 -0500
message:
Add NEWS
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20070309220228-fsmagyzqizejudw2
parent: abentley at panoramicfeedback.com-20070309215141-wmmgb9czhi9ea14j
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Fri 2007-03-09 17:02:28 -0500
message:
Import highres date functions to old location
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20070309215141-wmmgb9czhi9ea14j
parent: abentley at panoramicfeedback.com-20070309214640-nnxk7g37bygoz50c
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Fri 2007-03-09 16:51:41 -0500
message:
Change format marker to not experimental
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20070309214640-nnxk7g37bygoz50c
parent: abentley at panoramicfeedback.com-20070309212019-1tczqufaqn490bxg
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Fri 2007-03-09 16:46:40 -0500
message:
Add (set|get)_public_branch
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20070309212019-1tczqufaqn490bxg
parent: abentley at panoramicfeedback.com-20070309210541-8i1zu6gl1zo51b17
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Fri 2007-03-09 16:20:19 -0500
message:
Misc changes from review
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20070309210541-8i1zu6gl1zo51b17
parent: abentley at panoramicfeedback.com-20070309204148-vmtkocitp2er21r7
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Fri 2007-03-09 16:05:41 -0500
message:
Clean up blackbox tests
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20070309204148-vmtkocitp2er21r7
parent: abentley at panoramicfeedback.com-20070309200141-22zi853yb73m0w8h
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Fri 2007-03-09 15:41:48 -0500
message:
Clean up tests, add serialization text test
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20070309200141-22zi853yb73m0w8h
parent: aaron.bentley at utoronto.ca-20070309065057-6fhwzmcmq6gsnvph
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Fri 2007-03-09 15:01:41 -0500
message:
Do not show prefixes in diffs
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20070309065057-6fhwzmcmq6gsnvph
parent: aaron.bentley at utoronto.ca-20070309063954-kla33k312hc97fkg
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Fri 2007-03-09 01:50:57 -0500
message:
Re-design patch handling to use a dict
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20070309063954-kla33k312hc97fkg
parent: aaron.bentley at utoronto.ca-20070309040235-fg2w16vld49hn9v8
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Fri 2007-03-09 01:39:54 -0500
message:
Add docs for MergeDirective and RIO-patch functions
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20070309040235-fg2w16vld49hn9v8
parent: abentley at panoramicfeedback.com-20070307201406-5bxjy8wlmmcxy0eh
parent: pqm at pqm.ubuntu.com-20070309020838-1dd7e652bc5c30ff
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Thu 2007-03-08 23:02:35 -0500
message:
Merge bzr.dev
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20070307201406-5bxjy8wlmmcxy0eh
parent: abentley at panoramicfeedback.com-20070307193308-0d4e2jx8m14w5n99
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Wed 2007-03-07 15:14:06 -0500
message:
Fix failing tests
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20070307193308-0d4e2jx8m14w5n99
parent: abentley at panoramicfeedback.com-20070306173820-gm6h3evc1wq5hmcq
parent: pqm at pqm.ubuntu.com-20070307121852-b60a661123a5063d
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Wed 2007-03-07 14:33:08 -0500
message:
Merge bzr.dev
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20070306173820-gm6h3evc1wq5hmcq
parent: abentley at panoramicfeedback.com-20070306173229-f5rqgyxswuetgzn5
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Tue 2007-03-06 12:38:20 -0500
message:
Check public branch only if not using a bundle
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20070306173229-f5rqgyxswuetgzn5
parent: abentley at panoramicfeedback.com-20070306171830-a8t6u8zqi0dngymt
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Tue 2007-03-06 12:32:29 -0500
message:
Take public_branch as a string, not object
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20070306171830-a8t6u8zqi0dngymt
parent: abentley at panoramicfeedback.com-20070306170240-0y7u12fgon0pj4n2
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Tue 2007-03-06 12:18:30 -0500
message:
Improve merge directive help
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20070306170240-0y7u12fgon0pj4n2
parent: abentley at panoramicfeedback.com-20070306160259-dunx5d9kztvjdl3q
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Tue 2007-03-06 12:02:40 -0500
message:
Tweak merge-directive help text
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20070306160259-dunx5d9kztvjdl3q
parent: abentley at panoramicfeedback.com-20070306160225-m505tm2meq7dolg3
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Tue 2007-03-06 11:02:59 -0500
message:
Use patch-style dates for timestamps in merge directives
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20070306160225-m505tm2meq7dolg3
parent: abentley at panoramicfeedback.com-20070306143648-21mk65sacviz0cxn
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Tue 2007-03-06 11:02:25 -0500
message:
Copy and extend patch date formatting code, add patch-date parsing
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20070306143648-21mk65sacviz0cxn
parent: aaron.bentley at utoronto.ca-20070306064336-faqn0n4uc9cmsny4
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Tue 2007-03-06 09:36:48 -0500
message:
Move bundle timestamp code to timestamp
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20070306064336-faqn0n4uc9cmsny4
parent: aaron.bentley at utoronto.ca-20070306063419-ils9x2j89l1sz2u4
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Tue 2007-03-06 01:43:36 -0500
message:
support custom message everywhere
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20070306063419-ils9x2j89l1sz2u4
parent: aaron.bentley at utoronto.ca-20070306024029-xq5xqmzn0yrcoo1g
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Tue 2007-03-06 01:34:19 -0500
message:
Get email working, with optional message
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20070306024029-xq5xqmzn0yrcoo1g
parent: abentley at panoramicfeedback.com-20070302202706-mriia2sdekme12af
parent: pqm at pqm.ubuntu.com-20070305220713-41e023034592cca1
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Mon 2007-03-05 21:40:29 -0500
message:
Merge bzr.dev
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20070302202706-mriia2sdekme12af
parent: abentley at panoramicfeedback.com-20070302160831-awgljsprb3y5lm6f
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Fri 2007-03-02 15:27:06 -0500
message:
Add RegistryOption.from_swargs to simplify simple registry options
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20070302160831-awgljsprb3y5lm6f
parent: abentley at panoramicfeedback.com-20070302160033-24rk2wsej7212y0f
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Fri 2007-03-02 11:08:31 -0500
message:
Indent line continuations in Patch-RIO, to improve readability
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20070302160033-24rk2wsej7212y0f
parent: abentley at panoramicfeedback.com-20070302150307-zg8n768fzowijv7l
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Fri 2007-03-02 11:00:33 -0500
message:
Fix handling of whitespace-stripping without newline munging
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20070302150307-zg8n768fzowijv7l
parent: aaron.bentley at utoronto.ca-20070302050016-m6m8kh6f6ev6sby4
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Fri 2007-03-02 10:03:07 -0500
message:
Patch-RIO does line breaks in slightly more readable places
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20070302050016-m6m8kh6f6ev6sby4
parent: aaron.bentley at utoronto.ca-20070302045725-gwstbhhzjko37t7h
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Fri 2007-03-02 00:00:16 -0500
message:
Pull directive registry into command class
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20070302045725-gwstbhhzjko37t7h
parent: aaron.bentley at utoronto.ca-20070302045310-a4jr2qd18xuzqz25
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Thu 2007-03-01 23:57:25 -0500
message:
Clean up patch-selection options
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20070302045310-a4jr2qd18xuzqz25
parent: aaron.bentley at utoronto.ca-20070302043147-ig72y3cqimym5mv4
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Thu 2007-03-01 23:53:10 -0500
message:
Allow RegistryOption to omit the value-taking option
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20070302043147-ig72y3cqimym5mv4
parent: aaron.bentley at utoronto.ca-20070302040759-5xs52rvht12z9pld
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Thu 2007-03-01 23:31:47 -0500
message:
add revision selection to mergedirective
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20070302040759-5xs52rvht12z9pld
parent: aaron.bentley at utoronto.ca-20070302035817-hetup3803ogn6f3n
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Thu 2007-03-01 23:07:59 -0500
message:
Enable signing merge directives
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20070302035817-hetup3803ogn6f3n
parent: aaron.bentley at utoronto.ca-20070302024626-nxb07lxv8k162wwd
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Thu 2007-03-01 22:58:17 -0500
message:
add header/trailer to fake clearsigned texts
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20070302024626-nxb07lxv8k162wwd
parent: abentley at panoramicfeedback.com-20070301220239-912wunnt0ibdxwv8
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Thu 2007-03-01 21:46:26 -0500
message:
Get merge-directive command basically working
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20070301220239-912wunnt0ibdxwv8
parent: abentley at panoramicfeedback.com-20070301184936-yqh784phreoj8frm
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Thu 2007-03-01 17:02:39 -0500
message:
Rename fields
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20070301184936-yqh784phreoj8frm
parent: abentley at panoramicfeedback.com-20070301183050-g05fxlw903g99b1h
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Thu 2007-03-01 13:49:36 -0500
message:
Add format header
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20070301183050-g05fxlw903g99b1h
parent: abentley at panoramicfeedback.com-20070301181600-vs3elfjgigoskuuk
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Thu 2007-03-01 13:30:50 -0500
message:
Handle trailing whitepace cleanly
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20070301181600-vs3elfjgigoskuuk
parent: aaron.bentley at utoronto.ca-20070301060310-0pt01rqke20k7ynr
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Thu 2007-03-01 13:16:00 -0500
message:
Reduce max width to 72
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20070301060310-0pt01rqke20k7ynr
parent: aaron.bentley at utoronto.ca-20070301060307-a6se6653vx5fi65s
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Thu 2007-03-01 01:03:10 -0500
message:
force patch-rio to 76 characters
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20070301060307-a6se6653vx5fi65s
parent: aaron.bentley at utoronto.ca-20070301045143-w3isp2hojzyvd2px
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Thu 2007-03-01 01:03:07 -0500
message:
Add merge-directive command
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20070301045143-w3isp2hojzyvd2px
parent: aaron.bentley at utoronto.ca-20070301044855-ywj2umovp9uid2w6
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Wed 2007-02-28 23:51:43 -0500
message:
Fix use of public location/branch
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20070301044855-ywj2umovp9uid2w6
parent: aaron.bentley at utoronto.ca-20070301041436-cyfzmqrtau2qs4fk
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Wed 2007-02-28 23:48:55 -0500
message:
Force times to be floats
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20070301041436-cyfzmqrtau2qs4fk
parent: abentley at panoramicfeedback.com-20070301013455-4i2rtr2x7ykhedt6
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Wed 2007-02-28 23:14:36 -0500
message:
Get MergeDirective.from_objects working
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20070301013455-4i2rtr2x7ykhedt6
parent: abentley at panoramicfeedback.com-20070228225845-01l214kd4xeb681q
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Wed 2007-02-28 20:34:55 -0500
message:
Add failing test
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20070228225845-01l214kd4xeb681q
parent: abentley at panoramicfeedback.com-20070228185118-9m1ko9deqtokocil
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Wed 2007-02-28 17:58:45 -0500
message:
Add timestamps to merge directives
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20070228185118-9m1ko9deqtokocil
parent: abentley at panoramicfeedback.com-20070228165118-1v8tiziwwq5wzr1z
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Wed 2007-02-28 13:51:18 -0500
message:
Got directives round-tripping, with bundles and everything
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20070228165118-1v8tiziwwq5wzr1z
parent: aaron.bentley at utoronto.ca-20070216001818-rlhrzftmlaune361
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Wed 2007-02-28 11:51:18 -0500
message:
Basic RIO patch-compatible format is working
More information about the bazaar-commits
mailing list