Rev 2454: [merge] bzr.dev 2465 in http://bzr.arbash-meinel.com/branches/bzr/0.16-dev/bundle_empty_properties
John Arbash Meinel
john at arbash-meinel.com
Thu Apr 26 19:53:54 BST 2007
At http://bzr.arbash-meinel.com/branches/bzr/0.16-dev/bundle_empty_properties
------------------------------------------------------------
revno: 2454
revision-id: john at arbash-meinel.com-20070426185333-i1xlyaeyf049kdxc
parent: john at arbash-meinel.com-20070426145512-xnda2pxcpfa86yld
parent: pqm at pqm.ubuntu.com-20070426181928-ot99t6eyhjjfj5h3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bundle_empty_properties
timestamp: Thu 2007-04-26 13:53:33 -0500
message:
[merge] bzr.dev 2465
removed:
bzrlib/tests/test_doc_generate.py test_doc_generate.py-20051224124638-88da58fc872b93ba
added:
bzrlib/breakin.py breakin.py-20070417043829-so46nevf978u713k-1
bzrlib/tests/blackbox/test_breakin.py test_breakin.py-20070424043903-qyy6zm4pj3h4sbp3-1
bzrlib/tests/branch_implementations/test_get_revision_id_to_revno_map.py test_get_revision_id-20070417211641-6kcoj1c704gqqopn-1
bzrlib/tests/branch_implementations/test_revision_id_to_revno.py test_revision_id_to_-20070417200738-lo776wkqikhe5goo-1
bzrlib/tests/workingtree_implementations/test_remove.py test_remove.py-20070413183901-rvnp85rtc0q0sclp-1
modified:
HACKING HACKING-20050805200004-2a5dc975d870f78c
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/memorytree.py memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/smart/__init__.py __init__.py-20061101100249-8jwwl0d3jr080zim-1
bzrlib/smart/branch.py branch.py-20061124031907-mzh3pla28r83r97f-1
bzrlib/smart/bzrdir.py bzrdir.py-20061122024551-ol0l0o0oofsu9b3t-1
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/smart/protocol.py protocol.py-20061108035435-ot0lstk2590yqhzr-1
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/smart/request.py request.py-20061108095550-gunadhxmzkdjfeek-1
bzrlib/smart/vfs.py vfs.py-20061108095550-gunadhxmzkdjfeek-2
bzrlib/tests/HTTPTestUtil.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/HttpServer.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
bzrlib/tests/blackbox/test_debug.py test_debug.py-20061026142942-q76cgg41785b3mdk-1
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_mv.py test_mv.py-20060705114902-33tkxz0o9cdshemo-1
bzrlib/tests/blackbox/test_remove.py test_remove.py-20060530011439-fika5rm84lon0goe-1
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_timestamp.py test_timestamp.py-20070306153932-r3ejn242c20asagv-1
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/test_ui.py test_ui.py-20051130162854-458e667a7414af09
bzrlib/tests/test_urlutils.py test_urlutils.py-20060502192900-46b1f9579987cf9c
bzrlib/tests/test_wsgi.py test_wsgi.py-20061005091552-rz8pva0olkxv0sd8-1
bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
bzrlib/tests/workingtree_implementations/test_move.py test_move.py-20070225171927-mohn2vqj5fx7edc6-1
bzrlib/timestamp.py timestamp.py-20070306142322-ttbb9oulf3jotljd-1
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
bzrlib/transport/http/wsgi.py wsgi.py-20061005091552-rz8pva0olkxv0sd8-2
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/urlutils.py urlutils.py-20060502195429-e8a161ecf8fac004
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 2447.1.18
merged: pqm at pqm.ubuntu.com-20070426181928-ot99t6eyhjjfj5h3
parent: pqm at pqm.ubuntu.com-20070426153904-l91p9ybsqpxt2vyv
parent: john at arbash-meinel.com-20070426165232-lbjqbhqld4k106uv
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-26 19:19:28 +0100
message:
(John Arbash Meinel, trivial) Clean up NEWS to conform to reST syntax
------------------------------------------------------------
revno: 2447.1.17.1.2
merged: john at arbash-meinel.com-20070426165232-lbjqbhqld4k106uv
parent: john at arbash-meinel.com-20070426160504-ob2sd03xgjuo0f9o
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2007-04-26 11:52:32 -0500
message:
Cleanup NEWS in accordance with rst formatting rules.
Wrap explicit text with ``foo`` when reasonable (especially if we have an underscore
or other rst meta character).
Also, reformat attributions to be (User Name, #bugnumber), prefering not to wrap.
------------------------------------------------------------
revno: 2447.1.17.1.1
merged: john at arbash-meinel.com-20070426160504-ob2sd03xgjuo0f9o
parent: pqm at pqm.ubuntu.com-20070426153904-l91p9ybsqpxt2vyv
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2007-04-26 11:05:04 -0500
message:
Move NEWS entry for 109993 to IN DEVELOPMENT rather than 0.16rc1
------------------------------------------------------------
revno: 2447.1.17
merged: pqm at pqm.ubuntu.com-20070426153904-l91p9ybsqpxt2vyv
parent: pqm at pqm.ubuntu.com-20070426104148-4l5wq2zemlzv0shg
parent: john at arbash-meinel.com-20070426144401-zdbrjiuao7xqrp0r
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-26 16:39:04 +0100
message:
(John Arbash Meinel) Fix bug #109993 by fixing _iter_changes to not sync an on-disk file with an 'absent' dirblock record.
------------------------------------------------------------
revno: 2447.1.9.2.6
merged: john at arbash-meinel.com-20070426144401-zdbrjiuao7xqrp0r
parent: john at arbash-meinel.com-20070425224555-msapt0k72c4h8wju
parent: pqm at pqm.ubuntu.com-20070426104148-4l5wq2zemlzv0shg
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: rename_iter_changes_109993
timestamp: Thu 2007-04-26 09:44:01 -0500
message:
[merge] bzr.dev 2463
------------------------------------------------------------
revno: 2447.1.9.2.5
merged: john at arbash-meinel.com-20070425224555-msapt0k72c4h8wju
parent: john at arbash-meinel.com-20070425221045-z3oqq15r3g5p9goj
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: rename_iter_changes_109993
timestamp: Wed 2007-04-25 17:45:55 -0500
message:
Make sure the output with want_unversioned=False is reasonable.
------------------------------------------------------------
revno: 2447.1.9.2.4
merged: john at arbash-meinel.com-20070425221045-z3oqq15r3g5p9goj
parent: john at arbash-meinel.com-20070425220709-smtrld4n70yy3u51
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: rename_iter_changes_109993
timestamp: Wed 2007-04-25 17:10:45 -0500
message:
NEWS entry for fixing bug 109993
------------------------------------------------------------
revno: 2447.1.9.2.3
merged: john at arbash-meinel.com-20070425220709-smtrld4n70yy3u51
parent: john at arbash-meinel.com-20070425215414-3zso9m2xndcd4rwp
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: rename_iter_changes_109993
timestamp: Wed 2007-04-25 17:07:09 -0500
message:
Tests now pass
------------------------------------------------------------
revno: 2447.1.9.2.2
merged: john at arbash-meinel.com-20070425215414-3zso9m2xndcd4rwp
parent: john at arbash-meinel.com-20070425184156-weys7l94o2nn6d4l
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: rename_iter_changes_109993
timestamp: Wed 2007-04-25 16:54:14 -0500
message:
Add another (failing) test case.
If we unversion a file, but it is still on disk
we should get 2 records from _iter_changes
one to indicate the removal
the other to indicate the unknown file on disk
------------------------------------------------------------
revno: 2447.1.9.2.1
merged: john at arbash-meinel.com-20070425184156-weys7l94o2nn6d4l
parent: pqm at pqm.ubuntu.com-20070425143732-c4aa489eylhhfnzg
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: rename_iter_changes_109993
timestamp: Wed 2007-04-25 13:41:56 -0500
message:
(broken) Add a (failing) test that _iter_changes works correctly
in the case that you delete a file, and rename another file overtop.
(Dirstate currently has a chance to report the renamed file as deleted
if the rename goes to a name which sorts first in the list.)
------------------------------------------------------------
revno: 2447.1.16
merged: pqm at pqm.ubuntu.com-20070426104148-4l5wq2zemlzv0shg
parent: pqm at pqm.ubuntu.com-20070426083414-8xgtmyk47txgquaw
parent: v.ladeuil+lp at free.fr-20070426090738-3n4pmuhuwqxr05fj
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-26 11:41:48 +0100
message:
http authentication and other integrated fixes
------------------------------------------------------------
revno: 2420.1.22
merged: v.ladeuil+lp at free.fr-20070426090738-3n4pmuhuwqxr05fj
parent: v.ladeuil+lp at free.fr-20070426090146-jbwl0muvk76wlw6c
parent: pqm at pqm.ubuntu.com-20070426083414-8xgtmyk47txgquaw
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.auth
timestamp: Thu 2007-04-26 11:07:38 +0200
message:
Merge bzr.dev, resolving trivila conflicts in bzrlib/smart/repository.py
------------------------------------------------------------
revno: 2420.1.21
merged: v.ladeuil+lp at free.fr-20070426090146-jbwl0muvk76wlw6c
parent: v.ladeuil+lp at free.fr-20070426072124-bty9pn2i122u1zpx
parent: andrew.bennetts at canonical.com-20070426081540-36glj2kouoldc866
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.auth
timestamp: Thu 2007-04-26 11:01:46 +0200
message:
Merge spiv modifications
------------------------------------------------------------
revno: 2420.1.20.1.2
merged: andrew.bennetts at canonical.com-20070426081540-36glj2kouoldc866
parent: andrew.bennetts at canonical.com-20070426075456-5edsg5a2zo7iiimv
parent: mbp at sourcefrog.net-20070426074805-va53nylsxqt7ur7u
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr.http.auth
timestamp: Thu 2007-04-26 18:15:40 +1000
message:
Merge tarball branch that's already with PQM, resolving conflicts.
------------------------------------------------------------
revno: 2420.1.20.1.1
merged: andrew.bennetts at canonical.com-20070426075456-5edsg5a2zo7iiimv
parent: v.ladeuil+lp at free.fr-20070426072124-bty9pn2i122u1zpx
parent: andrew.bennetts at canonical.com-20070426064512-kcdvlg2u3dzi2l4s
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr.http.auth
timestamp: Thu 2007-04-26 17:54:56 +1000
message:
Merge smart server changes that are already with PQM, and fix conflict and formatting nit in NEWS.
------------------------------------------------------------
revno: 2432.2.6.1.7
merged: andrew.bennetts at canonical.com-20070426064512-kcdvlg2u3dzi2l4s
parent: andrew.bennetts at canonical.com-20070426061436-blwwa9pez8gkkgh5
parent: andrew.bennetts at canonical.com-20070426064415-69n3ie22q8l2t44f
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-vfs-fallback
timestamp: Thu 2007-04-26 16:45:12 +1000
message:
Merge in smart-transport-subpaths.
------------------------------------------------------------
revno: 2208.4.5
merged: andrew.bennetts at canonical.com-20070426064415-69n3ie22q8l2t44f
parent: andrew.bennetts at canonical.com-20070426061907-ipn74twdz1gmz52i
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: smart-transport-subpaths
timestamp: Thu 2007-04-26 16:44:15 +1000
message:
Add NEWS entry about bzr+http change.
------------------------------------------------------------
revno: 2208.4.4
merged: andrew.bennetts at canonical.com-20070426061907-ipn74twdz1gmz52i
parent: andrew.bennetts at canonical.com-20070104052612-uflmazssfnud41y8
parent: pqm at pqm.ubuntu.com-20070426054238-v6k5ge3z766vaafk
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: smart-transport-subpaths
timestamp: Thu 2007-04-26 16:19:07 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 2208.4.3
merged: andrew.bennetts at canonical.com-20070104052612-uflmazssfnud41y8
parent: andrew.bennetts at canonical.com-20061222060424-psweqla98ig12mra
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: smart-transport-subpaths
timestamp: Thu 2007-01-04 16:26:12 +1100
message:
Let SmartHTTPTransport.clone('..') continue to POST to the cloned URL (unlike clone('child')).
------------------------------------------------------------
revno: 2208.4.2
merged: andrew.bennetts at canonical.com-20061222060424-psweqla98ig12mra
parent: andrew.bennetts at canonical.com-20061222055608-t1cfil9ws1l95k0f
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr
timestamp: Fri 2006-12-22 17:04:24 +1100
message:
Always POST to the same .bzr/smart URL for a given branch, even when accessing files in subdirectories.
------------------------------------------------------------
revno: 2208.4.1
merged: andrew.bennetts at canonical.com-20061222055608-t1cfil9ws1l95k0f
parent: pqm at pqm.ubuntu.com-20061221043820-0b56b176269f173a
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr
timestamp: Fri 2006-12-22 16:56:08 +1100
message:
normalize_url should normalise escaping of unreserved characters, like '~'.
------------------------------------------------------------
revno: 2432.2.6.1.6
merged: andrew.bennetts at canonical.com-20070426061436-blwwa9pez8gkkgh5
parent: andrew.bennetts at canonical.com-20070426060131-zaumabdzwl8nrlux
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-vfs-fallback
timestamp: Thu 2007-04-26 16:14:36 +1000
message:
Fix a couple of test failures introduced by the previous merge.
------------------------------------------------------------
revno: 2432.2.6.1.5
merged: andrew.bennetts at canonical.com-20070426060131-zaumabdzwl8nrlux
parent: andrew.bennetts at canonical.com-20070426054956-eipakzwjs76a14wq
parent: robertc at lifelesswks.robertcollins.net-20070424130122-0a33444e2abe6a8f
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-vfs-fallback
timestamp: Thu 2007-04-26 16:01:31 +1000
message:
Merge Robert's status prefix changes to protocol 2.
------------------------------------------------------------
revno: 2432.2.2.1.7
merged: robertc at lifelesswks.robertcollins.net-20070424130122-0a33444e2abe6a8f
parent: robertc at lifelesswks.robertcollins.net-20070424125050-8b4f1cf3f5b017bb
committer: Robert Collins <robertc at lifelesswks.robertcollins.net>
branch nick: hpss-protocol2-wire-prefix
timestamp: Tue 2007-04-24 23:01:22 +1000
message:
NEWS.
------------------------------------------------------------
revno: 2432.2.2.1.6
merged: robertc at lifelesswks.robertcollins.net-20070424125050-8b4f1cf3f5b017bb
parent: robertc at lifelesswks.robertcollins.net-20070424122009-8bb4dede6a298d93
committer: Robert Collins <robertc at lifelesswks.robertcollins.net>
branch nick: hpss-protocol2-wire-prefix
timestamp: Tue 2007-04-24 22:50:50 +1000
message:
Include success/failure feedback in SmartProtocolTwo responses to allow robust handling in the future.
------------------------------------------------------------
revno: 2432.2.2.1.5
merged: robertc at lifelesswks.robertcollins.net-20070424122009-8bb4dede6a298d93
parent: robertc at lifelesswks.robertcollins.net-20070424120730-ff71254d94206e30
committer: Robert Collins <robertc at lifelesswks.robertcollins.net>
branch nick: hpss-protocol2-wire-prefix
timestamp: Tue 2007-04-24 22:20:09 +1000
message:
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic.
------------------------------------------------------------
revno: 2432.2.2.1.4
merged: robertc at lifelesswks.robertcollins.net-20070424120730-ff71254d94206e30
parent: robertc at lifelesswks.robertcollins.net-20070424113214-5660f78098933edb
parent: andrew.bennetts at canonical.com-20070424090150-9buzrpi8lt6qv0tg
committer: Robert Collins <robertc at lifelesswks.robertcollins.net>
branch nick: hpss-protocol2-wire-prefix
timestamp: Tue 2007-04-24 22:07:30 +1000
message:
Merge hpss-protocol2.
------------------------------------------------------------
revno: 2432.2.2.1.3
merged: robertc at lifelesswks.robertcollins.net-20070424113214-5660f78098933edb
parent: robertc at lifelesswks.robertcollins.net-20070424105216-8a68b2533da78717
committer: Robert Collins <robertc at lifelesswks.robertcollins.net>
branch nick: hpss-protocol2-wire-prefix
timestamp: Tue 2007-04-24 21:32:14 +1000
message:
Refactor the HPSS Response code to take SmartServerResponse rather than args and body.
------------------------------------------------------------
revno: 2432.2.2.1.2
merged: robertc at lifelesswks.robertcollins.net-20070424105216-8a68b2533da78717
parent: robertc at lifelesswks.robertcollins.net-20070424104022-308ab78a663c23f7
committer: Robert Collins <robertc at lifelesswks.robertcollins.net>
branch nick: hpss-protocol2-wire-prefix
timestamp: Tue 2007-04-24 20:52:16 +1000
message:
Add FailedSmartServerResponse.
------------------------------------------------------------
revno: 2432.2.2.1.1
merged: robertc at lifelesswks.robertcollins.net-20070424104022-308ab78a663c23f7
parent: andrew.bennetts at canonical.com-20070424072048-tgbochqfr1n33bcy
committer: Robert Collins <robertc at lifelesswks.robertcollins.net>
branch nick: hpss-protocol2-wire-prefix
timestamp: Tue 2007-04-24 20:40:22 +1000
message:
Add SuccessfulSmartServerResponse.
------------------------------------------------------------
revno: 2432.2.6.1.4
merged: andrew.bennetts at canonical.com-20070426054956-eipakzwjs76a14wq
parent: andrew.bennetts at canonical.com-20070425055650-8mlo7rmtj65za5ql
parent: pqm at pqm.ubuntu.com-20070426054238-v6k5ge3z766vaafk
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-vfs-fallback
timestamp: Thu 2007-04-26 15:49:56 +1000
message:
Merge from bzr.dev.
------------------------------------------------------------
revno: 2432.2.6.1.3
merged: andrew.bennetts at canonical.com-20070425055650-8mlo7rmtj65za5ql
parent: andrew.bennetts at canonical.com-20070424181238-ujjudjjjn2jbqrj6
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-vfs-fallback
timestamp: Wed 2007-04-25 15:56:50 +1000
message:
Update comment according to Martin's suggestion.
------------------------------------------------------------
revno: 2432.2.6.1.2
merged: andrew.bennetts at canonical.com-20070424181238-ujjudjjjn2jbqrj6
parent: andrew.bennetts at canonical.com-20070424102546-am5s92urrlfk9zjb
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-vfs-fallback
timestamp: Wed 2007-04-25 04:12:38 +1000
message:
Add test, and tidy implementation.
------------------------------------------------------------
revno: 2432.2.6.1.1
merged: andrew.bennetts at canonical.com-20070424102546-am5s92urrlfk9zjb
parent: andrew.bennetts at canonical.com-20070424090150-9buzrpi8lt6qv0tg
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-vfs-fallback
timestamp: Tue 2007-04-24 20:25:46 +1000
message:
Try a version 1 hello probe to determine if we can use RemoteBzrDir on a particular transport, allowing smooth interoperation with older servers.
------------------------------------------------------------
revno: 2420.1.20
merged: v.ladeuil+lp at free.fr-20070426072124-bty9pn2i122u1zpx
parent: v.ladeuil+lp at free.fr-20070424100523-3odqlqm2nnoc8gdu
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.auth
timestamp: Thu 2007-04-26 09:21:24 +0200
message:
Fix test failure on pqm.
* bzrlib/tests/test_http.py:
(TestAuth.setUp): Overrides sys.stdout, TestUIFactory will not do
it for us and the tests fail on pqm otherwise.
(TestAuth.test_prompt_for_password): No need to provide stdout
parameter anymore.
------------------------------------------------------------
revno: 2420.1.19
merged: v.ladeuil+lp at free.fr-20070424100523-3odqlqm2nnoc8gdu
parent: v.ladeuil+lp at free.fr-20070424095159-pnxwqfn1og3bqg5e
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.auth
timestamp: Tue 2007-04-24 12:05:23 +0200
message:
Cosmetic changes.
------------------------------------------------------------
revno: 2420.1.18
merged: v.ladeuil+lp at free.fr-20070424095159-pnxwqfn1og3bqg5e
parent: v.ladeuil+lp at free.fr-20070424094954-k60h58nkwrf09l94
parent: pqm at pqm.ubuntu.com-20070424054249-bpkw4wwywqjt2nel
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.auth
timestamp: Tue 2007-04-24 11:51:59 +0200
message:
merge bzr.dev at 2450
------------------------------------------------------------
revno: 2420.1.17
merged: v.ladeuil+lp at free.fr-20070424094954-k60h58nkwrf09l94
parent: v.ladeuil+lp at free.fr-20070422163204-7iksk91jy9091nex
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.auth
timestamp: Tue 2007-04-24 11:49:54 +0200
message:
Update NEWS.
------------------------------------------------------------
revno: 2420.1.16
merged: v.ladeuil+lp at free.fr-20070422163204-7iksk91jy9091nex
parent: v.ladeuil+lp at free.fr-20070422110259-dx0e5do9dzzf0qjt
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.auth
timestamp: Sun 2007-04-22 18:32:04 +0200
message:
Handle nonce changes. Fix a nasty bug breaking the auth parameters sharing.
* bzrlib/tests/HTTPTestUtil.py:
(DigestAuthServer.digest_authorized): Check the nonce validity.
* bzrlib/transport/http/_urllib.py:
(HttpTransport_urllib._perform): Always update auth parameters
after a request processing, they could change at any moment.
* bzrlib/transport/http/_urllib2_wrappers.py:
(AbstractAuthHandler.update_auth): New method to track auth
modifications that should be lead to new authentications.
(AbstractAuthHandler.auth_required): Do not copy the auth
parameters but track the changes instead (copying breaks the auth
parameters sharing between cloned transports). Do not restrict the
auth 'identity' to be (user, realm, password) only.
(AbstractAuthHandler.auth_match): Document the auth parameter
update policy that MUST be respected to avoid retrying to
authenticate with wrong parameters, endlessly.
(AbstractAuthHandler.auth_successful): Not used anymore, but kept
in place if we ever want to handle the 'Authorization-Info' header.
------------------------------------------------------------
revno: 2420.1.15
merged: v.ladeuil+lp at free.fr-20070422110259-dx0e5do9dzzf0qjt
parent: v.ladeuil+lp at free.fr-20070422100132-98l662vmscalaiin
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.auth
timestamp: Sun 2007-04-22 13:02:59 +0200
message:
Check digest robustness.
* bzrlib/tests/test_http.py:
(TestDigestAuth.test_changing_nonce): New robustness digest test.
------------------------------------------------------------
revno: 2420.1.14
merged: v.ladeuil+lp at free.fr-20070422100132-98l662vmscalaiin
parent: v.ladeuil+lp at free.fr-20070421213132-6ffsjiv1bf6tnfhq
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.auth
timestamp: Sun 2007-04-22 12:01:32 +0200
message:
Tested against squid-2.6.5 with digest authentication.
* bzrlib/transport/http/_urllib2_wrappers.py:
(DigestAuthHandler.build_auth_header): Only the request path
should appear in the uri. nc value should not be quoted for
squid (the devil is in the details...). Well, some cleaning
helped. Don't put algorithm in the header if none was specified by
the server.
------------------------------------------------------------
revno: 2420.1.13
merged: v.ladeuil+lp at free.fr-20070421213132-6ffsjiv1bf6tnfhq
parent: v.ladeuil+lp at free.fr-20070421212934-y3gyvd9pgs19sr7u
parent: pqm at pqm.ubuntu.com-20070421151139-5wau2ukbpx5z1hv2
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.auth
timestamp: Sat 2007-04-21 23:31:32 +0200
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2420.1.12
merged: v.ladeuil+lp at free.fr-20070421212934-y3gyvd9pgs19sr7u
parent: v.ladeuil+lp at free.fr-20070421203906-hta5jt0nmauyl9qy
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.auth
timestamp: Sat 2007-04-21 23:29:34 +0200
message:
Cometic changes.
------------------------------------------------------------
revno: 2420.1.11
merged: v.ladeuil+lp at free.fr-20070421203906-hta5jt0nmauyl9qy
parent: v.ladeuil+lp at free.fr-20070421113113-b0br4norqbtlx1o2
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.auth
timestamp: Sat 2007-04-21 22:39:06 +0200
message:
Implement digest authentication. Test suite passes. Tested against apache-2.x.
* bzrlib/transport/http/_urllib2_wrappers.py:
(AbstractAuthHandler.auth_required): Do not attempt to
authenticate if we don't have a user. Rework the detection of
already tried authentications. Avoid building the auth header two
times, save the auth info at the right places.
(AbstractAuthHandler.build_auth_header): Add a request parameter
for digest needs.
(BasicAuthHandler.auth_match): Simplify.
(get_digest_algorithm_impls, DigestAuthHandler): Implements client
digest authentication. MD5 and SHA algorithms are supported. Only
'auth' qop is suppoted.
(HTTPBasicAuthHandler, ProxyBasicAuthHandler): Renamed HTTPHandler
and ProxyAuthHandler respectively.
(HTTPBasicAuthHandler, ProxyBasicAuthHandler,
HTTPDigestAuthHandler, ProxyDigestAuthHandler): New classes
implementing the combinations between (http, proxy) and (basic,
digest).
(Opener.__init__): No more handlers in comment ! One TODO less !
* bzrlib/transport/http/_urllib.py:
(HttpTransport_urllib.__init__): self.base is not suitable for an
auth uri, it can contain decorators.
* bzrlib/tests/test_http.py:
(TestAuth.test_no_user): New test to check the behavior with no
user when authentication is required.
* bzrlib/tests/HTTPTestUtil.py:
(DigestAuthRequestHandler.authorized): Delegate most of the work
to the server that control the needed persistent infos.
(AuthServer): Define an auth_relam attribute.
(DigestAuthServer): Implement a first version of digest
authentication. Only the MD5 algorithm and the 'auth' qop are
supported so far.
(HTTPAuthServer.init_http_auth): New method to simplify
the [http|proxy], [basic|digest] server combinations writing.
------------------------------------------------------------
revno: 2420.1.10
merged: v.ladeuil+lp at free.fr-20070421113113-b0br4norqbtlx1o2
parent: v.ladeuil+lp at free.fr-20070421092630-ty7a90wrx4v2x5k8
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.auth
timestamp: Sat 2007-04-21 13:31:13 +0200
message:
Doc fixes.
------------------------------------------------------------
revno: 2420.1.9
merged: v.ladeuil+lp at free.fr-20070421092630-ty7a90wrx4v2x5k8
parent: v.ladeuil+lp at free.fr-20070420113620-lawri7ftno7lbycw
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.auth
timestamp: Sat 2007-04-21 11:26:30 +0200
message:
Refactor proxy and auth test classes. Tests failing for digest auth.
* bzrlib/transport/http/_urllib2_wrappers.py:
(AbstractAuthHandler.auth_required,
AbstractAuthHandler.auth_successful): Add response parameter as an
authentication scheme may need additional info provided only
there.
* bzrlib/tests/test_http.py:
(TestAuth, TestHTTPAuth, TestProxyAuth, TestHTTPBasicAuth,
TestHTTPProxyBasicAuth): Refactoring.
(TestHTTPDigestAuth, TestHTTPProxyDigestAuth): New classes for
digest authentication tests.
* bzrlib/tests/HttpServer.py:
(TestingHTTPRequestHandler.translate_path): Handles request
proxying based on a server attribute.
(HttpServer): Add proxy_requests attribute.
* bzrlib/tests/HTTPTestUtil.py:
(ProxyServer): Replaces FakeProxyRequestHandler now that
HttpServer handles proxying based on a server attribute.
(AuthRequestHandler, BasicAuthRequestHandler, AuthServer,
HTTPAuthServer, ProxyAuthServer, HTTPBasicAuthServer,
ProxyBasicAuthServer): Refactoring Auth servers and request
handlers.
(HTTPDigestAuthServer, ProxyDigestAuthServer): New classes for
digest authentication.
------------------------------------------------------------
revno: 2420.1.8
merged: v.ladeuil+lp at free.fr-20070420113620-lawri7ftno7lbycw
parent: v.ladeuil+lp at free.fr-20070420112453-smx7l1dfilvozcqp
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.auth
timestamp: Fri 2007-04-20 13:36:20 +0200
message:
Interesting typo :-) A mix between capitalize, title and fuzzy may be...
------------------------------------------------------------
revno: 2420.1.7
merged: v.ladeuil+lp at free.fr-20070420112453-smx7l1dfilvozcqp
parent: v.ladeuil+lp at free.fr-20070420065059-oig56fr6u5yxeiob
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.auth
timestamp: Fri 2007-04-20 13:24:53 +0200
message:
Tested against squid-2.6.5 with basic authentication.
* bzrlib/transport/http/_urllib2_wrappers.py:
(ProxyBasicAuthHandler): Add realm in the prompt.
------------------------------------------------------------
revno: 2420.1.6
merged: v.ladeuil+lp at free.fr-20070420065059-oig56fr6u5yxeiob
parent: v.ladeuil+lp at free.fr-20070419172804-m3b5ayyfslh08vrr
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.auth
timestamp: Fri 2007-04-20 08:50:59 +0200
message:
Update NEWS to explain the intent of the modification. Also, use dicts
instead of tuples for auth parameters.
* bzrlib/transport/http/_urllib2_wrappers.py:
Use dicts for auth parameters.
* bzrlib/transport/http/_urllib.py:
(HttpTransport_urllib.__init__): Use dicts for auth parameters.
------------------------------------------------------------
revno: 2420.1.5
merged: v.ladeuil+lp at free.fr-20070419172804-m3b5ayyfslh08vrr
parent: v.ladeuil+lp at free.fr-20070418080816-ovy46d2gv7mzlr86
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.auth
timestamp: Thu 2007-04-19 19:28:04 +0200
message:
Refactor http and proxy authentication. Tests passing. proxy password can be prompted too.
* bzrlib/transport/http/_urllib2_wrappers.py:
(Request.__init__): New auth and proxy_auth attributes: tuples
with all the needed info). Should accept digest auth too.
(extract_authentication_uri): New function. Clearly define how we
define authentication uri for bzr.
(ProxyHandler.set_proxy): As HttpTransport_urllib.__init__,
extract auth info from env variables and leave the auth handlers
do the job.
(AbstractAuthHandler): Better abstraction of authentication,
handles auth errors and preventively set headers once the first
auth is successful.
(AbstractBasicAuthHandler): Specialization for basic scheme
authentication.
(HTTPBasicAuthHandler, ProxyBasicAuthHandler): Simplified, do not
rely on urllib2 anymore.
* bzrlib/transport/http/_urllib.py:
(HttpTransport_urllib.__init__): Use a tuple instead of different
attributes for scheme, user, password as we need two more
attributes (authuri and realm) for each auth (http and
proxy). And, yes, better handling of proxies (including prompting
user for a password).
(HttpTransport_urllib._ask_password): Deleted. _urllib2_wrappers
is handling that now.
* bzrlib/tests/test_http.py:
(TestHTTPBasicAuth.get_user_transport, TestHTTPProxyBasicAuth):
New method to build a different transport when proxying or not.
------------------------------------------------------------
revno: 2420.1.4
merged: v.ladeuil+lp at free.fr-20070418080816-ovy46d2gv7mzlr86
parent: v.ladeuil+lp at free.fr-20070417220718-kce3mj0wn8hi8m02
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.auth
timestamp: Wed 2007-04-18 10:08:16 +0200
message:
Add test checking the number of roundtrips due to 401 or 407 errors.
* bzrlib/tests/test_http.py:
(TestHTTPAuth.test_empty_pass): Verifying the number of
authentication errors allows to count the 40[17] roundtrips.
* bzrlib/tests/HTTPTestUtil.py:
(AbstractBasicAuthRequestHandler.do_GET): Count the authentication
errors.
------------------------------------------------------------
revno: 2420.1.3
merged: v.ladeuil+lp at free.fr-20070417220718-kce3mj0wn8hi8m02
parent: v.ladeuil+lp at free.fr-20070417103339-3kywr38d0p50czrw
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.auth
timestamp: Wed 2007-04-18 00:07:18 +0200
message:
Implement http proxy basic authentication.
* bzrlib/transport/http/_urllib2_wrappers.py:
(Request.set_proxy_auth): New method.
(extract_credentials): Moved from
HttpTransport_urllib._extract_auth.
(ProxyHandler.__init__): We need a password_manager for
authentication.
(ProxyHandler.set_proxy): Don't add the auth header, the
ProxyHandlers will do it later.
(ProxyBasicAuthHandler): New class. Handle the http basic
authentication for proxy.
(Opener.__init__): Enable ProxyBasicAuthHandler.
* bzrlib/transport/http/_urllib.py:
(HttpTransport_urllib._extract_auth): Moved to
_urllib2_wrappers.extract_credentials.
* bzrlib/tests/test_http.py:
(TestHttpProxyWhiteBox.test_empty_pass,
TestHttpProxyWhiteBox.test_user_pass): Deleted. Euivalent tests
exists in TestHTTPProxyBasicAuth now.
* bzrlib/tests/HTTPTestUtil.py:
(BasicAuthRequestHandler): Fix inheritance.
(ProxyBasicAuthRequestHandler): Force the use of
FakeProxyRequestHandler.translate_path. This is a bit ugly :-/
------------------------------------------------------------
revno: 2420.1.2
merged: v.ladeuil+lp at free.fr-20070417103339-3kywr38d0p50czrw
parent: v.ladeuil+lp at free.fr-20070416134120-i8y220zv30spaq0a
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.auth
timestamp: Tue 2007-04-17 12:33:39 +0200
message:
Define tests for http proxy basic authentication. They fail.
* bzrlib/tests/test_http.py:
(TestHttpProxyWhiteBox._set_and_capture_env_var): Deleted. YAGNI.
(TestProxyHttpServer._set_and_capture_env_var): Deleted. YAGNI
(TestHTTPAuth): Made abstract so it can be reused for proxy.
(TestHTTPAuth.test_prompt_for_password): New class.
(TestHTTPAuth.test_prompt_for_password): New class. Failed tests so
far.
* bzrlib/tests/HTTPTestUtil.py:
(AbstractBasicAuthRequestHandler): Made abstract from
BasicAuthRequestHandler so it can be reused for proxy.
(ProxyBasicAuthRequestHandler): New class.
(ProxyBasicAuthHTTPServer): New class.
------------------------------------------------------------
revno: 2420.1.1
merged: v.ladeuil+lp at free.fr-20070416134120-i8y220zv30spaq0a
parent: pqm at pqm.ubuntu.com-20070416080254-bf3rfk77k5bgfdl7
parent: v.ladeuil+lp at free.fr-20070415155708-frrm29cd9vvvd8do
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.auth
timestamp: Mon 2007-04-16 15:41:20 +0200
message:
merge basic auth
------------------------------------------------------------
revno: 2363.4.12
merged: v.ladeuil+lp at free.fr-20070415155708-frrm29cd9vvvd8do
parent: v.ladeuil+lp at free.fr-20070413163858-3v6pox4wls7j9ljb
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 72792
timestamp: Sun 2007-04-15 17:57:08 +0200
message:
Take jam's review comments into account. Fix typos, give better
explanations, add a test, complete another.
* bzrlib/transport/http/_urllib2_wrappers.py:
(HTTPBasicAuthHandler.http_error_401): Better explanation.
* bzrlib/transport/http/_urllib.py:
(HttpTransport_urllib.__init__): _auth renamed to _auth_scheme.
* bzrlib/tests/test_http.py:
(TestHTTPBasicAuth.test_unknown_user): New test.
* bzrlib/tests/HTTPTestUtil.py:
(BasicAuthHTTPServer): New class. Be explicit about use
requirements: basic authentication is mandatory.
------------------------------------------------------------
revno: 2363.4.11
merged: v.ladeuil+lp at free.fr-20070413163858-3v6pox4wls7j9ljb
parent: v.ladeuil+lp at free.fr-20070413161654-kp4kajrrr23jge2f
parent: pqm at pqm.ubuntu.com-20070413160237-0weampli2rrmzjht
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 72792
timestamp: Fri 2007-04-13 18:38:58 +0200
message:
merge bzr.dev
------------------------------------------------------------
revno: 2363.4.10
merged: v.ladeuil+lp at free.fr-20070413161654-kp4kajrrr23jge2f
parent: v.ladeuil+lp at free.fr-20070413121740-mnwzf1656e31aenj
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 72792
timestamp: Fri 2007-04-13 18:16:54 +0200
message:
Complete tests.
* bzrlib/transport/http/_urllib.py:
(HttpTransport_urllib.__init__): Be more strict on valid users.
(HttpTransport_urllib._ask_password): Delete John's TODO. See ? I
didn't forget ! :-)
* bzrlib/tests/test_ui.py:
Fix some inconsistencies.
* bzrlib/tests/test_http.py:
Add more tests.
(TestHTTPBasicAuth.setUp): Setup a private ui_factory.
------------------------------------------------------------
revno: 2363.4.9
merged: v.ladeuil+lp at free.fr-20070413121740-mnwzf1656e31aenj
parent: v.ladeuil+lp at free.fr-20070413081101-j0keov4vgf493m2d
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 72792
timestamp: Fri 2007-04-13 14:17:40 +0200
message:
Catch first succesful authentification to avoid further 401
roudtrips in hhtp urllib implementation.
* bzrlib/transport/http/_urllib2_wrappers.py:
(Request.__init__): Initialize auth parameters.
(Request.extract_auth): Moved to
HttpTransport_urllib._extract_auth.
(Request.set_auth): New method.
(PasswordManager): Now that the transport handles the auth
parameters, we can use transport.base as the auth uri and work
around the python-2.4 bug.
(HTTPBasicAuthHandler.http_error_401): Capture the auth scheme
when the authentication succeeds.
* bzrlib/transport/http/_urllib.py:
(HttpTransport_urllib.__init__): Extract authentication at
construction time so that we don't have to do it at request build
time. urllib2 will be happier without it.
(HttpTransport_urllib._extract_auth): Moved from
_urllib2_wrappers.Request.extract_auth.
(HttpTransport_urllib._ask_password): Made private and do not
require a 'request' parameter anymore.
(HttpTransport_urllib._perform): The transport is now responsible
for handling the auth parameters and provide them to the
requests. And from there we can avoid the 401 roundtrips
yeaaaaah! (Except the first one of course to determine the auth
scheme).
------------------------------------------------------------
revno: 2363.4.8
merged: v.ladeuil+lp at free.fr-20070413081101-j0keov4vgf493m2d
parent: v.ladeuil+lp at free.fr-20070412160004-zrffqcemqyjb8gvq
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 72792
timestamp: Fri 2007-04-13 10:11:01 +0200
message:
Implement a basic auth HTTP server, rewrite tests accordingly.
* bzrlib/transport/http/_urllib2_wrappers.py:
(PasswordManager.add_password, PasswordManager.find_user_password,
PasswordManager.reduce_uri): Copied from python-2.5 urllib2.py as
a stop gap. A python-2.4 compatible work must be found.
(Opener.preprocess_request): Deleted.
* bzrlib/tests/test_http.py:
(TestHTTPBasicAuth.create_transport_readonly_server): Use the
right auth HTTP server.
(TestHTTPBasicAuth.setUp): Plug the the server.
(TestHTTPBasicAuth.process_request): Deleted.
* bzrlib/tests/HTTPTestUtil.py:
(BasicAuthRequestHandler, AuthHTTPServer): New classes. Implement
basic authentication on HTTP server.
------------------------------------------------------------
revno: 2363.4.7
merged: v.ladeuil+lp at free.fr-20070412160004-zrffqcemqyjb8gvq
parent: v.ladeuil+lp at free.fr-20070412142800-6e1pc8aksxlp7pg4
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 72792
timestamp: Thu 2007-04-12 18:00:04 +0200
message:
Deeper tests, prepare the auth setting that will avoid the
roundtrip with each 401.
* bzrlib/transport/http/_urllib2_wrappers.py:
(Request.__init__): Create the auth field.
(ConnectionHandler.get_key): Deleted.
(HTTPBasicAuthHandler.http_request): Add the authentication
parameter if the request requires it.
* bzrlib/tests/test_http.py:
(TestHTTPBasicAuth.setUp): Create the transport to access the
underlying _urllib2_wrappers opener.
(TestHTTPBasicAuth.process_request): Leave the opener process the
request based on the request.auth field.
------------------------------------------------------------
revno: 2363.4.6
merged: v.ladeuil+lp at free.fr-20070412142800-6e1pc8aksxlp7pg4
parent: v.ladeuil+lp at free.fr-20070412130953-pwgok8w72gxazlel
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 72792
timestamp: Thu 2007-04-12 16:28:00 +0200
message:
Fix tests around stdin emptyness.
* bzrlib/tests/test_ui.py:
Use readline not getline and test '' not None.
------------------------------------------------------------
revno: 2363.4.5
merged: v.ladeuil+lp at free.fr-20070412130953-pwgok8w72gxazlel
parent: v.ladeuil+lp at free.fr-20070411142442-a8eilux70zs8ddg6
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 72792
timestamp: Thu 2007-04-12 15:09:53 +0200
message:
Add white box tests for basic HTTP auth.
* bzrlib/transport/http/_urllib2_wrappers.py:
(HTTPBasicAuthHandler.get_auth, HTTPBasicAuthHandler.set_auth):
New methods.
* bzrlib/tests/test_http.py:
(TestHttpProxyWhiteBox._proxied_request): Get rid of local imports.
(TestHTTPBasicAuth): New class. Tests basic HTTP auth.
------------------------------------------------------------
revno: 2363.4.4
merged: v.ladeuil+lp at free.fr-20070411142442-a8eilux70zs8ddg6
parent: v.ladeuil+lp at free.fr-20070411141729-cdaswhptaqmz4jrw
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 72792
timestamp: Wed 2007-04-11 16:24:42 +0200
message:
More tidying-up.
* bzrlib/tests/test_ui.py:
Fix some spaceing issues and check more stdin emptiness.
------------------------------------------------------------
revno: 2363.4.3
merged: v.ladeuil+lp at free.fr-20070411141729-cdaswhptaqmz4jrw
parent: v.ladeuil+lp at free.fr-20070410212235-vlcb8g9h421qpnwf
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 72792
timestamp: Wed 2007-04-11 16:17:29 +0200
message:
Tidy-up tests.
* bzrlib/tests/test_ui.py:
Assert that stdin is empty after passwords have been queried.
------------------------------------------------------------
revno: 2363.4.2
merged: v.ladeuil+lp at free.fr-20070410212235-vlcb8g9h421qpnwf
parent: v.ladeuil+lp at free.fr-20070403130039-5yuvjob1hwqjkvsd
parent: pqm at pqm.ubuntu.com-20070410074302-cf6b95587a1058cd
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 72792
timestamp: Tue 2007-04-10 23:22:35 +0200
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2363.4.1
merged: v.ladeuil+lp at free.fr-20070403130039-5yuvjob1hwqjkvsd
parent: pqm at pqm.ubuntu.com-20070317015305-7b7562331da9f786
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 72792
timestamp: Tue 2007-04-03 15:00:39 +0200
message:
Partial fix for bug #72292.
* bzrlib/transport/http/_urllib.py:
(HttpTransport_urllib.ask_password): If a password is already
supplied, pass it to the password manager.
------------------------------------------------------------
revno: 2447.1.15
merged: pqm at pqm.ubuntu.com-20070426083414-8xgtmyk47txgquaw
parent: pqm at pqm.ubuntu.com-20070426070825-6xw10b1el98su02i
parent: mbp at sourcefrog.net-20070426074805-va53nylsxqt7ur7u
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-26 09:34:14 +0100
message:
Repository.tarball operation to speed initial checkouts
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.25
merged: mbp at sourcefrog.net-20070426074805-va53nylsxqt7ur7u
parent: mbp at sourcefrog.net-20070423120654-7k0q70jyjrvb5g38
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Thu 2007-04-26 17:48:05 +1000
message:
Repository.tarball fixes for python2.4
Use 'r|bz2' to extract since r:bz2 is not supported
Replace extractall, which is not in python2.4
RemoteRepository._get_tarball returns a TemporaryFile
-------------- This line and the following will be ignored --------------
modified:
bzrlib/remote.py
bzrlib/tests/test_remote.py
bzrlib/tests/test_smart.py
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.24
merged: mbp at sourcefrog.net-20070423120654-7k0q70jyjrvb5g38
parent: mbp at sourcefrog.net-20070423071826-0vcm0vzp4jp3ajax
parent: mbp at sourcefrog.net-20070423095250-xzaleukzs05x9lp0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Mon 2007-04-23 22:06:54 +1000
message:
Merge Repository.sprout refactoring, and make that use Repository.tarball
------------------------------------------------------------
revno: 2440.1.1
merged: mbp at sourcefrog.net-20070423095250-xzaleukzs05x9lp0
parent: pqm at pqm.ubuntu.com-20070421151139-5wau2ukbpx5z1hv2
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: sprout-cleanup
timestamp: Mon 2007-04-23 19:52:50 +1000
message:
Add new Repository.sprout,
Cleaner in intention and purpose than copy_content_into. It doesn't copy the
extra settings of the repository (like working-trees and shared), which is
normally what you'll want.
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.23
merged: mbp at sourcefrog.net-20070423071826-0vcm0vzp4jp3ajax
parent: mbp at sourcefrog.net-20070423050344-7r4w0fvmjbevcn0r
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Mon 2007-04-23 17:18:26 +1000
message:
review cleanups
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.22
merged: mbp at sourcefrog.net-20070423050344-7r4w0fvmjbevcn0r
parent: mbp at sourcefrog.net-20070416153631-425bo8mmp7kkitox
parent: pqm at pqm.ubuntu.com-20070421151139-5wau2ukbpx5z1hv2
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Mon 2007-04-23 15:03:44 +1000
message:
merge bzr.dev
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.21
merged: mbp at sourcefrog.net-20070416153631-425bo8mmp7kkitox
parent: mbp at sourcefrog.net-20070416153233-bbvwu8649jdl8d4c
parent: pqm at pqm.ubuntu.com-20070416080254-bf3rfk77k5bgfdl7
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Tue 2007-04-17 01:36:31 +1000
message:
merge bzr.dev
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.20
merged: mbp at sourcefrog.net-20070416153233-bbvwu8649jdl8d4c
parent: mbp at sourcefrog.net-20070416153202-l0tgct3ib1vk77fl
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Tue 2007-04-17 01:32:33 +1000
message:
Route branch operations through remote copy_content_into
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.19
merged: mbp at sourcefrog.net-20070416153202-l0tgct3ib1vk77fl
parent: mbp at sourcefrog.net-20070416143438-gev59fyob49myi74
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Tue 2007-04-17 01:32:02 +1000
message:
fix up test data format
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.18
merged: mbp at sourcefrog.net-20070416143438-gev59fyob49myi74
parent: mbp at sourcefrog.net-20070416134530-a9p6c12yp8l1wnr1
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Tue 2007-04-17 00:34:38 +1000
message:
reformat
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.17
merged: mbp at sourcefrog.net-20070416134530-a9p6c12yp8l1wnr1
parent: mbp at sourcefrog.net-20070416100344-xuvua8ydn5ma6syg
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Mon 2007-04-16 23:45:30 +1000
message:
Update and reenable rpc-level tests for Repository.tarball
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.16
merged: mbp at sourcefrog.net-20070416100344-xuvua8ydn5ma6syg
parent: mbp at sourcefrog.net-20070416100133-whdocdv9cnlre1ye
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Mon 2007-04-16 20:03:44 +1000
message:
doc
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.15
merged: mbp at sourcefrog.net-20070416100133-whdocdv9cnlre1ye
parent: mbp at sourcefrog.net-20070416095757-t5eud8iy6l1kw70b
parent: andrew.bennetts at canonical.com-20070416065300-8te6vwujl287yh5p
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Mon 2007-04-16 20:01:33 +1000
message:
Merge more from hpss
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.14
merged: mbp at sourcefrog.net-20070416095757-t5eud8iy6l1kw70b
parent: mbp at sourcefrog.net-20070416042255-rs6sxqr68n374fbi
parent: andrew.bennetts at canonical.com-20070416025619-v6rjozkjjnrg970w
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Mon 2007-04-16 19:57:57 +1000
message:
merge hpss again; restore incorrectly removed RemoteRepository.break_lock
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.13
merged: mbp at sourcefrog.net-20070416042255-rs6sxqr68n374fbi
parent: mbp at sourcefrog.net-20070416033524-7w3l94gisf1p9w3a
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Mon 2007-04-16 14:22:55 +1000
message:
Remove obsolete test
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.12
merged: mbp at sourcefrog.net-20070416033524-7w3l94gisf1p9w3a
parent: mbp at sourcefrog.net-20070416032143-6pmuezr2i7umkj9q
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Mon 2007-04-16 13:35:24 +1000
message:
small test cleanups
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.11
merged: mbp at sourcefrog.net-20070416032143-6pmuezr2i7umkj9q
parent: mbp at sourcefrog.net-20070411100702-r12ixsycxcohqu4s
parent: andrew.bennetts at canonical.com-20070414142229-633813p69cryl6gm
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Mon 2007-04-16 13:21:43 +1000
message:
merge hpss changes
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.10
merged: mbp at sourcefrog.net-20070411100702-r12ixsycxcohqu4s
parent: mbp at sourcefrog.net-20070411091045-yhvop9nb1ngwvi00
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Wed 2007-04-11 20:07:02 +1000
message:
copy_content_into from Remote repositories by using temporary directories on both ends.
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.9
merged: mbp at sourcefrog.net-20070411091045-yhvop9nb1ngwvi00
parent: ian.clatworthy at internode.on.net-20070330063856-c41baqaxj78otvri
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Wed 2007-04-11 19:10:45 +1000
message:
remote Repository.tarball builds a temporary directory and tars that
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.8
merged: ian.clatworthy at internode.on.net-20070330063856-c41baqaxj78otvri
parent: mbp at sourcefrog.net-20070330035956-lmp3z220xq1kdusx
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: hpss-faster-copy
timestamp: Fri 2007-03-30 16:38:56 +1000
message:
Tarball proxy code & tests
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.7
merged: mbp at sourcefrog.net-20070330035956-lmp3z220xq1kdusx
parent: mbp at sourcefrog.net-20070330022302-h7yo29evei09rpj1
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Fri 2007-03-30 13:59:56 +1000
message:
(broken) Start addng client proxy test for Repository.tarball
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.6
merged: mbp at sourcefrog.net-20070330022302-h7yo29evei09rpj1
parent: mbp at sourcefrog.net-20070330022108-5dxt1f34qla13yl9
parent: andrew.bennetts at canonical.com-20070330014631-a3xragco77jx67pv
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Fri 2007-03-30 12:23:02 +1000
message:
merge hpss
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.5
merged: mbp at sourcefrog.net-20070330022108-5dxt1f34qla13yl9
parent: mbp at sourcefrog.net-20070330020514-7601dsj0nt3nievp
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Fri 2007-03-30 12:21:08 +1000
message:
Repository.tarball locks repository while running for consistency
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.4
merged: mbp at sourcefrog.net-20070330020514-7601dsj0nt3nievp
parent: mbp at sourcefrog.net-20070330020456-yck6eki5w4txsr19
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Fri 2007-03-30 12:05:14 +1000
message:
Change Transport.local_abspath to raise NotLocalUrl, and test.
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.3
merged: mbp at sourcefrog.net-20070330020456-yck6eki5w4txsr19
parent: mbp at sourcefrog.net-20070329072503-ir70ask331e138ux
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Fri 2007-03-30 12:04:56 +1000
message:
Cherrypick assertRaises enhancement
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.2
merged: mbp at sourcefrog.net-20070329072503-ir70ask331e138ux
parent: mbp at sourcefrog.net-20070329060803-dywopr2sg30oj23e
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Thu 2007-03-29 17:25:03 +1000
message:
smart method Repository.tarball actually returns the tarball
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.1
merged: mbp at sourcefrog.net-20070329060803-dywopr2sg30oj23e
parent: robertc at robertcollins.net-20070329042156-28vdpsyvcbrw7wy9
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Thu 2007-03-29 16:08:03 +1000
message:
Add stub Repository.tarball smart method
------------------------------------------------------------
revno: 2447.1.14
merged: pqm at pqm.ubuntu.com-20070426070825-6xw10b1el98su02i
parent: pqm at pqm.ubuntu.com-20070426062134-r5pvo74u33vke1km
parent: mbp at sourcefrog.net-20070426052849-ffc06nlmkpbvqata
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-26 08:08:25 +0100
message:
Correct the handling of timezones and epoch time in bundles
------------------------------------------------------------
revno: 2425.6.3
merged: mbp at sourcefrog.net-20070426052849-ffc06nlmkpbvqata
parent: mbp at sourcefrog.net-20070419080319-amc7f3frr64lxolq
parent: pqm at pqm.ubuntu.com-20070426050629-c5i80a0iav553pix
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: gmtime
timestamp: Thu 2007-04-26 15:28:49 +1000
message:
merge bzr.dev
------------------------------------------------------------
revno: 2425.6.2
merged: mbp at sourcefrog.net-20070419080319-amc7f3frr64lxolq
parent: mbp at sourcefrog.net-20070419071716-tcuv5i38vhci6fuf
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: gmtime
timestamp: Thu 2007-04-19 18:03:19 +1000
message:
Make timestamps use existing format_date; document that function more
------------------------------------------------------------
revno: 2425.6.1
merged: mbp at sourcefrog.net-20070419071716-tcuv5i38vhci6fuf
parent: pqm at pqm.ubuntu.com-20070417080415-5vn25svmf95ki88z
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: gmtime
timestamp: Thu 2007-04-19 17:17:16 +1000
message:
Fix formatting of timezones in bundles and merge directives.
Always give epoch time in utc.
------------------------------------------------------------
revno: 2447.1.13
merged: pqm at pqm.ubuntu.com-20070426062134-r5pvo74u33vke1km
parent: pqm at pqm.ubuntu.com-20070426054238-v6k5ge3z766vaafk
parent: robertc at robertcollins.net-20070426050440-7ktqwywg8sd2eiey
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-26 07:21:34 +0100
message:
(robertc) Fix bzr --no-plugins selftest which was broken by the help indices patch. (Robert Collins, Martin Pool)
------------------------------------------------------------
revno: 2447.1.10.1.1
merged: robertc at robertcollins.net-20070426050440-7ktqwywg8sd2eiey
parent: pqm at pqm.ubuntu.com-20070426021942-eutaiob3qgh6kln8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2007-04-26 15:04:40 +1000
message:
(robertc) Fix bzr --no-plugins selftest which was broken by the help indices patch. (Robert Collins, Martin Pool)
------------------------------------------------------------
revno: 2447.1.12
merged: pqm at pqm.ubuntu.com-20070426054238-v6k5ge3z766vaafk
parent: pqm at pqm.ubuntu.com-20070426050629-c5i80a0iav553pix
parent: andrew.bennetts at canonical.com-20070426043244-l1gtjevl8f98jbnk
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-26 06:42:38 +0100
message:
(Andrew Bennetts, Robert Collins) Smart server protocol versioning.
------------------------------------------------------------
revno: 2432.2.9
merged: andrew.bennetts at canonical.com-20070426043244-l1gtjevl8f98jbnk
parent: andrew.bennetts at canonical.com-20070425054002-08sj7lxphtpb6ewm
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-protocol2
timestamp: Thu 2007-04-26 14:32:44 +1000
message:
Update protocol versioning docs to explain how unknown request versions should be handled.
------------------------------------------------------------
revno: 2432.2.8
merged: andrew.bennetts at canonical.com-20070425054002-08sj7lxphtpb6ewm
parent: andrew.bennetts at canonical.com-20070425045619-gfsty2ebwx3c5rka
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-protocol2
timestamp: Wed 2007-04-25 15:40:02 +1000
message:
NEWS entry, greatly improved docstring in bzrlib.smart.
------------------------------------------------------------
revno: 2432.2.7
merged: andrew.bennetts at canonical.com-20070425045619-gfsty2ebwx3c5rka
parent: andrew.bennetts at canonical.com-20070424090150-9buzrpi8lt6qv0tg
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-protocol2
timestamp: Wed 2007-04-25 14:56:19 +1000
message:
Use less confusing version strings, and define REQUEST_VERSION_TWO/RESPONSE_VERSION_TWO constants for them.
------------------------------------------------------------
revno: 2432.2.6
merged: andrew.bennetts at canonical.com-20070424090150-9buzrpi8lt6qv0tg
parent: andrew.bennetts at canonical.com-20070424085029-0o6h7jj68i7sd8ea
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-protocol2
timestamp: Tue 2007-04-24 19:01:50 +1000
message:
Improve HelloRequest's docstring.
------------------------------------------------------------
revno: 2432.2.5
merged: andrew.bennetts at canonical.com-20070424085029-0o6h7jj68i7sd8ea
parent: andrew.bennetts at canonical.com-20070424083632-f7kadff1wbp3eszn
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-protocol2
timestamp: Tue 2007-04-24 18:50:29 +1000
message:
Reduce duplication in test_smart_transport.
------------------------------------------------------------
revno: 2432.2.4
merged: andrew.bennetts at canonical.com-20070424083632-f7kadff1wbp3eszn
parent: andrew.bennetts at canonical.com-20070424075513-ibtrd164miun08a8
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-protocol2
timestamp: Tue 2007-04-24 18:36:32 +1000
message:
Change smart protocol version two prefix to '2\n'.
------------------------------------------------------------
revno: 2432.2.3
merged: andrew.bennetts at canonical.com-20070424075513-ibtrd164miun08a8
parent: andrew.bennetts at canonical.com-20070424072048-tgbochqfr1n33bcy
parent: pqm at pqm.ubuntu.com-20070423170758-qd512ltqglzfo6w9
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-protocol2
timestamp: Tue 2007-04-24 17:55:13 +1000
message:
Merge from bzr.dev.
------------------------------------------------------------
revno: 2432.2.2
merged: andrew.bennetts at canonical.com-20070424072048-tgbochqfr1n33bcy
parent: andrew.bennetts at canonical.com-20070424051106-wwlidpflp1rwi3a7
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-protocol2
timestamp: Tue 2007-04-24 17:20:48 +1000
message:
Smart server mediums now detect which protocol version a request is and dispatch accordingly.
------------------------------------------------------------
revno: 2432.2.1
merged: andrew.bennetts at canonical.com-20070424051106-wwlidpflp1rwi3a7
parent: pqm at pqm.ubuntu.com-20070419224637-jvlshh6kibtj43a5
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-protocol2
timestamp: Tue 2007-04-24 15:11:06 +1000
message:
Add Smart{Client,Server}RequestProtocolTwo, that prefix args tuples with a version marker.
------------------------------------------------------------
revno: 2447.1.11
merged: pqm at pqm.ubuntu.com-20070426050629-c5i80a0iav553pix
parent: pqm at pqm.ubuntu.com-20070426021942-eutaiob3qgh6kln8
parent: mbp at sourcefrog.net-20070425055110-i0fmvoc3t4jejlbd
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-26 06:06:29 +0100
message:
Don't set the bugs property unless bugs are actually set
------------------------------------------------------------
revno: 2447.1.6.2.1
merged: mbp at sourcefrog.net-20070425055110-i0fmvoc3t4jejlbd
parent: pqm at pqm.ubuntu.com-20070425025045-rs79ekrx5xtf9eq9
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bugfix-property
timestamp: Wed 2007-04-25 15:51:10 +1000
message:
Don't set the bugs property unless bugs are actually set
------------------------------------------------------------
revno: 2447.1.10
merged: pqm at pqm.ubuntu.com-20070426021942-eutaiob3qgh6kln8
parent: pqm at pqm.ubuntu.com-20070425143732-c4aa489eylhhfnzg
parent: robertc at robertcollins.net-20070426014829-znbzqzsk1gq68xqh
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-26 03:19:42 +0100
message:
(robertc) Use repr rather than str when reporting an unprintable exception to aid debugging. (Robert Collins)
------------------------------------------------------------
revno: 2447.1.9.1.1
merged: robertc at robertcollins.net-20070426014829-znbzqzsk1gq68xqh
parent: pqm at pqm.ubuntu.com-20070425143732-c4aa489eylhhfnzg
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2007-04-26 11:48:29 +1000
message:
Fix the 'Unprintable error' message display to use the repr of the
exception that prevented printing the error because the str value for it
is often not useful in debugging (e.g. KeyError('foo') has a str() of
'foo' but a repr of 'KeyError('foo')' which is much more useful.
(Robert Collins)
------------------------------------------------------------
revno: 2447.1.9
merged: pqm at pqm.ubuntu.com-20070425143732-c4aa489eylhhfnzg
parent: pqm at pqm.ubuntu.com-20070425065022-rsmpi4x2q1gn8536
parent: john at arbash-meinel.com-20070423192314-y2x7sr7yupacqglk
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-04-25 15:37:32 +0100
message:
(Kent Gibson, John Arbash Meinel) Improve 'bzr log file' to both be significantly faster, and more correct.
------------------------------------------------------------
revno: 2359.1.11
merged: john at arbash-meinel.com-20070423192314-y2x7sr7yupacqglk
parent: john at arbash-meinel.com-20070423180919-22nnm0baju1kab6x
parent: pqm at pqm.ubuntu.com-20070423075015-340ajk1vo3pzxheu
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: log_ancestry
timestamp: Mon 2007-04-23 14:23:14 -0500
message:
[merge] bzr.dev 2446
------------------------------------------------------------
revno: 2359.1.10
merged: john at arbash-meinel.com-20070423180919-22nnm0baju1kab6x
parent: john at arbash-meinel.com-20070423175330-cwzggk38xbsf4wyy
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: log_ancestry
timestamp: Mon 2007-04-23 13:09:19 -0500
message:
Add my name to the NEWS entry
------------------------------------------------------------
revno: 2359.1.9
merged: john at arbash-meinel.com-20070423175330-cwzggk38xbsf4wyy
parent: john at arbash-meinel.com-20070418223921-0h2g7salf1scfd2a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: log_ancestry
timestamp: Mon 2007-04-23 12:53:30 -0500
message:
Only generate a new set when we need to. Drops 'bzr log NEWS' time from 22s => 8s
------------------------------------------------------------
revno: 2359.1.8
merged: john at arbash-meinel.com-20070418223921-0h2g7salf1scfd2a
parent: john at arbash-meinel.com-20070418223759-kek0qqqdv3wddcae
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: log_ancestry
timestamp: Wed 2007-04-18 17:39:21 -0500
message:
doc
------------------------------------------------------------
revno: 2359.1.7
merged: john at arbash-meinel.com-20070418223759-kek0qqqdv3wddcae
parent: john at arbash-meinel.com-20070418221454-zkozu1yyny4zx3rv
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: log_ancestry
timestamp: Wed 2007-04-18 17:37:59 -0500
message:
Create a direct test for _get_revisions_touching_file_id
------------------------------------------------------------
revno: 2359.1.6
merged: john at arbash-meinel.com-20070418221454-zkozu1yyny4zx3rv
parent: john at arbash-meinel.com-20070418215032-38i9ynsx6fkqaiyf
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: log_ancestry
timestamp: Wed 2007-04-18 17:14:54 -0500
message:
Create a helper tree which has a semi-interesting history.
This allows us to test which files are actually modified.
------------------------------------------------------------
revno: 2359.1.5
merged: john at arbash-meinel.com-20070418215032-38i9ynsx6fkqaiyf
parent: john at arbash-meinel.com-20070418214759-xmfpvwok0v6ci38l
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: log_ancestry
timestamp: Wed 2007-04-18 16:50:32 -0500
message:
change some variable names to make the function a bit clearer.
------------------------------------------------------------
revno: 2359.1.4
merged: john at arbash-meinel.com-20070418214759-xmfpvwok0v6ci38l
parent: warthog618 at gmail.com-20070410160523-wuwa272pl243buhf
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: log_ancestry
timestamp: Wed 2007-04-18 16:47:59 -0500
message:
Refactor the specific revisions for file id into a helper function.
------------------------------------------------------------
revno: 2359.1.3
merged: warthog618 at gmail.com-20070410160523-wuwa272pl243buhf
parent: warthog618 at gmail.com-20070410151824-9qnth9n0uiypca71
parent: pqm at pqm.ubuntu.com-20070410074302-cf6b95587a1058cd
committer: Kent Gibson <warthog618 at gmail.com>
branch nick: bzr.kg
timestamp: Wed 2007-04-11 00:05:23 +0800
message:
merge bzr.dev
------------------------------------------------------------
revno: 2359.1.2
merged: warthog618 at gmail.com-20070410151824-9qnth9n0uiypca71
parent: warthog618 at gmail.com-20070315161504-lrltutbkgs7ksago
committer: Kent Gibson <warthog618 at gmail.com>
branch nick: bzr.kg
timestamp: Tue 2007-04-10 23:18:24 +0800
message:
add logging of merge revisions
------------------------------------------------------------
revno: 2359.1.1
merged: warthog618 at gmail.com-20070315161504-lrltutbkgs7ksago
parent: pqm at pqm.ubuntu.com-20070314155044-47c0c6257a6c6717
committer: Kent Gibson <warthog618 at gmail.com>
branch nick: bzr.kg
timestamp: Fri 2007-03-16 01:15:04 +0900
message:
Fix ``bzr log <file>`` so it only logs the revisions that changed the file, and does it faster.
------------------------------------------------------------
revno: 2447.1.8
merged: pqm at pqm.ubuntu.com-20070425065022-rsmpi4x2q1gn8536
parent: pqm at pqm.ubuntu.com-20070425054241-urh0t3nequwc2j6q
parent: amanic at gmail.com-20070420071526-8e395b3gqvp1by61
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-04-25 07:50:22 +0100
message:
bzr rm removes the working file
------------------------------------------------------------
revno: 2292.1.34
merged: amanic at gmail.com-20070420071526-8e395b3gqvp1by61
parent: amanic at gmail.com-20070420070001-lbknio8gvry1au0w
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Fri 2007-04-20 09:15:26 +0200
message:
Move "magically convert commands like 'remove abc' to ['remove', 'abc']"
from tests/__init__.run_bzr_captured to tests/blackbox/test_remove
------------------------------------------------------------
revno: 2292.1.33
merged: amanic at gmail.com-20070420070001-lbknio8gvry1au0w
parent: amanic at gmail.com-20070419055947-x776pmmp7uj7utva
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Fri 2007-04-20 09:00:01 +0200
message:
* Remove workingtree.canonicalpath
------------------------------------------------------------
revno: 2292.1.32
merged: amanic at gmail.com-20070419055947-x776pmmp7uj7utva
parent: amanic at gmail.com-20070418202208-8081vgmmyr6k87op
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Thu 2007-04-19 07:59:47 +0200
message:
* tests/__init__.run_bzr
Now gives better assert message for 'Unexpected return code'
* blackbox/test_remove
- Add changed file tests
- When checking changed/unknown rm fails, always wheck if we can forec it.
- Move one file tests to top
- Fixed copy-paste pattern induced mishaps where more-than-one-file-tests
were actually just testing one-file
- Add test to remove while in a child dir
- Add remove deleted file test
------------------------------------------------------------
revno: 2292.1.31
merged: amanic at gmail.com-20070418202208-8081vgmmyr6k87op
parent: amanic at gmail.com-20070418201215-upzz7pof6a4433n7
parent: pqm at pqm.ubuntu.com-20070417080415-5vn25svmf95ki88z
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Wed 2007-04-18 22:22:08 +0200
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2292.1.30
merged: amanic at gmail.com-20070418201215-upzz7pof6a4433n7
parent: amanic at gmail.com-20070416183544-tdtramoul71svkhh
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Wed 2007-04-18 22:12:15 +0200
message:
* Minor text fixes.
* Remove trailing whitespace added by this branch.
* Add tests for removing empty directories.
* workingtree.remove
- Don't recurse into empty directories.
- Use absolute path when deleting from the file system.
------------------------------------------------------------
revno: 2292.1.29
merged: amanic at gmail.com-20070416183544-tdtramoul71svkhh
parent: amanic at gmail.com-20070416182641-8ewx7hfmkehjq5li
parent: pqm at pqm.ubuntu.com-20070416080254-bf3rfk77k5bgfdl7
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Mon 2007-04-16 20:35:44 +0200
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2292.1.28
merged: amanic at gmail.com-20070416182641-8ewx7hfmkehjq5li
parent: amanic at gmail.com-20070416062659-z2yrpp5118a1yeyr
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Mon 2007-04-16 20:26:41 +0200
message:
* NEWS
- move my news to NOTES WHEN UPGRADING section.
* bzrlib/builtins.py
- Use RegistryOption for bzr rm --force and --keep
* bzrlib/tests/__init__.py
- remove a white space
* bzrlib/tests/blackbox/test_selftest.py
- make blackbox/test_selftest.py pass again:
Its run_bzr_captured method did not return anything, although bzr_run
expects it now.
------------------------------------------------------------
revno: 2292.1.27
merged: amanic at gmail.com-20070416062659-z2yrpp5118a1yeyr
parent: amanic at gmail.com-20070416025505-spmkhtjsrbiv21m3
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Mon 2007-04-16 08:26:59 +0200
message:
* tests/__init__.TestCase.run_bzr_captured
- Support single text commands with quoted sub-strings eg.:
"bzr commit 'some message'"
- Move support for error_regexes from run_bzr_error() to run_bzr()
as it is quite usefull to assert output from notes.
* blackbox/test_remove
- convert the rest of the tests to use the new improved self.run_bzr
------------------------------------------------------------
revno: 2292.1.26
merged: amanic at gmail.com-20070416025505-spmkhtjsrbiv21m3
parent: amanic at gmail.com-20070416010020-3jan8hje4qmbwdsh
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Mon 2007-04-16 04:55:05 +0200
message:
* tests/__init__
- make run_bzr_captured abit more clever, so that it will
split up argunents if they are passed as a single string.
* blackbox/test_remove
- start converting to run_bzr and run_bzr_error
------------------------------------------------------------
revno: 2292.1.25
merged: amanic at gmail.com-20070416010020-3jan8hje4qmbwdsh
parent: amanic at gmail.com-20070414124037-ewx6hp70tw4vdtdb
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Mon 2007-04-16 03:00:20 +0200
message:
* Add utility method delta.get_changes_as_text to get the output of .show()
as a string.
* Add new errors.BzrRemoveChangedFilesError to raise when 'bzr remove'
should refuse to delete stuff.
* Add workingtree.canicalpath(filename) to normalize file names.
* Changed the working of workingtree.remove(...) to check if any files
are changed before it starts deleting anything. Will raise exception
now if changed files are passed to be removed.
* workingtree_implementations/test_remove.py
- Checked all tests and add more cases.
------------------------------------------------------------
revno: 2292.1.24
merged: amanic at gmail.com-20070414124037-ewx6hp70tw4vdtdb
parent: amanic at gmail.com-20070414115726-kykcsm9pztykst1w
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Sat 2007-04-14 14:40:37 +0200
message:
minor text cleanups
------------------------------------------------------------
revno: 2292.1.23
merged: amanic at gmail.com-20070414115726-kykcsm9pztykst1w
parent: amanic at gmail.com-20070414005827-zf4n2y9scrjs2d2x
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Sat 2007-04-14 13:57:26 +0200
message:
Revert test_too_much.py and just do the minimum te get the tests to pass.
Add some test to test_remove.py.
Let test_remove.py make safe id's.
------------------------------------------------------------
revno: 2292.1.22
merged: amanic at gmail.com-20070414005827-zf4n2y9scrjs2d2x
parent: amanic at gmail.com-20070413194540-jaf9n9wzhx4pd66c
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Sat 2007-04-14 02:58:27 +0200
message:
Implement TODO: Normalize names.
Assume paths relative to the basedir.
(not to the current dir, which I did previously)
------------------------------------------------------------
revno: 2292.1.21
merged: amanic at gmail.com-20070413194540-jaf9n9wzhx4pd66c
parent: amanic at gmail.com-20070413184526-6xhpgyvqz2u18l2q
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Fri 2007-04-13 21:45:40 +0200
message:
undo tree.has_id fake-bugfix, which seems to not be needed anymore..
------------------------------------------------------------
revno: 2292.1.20
merged: amanic at gmail.com-20070413184526-6xhpgyvqz2u18l2q
parent: amanic at gmail.com-20070413182326-qt44rjuzo249l7x8
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Fri 2007-04-13 20:45:26 +0200
message:
move test_workingtree.TestRemove to workingtree_implementations/test_remove
------------------------------------------------------------
revno: 2292.1.19
merged: amanic at gmail.com-20070413182326-qt44rjuzo249l7x8
parent: amanic at gmail.com-20070413181313-btt9e9cx16987yrq
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Fri 2007-04-13 20:23:26 +0200
message:
convert from using self.runbzr to self.run_bzr_captured
------------------------------------------------------------
revno: 2292.1.18
merged: amanic at gmail.com-20070413181313-btt9e9cx16987yrq
parent: amanic at gmail.com-20070412014719-3oo573tt381rpigu
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Fri 2007-04-13 20:13:13 +0200
message:
revert wrapping change
------------------------------------------------------------
revno: 2292.1.17
merged: amanic at gmail.com-20070412014719-3oo573tt381rpigu
parent: amanic at gmail.com-20070412013832-1avmdh8pba8yp4b1
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Thu 2007-04-12 03:47:19 +0200
message:
Remove redundant __init__ and object variable.
------------------------------------------------------------
revno: 2292.1.16
merged: amanic at gmail.com-20070412013832-1avmdh8pba8yp4b1
parent: amanic at gmail.com-20070412011853-z30g2o1ypj7rqcyr
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Thu 2007-04-12 03:38:32 +0200
message:
Update NEWS
------------------------------------------------------------
revno: 2292.1.15
merged: amanic at gmail.com-20070412011853-z30g2o1ypj7rqcyr
parent: amanic at gmail.com-20070412011017-ofzhcgj7o7bnh6dd
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Thu 2007-04-12 03:18:53 +0200
message:
Fix test too much again.
------------------------------------------------------------
revno: 2292.1.14
merged: amanic at gmail.com-20070412011017-ofzhcgj7o7bnh6dd
parent: amanic at gmail.com-20070412004748-0nsa6sughf0xu744
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Thu 2007-04-12 03:10:17 +0200
message:
* blackbox/test_remove
- uninvert my logic
- add a little more testing
------------------------------------------------------------
revno: 2292.1.13
merged: amanic at gmail.com-20070412004748-0nsa6sughf0xu744
parent: amanic at gmail.com-20070411225348-7145vlsq3f390osg
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Thu 2007-04-12 02:47:48 +0200
message:
* merge the unversion command back into the remove command,
merging the commands and tests.
* make all tests pass again.
------------------------------------------------------------
revno: 2292.1.12
merged: amanic at gmail.com-20070411225348-7145vlsq3f390osg
parent: amanic at gmail.com-20070411220954-azjn3zpjystqowcv
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Thu 2007-04-12 00:53:48 +0200
message:
* test_workingtree/TestRemove
- Change global and local constants to class variables.
------------------------------------------------------------
revno: 2292.1.11
merged: amanic at gmail.com-20070411220954-azjn3zpjystqowcv
parent: amanic at gmail.com-20070411220247-plcjs3dvidvjx2vj
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Thu 2007-04-12 00:09:54 +0200
message:
* workingtree.remove
- Don't figure out what changed if we don't care.
------------------------------------------------------------
revno: 2292.1.10
merged: amanic at gmail.com-20070411220247-plcjs3dvidvjx2vj
parent: amanic at gmail.com-20070411212706-7jzaph3pv0856qks
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Thu 2007-04-12 00:02:47 +0200
message:
* workingtree.remove
- Add and test a new force option in order to force the deletion of changed files
and non-empty directories.
- Some doc fixups.
- Remove some implemented todo's
- Remove ## TODO: Remove nested loops; better scalability
as I can't see any nested loop.s
- small whitespace cleanups in tests.
------------------------------------------------------------
revno: 2292.1.9
merged: amanic at gmail.com-20070411212706-7jzaph3pv0856qks
parent: amanic at gmail.com-20070411204847-quynsdasuvjhju64
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Wed 2007-04-11 23:27:06 +0200
message:
Handle the removing of nonempty directories.
------------------------------------------------------------
revno: 2292.1.8
merged: amanic at gmail.com-20070411204847-quynsdasuvjhju64
parent: amanic at gmail.com-20070409215050-9k4jxh76grq7jxz8
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Wed 2007-04-11 22:48:47 +0200
message:
When removing and deleting files,
only check for changes on specific files.
------------------------------------------------------------
revno: 2292.1.7
merged: amanic at gmail.com-20070409215050-9k4jxh76grq7jxz8
parent: amanic at gmail.com-20070331204906-iai2v10wk3l3lt12
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Mon 2007-04-09 23:50:50 +0200
message:
First pass at only deleting files on 'bzr remove' when
they haven't changed.
Needed to modify _find_children_across_trees (tree.py) because
tree.has_id did not work as excpeted.
------------------------------------------------------------
revno: 2292.1.6
merged: amanic at gmail.com-20070331204906-iai2v10wk3l3lt12
parent: amanic at gmail.com-20070323182956-5vestftm6gx3o9mz
parent: pqm at pqm.ubuntu.com-20070329064515-7bfc20fbcf9cf1a7
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Sat 2007-03-31 22:49:06 +0200
message:
merge bzr.dev
------------------------------------------------------------
revno: 2292.1.5
merged: amanic at gmail.com-20070323182956-5vestftm6gx3o9mz
parent: amanic at gmail.com-20070219054605-o69te1fuwcirv01a
parent: pqm at pqm.ubuntu.com-20070322230820-f8735ba918f51539
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Fri 2007-03-23 20:29:56 +0200
message:
merge with bzr.dev
------------------------------------------------------------
revno: 2292.1.4
merged: amanic at gmail.com-20070219054605-o69te1fuwcirv01a
parent: amanic at gmail.com-20070216072443-g38i13amiri6j2ir
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Mon 2007-02-19 07:46:05 +0200
message:
Make output for bzr remove more verbose.
------------------------------------------------------------
revno: 2292.1.3
merged: amanic at gmail.com-20070216072443-g38i13amiri6j2ir
parent: amanic at gmail.com-20070216071540-wq20se0crnnki9c9
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Fri 2007-02-16 09:24:43 +0200
message:
Factored out common code from test_remove.py into test_unversion.py
------------------------------------------------------------
revno: 2292.1.2
merged: amanic at gmail.com-20070216071540-wq20se0crnnki9c9
parent: amanic at gmail.com-20070216061611-sjscmgi4v5rozq6h
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Fri 2007-02-16 09:15:40 +0200
message:
Minor test cleanups, making test_remove.py and test_unversion.py more similar.
------------------------------------------------------------
revno: 2292.1.1
merged: amanic at gmail.com-20070216061611-sjscmgi4v5rozq6h
parent: pqm at pqm.ubuntu.com-20070215181416-864dbe690a0f3da8
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Fri 2007-02-16 08:16:11 +0200
message:
"bzr remove" and "bzr rm" will now remove the working file.
This has been done for consistency with svn and the unix rm command.
The old remove behaviour has been retained in the new command
"bzr unversion", which will just stop versioning the file,
but not delete it.
(Addressing Bug #82602)
Exisitng tests have been reworked and new tests were added to test these
changes properly.
------------------------------------------------------------
revno: 2447.1.7
merged: pqm at pqm.ubuntu.com-20070425054241-urh0t3nequwc2j6q
parent: pqm at pqm.ubuntu.com-20070425025045-rs79ekrx5xtf9eq9
parent: bialix at ukr.net-20070425044607-qbl5oce7jygaxat2
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-04-25 06:42:41 +0100
message:
(bialix, mbp) explicitly check for SIGQUIT in 'signal' stdlib module
------------------------------------------------------------
revno: 2447.1.6.1.1
merged: bialix at ukr.net-20070425044607-qbl5oce7jygaxat2
parent: pqm at pqm.ubuntu.com-20070425025045-rs79ekrx5xtf9eq9
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win32.fixes
timestamp: Wed 2007-04-25 07:46:07 +0300
message:
explicitly check for SIGQUIT in 'signal' stdlib module (it's absent on win32)
------------------------------------------------------------
revno: 2447.1.6
merged: pqm at pqm.ubuntu.com-20070425025045-rs79ekrx5xtf9eq9
parent: pqm at pqm.ubuntu.com-20070424224426-po331pf12jpzmrvk
parent: mbp at sourcefrog.net-20070425022456-9fh3xckrqi8dmne3
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-04-25 03:50:45 +0100
message:
Remove redundant test_doc_generate (alexander)
------------------------------------------------------------
revno: 2447.1.5.1.1
merged: mbp at sourcefrog.net-20070425022456-9fh3xckrqi8dmne3
parent: pqm at pqm.ubuntu.com-20070424224426-po331pf12jpzmrvk
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Wed 2007-04-25 12:24:56 +1000
message:
Remove redundant test_doc_generate (alexander)
------------------------------------------------------------
revno: 2447.1.5
merged: pqm at pqm.ubuntu.com-20070424224426-po331pf12jpzmrvk
parent: pqm at pqm.ubuntu.com-20070424141924-i4w482pi1pb95pob
parent: john at arbash-meinel.com-20070424220920-1pamgmk2mo44wlm3
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-04-24 23:44:26 +0100
message:
(John Arbash Meinel) Add Branch.get_revision_id_to_revno_map
------------------------------------------------------------
revno: 2418.5.15
merged: john at arbash-meinel.com-20070424220920-1pamgmk2mo44wlm3
parent: john at arbash-meinel.com-20070424194505-mv5dwjw0mx4tfpfs
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: branch_revision_id_to_revno
timestamp: Tue 2007-04-24 17:09:20 -0500
message:
NEWS
------------------------------------------------------------
revno: 2418.5.14
merged: john at arbash-meinel.com-20070424194505-mv5dwjw0mx4tfpfs
parent: john at arbash-meinel.com-20070424194309-nt3sxw7x4sqwnykh
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: branch_revision_id_to_revno
timestamp: Tue 2007-04-24 14:45:05 -0500
message:
clean up ASCII revision graph art.
------------------------------------------------------------
revno: 2418.5.13
merged: john at arbash-meinel.com-20070424194309-nt3sxw7x4sqwnykh
parent: john at arbash-meinel.com-20070424194013-zjckbpsbq7vff1wh
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: branch_revision_id_to_revno
timestamp: Tue 2007-04-24 14:43:09 -0500
message:
Remove revision_id_to_dotted_revno, because it isn't used.
------------------------------------------------------------
revno: 2418.5.12
merged: john at arbash-meinel.com-20070424194013-zjckbpsbq7vff1wh
parent: john at arbash-meinel.com-20070424032327-w2tz2smz41eco4u1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: branch_revision_id_to_revno
timestamp: Tue 2007-04-24 14:40:13 -0500
message:
Move functions from BzrBranch to base Branch object.
Fix RemoteBranch to properly clear its cache at the right time.
------------------------------------------------------------
revno: 2418.5.11
merged: john at arbash-meinel.com-20070424032327-w2tz2smz41eco4u1
parent: john at arbash-meinel.com-20070417213150-yf8r9e1ufueedb3q
parent: pqm at pqm.ubuntu.com-20070423170758-qd512ltqglzfo6w9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: branch_revision_id_to_revno
timestamp: Mon 2007-04-23 22:23:27 -0500
message:
[merge] bzr.dev 2447
------------------------------------------------------------
revno: 2418.5.10
merged: john at arbash-meinel.com-20070417213150-yf8r9e1ufueedb3q
parent: john at arbash-meinel.com-20070417212608-84w0sw1e7tiuhgr4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: branch_revision_id_to_revno
timestamp: Tue 2007-04-17 16:31:50 -0500
message:
fix typo
------------------------------------------------------------
revno: 2418.5.9
merged: john at arbash-meinel.com-20070417212608-84w0sw1e7tiuhgr4
parent: john at arbash-meinel.com-20070417211929-rchob1jeahy30cj0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: branch_revision_id_to_revno
timestamp: Tue 2007-04-17 16:26:08 -0500
message:
Have RevisionSpec_revno() also use the new helper
------------------------------------------------------------
revno: 2418.5.8
merged: john at arbash-meinel.com-20070417211929-rchob1jeahy30cj0
parent: john at arbash-meinel.com-20070417211809-f225hrm1juxoityu
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: branch_revision_id_to_revno
timestamp: Tue 2007-04-17 16:19:29 -0500
message:
Update annotate.py to use the new helper function.
------------------------------------------------------------
revno: 2418.5.7
merged: john at arbash-meinel.com-20070417211809-f225hrm1juxoityu
parent: john at arbash-meinel.com-20070417210124-rfr3w1llh869058q
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: branch_revision_id_to_revno
timestamp: Tue 2007-04-17 16:18:09 -0500
message:
Move the revision_id=>map generation to be a public function.
------------------------------------------------------------
revno: 2418.5.6
merged: john at arbash-meinel.com-20070417210124-rfr3w1llh869058q
parent: john at arbash-meinel.com-20070417203323-xbmbi9cyjr6cocuf
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: branch_revision_id_to_revno
timestamp: Tue 2007-04-17 16:01:24 -0500
message:
Cache the revision_id => revno map as appropriate.
------------------------------------------------------------
revno: 2418.5.5
merged: john at arbash-meinel.com-20070417203323-xbmbi9cyjr6cocuf
parent: john at arbash-meinel.com-20070417202335-0cc0thlj5sy28m9m
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: branch_revision_id_to_revno
timestamp: Tue 2007-04-17 15:33:23 -0500
message:
Add some tests and an api for revision_id_to_dotted_revno
This should use caching to be fast for multiple calls
but for now it just implements what is needed.
------------------------------------------------------------
revno: 2418.5.4
merged: john at arbash-meinel.com-20070417202335-0cc0thlj5sy28m9m
parent: john at arbash-meinel.com-20070417201836-2bso1f1clhhx7k1a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: branch_revision_id_to_revno
timestamp: Tue 2007-04-17 15:23:35 -0500
message:
Included a test for revision_id=None
------------------------------------------------------------
revno: 2418.5.3
merged: john at arbash-meinel.com-20070417201836-2bso1f1clhhx7k1a
parent: john at arbash-meinel.com-20070417201724-5seu77st1h843nie
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: branch_revision_id_to_revno
timestamp: Tue 2007-04-17 15:18:36 -0500
message:
Use a more straightforward implementation of generating 'tree_with_merge'
------------------------------------------------------------
revno: 2418.5.2
merged: john at arbash-meinel.com-20070417201724-5seu77st1h843nie
parent: john at arbash-meinel.com-20070417201004-1v7sim0tlt19l8o4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: branch_revision_id_to_revno
timestamp: Tue 2007-04-17 15:17:24 -0500
message:
Move TestCaseWithBranch into branch_implementations from test_branch.py
------------------------------------------------------------
revno: 2418.5.1
merged: john at arbash-meinel.com-20070417201004-1v7sim0tlt19l8o4
parent: pqm at pqm.ubuntu.com-20070413174100-zpfqleaf5ph9ycx4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: branch_revision_id_to_revno
timestamp: Tue 2007-04-17 15:10:04 -0500
message:
Make a Branch helper which can create a very basic MemoryTree with history.
This updates MutableTree to include 'set_parent_ids' which is helpful
when setting up simple tests.
It also creates a helper function in branch_implementations..TestCaseWithBranch
so that we can create a Branch which has a simple merge in it.
It also adds a test for revision_id_to_revno which previously did not have any
direct tests.
------------------------------------------------------------
revno: 2447.1.4
merged: pqm at pqm.ubuntu.com-20070424141924-i4w482pi1pb95pob
parent: pqm at pqm.ubuntu.com-20070424054249-bpkw4wwywqjt2nel
parent: bialix at ukr.net-20070424131506-8roiv9b2bu7gv3cf
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-04-24 15:19:24 +0100
message:
(bialix) fix RSTX wrong formatting in HACKING (trivial)
------------------------------------------------------------
revno: 2447.1.2.1.1
merged: bialix at ukr.net-20070424131506-8roiv9b2bu7gv3cf
parent: pqm at pqm.ubuntu.com-20070424033735-s0igieajv2czb2tt
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: trivial
timestamp: Tue 2007-04-24 16:15:06 +0300
message:
fix RSTX wrong formatting in HACKING
------------------------------------------------------------
revno: 2447.1.3
merged: pqm at pqm.ubuntu.com-20070424054249-bpkw4wwywqjt2nel
parent: pqm at pqm.ubuntu.com-20070424033735-s0igieajv2czb2tt
parent: mbp at sourcefrog.net-20070424050204-bfkc1qiq0axt5f14
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-04-24 06:42:49 +0100
message:
Press C-\ to break into pdb
------------------------------------------------------------
revno: 2423.3.8
merged: mbp at sourcefrog.net-20070424050204-bfkc1qiq0axt5f14
parent: mbp at sourcefrog.net-20070424045131-gyjo7l8oa99ndyrv
parent: pqm at pqm.ubuntu.com-20070424033735-s0igieajv2czb2tt
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: breakin
timestamp: Tue 2007-04-24 15:02:04 +1000
message:
Merge trunk & fix NEWS conflict
------------------------------------------------------------
revno: 2423.3.7
merged: mbp at sourcefrog.net-20070424045131-gyjo7l8oa99ndyrv
parent: mbp at sourcefrog.net-20070417092535-n711rw7qtt6irrye
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: breakin
timestamp: Tue 2007-04-24 14:51:31 +1000
message:
Add BZR_SIGQUIT_PDB=0 option to disable breakin.
Split tests for this into test_breakin, and make them a bit more robust.
------------------------------------------------------------
revno: 2423.3.6
merged: mbp at sourcefrog.net-20070417092535-n711rw7qtt6irrye
parent: mbp at sourcefrog.net-20070417073222-l20nvpvkfr8ak12d
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: breakin
timestamp: Tue 2007-04-17 19:25:35 +1000
message:
Correct the mention of C-\ in NEWS (Daniel Silverstone)
------------------------------------------------------------
revno: 2423.3.5
merged: mbp at sourcefrog.net-20070417073222-l20nvpvkfr8ak12d
parent: mbp at sourcefrog.net-20070417065755-lgvnd360eqfs8cfz
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: breakin
timestamp: Tue 2007-04-17 17:32:22 +1000
message:
Second sigquit goes through to the default handler
------------------------------------------------------------
revno: 2423.3.4
merged: mbp at sourcefrog.net-20070417065755-lgvnd360eqfs8cfz
parent: mbp at sourcefrog.net-20070417065314-r4zeer3hcw8j77rw
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: breakin
timestamp: Tue 2007-04-17 16:57:55 +1000
message:
Late load pdb for breakin; fix copyright
------------------------------------------------------------
revno: 2423.3.3
merged: mbp at sourcefrog.net-20070417065314-r4zeer3hcw8j77rw
parent: mbp at sourcefrog.net-20070417052419-x9erzvt3xtzuhdvf
parent: mbp at sourcefrog.net-20070417065102-zabhms9y28q2ik00
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: breakin
timestamp: Tue 2007-04-17 16:53:14 +1000
message:
merge benchmark fix
------------------------------------------------------------
revno: 2423.3.2
merged: mbp at sourcefrog.net-20070417052419-x9erzvt3xtzuhdvf
parent: mbp at sourcefrog.net-20070417043912-2mwgd3htam3a5uq2
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: breakin
timestamp: Tue 2007-04-17 15:24:19 +1000
message:
doc BZR_PDB and sigquit
------------------------------------------------------------
revno: 2423.3.1
merged: mbp at sourcefrog.net-20070417043912-2mwgd3htam3a5uq2
parent: pqm at pqm.ubuntu.com-20070417005930-rofskshyjsfzrahh
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: breakin
timestamp: Tue 2007-04-17 14:39:12 +1000
message:
C-\ drops bzr into the debugger
------------------------------------------------------------
revno: 2447.1.2
merged: pqm at pqm.ubuntu.com-20070424033735-s0igieajv2czb2tt
parent: pqm at pqm.ubuntu.com-20070424031208-9y04a1j0yx3fjte5
parent: john at arbash-meinel.com-20070424025510-qyl1mc76r4sscj53
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-04-24 04:37:35 +0100
message:
(John Arbash Meinel) Small updates for 'bzr info' tests and win32
------------------------------------------------------------
revno: 2425.3.3
merged: john at arbash-meinel.com-20070424025510-qyl1mc76r4sscj53
parent: john at arbash-meinel.com-20070419222604-f3cfi8gqdu4bky6t
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_locking_fixes
timestamp: Mon 2007-04-23 21:55:10 -0500
message:
Update comment according to Martin
------------------------------------------------------------
revno: 2425.3.2
merged: john at arbash-meinel.com-20070419222604-f3cfi8gqdu4bky6t
parent: john at arbash-meinel.com-20070419182756-rdg6e8zoaxy9mg9q
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_locking_fixes
timestamp: Thu 2007-04-19 17:26:04 -0500
message:
Make "test_info_locking" an expected failure on win32 for now.
------------------------------------------------------------
revno: 2447.1.1
merged: pqm at pqm.ubuntu.com-20070424031208-9y04a1j0yx3fjte5
parent: pqm at pqm.ubuntu.com-20070423170758-qd512ltqglzfo6w9
parent: john at arbash-meinel.com-20070424024356-nffcxmkfaigudmrp
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-04-24 04:12:08 +0100
message:
(Ian Clatworthy) Bugs #102679, #102686. Add --exclude and --randomize to 'bzr selftest'
------------------------------------------------------------
revno: 2418.4.2
merged: john at arbash-meinel.com-20070424024356-nffcxmkfaigudmrp
parent: john at arbash-meinel.com-20070413201949-ay6r5nh3bgsxfogw
parent: pqm at pqm.ubuntu.com-20070423170758-qd512ltqglzfo6w9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2007-04-23 21:43:56 -0500
message:
[merge] bzr.dev 2447
------------------------------------------------------------
revno: 2418.4.1
merged: john at arbash-meinel.com-20070413201949-ay6r5nh3bgsxfogw
parent: pqm at pqm.ubuntu.com-20070413174100-zpfqleaf5ph9ycx4
parent: ian.clatworthy at internode.on.net-20070413004631-nkdsnpcuy8xb0x62
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2007-04-13 15:19:49 -0500
message:
(Ian Clatworthy) Bugs #102679, #102686. Add --exclude and --randomize to 'bzr selftest'
------------------------------------------------------------
revno: 2394.2.10
merged: ian.clatworthy at internode.on.net-20070413004631-nkdsnpcuy8xb0x62
parent: ian.clatworthy at internode.on.net-20070413004053-y5wr76o3512rjawk
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.selftest-not
timestamp: Fri 2007-04-13 10:46:31 +1000
message:
another doc fix and whitespace fixes
------------------------------------------------------------
revno: 2394.2.9
merged: ian.clatworthy at internode.on.net-20070413004053-y5wr76o3512rjawk
parent: ian.clatworthy at internode.on.net-20070413003033-k3nc1zq02qlkb8cj
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.selftest-not
timestamp: Fri 2007-04-13 10:40:53 +1000
message:
update NEWS and help to reflect removal of comma support
------------------------------------------------------------
revno: 2394.2.8
merged: ian.clatworthy at internode.on.net-20070413003033-k3nc1zq02qlkb8cj
parent: ian.clatworthy at internode.on.net-20070411021409-im2b7jkohfnb5boq
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.selftest-not
timestamp: Fri 2007-04-13 10:30:33 +1000
message:
incorporate feedback from jam
------------------------------------------------------------
revno: 2394.2.7
merged: ian.clatworthy at internode.on.net-20070411021409-im2b7jkohfnb5boq
parent: ian.clatworthy at internode.on.net-20070410142343-6bfz9k67b8tvrz6x
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.selftest-not
timestamp: Wed 2007-04-11 12:14:09 +1000
message:
Added whitebox tests - filter_suite_by_re and sort_suite_by_re
------------------------------------------------------------
revno: 2394.2.6
merged: ian.clatworthy at internode.on.net-20070410142343-6bfz9k67b8tvrz6x
parent: ian.clatworthy at internode.on.net-20070410090806-d9pkgwomcpbkizj2
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.selftest-not
timestamp: Wed 2007-04-11 00:23:43 +1000
message:
completed blackbox tests
------------------------------------------------------------
revno: 2394.2.5
merged: ian.clatworthy at internode.on.net-20070410090806-d9pkgwomcpbkizj2
parent: ian.clatworthy at internode.on.net-20070404131351-xqdiyfvwohs96ecs
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.selftest-not
timestamp: Tue 2007-04-10 19:08:06 +1000
message:
list-only working, include test not
------------------------------------------------------------
revno: 2394.2.4
merged: ian.clatworthy at internode.on.net-20070404131351-xqdiyfvwohs96ecs
parent: ian.clatworthy at internode.on.net-20070404131147-r9dp5hu8166xhb8u
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.selftest-not
timestamp: Wed 2007-04-04 23:13:51 +1000
message:
Clean up whitespace
------------------------------------------------------------
revno: 2394.2.3
merged: ian.clatworthy at internode.on.net-20070404131147-r9dp5hu8166xhb8u
parent: ian.clatworthy at internode.on.net-20070404125915-w0m76xc9tjxhbo42
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.selftest-not
timestamp: Wed 2007-04-04 23:11:47 +1000
message:
Backed out test junk
------------------------------------------------------------
revno: 2394.2.2
merged: ian.clatworthy at internode.on.net-20070404125915-w0m76xc9tjxhbo42
parent: ian.clatworthy at internode.on.net-20070404091010-1j1sdngh8t77ef9v
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.selftest-not
timestamp: Wed 2007-04-04 22:59:15 +1000
message:
Add --randomize and update help
------------------------------------------------------------
revno: 2394.2.1
merged: ian.clatworthy at internode.on.net-20070404091010-1j1sdngh8t77ef9v
parent: pqm at pqm.ubuntu.com-20070404005411-46c388fbf2acf940
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.selftest-not
timestamp: Wed 2007-04-04 19:10:10 +1000
message:
--list and --exclude first cut
-------------- next part --------------
Diff too large for email (8865 lines, the limit is 1000).
More information about the bazaar-commits
mailing list