Rev 2326: Merge Martins 0.15rc2 release branch. in http://people.ubuntu.com/~robertc/baz2.0/0.15
Robert Collins
robertc at robertcollins.net
Wed Mar 21 03:31:44 GMT 2007
At http://people.ubuntu.com/~robertc/baz2.0/0.15
------------------------------------------------------------
revno: 2326
revision-id: robertc at robertcollins.net-20070321033137-8tj3jiz2nxqdk7pa
parent: pqm at pqm.ubuntu.com-20070310024746-9892781e4718edaf
parent: mbp at sourcefrog.net-20070314093338-5y0goexyi5vla7w5
committer: Robert Collins <robertc at robertcollins.net>
branch nick: 0.15
timestamp: Wed 2007-03-21 14:31:37 +1100
message:
Merge Martins 0.15rc2 release branch.
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/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
bzrlib/tests/test_ssh_transport.py test_ssh_transport.p-20070105153201-f7iq2bosvgjbdgc3-1
bzrlib/tests/test_timestamp.py test_timestamp.py-20070306153932-r3ejn242c20asagv-1
bzrlib/tests/tree_implementations/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
bzrlib/tests/workingtree_implementations/test_inv.py test_inv.py-20070311221604-ighlq8tbn5xq0kuo-1
bzrlib/timestamp.py timestamp.py-20070306142322-ttbb9oulf3jotljd-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
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/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/gpg.py gpg.py-20051017065112-8654536d415dacc6
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/merge3.py merge3.py-20050704130834-bf0597094828a2e1
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/rio.py rio.py-20051128032247-770b120b34dfff60
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_bound_branches.py test_bound_branches.py-20051109215527-2373188ad566c205
bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
bzrlib/tests/blackbox/test_re_sign.py test_re_sign.py-20060214165921-4d04eba231454693
bzrlib/tests/blackbox/test_reconcile.py test_fix.py-20060223013051-9a188e15a5ee9451
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/blackbox/test_shared_repository.py test_shared_repository.py-20060317053531-ed30c0d79325e483
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/tests/blackbox/test_tags.py test_tags.py-20070116132048-5h4qak2cm22jlb9e-1
bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_commit_merge.py test_commit_merge.py-20050920084723-819eeeff77907bc5
bzrlib/tests/test_delta.py test_delta.py-20070110134455-sqpd1y7mbjndelxf-1
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
bzrlib/tests/test_inv.py testinv.py-20050722220913-1dc326138d1a5892
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_merge3.py merge3.py-20050704130834-556689114c89e6f2
bzrlib/tests/test_options.py testoptions.py-20051014093702-96457cfc86319a8f
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_revisionnamespaces.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
bzrlib/tests/test_rio.py test_rio.py-20051128032247-dcd1082dfc86d3d3
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_tag.py test_tag.py-20070212110532-91cw79inah2cfozx-2
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/test_ui.py test_ui.py-20051130162854-458e667a7414af09
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
bzrlib/tests/workingtree_implementations/test_merge_from_branch.py test_merge_from_bran-20060904034200-12jxyk2zlhpufxe1-1
bzrlib/tests/workingtree_implementations/test_nested_specifics.py test_nested_specific-20070306004443-qut978c488jr11sg-1
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/memory.py memory.py-20051016101338-cd008dbdf69f04fc
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/transport/ssh.py ssh.py-20060824042150-0s9787kng6zv1nwq-1
bzrlib/ui/__init__.py ui.py-20050824083933-8cf663c763ba53a9
bzrlib/ui/text.py text.py-20051130153916-2e438cffc8afc478
bzrlib/version.py version.py-20060816024207-ves6ult9a11taj9t-1
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 2323.2.36
merged: mbp at sourcefrog.net-20070314093338-5y0goexyi5vla7w5
parent: pqm at pqm.ubuntu.com-20070314050855-7241ac88a0577101
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.15rc2
timestamp: Wed 2007-03-14 20:33:38 +1100
message:
prepare to release 0.15rc2
------------------------------------------------------------
revno: 2323.2.35
merged: pqm at pqm.ubuntu.com-20070314050855-7241ac88a0577101
parent: pqm at pqm.ubuntu.com-20070314015649-ea459482fb1d053d
parent: aaron.bentley at utoronto.ca-20070314044345-gdpib8w2b9l3lnt2
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-03-14 05:08:55 +0000
message:
Hide dirstate-with-subtree, introduce dirstate-tags
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.2
merged: aaron.bentley at utoronto.ca-20070314044345-gdpib8w2b9l3lnt2
parent: aaron.bentley at utoronto.ca-20070314034240-62xl0izb1dloe30v
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2007-03-14 00:43:45 -0400
message:
Hide dirstate-with-subtree format
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.1
merged: aaron.bentley at utoronto.ca-20070314034240-62xl0izb1dloe30v
parent: abentley at panoramicfeedback.com-20070313140707-tr2b6emwkekfejlu
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-03-13 23:42:40 -0400
message:
Introduce dirstate-tags format
------------------------------------------------------------
revno: 2323.2.34
merged: pqm at pqm.ubuntu.com-20070314015649-ea459482fb1d053d
parent: pqm at pqm.ubuntu.com-20070313211439-de065881d219e0dd
parent: andrew.bennetts at canonical.com-20070313052712-fjpwxnglz6nlmehu
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-03-14 01:56:49 +0000
message:
(Andrew Bennetts) Fix bug in MemoryTransport.rmdir.
------------------------------------------------------------
revno: 2323.2.15.5.1
merged: andrew.bennetts at canonical.com-20070313052712-fjpwxnglz6nlmehu
parent: pqm at pqm.ubuntu.com-20070311211206-0fd0176ac1e77ef7
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: memory-transport-rmdir
timestamp: Tue 2007-03-13 16:27:12 +1100
message:
Fix bug in MemoryTransport.rmdir.
------------------------------------------------------------
revno: 2323.2.33
merged: pqm at pqm.ubuntu.com-20070313211439-de065881d219e0dd
parent: pqm at pqm.ubuntu.com-20070313194443-cb3e725957c95642
parent: bialix at ukr.net-20070313201805-pgocxg341h7156vk
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-03-13 21:14:39 +0000
message:
(bialix) fixes for selftest on win32
------------------------------------------------------------
revno: 2321.2.4.1.10
merged: bialix at ukr.net-20070313201805-pgocxg341h7156vk
parent: bialix at ukr.net-20070313021617-azd5lv30b23gyu48
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32-0.16
timestamp: Tue 2007-03-13 22:18:05 +0200
message:
Explanation about Python 2.5 and StandardError.message attribute
------------------------------------------------------------
revno: 2321.2.4.1.9
merged: bialix at ukr.net-20070313021617-azd5lv30b23gyu48
parent: bialix at ukr.net-20070313021211-su48tjggdkklec47
parent: pqm at pqm.ubuntu.com-20070312175624-659e53c1fa4f5c0c
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32-0.16
timestamp: Tue 2007-03-13 04:16:17 +0200
message:
merge bzr.dev
------------------------------------------------------------
revno: 2321.2.4.1.8
merged: bialix at ukr.net-20070313021211-su48tjggdkklec47
parent: bialix at ukr.net-20070313020319-jrxdz5hlizbid4wz
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32-0.16
timestamp: Tue 2007-03-13 04:12:11 +0200
message:
Cleanup patch after John's review
------------------------------------------------------------
revno: 2321.2.4.1.7
merged: bialix at ukr.net-20070313020319-jrxdz5hlizbid4wz
parent: bialix at ukr.net-20070310233655-1bdw1r64cytacnfe
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32-0.16
timestamp: Tue 2007-03-13 04:03:19 +0200
message:
fixes for passing test_sftp_transport on win32 (thankyou John)
------------------------------------------------------------
revno: 2321.2.4.1.6
merged: bialix at ukr.net-20070310233655-1bdw1r64cytacnfe
parent: bialix at ukr.net-20070310230145-inyu15nildow8w5z
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32
timestamp: Sun 2007-03-11 01:36:55 +0200
message:
LockError produce unprintable exception on Python 2.5 because it try to override StandardError.message attribute
------------------------------------------------------------
revno: 2321.2.4.1.5
merged: bialix at ukr.net-20070310230145-inyu15nildow8w5z
parent: bialix at ukr.net-20070308003318-5shp0t2fetqy5v1z
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32
timestamp: Sun 2007-03-11 01:01:45 +0200
message:
TestCase.assertFileEqual: separate open/read file operations
to achieve more precise locating the problems on win32
------------------------------------------------------------
revno: 2321.2.4.1.4
merged: bialix at ukr.net-20070308003318-5shp0t2fetqy5v1z
parent: bialix at ukr.net-20070308002046-cab3assbe0chebdp
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32
timestamp: Thu 2007-03-08 02:33:18 +0200
message:
test intertree_implementations: skip tests with symlinks on platforms that don't have symlinks support
------------------------------------------------------------
revno: 2321.2.4.1.3
merged: bialix at ukr.net-20070308002046-cab3assbe0chebdp
parent: bialix at ukr.net-20070308000005-ppaej09riavo7hfh
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32
timestamp: Thu 2007-03-08 02:20:46 +0200
message:
test_dirstate: skip tests with symlinks on platforms that don't have symlinks support
------------------------------------------------------------
revno: 2321.2.4.1.2
merged: bialix at ukr.net-20070308000005-ppaej09riavo7hfh
parent: bialix at ukr.net-20070307232852-189cg2khvvwuavyo
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32
timestamp: Thu 2007-03-08 02:00:05 +0200
message:
numbered dirs: printErrorList show test number for NUMBERED_DIRS
------------------------------------------------------------
revno: 2321.2.4.1.1
merged: bialix at ukr.net-20070307232852-189cg2khvvwuavyo
parent: bialix at ukr.net-20070307105229-v9wczlhckrql4aae
parent: pqm at pqm.ubuntu.com-20070307110538-3026a526f5178b00
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32
timestamp: Thu 2007-03-08 01:28:52 +0200
message:
merge bzr.dev (pre-0.15/pre-0.16). It should be mergeable to both
------------------------------------------------------------
revno: 2323.2.32
merged: pqm at pqm.ubuntu.com-20070313194443-cb3e725957c95642
parent: pqm at pqm.ubuntu.com-20070313192858-49070f0422c58848
parent: john at arbash-meinel.com-20070313181145-k7jczddn8rnnlq5s
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-03-13 19:44:43 +0000
message:
(Wouter van Heyst) switch 'bzr init-repo' to default to '--no-trees'
------------------------------------------------------------
revno: 2323.2.30.2.1
merged: john at arbash-meinel.com-20070313181145-k7jczddn8rnnlq5s
parent: pqm at pqm.ubuntu.com-20070313175755-809681c81472204a
parent: larstiq at larstiq.dyndns.org-20070202160551-t5szmmar7gb7zt6l
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2007-03-13 12:11:45 -0600
message:
(Wouter van Heyst) switch 'bzr init-repo' to default to '--no-trees'
------------------------------------------------------------
revno: 2257.2.2
merged: larstiq at larstiq.dyndns.org-20070202160551-t5szmmar7gb7zt6l
parent: larstiq at larstiq.dyndns.org-20070202122410-pvj8k5lqmdrwpazh
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
branch nick: treeful-repositories
timestamp: Fri 2007-02-02 17:05:51 +0100
message:
Actually test that `bzr init-repo --{no,}-trees` still works
------------------------------------------------------------
revno: 2257.2.1
merged: larstiq at larstiq.dyndns.org-20070202122410-pvj8k5lqmdrwpazh
parent: pqm at pqm.ubuntu.com-20070202101652-5367171684fe2eec
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
branch nick: treeful-repositories
timestamp: Fri 2007-02-02 13:24:10 +0100
message:
Change the ui level default for init-repo to --trees.
------------------------------------------------------------
revno: 2323.2.31
merged: pqm at pqm.ubuntu.com-20070313192858-49070f0422c58848
parent: pqm at pqm.ubuntu.com-20070313175755-809681c81472204a
parent: abentley at panoramicfeedback.com-20070313181158-l11qyxl63pxgf9bk
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-03-13 19:28:58 +0000
message:
Add news entry for status --versioned
------------------------------------------------------------
revno: 2323.2.30.1.1
merged: abentley at panoramicfeedback.com-20070313181158-l11qyxl63pxgf9bk
parent: pqm at pqm.ubuntu.com-20070313175755-809681c81472204a
parent: warthog618 at gmail.com-20070313142019-mood3em2yds0yg0e
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Tue 2007-03-13 14:11:58 -0400
message:
Add news entry for status --versioned
------------------------------------------------------------
revno: 2323.2.27.1.1
merged: warthog618 at gmail.com-20070313142019-mood3em2yds0yg0e
parent: pqm at pqm.ubuntu.com-20070313120134-ddd44b75e5a2639c
committer: Kent Gibson <warthog618 at gmail.com>
branch nick: bzr.kg
timestamp: Tue 2007-03-13 23:20:19 +0900
message:
Add NEWS entry for status versioned.
------------------------------------------------------------
revno: 2323.2.30
merged: pqm at pqm.ubuntu.com-20070313175755-809681c81472204a
parent: pqm at pqm.ubuntu.com-20070313135340-0314c4d26adf39b1
parent: abentley at panoramicfeedback.com-20070313164523-fgyboparf5iyz6li
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-03-13 17:57:55 +0000
message:
Merge autodetects line ending for conflict markers
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.40
merged: abentley at panoramicfeedback.com-20070313164523-fgyboparf5iyz6li
parent: abentley at panoramicfeedback.com-20070313140707-tr2b6emwkekfejlu
parent: pqm at pqm.ubuntu.com-20070313135340-0314c4d26adf39b1
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-03-13 12:45:23 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39
merged: abentley at panoramicfeedback.com-20070313140707-tr2b6emwkekfejlu
parent: abentley at panoramicfeedback.com-20070312195641-ezjnseqwgjtkh0iu
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-03-13 10:07:07 -0400
message:
Add news entry
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.38
merged: abentley at panoramicfeedback.com-20070312195641-ezjnseqwgjtkh0iu
parent: aaron.bentley at utoronto.ca-20070311203448-a86mnhetckle18co
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Mon 2007-03-12 15:56:41 -0400
message:
merge3 auto-detects line endings for conflict markers
------------------------------------------------------------
revno: 2323.2.29
merged: pqm at pqm.ubuntu.com-20070313135340-0314c4d26adf39b1
parent: pqm at pqm.ubuntu.com-20070313133834-ff8514538f6b02f7
parent: marienz at gentoo.org-20070313010034-1m84wjf97jscdkdg
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-03-13 13:53:40 +0000
message:
Properly push tags if push creates a new branch.
------------------------------------------------------------
revno: 2323.2.25.2.1
merged: marienz at gentoo.org-20070313010034-1m84wjf97jscdkdg
parent: pqm at pqm.ubuntu.com-20070312222222-41194ff2fd4e23fe
committer: Marien Zwart <marienz at gentoo.org>
branch nick: push-tags
timestamp: Tue 2007-03-13 02:00:34 +0100
message:
Properly push tags if push creates a new branch.
------------------------------------------------------------
revno: 2323.2.28
merged: pqm at pqm.ubuntu.com-20070313133834-ff8514538f6b02f7
parent: pqm at pqm.ubuntu.com-20070313120134-ddd44b75e5a2639c
parent: john at arbash-meinel.com-20070309211422-uoiy80goncfqwr5j
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-03-13 13:38:34 +0000
message:
(John Arbash Meinel) Some small fixes for win32 and dirstate.
------------------------------------------------------------
revno: 2323.2.2.3.5
merged: john at arbash-meinel.com-20070309211422-uoiy80goncfqwr5j
parent: john at arbash-meinel.com-20070309005252-4heez38fmg2qsfqy
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Fri 2007-03-09 15:14:22 -0600
message:
is_executable needs a read lock.
------------------------------------------------------------
revno: 2323.2.2.3.4
merged: john at arbash-meinel.com-20070309005252-4heez38fmg2qsfqy
parent: john at arbash-meinel.com-20070308235059-bi2pipjkmdf8q4m0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Thu 2007-03-08 18:52:52 -0600
message:
Rather than setting the executable bit for every file, properly create the working inventory to include it.
------------------------------------------------------------
revno: 2323.2.2.3.3
merged: john at arbash-meinel.com-20070308235059-bi2pipjkmdf8q4m0
parent: john at arbash-meinel.com-20070308215801-pr998i7nfbihrf1w
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Thu 2007-03-08 17:50:59 -0600
message:
We need to set 'executability' for all files, because on win32, executability=None => executability=False, not executability=nochange
------------------------------------------------------------
revno: 2323.2.2.3.2
merged: john at arbash-meinel.com-20070308215801-pr998i7nfbihrf1w
parent: john at arbash-meinel.com-20070308213236-zt1tp45j9tocyp86
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Thu 2007-03-08 15:58:01 -0600
message:
Implement is_executable for WorkingTree4 and win32
------------------------------------------------------------
revno: 2323.2.2.3.1
merged: john at arbash-meinel.com-20070308213236-zt1tp45j9tocyp86
parent: pqm at pqm.ubuntu.com-20070307233124-ad2724bf65e09035
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Thu 2007-03-08 15:32:36 -0600
message:
New helper function for merge, which allows us to re-use the existing workingtree, rather than opening it again.
------------------------------------------------------------
revno: 2323.2.27
merged: pqm at pqm.ubuntu.com-20070313120134-ddd44b75e5a2639c
parent: pqm at pqm.ubuntu.com-20070313055515-823e15af73d49270
parent: warthog618 at gmail.com-20070311134418-nu57arul94zawbj4
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-03-13 12:01:34 +0000
message:
Add support for status --versioned
------------------------------------------------------------
revno: 2318.2.4
merged: warthog618 at gmail.com-20070311134418-nu57arul94zawbj4
parent: warthog618 at gmail.com-20070307144900-6bt7twg47zul3w0w
parent: pqm at pqm.ubuntu.com-20070310232535-dd964b3ad4a93236
committer: Kent Gibson <warthog618 at gmail.com>
branch nick: bzr.kg
timestamp: Sun 2007-03-11 22:44:18 +0900
message:
merge bzr.dev
------------------------------------------------------------
revno: 2318.2.3
merged: warthog618 at gmail.com-20070307144900-6bt7twg47zul3w0w
parent: warthog618 at gmail.com-20070306083736-mldnhakkcj4c8m83
parent: pqm at pqm.ubuntu.com-20070307121852-b60a661123a5063d
committer: Kent Gibson <warthog618 at gmail.com>
branch nick: bzr.kg
timestamp: Wed 2007-03-07 23:49:00 +0900
message:
merged bzr.dev
------------------------------------------------------------
revno: 2318.2.2
merged: warthog618 at gmail.com-20070306083736-mldnhakkcj4c8m83
parent: warthog618 at gmail.com-20070306083700-u0uciru4ll57ib08
committer: Kent Gibson <warthog618 at gmail.com>
branch nick: bzr.kg
timestamp: Tue 2007-03-06 17:37:36 +0900
message:
Apply bug 86451 patch
------------------------------------------------------------
revno: 2318.2.1
merged: warthog618 at gmail.com-20070306083700-u0uciru4ll57ib08
parent: pqm at pqm.ubuntu.com-20070306003758-f693dc70e8b3706b
committer: Kent Gibson <warthog618 at gmail.com>
branch nick: bzr.kg
timestamp: Tue 2007-03-06 17:37:00 +0900
message:
Apply status versioned patch
------------------------------------------------------------
revno: 2323.2.26
merged: pqm at pqm.ubuntu.com-20070313055515-823e15af73d49270
parent: pqm at pqm.ubuntu.com-20070312222222-41194ff2fd4e23fe
parent: mbp at sourcefrog.net-20070313025837-ob25gqj83tyemwj2
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-03-13 05:55:15 +0000
message:
(marienz,r=john,r=mbp) fix error committing merge with symlinks in dirstate
------------------------------------------------------------
revno: 2323.2.25.1.2
merged: mbp at sourcefrog.net-20070313025837-ob25gqj83tyemwj2
parent: mbp at sourcefrog.net-20070313025747-k6ifccbdvba2l12o
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: mz.symlinks
timestamp: Tue 2007-03-13 13:58:37 +1100
message:
update news
------------------------------------------------------------
revno: 2323.2.25.1.1
merged: mbp at sourcefrog.net-20070313025747-k6ifccbdvba2l12o
parent: pqm at pqm.ubuntu.com-20070312222222-41194ff2fd4e23fe
parent: marienz at gentoo.org-20070312205523-gl34xzw1eg0ji28x
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: mz.symlinks
timestamp: Tue 2007-03-13 13:57:47 +1100
message:
(marienz) fixes for error committing merge with symlinks in dirstate
------------------------------------------------------------
revno: 2323.2.15.4.10
merged: marienz at gentoo.org-20070312205523-gl34xzw1eg0ji28x
parent: marienz at gentoo.org-20070312033112-q8h6b0wwzc7ew4d8
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr-dirstate-symlinks
timestamp: Mon 2007-03-12 21:55:23 +0100
message:
Make a test skipped from setUp run tearDown again. Make calling _runCleanups twice safe. Clean up tests.
------------------------------------------------------------
revno: 2323.2.15.4.9
merged: marienz at gentoo.org-20070312033112-q8h6b0wwzc7ew4d8
parent: marienz at gentoo.org-20070312033007-47ci7w0fehb5gqq2
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr-dirstate-symlinks
timestamp: Mon 2007-03-12 04:31:12 +0100
message:
More tests for symlinks in tree inventories.
------------------------------------------------------------
revno: 2323.2.15.4.8
merged: marienz at gentoo.org-20070312033007-47ci7w0fehb5gqq2
parent: marienz at gentoo.org-20070312023543-2ue1egax0wbvl87s
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr-dirstate-symlinks
timestamp: Mon 2007-03-12 04:30:07 +0100
message:
Fix a bug in selftest causing tearDown to run twice for skipped tests.
------------------------------------------------------------
revno: 2323.2.15.4.7
merged: marienz at gentoo.org-20070312023543-2ue1egax0wbvl87s
parent: marienz at gentoo.org-20070312023523-h4bhx3oyqmbd27tf
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr-dirstate-symlinks
timestamp: Mon 2007-03-12 03:35:43 +0100
message:
Remove dead code.
------------------------------------------------------------
revno: 2323.2.15.4.6
merged: marienz at gentoo.org-20070312023523-h4bhx3oyqmbd27tf
parent: marienz at gentoo.org-20070312010216-j6u0y6v75nk071me
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr-dirstate-symlinks
timestamp: Mon 2007-03-12 03:35:23 +0100
message:
Move some tests that do not need a working tree from workingtree_implementations to tree_implementations.
------------------------------------------------------------
revno: 2323.2.15.4.5
merged: marienz at gentoo.org-20070312010216-j6u0y6v75nk071me
parent: marienz at gentoo.org-20070312003752-luxbjn7ty2mr3pyj
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr-dirstate-symlinks
timestamp: Mon 2007-03-12 02:02:16 +0100
message:
Make an assert actually assert something.
------------------------------------------------------------
revno: 2323.2.15.4.4
merged: marienz at gentoo.org-20070312003752-luxbjn7ty2mr3pyj
parent: marienz at gentoo.org-20070311232335-wpymm3pagwdtasjn
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr-dirstate-symlinks
timestamp: Mon 2007-03-12 01:37:52 +0100
message:
Increase test coverage.
------------------------------------------------------------
revno: 2323.2.15.4.3
merged: marienz at gentoo.org-20070311232335-wpymm3pagwdtasjn
parent: marienz at gentoo.org-20070311230549-rn7jh354jrzq6m1e
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr-dirstate-symlinks
timestamp: Mon 2007-03-12 00:23:35 +0100
message:
Make the workingtree inventory tests actually use the different workingtree implementations.
------------------------------------------------------------
revno: 2323.2.15.4.2
merged: marienz at gentoo.org-20070311230549-rn7jh354jrzq6m1e
parent: marienz at gentoo.org-20070311221559-mvb05lew4yyogh5y
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr-dirstate-symlinks
timestamp: Mon 2007-03-12 00:05:49 +0100
message:
Move the workingtree-related inventory tests to a separate file.
------------------------------------------------------------
revno: 2323.2.15.4.1
merged: marienz at gentoo.org-20070311221559-mvb05lew4yyogh5y
parent: pqm at pqm.ubuntu.com-20070311211206-0fd0176ac1e77ef7
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr-dirstate-symlinks
timestamp: Sun 2007-03-11 23:15:59 +0100
message:
Fix committing merges in a dirstate tree with a symlink.
------------------------------------------------------------
revno: 2323.2.25
merged: pqm at pqm.ubuntu.com-20070312222222-41194ff2fd4e23fe
parent: pqm at pqm.ubuntu.com-20070312212825-f3cc39efba5d38f8
parent: john at arbash-meinel.com-20070312215713-sg04g24khpu222l8
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-03-12 22:22:22 +0000
message:
(John Whitley) Print out the location of ~/.bazaar as part of 'bzr --version'
------------------------------------------------------------
revno: 2323.2.24.1.1
merged: john at arbash-meinel.com-20070312215713-sg04g24khpu222l8
parent: pqm at pqm.ubuntu.com-20070312212825-f3cc39efba5d38f8
parent: whitley at bangpath.org-20070312060419-e5dsbp3093f3razu
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2007-03-12 16:57:13 -0500
message:
(John Whitley) Print out the location of ~/.bazaar as part of 'bzr --version'
------------------------------------------------------------
revno: 2323.2.1.3.3
merged: whitley at bangpath.org-20070312060419-e5dsbp3093f3razu
parent: whitley at bangpath.org-20070312060237-sdfcipif2mxckp2j
parent: pqm at pqm.ubuntu.com-20070311211206-0fd0176ac1e77ef7
committer: John Whitley <whitley at bangpath.org>
branch nick: bug-90467
timestamp: Sun 2007-03-11 23:04:19 -0700
message:
Merged bzr.dev
------------------------------------------------------------
revno: 2323.2.1.3.2
merged: whitley at bangpath.org-20070312060237-sdfcipif2mxckp2j
parent: whitley at bangpath.org-20070308011749-jn2gand2rpkwqjhn
committer: John Whitley <whitley at bangpath.org>
branch nick: bug-90467
timestamp: Sun 2007-03-11 23:02:37 -0700
message:
Added blackbox test for bzr version.
------------------------------------------------------------
revno: 2323.2.1.3.1
merged: whitley at bangpath.org-20070308011749-jn2gand2rpkwqjhn
parent: pqm at pqm.ubuntu.com-20070307121852-b60a661123a5063d
committer: John Whitley <whitley at bangpath.org>
branch nick: bug-90467
timestamp: Wed 2007-03-07 17:17:49 -0800
message:
Reveal location of .bazaar directory in 'bzr version'
------------------------------------------------------------
revno: 2323.2.24
merged: pqm at pqm.ubuntu.com-20070312212825-f3cc39efba5d38f8
parent: pqm at pqm.ubuntu.com-20070312175624-659e53c1fa4f5c0c
parent: john at arbash-meinel.com-20070312203744-uxmg8gk0tl9w5dy6
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-03-12 21:28:25 +0000
message:
NEWS fixes for post 0.15-rc1
------------------------------------------------------------
revno: 2323.2.21.1.4
merged: john at arbash-meinel.com-20070312203744-uxmg8gk0tl9w5dy6
parent: john at arbash-meinel.com-20070312203240-yv505vqi4x1ui1vn
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2007-03-12 15:37:44 -0500
message:
NEWS for fixing bug #88842
------------------------------------------------------------
revno: 2323.2.21.1.3
merged: john at arbash-meinel.com-20070312203240-yv505vqi4x1ui1vn
parent: john at arbash-meinel.com-20070312202959-13znkfotwveqmm4r
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2007-03-12 15:32:40 -0500
message:
NEWS for fixing bug #90501
------------------------------------------------------------
revno: 2323.2.21.1.2
merged: john at arbash-meinel.com-20070312202959-13znkfotwveqmm4r
parent: john at arbash-meinel.com-20070312173106-d0pbq1cct4sv55vp
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2007-03-12 15:29:59 -0500
message:
Clean up NEWS to fix what actually came after 0.15-rc1 was released.
------------------------------------------------------------
revno: 2323.2.23
merged: pqm at pqm.ubuntu.com-20070312175624-659e53c1fa4f5c0c
parent: pqm at pqm.ubuntu.com-20070312173053-4cdb4cd14190d29e
parent: john at arbash-meinel.com-20070312173106-d0pbq1cct4sv55vp
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-03-12 17:56:24 +0000
message:
(Dmitry Vasiliev) Fix typo in 'bzr help selftest'
------------------------------------------------------------
revno: 2323.2.21.1.1
merged: john at arbash-meinel.com-20070312173106-d0pbq1cct4sv55vp
parent: pqm at pqm.ubuntu.com-20070312171624-360d208955511d66
parent: dima at hlabs.spb.ru-20070311111332-8dc0ujrbgfhm1h9d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2007-03-12 11:31:06 -0600
message:
(Dmitry Vasiliev) Fix typo in 'bzr help selftest'
------------------------------------------------------------
revno: 2323.2.10.1.1
merged: dima at hlabs.spb.ru-20070311111332-8dc0ujrbgfhm1h9d
parent: pqm at pqm.ubuntu.com-20070310212110-7853e75061cf66d6
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: small.fixes
timestamp: Sun 2007-03-11 14:13:32 +0300
message:
Fixed typo and removed some trailing whitespaces
------------------------------------------------------------
revno: 2323.2.22
merged: pqm at pqm.ubuntu.com-20070312173053-4cdb4cd14190d29e
parent: pqm at pqm.ubuntu.com-20070312171624-360d208955511d66
parent: abentley at panoramicfeedback.com-20070312160852-tap1mfd79v18kccy
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-03-12 17:30:53 +0000
message:
Hide nested-tree commands and improve their docs
------------------------------------------------------------
revno: 2323.2.15.3.1
merged: abentley at panoramicfeedback.com-20070312160852-tap1mfd79v18kccy
parent: pqm at pqm.ubuntu.com-20070311211206-0fd0176ac1e77ef7
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: hide-nested
timestamp: Mon 2007-03-12 12:08:52 -0400
message:
Hide nested-tree commands and improve their docs
------------------------------------------------------------
revno: 2323.2.21
merged: pqm at pqm.ubuntu.com-20070312171624-360d208955511d66
parent: pqm at pqm.ubuntu.com-20070312170144-be4e29ded595dd0a
parent: aaron.bentley at utoronto.ca-20070311203448-a86mnhetckle18co
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-03-12 17:16:24 +0000
message:
Fix TT._iter_changes bug with kind=None
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.37
merged: aaron.bentley at utoronto.ca-20070311203448-a86mnhetckle18co
parent: aaron.bentley at utoronto.ca-20070311203045-ok1mva0myxd1aetu
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sun 2007-03-11 16:34:48 -0400
message:
recommit of TreeTransform._iter_changes fix with missing files
------------------------------------------------------------
revno: 2323.2.20
merged: pqm at pqm.ubuntu.com-20070312170144-be4e29ded595dd0a
parent: pqm at pqm.ubuntu.com-20070312164621-d96558dc43d9c1b6
parent: john at arbash-meinel.com-20070312162947-y3a3fjf0iwalwot5
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-03-12 17:01:44 +0000
message:
(Marien Zwart) RevisionSpec.from_string() should support Unicode parameters. (especially for revid:)
------------------------------------------------------------
revno: 2323.2.17.1.1
merged: john at arbash-meinel.com-20070312162947-y3a3fjf0iwalwot5
parent: pqm at pqm.ubuntu.com-20070312161518-2706316ad769b56a
parent: marienz at gentoo.org-20070311181444-9p0nwvaljp1h42xh
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2007-03-12 10:29:47 -0600
message:
(Marien Zwart) RevisionSpec.from_string() should support Unicode parameters. (especially for revid:)
------------------------------------------------------------
revno: 2323.2.2.2.5
merged: marienz at gentoo.org-20070311181444-9p0nwvaljp1h42xh
parent: marienz at gentoo.org-20070309042901-n5sben4mqbf6iwgj
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr.dev
timestamp: Sun 2007-03-11 19:14:44 +0100
message:
Call osutils.safe_revision_id instead of duplicating it.
------------------------------------------------------------
revno: 2323.2.2.2.4
merged: marienz at gentoo.org-20070309042901-n5sben4mqbf6iwgj
parent: marienz at gentoo.org-20070309042706-173aok1s5f30rcuj
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr.dev
timestamp: Fri 2007-03-09 05:29:01 +0100
message:
Rename rev_id to revision_id because HACKING says so.
------------------------------------------------------------
revno: 2323.2.2.2.3
merged: marienz at gentoo.org-20070309042706-173aok1s5f30rcuj
parent: marienz at gentoo.org-20070308185109-wdlc2839v8qcuqhc
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr.dev
timestamp: Fri 2007-03-09 05:27:06 +0100
message:
Make the revid RevisionSpec also support utf8-encoded bytestrings.
------------------------------------------------------------
revno: 2323.2.2.2.2
merged: marienz at gentoo.org-20070308185109-wdlc2839v8qcuqhc
parent: marienz at gentoo.org-20070308171357-7u3cn4ra7m2zhw0w
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr.dev
timestamp: Thu 2007-03-08 19:51:09 +0100
message:
Make the revid RevisionSpec always return a str object, not a unicode object.
------------------------------------------------------------
revno: 2323.2.2.2.1
merged: marienz at gentoo.org-20070308171357-7u3cn4ra7m2zhw0w
parent: pqm at pqm.ubuntu.com-20070307233124-ad2724bf65e09035
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr.dev
timestamp: Thu 2007-03-08 18:13:57 +0100
message:
Make the test suite failure reporting a bit more robust.
------------------------------------------------------------
revno: 2323.2.19
merged: pqm at pqm.ubuntu.com-20070312164621-d96558dc43d9c1b6
parent: pqm at pqm.ubuntu.com-20070312163121-a8078e3704c91ffe
parent: abentley at panoramicfeedback.com-20070312133142-ox3xn8jpns33gqd7
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-03-12 16:46:21 +0000
message:
Small tweaks for merge directives
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.52
merged: abentley at panoramicfeedback.com-20070312133142-ox3xn8jpns33gqd7
parent: aaron.bentley at utoronto.ca-20070311161600-hvtsmkf3d2z72562
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Mon 2007-03-12 09:31:42 -0400
message:
speling fix
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.51
merged: aaron.bentley at utoronto.ca-20070311161600-hvtsmkf3d2z72562
parent: aaron.bentley at utoronto.ca-20070311012251-pf1lg4uhb5s4qs3n
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Sun 2007-03-11 12:16:00 -0400
message:
Allow leading junk before merge directive header
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.50
merged: aaron.bentley at utoronto.ca-20070311012251-pf1lg4uhb5s4qs3n
parent: aaron.bentley at utoronto.ca-20070311004707-nvgm18l7xx9md7hg
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Sat 2007-03-10 20:22:51 -0500
message:
Use public location of submit branch if possible
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.49
merged: aaron.bentley at utoronto.ca-20070311004707-nvgm18l7xx9md7hg
parent: abentley at panoramicfeedback.com-20070309224147-m7or85t0o86c0t34
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Sat 2007-03-10 19:47:07 -0500
message:
Proper error when deserializing junk
------------------------------------------------------------
revno: 2323.2.18
merged: pqm at pqm.ubuntu.com-20070312163121-a8078e3704c91ffe
parent: pqm at pqm.ubuntu.com-20070312161518-2706316ad769b56a
parent: john at arbash-meinel.com-20070309221739-ociisv9twj9t4ch2
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-03-12 16:31:21 +0000
message:
(John Arbash Meinel) raise more helpful errors when detecting Knit corruption.
------------------------------------------------------------
revno: 2323.2.6.1.2
merged: john at arbash-meinel.com-20070309221739-ociisv9twj9t4ch2
parent: john at arbash-meinel.com-20070309221455-xh1sb3i6v07a7mak
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_corrupt
timestamp: Fri 2007-03-09 16:17:39 -0600
message:
Remove some spurious whitespace changes.
------------------------------------------------------------
revno: 2323.2.6.1.1
merged: john at arbash-meinel.com-20070309221455-xh1sb3i6v07a7mak
parent: pqm at pqm.ubuntu.com-20070309212715-07aacbc78b3e2dc0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_corrupt
timestamp: Fri 2007-03-09 16:14:55 -0600
message:
Update _KnitData parser to raise more helpful errors when it detects corruption.
------------------------------------------------------------
revno: 2323.2.17
merged: pqm at pqm.ubuntu.com-20070312161518-2706316ad769b56a
parent: pqm at pqm.ubuntu.com-20070312154217-b0cd137fae2a67d8
parent: john at arbash-meinel.com-20070312155604-ce341jry03f4w58m
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-03-12 16:15:18 +0000
message:
(Marien Zwart) Override smtplib.connect so we don't require smtpd to be running.
------------------------------------------------------------
revno: 2323.2.16.1.1
merged: john at arbash-meinel.com-20070312155604-ce341jry03f4w58m
parent: pqm at pqm.ubuntu.com-20070312154217-b0cd137fae2a67d8
parent: marienz at gentoo.org-20070312034818-vxuaptp67gfiv8ym
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2007-03-12 09:56:04 -0600
message:
(Marien Zwart) Override smtplib.connect so we don't require smtpd to be running.
------------------------------------------------------------
revno: 2323.2.15.2.1
merged: marienz at gentoo.org-20070312034818-vxuaptp67gfiv8ym
parent: pqm at pqm.ubuntu.com-20070311211206-0fd0176ac1e77ef7
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr-mail-test
timestamp: Mon 2007-03-12 04:48:18 +0100
message:
Make the merge directive tests work if there is no smtpd running on localhost.
------------------------------------------------------------
revno: 2323.2.16
merged: pqm at pqm.ubuntu.com-20070312154217-b0cd137fae2a67d8
parent: pqm at pqm.ubuntu.com-20070311211206-0fd0176ac1e77ef7
parent: john at arbash-meinel.com-20070312151404-1midj71kyca44q3p
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-03-12 15:42:17 +0000
message:
(Arnaud Fontaine) Compatibility with vsftpd error messages.
------------------------------------------------------------
revno: 2323.2.15.1.1
merged: john at arbash-meinel.com-20070312151404-1midj71kyca44q3p
parent: pqm at pqm.ubuntu.com-20070311211206-0fd0176ac1e77ef7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2007-03-12 09:14:04 -0600
message:
(Arnaud Fontaine) Compatibility with vsftpd error messages.
------------------------------------------------------------
revno: 2323.2.15
merged: pqm at pqm.ubuntu.com-20070311211206-0fd0176ac1e77ef7
parent: pqm at pqm.ubuntu.com-20070311205710-9d93fca9fc40d2d0
parent: bialix at ukr.net-20070311203046-e8jo5ku8xxepti4x
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2007-03-11 21:12:06 +0000
message:
(bialix) 0.15 NEWS cleanup
------------------------------------------------------------
revno: 2321.2.6
merged: bialix at ukr.net-20070311203046-e8jo5ku8xxepti4x
parent: bialix at ukr.net-20070311193937-nx38jief5kw8pp2f
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: mergeable
timestamp: Sun 2007-03-11 22:30:46 +0200
message:
0.15 NEWS cleanup
------------------------------------------------------------
revno: 2323.2.14
merged: pqm at pqm.ubuntu.com-20070311205710-9d93fca9fc40d2d0
parent: pqm at pqm.ubuntu.com-20070311204222-85d0ff7fb929ca45
parent: aaron.bentley at utoronto.ca-20070311203045-ok1mva0myxd1aetu
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2007-03-11 20:57:10 +0000
message:
Introduce submit: revision spec
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.36
merged: aaron.bentley at utoronto.ca-20070311203045-ok1mva0myxd1aetu
parent: aaron.bentley at utoronto.ca-20070311202539-70agtar0cxuwn0hw
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sun 2007-03-11 16:30:45 -0400
message:
Add NEWS entry
------------------------------------------------------------
revno: 2323.2.13
merged: pqm at pqm.ubuntu.com-20070311204222-85d0ff7fb929ca45
parent: pqm at pqm.ubuntu.com-20070311202133-5b31ae3c82b0e7df
parent: aaron.bentley at utoronto.ca-20070311202539-70agtar0cxuwn0hw
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2007-03-11 20:42:22 +0000
message:
Introduce submit: revision spec
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.35
merged: aaron.bentley at utoronto.ca-20070311202539-70agtar0cxuwn0hw
parent: aaron.bentley at utoronto.ca-20070311201057-txp1dhe6rg2pts4p
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sun 2007-03-11 16:25:39 -0400
message:
Add note about which branch is selected by submit:
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.34
merged: aaron.bentley at utoronto.ca-20070311201057-txp1dhe6rg2pts4p
parent: aaron.bentley at utoronto.ca-20070311200834-qvh6yomzkv044yof
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sun 2007-03-11 16:10:57 -0400
message:
Fix tag: help
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.33
merged: aaron.bentley at utoronto.ca-20070311200834-qvh6yomzkv044yof
parent: aaron.bentley at utoronto.ca-20070311045313-oq12p1clr0i4042y
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sun 2007-03-11 16:08:34 -0400
message:
Updates from review
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.32
merged: aaron.bentley at utoronto.ca-20070311045313-oq12p1clr0i4042y
parent: aaron.bentley at utoronto.ca-20070310213907-ojai90fhn1rpc9vp
parent: pqm at pqm.ubuntu.com-20070310232535-dd964b3ad4a93236
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sat 2007-03-10 23:53:13 -0500
message:
Add submit: specifier, for merge-directive-like diffs
------------------------------------------------------------
revno: 2323.2.12
merged: pqm at pqm.ubuntu.com-20070311202133-5b31ae3c82b0e7df
parent: pqm at pqm.ubuntu.com-20070310232535-dd964b3ad4a93236
parent: bialix at ukr.net-20070311193937-nx38jief5kw8pp2f
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2007-03-11 20:21:33 +0000
message:
(bialix,r=aaron,r=john) fixes for selftest on win32
------------------------------------------------------------
revno: 2321.2.5
merged: bialix at ukr.net-20070311193937-nx38jief5kw8pp2f
parent: bialix at ukr.net-20070307105229-v9wczlhckrql4aae
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: mergeable
timestamp: Sun 2007-03-11 21:39:37 +0200
message:
external diff: no need for special code path for win32 (suggested by John Meinel)
------------------------------------------------------------
revno: 2321.2.4
merged: bialix at ukr.net-20070307105229-v9wczlhckrql4aae
parent: bialix at ukr.net-20070307015413-tqium0k9i1oulc6p
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32
timestamp: Wed 2007-03-07 12:52:29 +0200
message:
numbered dirs: default value for function args is None to prevent changing NUMBERED_DIRS during selftesting
------------------------------------------------------------
revno: 2321.2.3
merged: bialix at ukr.net-20070307015413-tqium0k9i1oulc6p
parent: bialix at ukr.net-20070307005740-bjpjks1bgk8efuo0
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32
timestamp: Wed 2007-03-07 03:54:13 +0200
message:
fix for check_repo_format_for_funky_id_on_win32 after Martin's refactoring of repository format
------------------------------------------------------------
revno: 2321.2.2
merged: bialix at ukr.net-20070307005740-bjpjks1bgk8efuo0
parent: bialix at ukr.net-20070306230900-mbyylf39npkof72m
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32
timestamp: Wed 2007-03-07 02:57:40 +0200
message:
win32 fixes for test_external_diff_binary (gettext on win32 rely on $LANGUAGE)
------------------------------------------------------------
revno: 2323.2.11
merged: pqm at pqm.ubuntu.com-20070310232535-dd964b3ad4a93236
parent: pqm at pqm.ubuntu.com-20070310212110-7853e75061cf66d6
parent: aaron.bentley at utoronto.ca-20070310213907-ojai90fhn1rpc9vp
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2007-03-10 23:25:35 +0000
message:
Fix WorkingTree4._iter_changes with pending merges and deleted files
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.31
merged: aaron.bentley at utoronto.ca-20070310213907-ojai90fhn1rpc9vp
parent: aaron.bentley at utoronto.ca-20070310203558-8dptj9p637ypat0f
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sat 2007-03-10 16:39:07 -0500
message:
Fix WorkingTree4._iter_changes with pending merges and deleted files
------------------------------------------------------------
revno: 2323.2.10
merged: pqm at pqm.ubuntu.com-20070310212110-7853e75061cf66d6
parent: pqm at pqm.ubuntu.com-20070310050104-4c59f87cee46be60
parent: aaron.bentley at utoronto.ca-20070310203558-8dptj9p637ypat0f
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2007-03-10 21:21:10 +0000
message:
Add + kind marker for tree references
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.30
merged: aaron.bentley at utoronto.ca-20070310203558-8dptj9p637ypat0f
parent: aaron.bentley at utoronto.ca-20070310031259-8n5spbsxrhik2dp7
parent: pqm at pqm.ubuntu.com-20070310050104-4c59f87cee46be60
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sat 2007-03-10 15:35:58 -0500
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.29
merged: aaron.bentley at utoronto.ca-20070310031259-8n5spbsxrhik2dp7
parent: aaron.bentley at utoronto.ca-20070308023327-cg1hnu5y8mh090n9
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2007-03-09 22:12:59 -0500
message:
Fix tree.list_files when file kind changes
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.28
merged: aaron.bentley at utoronto.ca-20070308023327-cg1hnu5y8mh090n9
parent: aaron.bentley at utoronto.ca-20070308005121-qdrfp0xmi5xu3fvi
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2007-03-07 21:33:27 -0500
message:
change kind marker to '+'
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.27
merged: aaron.bentley at utoronto.ca-20070308005121-qdrfp0xmi5xu3fvi
parent: abentley at panoramicfeedback.com-20070307231535-3nfhj93n3c5xpft2
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2007-03-07 19:51:21 -0500
message:
Add a kind marker for subtrees
------------------------------------------------------------
revno: 2323.2.9
merged: pqm at pqm.ubuntu.com-20070310050104-4c59f87cee46be60
parent: pqm at pqm.ubuntu.com-20070310041834-3f63de9e93982669
parent: robertc at robertcollins.net-20070310043739-5f2difugp27zkv6o
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2007-03-10 05:01:04 +0000
message:
(robertc) Forward port of dirstate correctness committed to bzr 0.15.
------------------------------------------------------------
revno: 2323.2.8.1.1
merged: robertc at robertcollins.net-20070310043739-5f2difugp27zkv6o
parent: pqm at pqm.ubuntu.com-20070310041834-3f63de9e93982669
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Sat 2007-03-10 15:37:39 +1100
message:
(robertc) Forward port of dirstate correctness committed to bzr 0.15.
------------------------------------------------------------
revno: 2323.2.8
merged: pqm at pqm.ubuntu.com-20070310041834-3f63de9e93982669
parent: pqm at pqm.ubuntu.com-20070309225721-d395866527ca9a47
parent: aaron.bentley at utoronto.ca-20070310032935-e89x8257lu2xl0ur
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2007-03-10 04:18:34 +0000
message:
Allow files to change kind in Tree.list_files
------------------------------------------------------------
revno: 2323.2.7.1.1
merged: aaron.bentley at utoronto.ca-20070310032935-e89x8257lu2xl0ur
parent: pqm at pqm.ubuntu.com-20070309225721-d395866527ca9a47
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ab.integration
timestamp: Fri 2007-03-09 22:29:35 -0500
message:
Allow files to change kind in Tree.list_files
------------------------------------------------------------
revno: 2323.2.7
merged: 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
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.48
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
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.47
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
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.46
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
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.45
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
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.44
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
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.43
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
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.42
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
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.41
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
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.40
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
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.39
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
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.38
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
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.37
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
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.36
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
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.35
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
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.34
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
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.33
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
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.32
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
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.31
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
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.30
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
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.29
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
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.28
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
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.27
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
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.26
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
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.25
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
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.24
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
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.23
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
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.22
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
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.21
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
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.20
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
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.19
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
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.18
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
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.17
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
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.16
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
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.15
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
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.14
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
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.13
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
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.12
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
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.11
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
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.10
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
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.9
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
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.8
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
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.7
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
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.6
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
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.5
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
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.4
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
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.3
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
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.2
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
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.1
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
------------------------------------------------------------
revno: 2323.2.6
merged: pqm at pqm.ubuntu.com-20070309212715-07aacbc78b3e2dc0
parent: pqm at pqm.ubuntu.com-20070309020838-1dd7e652bc5c30ff
parent: john at arbash-meinel.com-20070309211043-ln4hotho1vm2v5ur
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-03-09 21:27:15 +0000
message:
(Dmitry Vasiliev) Improvements to osutils functions.
------------------------------------------------------------
revno: 2323.2.5.1.1
merged: john at arbash-meinel.com-20070309211043-ln4hotho1vm2v5ur
parent: pqm at pqm.ubuntu.com-20070309020838-1dd7e652bc5c30ff
parent: dima at hlabs.spb.ru-20070307153731-2en9aa3ymzx4ltnn
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2007-03-09 15:10:43 -0600
message:
(Dmitry Vasiliev) Improvements to osutils functions.
------------------------------------------------------------
revno: 2323.2.1.2.4
merged: dima at hlabs.spb.ru-20070307153731-2en9aa3ymzx4ltnn
parent: dima at hlabs.spb.ru-20070307151756-ryfruec1tq9g8344
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: Small fixes
timestamp: Wed 2007-03-07 18:37:31 +0300
message:
Fixed test_unicode__walkdirs_utf8 test
------------------------------------------------------------
revno: 2323.2.1.2.3
merged: dima at hlabs.spb.ru-20070307151756-ryfruec1tq9g8344
parent: dima at hlabs.spb.ru-20070307144251-ogtxgcax84659wb0
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: Small fixes
timestamp: Wed 2007-03-07 18:17:56 +0300
message:
Fixed is_inside_* methods implementation
------------------------------------------------------------
revno: 2323.2.1.2.2
merged: dima at hlabs.spb.ru-20070307144251-ogtxgcax84659wb0
parent: dima at hlabs.spb.ru-20070307143607-na1fu8ut20td0i1u
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: Small fixes
timestamp: Wed 2007-03-07 17:42:51 +0300
message:
Fixed lexists() implementation
------------------------------------------------------------
revno: 2323.2.1.2.1
merged: dima at hlabs.spb.ru-20070307143607-na1fu8ut20td0i1u
parent: pqm at pqm.ubuntu.com-20070307121852-b60a661123a5063d
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: Small fixes
timestamp: Wed 2007-03-07 17:36:07 +0300
message:
kind_marker() optimization
------------------------------------------------------------
revno: 2323.2.5
merged: pqm at pqm.ubuntu.com-20070309020838-1dd7e652bc5c30ff
parent: pqm at pqm.ubuntu.com-20070309003830-14e9b007ad653905
parent: john at arbash-meinel.com-20070309004524-fz8byjfqklnzvi6h
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-03-09 02:08:38 +0000
message:
(Dmitry Vasiliev) Support for Putty SSH, and improved vendor support
------------------------------------------------------------
revno: 2323.2.4.1.1
merged: john at arbash-meinel.com-20070309004524-fz8byjfqklnzvi6h
parent: pqm at pqm.ubuntu.com-20070309003830-14e9b007ad653905
parent: dima at hlabs.spb.ru-20070307134747-clcmwlfck4g9yqh3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2007-03-08 18:45:24 -0600
message:
(Dmitry Vasiliev) Support for Putty SSH, and improved vendor support
------------------------------------------------------------
revno: 2221.5.22
merged: dima at hlabs.spb.ru-20070307134747-clcmwlfck4g9yqh3
parent: dima at hlabs.spb.ru-20070307132025-kgv55i7xvp7rp7pv
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: Putty SSH implementation support
timestamp: Wed 2007-03-07 16:47:47 +0300
message:
Updated note about registry.Registry
------------------------------------------------------------
revno: 2221.5.21
merged: dima at hlabs.spb.ru-20070307132025-kgv55i7xvp7rp7pv
parent: dima at hlabs.spb.ru-20070307124531-yom9s6p3rb1npeet
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: Putty SSH implementation support
timestamp: Wed 2007-03-07 16:20:25 +0300
message:
Reverted trailing whitespace removal
------------------------------------------------------------
revno: 2221.5.20
merged: dima at hlabs.spb.ru-20070307124531-yom9s6p3rb1npeet
parent: dima at hlabs.spb.ru-20070307121040-ekqnz95gtv2iq4jb
parent: pqm at pqm.ubuntu.com-20070307121852-b60a661123a5063d
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: Putty SSH implementation support
timestamp: Wed 2007-03-07 15:45:31 +0300
message:
Merged bzr.dev
------------------------------------------------------------
revno: 2221.5.19
merged: dima at hlabs.spb.ru-20070307121040-ekqnz95gtv2iq4jb
parent: dima at hlabs.spb.ru-20070302153843-9hks8px50lwukdcm
parent: pqm at pqm.ubuntu.com-20070307110538-3026a526f5178b00
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: Putty SSH implementation support
timestamp: Wed 2007-03-07 15:10:40 +0300
message:
Merged bzr.dev
------------------------------------------------------------
revno: 2221.5.18
merged: dima at hlabs.spb.ru-20070302153843-9hks8px50lwukdcm
parent: dima at hlabs.spb.ru-20070302141015-sjn7kthbdgylt3bp
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: Putty SSH implementation support
timestamp: Fri 2007-03-02 18:38:43 +0300
message:
Fixed variable name
------------------------------------------------------------
revno: 2221.5.17
merged: dima at hlabs.spb.ru-20070302141015-sjn7kthbdgylt3bp
parent: dima at hlabs.spb.ru-20070302134414-9mqpmmsii6llb9of
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: Putty SSH implementation support
timestamp: Fri 2007-03-02 17:10:15 +0300
message:
Added comments for test_get_vendor_search_order
------------------------------------------------------------
revno: 2221.5.16
merged: dima at hlabs.spb.ru-20070302134414-9mqpmmsii6llb9of
parent: dima at hlabs.spb.ru-20070302132658-m844rgyc8smzhw3y
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: Putty SSH implementation support
timestamp: Fri 2007-03-02 16:44:14 +0300
message:
Added comments for test_cached_vendor
------------------------------------------------------------
revno: 2221.5.15
merged: dima at hlabs.spb.ru-20070302132658-m844rgyc8smzhw3y
parent: dima at hlabs.spb.ru-20070302122819-c5cfkd4nnp5tzksp
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: Putty SSH implementation support
timestamp: Fri 2007-03-02 16:26:58 +0300
message:
Added docstrings for all SSHVendorManager's methods
------------------------------------------------------------
revno: 2221.5.14
merged: dima at hlabs.spb.ru-20070302122819-c5cfkd4nnp5tzksp
parent: dima at hlabs.spb.ru-20070302122200-5oqpv72nae2tr8sl
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: Putty SSH implementation support
timestamp: Fri 2007-03-02 15:28:19 +0300
message:
Wrapped long lines
------------------------------------------------------------
revno: 2221.5.13
merged: dima at hlabs.spb.ru-20070302122200-5oqpv72nae2tr8sl
parent: dima at hlabs.spb.ru-20070302120557-vasdqot44qytav50
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: Putty SSH implementation support
timestamp: Fri 2007-03-02 15:22:00 +0300
message:
Fixed expected message in test
------------------------------------------------------------
revno: 2221.5.12
merged: dima at hlabs.spb.ru-20070302120557-vasdqot44qytav50
parent: dima at hlabs.spb.ru-20070302115124-xpya6q8087zrzb5z
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: Putty SSH implementation support
timestamp: Fri 2007-03-02 15:05:57 +0300
message:
Added note about SSHVendorManager
------------------------------------------------------------
revno: 2221.5.11
merged: dima at hlabs.spb.ru-20070302115124-xpya6q8087zrzb5z
parent: dima at hlabs.spb.ru-20070206185152-qk1p2p0tjn9uf4nm
parent: pqm at pqm.ubuntu.com-20070301073000-0bfe1394fee5e712
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: Putty SSH implementation support
timestamp: Fri 2007-03-02 14:51:24 +0300
message:
Merged bzr.dev
------------------------------------------------------------
revno: 2221.5.10
merged: dima at hlabs.spb.ru-20070206185152-qk1p2p0tjn9uf4nm
parent: dima at hlabs.spb.ru-20070206184530-4rtd41xpm9ksgbo5
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: Small Fixes
timestamp: Tue 2007-02-06 21:51:52 +0300
message:
Imports placed in alphabetical order
------------------------------------------------------------
revno: 2221.5.9
merged: dima at hlabs.spb.ru-20070206184530-4rtd41xpm9ksgbo5
parent: dima at hlabs.spb.ru-20070206182410-knuhr3u2s4xm3upb
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: Small Fixes
timestamp: Tue 2007-02-06 21:45:30 +0300
message:
Removed trailing whitespaces and wrapped all long lines
------------------------------------------------------------
revno: 2221.5.8
merged: dima at hlabs.spb.ru-20070206182410-knuhr3u2s4xm3upb
parent: dima at hlabs.spb.ru-20070203080847-3mnn4704lz6f2djs
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: Small Fixes
timestamp: Tue 2007-02-06 21:24:10 +0300
message:
Added SSHVendorManager.clear_cache() method
------------------------------------------------------------
revno: 2221.5.7
merged: dima at hlabs.spb.ru-20070203080847-3mnn4704lz6f2djs
parent: dima at hlabs.spb.ru-20070113135005-he6e52rif5rym8hv
parent: pqm at pqm.ubuntu.com-20070202204950-910381483d737306
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: Small Fixes
timestamp: Sat 2007-02-03 11:08:47 +0300
message:
Merged bzr.dev
------------------------------------------------------------
revno: 2221.5.6
merged: dima at hlabs.spb.ru-20070113135005-he6e52rif5rym8hv
parent: dima at hlabs.spb.ru-20070113132723-7b42wbkb488nf725
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: Small Fixes
timestamp: Sat 2007-01-13 16:50:05 +0300
message:
Changed tests to make sure the vendor manager returns the same object as was registered
------------------------------------------------------------
revno: 2221.5.5
merged: dima at hlabs.spb.ru-20070113132723-7b42wbkb488nf725
parent: dima at hlabs.spb.ru-20070113131305-ncebrfkhqacbbnjf
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: Small Fixes
timestamp: Sat 2007-01-13 16:27:23 +0300
message:
Added 'register_default_vendor' method to the SSHVendorManager
------------------------------------------------------------
revno: 2221.5.4
merged: dima at hlabs.spb.ru-20070113131305-ncebrfkhqacbbnjf
parent: dima at hlabs.spb.ru-20070113130821-78gaqgwsmyxprr12
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: Small Fixes
timestamp: Sat 2007-01-13 16:13:05 +0300
message:
Removed trailing whitespace
------------------------------------------------------------
revno: 2221.5.3
merged: dima at hlabs.spb.ru-20070113130821-78gaqgwsmyxprr12
parent: dima at hlabs.spb.ru-20070105161006-r0x531easfpft0k6
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: Small Fixes
timestamp: Sat 2007-01-13 16:08:21 +0300
message:
Fixed plink's arguments order. Added tests for such a case.
------------------------------------------------------------
revno: 2221.5.2
merged: dima at hlabs.spb.ru-20070105161006-r0x531easfpft0k6
parent: dima at hlabs.spb.ru-20070105154416-z0s48q431s86rm5j
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: Small Fixes
timestamp: Fri 2007-01-05 19:10:06 +0300
message:
Added note to the NEWS file
------------------------------------------------------------
revno: 2221.5.1
merged: dima at hlabs.spb.ru-20070105154416-z0s48q431s86rm5j
parent: pqm at pqm.ubuntu.com-20070103073947-f9906c0b1f425aa9
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: Small Fixes
timestamp: Fri 2007-01-05 18:44:16 +0300
message:
Added support for Putty's SSH implementation
------------------------------------------------------------
revno: 2323.2.4
merged: pqm at pqm.ubuntu.com-20070309003830-14e9b007ad653905
parent: pqm at pqm.ubuntu.com-20070308215322-265e2cf0b768f432
parent: john at arbash-meinel.com-20070308220808-3gdl6wjgje0ydbv5
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-03-09 00:38:30 +0000
message:
(Vincent Ladeuil) Improved infrastructure for password handling.
------------------------------------------------------------
revno: 2323.2.3.1.1
merged: john at arbash-meinel.com-20070308220808-3gdl6wjgje0ydbv5
parent: pqm at pqm.ubuntu.com-20070308215322-265e2cf0b768f432
parent: v.ladeuil+lp at free.fr-20070221144606-qoy01pue1p187j3b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2007-03-08 16:08:08 -0600
message:
(Vincent Ladeuil) Improved infrastructure for password handling.
------------------------------------------------------------
revno: 2294.4.4
merged: v.ladeuil+lp at free.fr-20070221144606-qoy01pue1p187j3b
parent: v.ladeuil+lp at free.fr-20070220080240-ti00ro17rxfqe86z
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: fakestdin
timestamp: Wed 2007-02-21 15:46:06 +0100
message:
Provide a better implementation for testing passwords.
* bzrlib/ui/__init__.py:
(UIFactory.get_login): Deleted.
(CLIUIFactory.get_non_echoed_password): New method allowing
overriding.
* bzrlib/tests/__init__.py:
(TestUIFactory.get_non_echoed_password): Allows password testing
without worrying about echo echo.
* bzrlib/tests/__init__.py:
(TestUIFactory): Moved from bzrlib/tests/blackbox/__init__.py
(FakeStdin): Deleted.
(TestCase.run_bzr_captured): Set and reuse ui.ui_factory.stdin.
* bzrlib/ui/text.py:
(TextUIFactory.get_login): Deleted.
(TextUIFactory.get_password): Moved to CLIUIFactory.
* bzrlib/tests/test_ui.py:
(UITests): Delete get_login tests.
(FakeTextUIFactory): Deleted. Better implementation in
TestUIFactory.
* bzrlib/tests/blackbox/__init__.py:
(TestUIFactory): Moved to bzrlib/tests/__init__.py.
------------------------------------------------------------
revno: 2294.4.3
merged: v.ladeuil+lp at free.fr-20070220080240-ti00ro17rxfqe86z
parent: v.ladeuil+lp at free.fr-20070220075141-92289xpd1mcfmjaq
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: fakestdin
timestamp: Tue 2007-02-20 09:02:40 +0100
message:
Fix typo.
------------------------------------------------------------
revno: 2294.4.2
merged: v.ladeuil+lp at free.fr-20070220075141-92289xpd1mcfmjaq
parent: v.ladeuil+lp at free.fr-20070219210827-qcz46is44zdpfjxr
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: fakestdin
timestamp: Tue 2007-02-20 08:51:41 +0100
message:
Take Martin's review comments into account.
------------------------------------------------------------
revno: 2294.4.1
merged: v.ladeuil+lp at free.fr-20070219210827-qcz46is44zdpfjxr
parent: pqm at pqm.ubuntu.com-20070217025822-306d98c244b53b08
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: fakestdin
timestamp: Mon 2007-02-19 22:08:27 +0100
message:
Add a UIFactory.get_login method, fix tests.
* bzrlib/ui/text.py:
(TextUIFactory.prompt): Made usable for more than get_boolean by
deleting the [y/n] part.
(TextUIFactory.get_login): New method.
* bzrlib/ui/__init__.py:
(UIFactory.get_login): New method.
(CLIUIFactory.get_boolean): Add the [y/n] part deleted from
prompt().
* bzrlib/tests/test_ui.py:
(FakeTextUIFactory): New test class.
(UITests.test_silent_factory): Add no output testing.
(UITests.test_text_factory_ascii_password,
UITests.test_text_factory_utf8_password,
UITests.test_text_factory_ascii_password,
UITests.test_text_factory_utf8_password): New tests replacing
test_text_factory.
(UITests.test_text_factory_prompts_and_clears): Use a
DotsProgressBar so that we can run the tests from a dumb terminal
too.
* bzrlib/tests/__init__.py:
(FakeStdin): New test class.
------------------------------------------------------------
revno: 2323.2.3
merged: pqm at pqm.ubuntu.com-20070308215322-265e2cf0b768f432
parent: pqm at pqm.ubuntu.com-20070307233124-ad2724bf65e09035
parent: john at arbash-meinel.com-20070308174644-shb8ue22yqlnmo8d
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-03-08 21:53:22 +0000
message:
(Dmitry Vasiliev) Small fixes to cmd_diff
------------------------------------------------------------
revno: 2323.2.2.1.2
merged: john at arbash-meinel.com-20070308174644-shb8ue22yqlnmo8d
parent: john at arbash-meinel.com-20070308174053-y1r0glqavi8iulez
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2007-03-08 11:46:44 -0600
message:
Add (eg "old/:new/") to errors to make it a little clearer.
------------------------------------------------------------
revno: 2323.2.2.1.1
merged: john at arbash-meinel.com-20070308174053-y1r0glqavi8iulez
parent: pqm at pqm.ubuntu.com-20070307233124-ad2724bf65e09035
parent: dima at hlabs.spb.ru-20070308094114-hqx0n9cu1w6z34ax
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2007-03-08 11:40:53 -0600
message:
[merge] Dmitry's updates to cmd_diff
------------------------------------------------------------
revno: 2323.2.1.1.2
merged: dima at hlabs.spb.ru-20070308094114-hqx0n9cu1w6z34ax
parent: dima at hlabs.spb.ru-20070308061932-iyxo5y77cabdfgtj
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: Small fixes
timestamp: Thu 2007-03-08 12:41:14 +0300
message:
Added test for bzr diff --prefix illegal_value
------------------------------------------------------------
revno: 2323.2.1.1.1
merged: dima at hlabs.spb.ru-20070308061932-iyxo5y77cabdfgtj
parent: pqm at pqm.ubuntu.com-20070307121852-b60a661123a5063d
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: Small fixes
timestamp: Thu 2007-03-08 09:19:32 +0300
message:
Small fixes for bzr diff
------------------------------------------------------------
revno: 2323.2.2
merged: pqm at pqm.ubuntu.com-20070307233124-ad2724bf65e09035
parent: pqm at pqm.ubuntu.com-20070307121852-b60a661123a5063d
parent: abentley at panoramicfeedback.com-20070307231535-3nfhj93n3c5xpft2
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-03-07 23:31:24 +0000
message:
fixes for 0.15
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.26
merged: abentley at panoramicfeedback.com-20070307231535-3nfhj93n3c5xpft2
parent: abentley at panoramicfeedback.com-20070307231510-jae63zsli83db3eb
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2007-03-07 18:15:35 -0500
message:
Allow extract when tree is locked
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.25
merged: abentley at panoramicfeedback.com-20070307231510-jae63zsli83db3eb
parent: abentley at panoramicfeedback.com-20070307231436-0bm7927iwy285un0
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2007-03-07 18:15:10 -0500
message:
Make ChangeReporter private
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.24
merged: abentley at panoramicfeedback.com-20070307231436-0bm7927iwy285un0
parent: aaron.bentley at utoronto.ca-20070301025337-ao2ls9hmiscidfg8
parent: pqm at pqm.ubuntu.com-20070307121852-b60a661123a5063d
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2007-03-07 18:14:36 -0500
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 2323.2.1
merged: pqm at pqm.ubuntu.com-20070307121852-b60a661123a5063d
parent: pqm at pqm.ubuntu.com-20070307110538-3026a526f5178b00
parent: robertc at robertcollins.net-20070307120012-cgx5yk2cob9v0i92
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-03-07 12:18:52 +0000
message:
(robertc) Setup for 0.16 development.
------------------------------------------------------------
revno: 2323.3.1
merged: robertc at robertcollins.net-20070307120012-cgx5yk2cob9v0i92
parent: pqm at pqm.ubuntu.com-20070307110538-3026a526f5178b00
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2007-03-07 23:00:12 +1100
message:
(robertc) Setup for 0.16 development.
Diff too large for email (6248 lines, the limit is 1000).
More information about the bazaar-commits
mailing list