Rev 2382: Merge bzr.dev. in file:///home/robertc/source/baz/hpss-hooks/
Robert Collins
robertc at robertcollins.net
Wed Apr 4 06:19:46 BST 2007
At file:///home/robertc/source/baz/hpss-hooks/
------------------------------------------------------------
revno: 2382
revision-id: robertc at robertcollins.net-20070404051938-2lnvpsm2tbo5a6g2
parent: robertc at robertcollins.net-20070327214048-286uc943sgxma2xe
parent: pqm at pqm.ubuntu.com-20070404022946-b93fc2e49b3bb195
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss-hooks
timestamp: Wed 2007-04-04 15:19:38 +1000
message:
Merge bzr.dev.
added:
bzrlib/strace.py strace.py-20070323001526-6zquhhw8leb9m6j8-1
bzrlib/tests/test_strace.py test_strace.py-20070323001526-6zquhhw8leb9m6j8-2
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/__init__.py changeset.py-20050513021216-b02ab57fb9738913
bzrlib/bundle/bundle_data.py read_changeset.py-20050619171944-c0d95aa685537640
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
bzrlib/bundle/serializer/v08.py v06.py-20051119041339-ee43f97270b01823
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/cmd_version_info.py __init__.py-20051228204928-697d01fdca29c99b
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/externalcommand.py externalcommand.py-20050901092254-b4fc642a55bb815b
bzrlib/help_topics.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/info.py info.py-20050323235939-6bbfe7d9700b0b9b
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/lock.py lock.py-20050527050856-ec090bb51bc03349
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repofmt/weaverepo.py presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
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/test_bound_branches.py test_bound_branches.py-20051109215527-2373188ad566c205
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/blackbox/test_bundle.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
bzrlib/tests/blackbox/test_merge_directive.py test_merge_directive-20070302012039-zh7uhy39biairtn0-1
bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
bzrlib/tests/branch_implementations/test_bound_sftp.py test_bound_sftp.py-20051231055311-2f96048c4f0940ef
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/branch_implementations/test_http.py test_http.py-20060731224648-2eef7ae5yja95rya-1
bzrlib/tests/branch_implementations/test_locking.py test_locking.py-20060707151933-tav3o2hpibwi53u4-4
bzrlib/tests/branch_implementations/test_push.py test_push.py-20070130153159-fhfap8uoifevg30j-1
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/repository_implementations/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
bzrlib/tests/repository_implementations/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
bzrlib/tests/repository_implementations/test_reconcile.py test_reconcile.py-20060223022332-572ef70a3288e369
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_lockdir.py test_lockdir.py-20060220222025-33d4221569a3d600
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
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/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
bzrlib/tests/workingtree_implementations/test_inv.py test_inv.py-20070311221604-ighlq8tbn5xq0kuo-1
bzrlib/tests/workingtree_implementations/test_move.py test_move.py-20070225171927-mohn2vqj5fx7edc6-1
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/chroot.py chroot.py-20061011104729-0us9mgm97z378vnt-1
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
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/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/transport/smart.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/ui/__init__.py ui.py-20050824083933-8cf663c763ba53a9
bzrlib/urlutils.py urlutils.py-20060502195429-e8a161ecf8fac004
bzrlib/version.py version.py-20060816024207-ves6ult9a11taj9t-1
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
tools/doc_generate/autodoc_man.py bzrman.py-20050601153041-0ff7f74de456d15e
tools/doc_generate/autodoc_rstx.py autodoc_rstx.py-20060420024836-3e0d4a526452193c
------------------------------------------------------------
revno: 2376.1.19
merged: pqm at pqm.ubuntu.com-20070404022946-b93fc2e49b3bb195
parent: pqm at pqm.ubuntu.com-20070404005411-46c388fbf2acf940
parent: aaron.bentley at utoronto.ca-20070404011502-cr6wqakuw9rgo1i4
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-04-04 03:29:46 +0100
message:
Update expectFailure docs
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.11
merged: aaron.bentley at utoronto.ca-20070404011502-cr6wqakuw9rgo1i4
parent: aaron.bentley at utoronto.ca-20070404001113-9w9ovclmn9eczzid
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-04-03 21:15:02 -0400
message:
Update docs
------------------------------------------------------------
revno: 2376.1.18
merged: pqm at pqm.ubuntu.com-20070404005411-46c388fbf2acf940
parent: pqm at pqm.ubuntu.com-20070402183941-55dc90797840300e
parent: aaron.bentley at utoronto.ca-20070404001113-9w9ovclmn9eczzid
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-04-04 01:54:11 +0100
message:
Implement TestCase.expectFailure
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.10
merged: aaron.bentley at utoronto.ca-20070404001113-9w9ovclmn9eczzid
parent: aaron.bentley at utoronto.ca-20070403233827-rhogvzi85d6pctik
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-04-03 20:11:13 -0400
message:
Changes from review (poolie)
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.9
merged: aaron.bentley at utoronto.ca-20070403233827-rhogvzi85d6pctik
parent: aaron.bentley at utoronto.ca-20070403231215-qt3qtjx2n5t61dyp
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-04-03 19:38:27 -0400
message:
Implement TestCase.expectFailure
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.8
merged: aaron.bentley at utoronto.ca-20070403231215-qt3qtjx2n5t61dyp
parent: aaron.bentley at utoronto.ca-20070328232821-x42jbaadrfstx5xe
parent: pqm at pqm.ubuntu.com-20070402183941-55dc90797840300e
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-04-03 19:12:15 -0400
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 2376.1.17
merged: pqm at pqm.ubuntu.com-20070402183941-55dc90797840300e
parent: pqm at pqm.ubuntu.com-20070401162926-2718905ae3092110
parent: abentley at panoramicfeedback.com-20070402175502-uzqmbqr5gcwjuio9
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-04-02 19:39:41 +0100
message:
Implement WorkingTree.apply_inventory_delta
------------------------------------------------------------
revno: 2376.3.9
merged: abentley at panoramicfeedback.com-20070402175502-uzqmbqr5gcwjuio9
parent: abentley at panoramicfeedback.com-20070402173506-46nv1j0udc9c4u1d
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: inventory-delta
timestamp: Mon 2007-04-02 13:55:02 -0400
message:
Cleanup from review
------------------------------------------------------------
revno: 2376.3.8
merged: abentley at panoramicfeedback.com-20070402173506-46nv1j0udc9c4u1d
parent: abentley at panoramicfeedback.com-20070402173240-odyocjetx9dsmvrf
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: inventory-delta
timestamp: Mon 2007-04-02 13:35:06 -0400
message:
Update NEWS
------------------------------------------------------------
revno: 2376.3.7
merged: abentley at panoramicfeedback.com-20070402173240-odyocjetx9dsmvrf
parent: abentley at panoramicfeedback.com-20070402171811-bz7y2b2h1m1k4n7x
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: inventory-delta
timestamp: Mon 2007-04-02 13:32:40 -0400
message:
Add another test case (suggested by John Meinel)
------------------------------------------------------------
revno: 2376.3.6
merged: abentley at panoramicfeedback.com-20070402171811-bz7y2b2h1m1k4n7x
parent: abentley at panoramicfeedback.com-20070326193914-quycobjtiy7js5hl
parent: pqm at pqm.ubuntu.com-20070401162926-2718905ae3092110
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: inventory-delta
timestamp: Mon 2007-04-02 13:18:11 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2376.3.5
merged: abentley at panoramicfeedback.com-20070326193914-quycobjtiy7js5hl
parent: abentley at panoramicfeedback.com-20070326190617-bclsdw1gm75ynf05
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: inventory-delta
timestamp: Mon 2007-03-26 15:39:14 -0400
message:
Clean up apply methods
------------------------------------------------------------
revno: 2376.3.4
merged: abentley at panoramicfeedback.com-20070326190617-bclsdw1gm75ynf05
parent: abentley at panoramicfeedback.com-20070326184431-xhil1b1d301pi7f2
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: inventory-delta
timestamp: Mon 2007-03-26 15:06:17 -0400
message:
Switch TreeTransform to use WT.apply_inventory_delta
------------------------------------------------------------
revno: 2376.3.3
merged: abentley at panoramicfeedback.com-20070326184431-xhil1b1d301pi7f2
parent: abentley at panoramicfeedback.com-20070326180617-s3mevl1o55wsnbwo
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: inventory-delta
timestamp: Mon 2007-03-26 14:44:31 -0400
message:
Fix root replacement for apply_inventory_delta
------------------------------------------------------------
revno: 2376.3.2
merged: abentley at panoramicfeedback.com-20070326180617-s3mevl1o55wsnbwo
parent: abentley at panoramicfeedback.com-20070326151523-zjnptbt4y573q6b7
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: inventory-delta
timestamp: Mon 2007-03-26 14:06:17 -0400
message:
Reduce lock to tree lock
------------------------------------------------------------
revno: 2376.3.1
merged: abentley at panoramicfeedback.com-20070326151523-zjnptbt4y573q6b7
parent: pqm at pqm.ubuntu.com-20070326073003-37941d0fa5a5a6c4
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: inventory-delta
timestamp: Mon 2007-03-26 11:15:23 -0400
message:
Implement MutableTree.apply_inventory_delta
------------------------------------------------------------
revno: 2376.1.16
merged: pqm at pqm.ubuntu.com-20070401162926-2718905ae3092110
parent: pqm at pqm.ubuntu.com-20070401155243-5f4a82698a76858e
parent: aaron.bentley at utoronto.ca-20070401160801-n54jkqz3q2hpys0s
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2007-04-01 17:29:26 +0100
message:
Fixes #98510: bundle selftest fails if email has 'two' embedded (Clatworthy)
------------------------------------------------------------
revno: 2376.1.6.1.2
merged: aaron.bentley at utoronto.ca-20070401160801-n54jkqz3q2hpys0s
parent: ian.clatworthy at internode.on.net-20070329085111-fcuzqsgdrtfsa1t3
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ab.integration
timestamp: Sun 2007-04-01 12:08:01 -0400
message:
Update NEWS
------------------------------------------------------------
revno: 2376.1.6.1.1
merged: ian.clatworthy at internode.on.net-20070329085111-fcuzqsgdrtfsa1t3
parent: pqm at pqm.ubuntu.com-20070329014424-0947dae124353e1f
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.bundle-test-fix
timestamp: Thu 2007-03-29 18:51:11 +1000
message:
Fixes #98510 - bundle selftest fails if email has 'two' embedded
------------------------------------------------------------
revno: 2376.1.15
merged: pqm at pqm.ubuntu.com-20070401155243-5f4a82698a76858e
parent: pqm at pqm.ubuntu.com-20070401064838-34903c7b0d0c8007
parent: ian.clatworthy at internode.on.net-20070323002400-sxtf5qae678nd83b
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2007-04-01 16:52:43 +0100
message:
Minor fixes to help on checkouts
------------------------------------------------------------
revno: 2370.2.2
merged: ian.clatworthy at internode.on.net-20070323002400-sxtf5qae678nd83b
parent: ian.clatworthy at internode.on.net-20070322010207-r8xcwjshipoahmcx
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.dev
timestamp: Fri 2007-03-23 10:24:00 +1000
message:
Minor fixes to help on checkouts
------------------------------------------------------------
revno: 2376.1.14
merged: pqm at pqm.ubuntu.com-20070401064838-34903c7b0d0c8007
parent: pqm at pqm.ubuntu.com-20070401051140-280aed4369df0386
parent: mbp at sourcefrog.net-20070401061916-plpgsxdf8g7gll9o
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2007-04-01 07:48:38 +0100
message:
merge 0.15 back to dev
------------------------------------------------------------
revno: 2376.1.13.1.1
merged: mbp at sourcefrog.net-20070401061916-plpgsxdf8g7gll9o
parent: pqm at pqm.ubuntu.com-20070401051140-280aed4369df0386
parent: mbp at sourcefrog.net-20070401052429-z2q259d3su4mjwnx
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.15-to-trunk
timestamp: Sun 2007-04-01 16:19:16 +1000
message:
Merge 0.15 final release back to trunk, including: recommend upgrades of old workingtrees, handle multiple http redirections, some dirstate fixes,
------------------------------------------------------------
revno: 2323.2.3.1.20
merged: mbp at sourcefrog.net-20070401052429-z2q259d3su4mjwnx
parent: mbp at sourcefrog.net-20070401044010-yj4r918takfk8dwp
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.15-integration
timestamp: Sun 2007-04-01 15:24:29 +1000
message:
Prepare 0.15 final release
------------------------------------------------------------
revno: 2323.2.3.1.19
merged: mbp at sourcefrog.net-20070401044010-yj4r918takfk8dwp
parent: mbp at sourcefrog.net-20070401013825-zggofbeun985u2ri
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.15-integration
timestamp: Sun 2007-04-01 14:40:10 +1000
message:
No upgrade recommendation on source when cloning
------------------------------------------------------------
revno: 2323.2.3.1.18
merged: mbp at sourcefrog.net-20070401013825-zggofbeun985u2ri
parent: mbp at sourcefrog.net-20070331040410-lcpffybfv91cn16x
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.15-integration
timestamp: Sun 2007-04-01 11:38:25 +1000
message:
(jam) trim st_ino to 32 bits in dirstate to avoid warning on win32
------------------------------------------------------------
revno: 2323.2.3.1.17
merged: mbp at sourcefrog.net-20070331040410-lcpffybfv91cn16x
parent: mbp at sourcefrog.net-20070331031939-3bc0km32p5gko14w
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.15-integration
timestamp: Sat 2007-03-31 14:04:10 +1000
message:
Add supports_tree_reference to all repo formats (robert)
------------------------------------------------------------
revno: 2323.2.3.1.16
merged: mbp at sourcefrog.net-20070331031939-3bc0km32p5gko14w
parent: mbp at sourcefrog.net-20070330092254-oyqkn935rqnyj9ev
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.15-integration
timestamp: Sat 2007-03-31 13:19:39 +1000
message:
rename support_tree_reference to supports_
------------------------------------------------------------
revno: 2323.2.3.1.15
merged: mbp at sourcefrog.net-20070330092254-oyqkn935rqnyj9ev
parent: mbp at sourcefrog.net-20070330090622-cmsu31j7bihg1jwl
parent: john at arbash-meinel.com-20070328201125-l1y0uyia91q56pmf
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.15-integration
timestamp: Fri 2007-03-30 19:22:54 +1000
message:
better dirstate lock contention messages (jam)
------------------------------------------------------------
revno: 2323.2.3.1.3.2.1.1.1
merged: john at arbash-meinel.com-20070328201125-l1y0uyia91q56pmf
parent: pqm at pqm.ubuntu.com-20070326124437-6f0ae3c58fa4b765
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking_errors
timestamp: Wed 2007-03-28 15:11:25 -0500
message:
Raise LockContetion rather than LockError
------------------------------------------------------------
revno: 2323.2.3.1.14
merged: mbp at sourcefrog.net-20070330090622-cmsu31j7bihg1jwl
parent: mbp at sourcefrog.net-20070330085522-sl5x8bwok1mtuhx2
parent: abentley at panoramicfeedback.com-20070328205332-z8vubwp2rve7jii0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.15-integration
timestamp: Fri 2007-03-30 19:06:22 +1000
message:
Better message on icompatible repositories
------------------------------------------------------------
revno: 2323.2.3.1.3.2.3
merged: abentley at panoramicfeedback.com-20070328205332-z8vubwp2rve7jii0
parent: abentley at panoramicfeedback.com-20070328135645-0nucuw6ijokpe076
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.0.15
timestamp: Wed 2007-03-28 16:53:32 -0400
message:
Reduce scope of try/except, update NEWS
------------------------------------------------------------
revno: 2323.2.3.1.3.2.2
merged: abentley at panoramicfeedback.com-20070328135645-0nucuw6ijokpe076
parent: pqm at pqm.ubuntu.com-20070326124437-6f0ae3c58fa4b765
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.0.15
timestamp: Wed 2007-03-28 09:56:45 -0400
message:
Give a nicer error on fetch when repos are in incompatible formats
------------------------------------------------------------
revno: 2323.2.3.1.3.2.1
merged: pqm at pqm.ubuntu.com-20070326124437-6f0ae3c58fa4b765
parent: pqm at pqm.ubuntu.com-20070325130603-35a88369597194ee
parent: mbp at sourcefrog.net-20070326122611-shyb9gf2l18i8scn
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: 0.15
timestamp: Mon 2007-03-26 13:44:37 +0100
message:
(mbp) integrated 0.15 fixes: http redirection, dirstate validation, move in dirstate
------------------------------------------------------------
revno: 2323.2.3.1.13
merged: mbp at sourcefrog.net-20070330085522-sl5x8bwok1mtuhx2
parent: mbp at sourcefrog.net-20070330083338-re6beh0iucji0g6k
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.15-integration
timestamp: Fri 2007-03-30 18:55:22 +1000
message:
TemporaryWriteLock should be exclusive (jam, marienz)
------------------------------------------------------------
revno: 2323.2.3.1.12
merged: mbp at sourcefrog.net-20070330083338-re6beh0iucji0g6k
parent: mbp at sourcefrog.net-20070326125653-268eg0uw9tuib9ix
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.15-integration
timestamp: Fri 2007-03-30 18:33:38 +1000
message:
doc
------------------------------------------------------------
revno: 2323.2.3.1.11
merged: mbp at sourcefrog.net-20070326125653-268eg0uw9tuib9ix
parent: mbp at sourcefrog.net-20070326122611-shyb9gf2l18i8scn
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.15-integration
timestamp: Mon 2007-03-26 22:56:53 +1000
message:
fix up news for 0.15 release
------------------------------------------------------------
revno: 2323.2.3.1.10
merged: mbp at sourcefrog.net-20070326122611-shyb9gf2l18i8scn
parent: mbp at sourcefrog.net-20070326092947-bumoacwocgexpqpc
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.15-integration
timestamp: Mon 2007-03-26 22:26:11 +1000
message:
DirState._validate must raise AssertionError rather than using assert
so that it still passes tests when run with python -O.
------------------------------------------------------------
revno: 2323.2.3.1.9
merged: mbp at sourcefrog.net-20070326092947-bumoacwocgexpqpc
parent: mbp at sourcefrog.net-20070326091217-00bjase6jntc12zm
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.15-integration
timestamp: Mon 2007-03-26 19:29:47 +1000
message:
Clear up assertRaises (r=robert)
------------------------------------------------------------
revno: 2323.2.3.1.8
merged: mbp at sourcefrog.net-20070326091217-00bjase6jntc12zm
parent: mbp at sourcefrog.net-20070326081645-o8epw58i1hk0mexj
parent: v.ladeuil+lp at free.fr-20070326073459-jlcqpqsrmhpmpk5b
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.15-integration
timestamp: Mon 2007-03-26 19:12:17 +1000
message:
merge http redirection fix
------------------------------------------------------------
revno: 2323.2.3.1.3.1.1
merged: v.ladeuil+lp at free.fr-20070326073459-jlcqpqsrmhpmpk5b
parent: pqm at pqm.ubuntu.com-20070325130603-35a88369597194ee
parent: v.ladeuil+lp at free.fr-20070314170125-ywny47g3rz2u4nba
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: redirection
timestamp: Mon 2007-03-26 09:34:59 +0200
message:
merge bzr.0.15
------------------------------------------------------------
revno: 2164.2.32
merged: v.ladeuil+lp at free.fr-20070314170125-ywny47g3rz2u4nba
parent: v.ladeuil+lp at free.fr-20070314165731-ro7aeu2k3jedut0k
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.redirection
timestamp: Wed 2007-03-14 18:01:25 +0100
message:
Cleanup
------------------------------------------------------------
revno: 2164.2.31
merged: v.ladeuil+lp at free.fr-20070314165731-ro7aeu2k3jedut0k
parent: v.ladeuil+lp at free.fr-20070314165507-ilkas6hcb1ih3a2m
parent: pqm at pqm.ubuntu.com-20070314155044-47c0c6257a6c6717
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.redirection
timestamp: Wed 2007-03-14 17:57:31 +0100
message:
merge bzr.dev
------------------------------------------------------------
revno: 2164.2.30
merged: v.ladeuil+lp at free.fr-20070314165507-ilkas6hcb1ih3a2m
parent: v.ladeuil+lp at free.fr-20070314163924-5xoey9mkxe6qaptd
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.redirection
timestamp: Wed 2007-03-14 17:55:07 +0100
message:
Cleanup
------------------------------------------------------------
revno: 2164.2.29
merged: v.ladeuil+lp at free.fr-20070314163924-5xoey9mkxe6qaptd
parent: v.ladeuil+lp at free.fr-20070314081220-b7rce9vi16r9yd0b
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.redirection
timestamp: Wed 2007-03-14 17:39:24 +0100
message:
Test the http redirection at the request level even if it's not
used anymore, so far.
* bzrlib/transport/http/_urllib2_wrappers.py
(HTTPRedirectHandler.http_error_302): Renamed from http_error_30x.
(HTTPRedirectHandler.http_error_301): Deleted. Finally, that's the
easiest way to fix bug #88780 :) In retrospect, that code was a
first attempt to handle this whole redirection handling by
providing the final target to the first request. This is not
needed anymore.
* bzrlib/tests/test_http.py:
(RedirectedRequest, TestHTTPSilentRedirections_urllib): Test the
_urllib2_wrappers redirection at the request level.
* bzrlib/tests/HTTPTestUtil.py:
(RedirectRequestHandler.parse_request): Delegate the redirection
handling to the test_case_server.
(HTTPServerRedirecting.is_redirected): Handle redirections by
searching a matching directive.
(HTTPServerRedirecting.redirect_to): Redefined to use the nre
redirections definitions.
------------------------------------------------------------
revno: 2164.2.28
merged: v.ladeuil+lp at free.fr-20070314081220-b7rce9vi16r9yd0b
parent: v.ladeuil+lp at free.fr-20070313170020-d0oimozr96pwconh
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.redirection
timestamp: Wed 2007-03-14 09:12:20 +0100
message:
TestingHTTPServer.test_case_server renamed from test_case to avoid confusions.
------------------------------------------------------------
revno: 2164.2.27
merged: v.ladeuil+lp at free.fr-20070313170020-d0oimozr96pwconh
parent: v.ladeuil+lp at free.fr-20070313162730-5xm7siq59snms8h3
parent: pqm at pqm.ubuntu.com-20070313135340-0314c4d26adf39b1
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.redirection
timestamp: Tue 2007-03-13 18:00:20 +0100
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2164.2.26
merged: v.ladeuil+lp at free.fr-20070313162730-5xm7siq59snms8h3
parent: v.ladeuil+lp at free.fr-20070313153837-3nsxxqn229b1exe4
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.redirection
timestamp: Tue 2007-03-13 17:27:30 +0100
message:
Delete obsolete note in doc string.
------------------------------------------------------------
revno: 2164.2.25
merged: v.ladeuil+lp at free.fr-20070313153837-3nsxxqn229b1exe4
parent: v.ladeuil+lp at free.fr-20070301214621-zq5wh150p7qampsu
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.redirection
timestamp: Tue 2007-03-13 16:38:37 +0100
message:
Fix typos noticed by Aaron.
------------------------------------------------------------
revno: 2164.2.24
merged: v.ladeuil+lp at free.fr-20070301214621-zq5wh150p7qampsu
parent: v.ladeuil+lp at free.fr-20070301212940-z63krdqjpbn0sgar
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.redirection
timestamp: Thu 2007-03-01 22:46:21 +0100
message:
Fix typos in NEWS
------------------------------------------------------------
revno: 2164.2.23
merged: v.ladeuil+lp at free.fr-20070301212940-z63krdqjpbn0sgar
parent: v.ladeuil+lp at free.fr-20070301212657-bclmihdfnxgfy0sw
parent: v.ladeuil+lp at free.fr-20070228231040-yx4119b16r5pjmyp
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.redirection
timestamp: Thu 2007-03-01 22:29:40 +0100
message:
Merge #88780 fix
------------------------------------------------------------
revno: 2305.1.1
merged: v.ladeuil+lp at free.fr-20070228231040-yx4119b16r5pjmyp
parent: pqm at pqm.ubuntu.com-20070228211048-30e18ddd8dd9c205
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 88780
timestamp: Thu 2007-03-01 00:10:40 +0100
message:
Fix bug #88780.
* bzrlib/transport/http/_urllib2_wrappers.py:
(HTTPRedirectHandler.http_error_301): Fix wrong indentation and
wrong variable name.
------------------------------------------------------------
revno: 2164.2.22
merged: v.ladeuil+lp at free.fr-20070301212657-bclmihdfnxgfy0sw
parent: v.ladeuil+lp at free.fr-20070225183336-ifty38ijssbqkcli
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.redirection
timestamp: Thu 2007-03-01 22:26:57 +0100
message:
Take Aaron's review comments into account.
* bzrlib/transport/http/_urllib2_wrappers.py:
(HTTPRedirectHandler.http_error_301): Fix bug #88780.
* bzrlib/transport/http/__init__.py:
(HttpTransportBase._get): Fix doc string.
* bzrlib/transport/__init__.py:
(do_catching_redirections): Raise TooManyRedirections instead of
requiring an exception as a parameter.
* bzrlib/tests/test_http.py:
(TestHTTPRedirections.setUp): Simplified.
(TestHTTPRedirections.test_read_redirected_bundle_from_url): New test.
(TestDoCatchRedirections): New tests.
* bzrlib/tests/HTTPTestUtil.py:
(TestCaseWithRedirectedWebserver): New class factored out from
test_http.TestHTTPRedirections.
* bzrlib/errors.py:
(TooManyRedirections): New exception.
* bzrlib/bzrdir.py:
(BzrDir.open_from_transport.redirected): Catch TooManyRedirections.
* bzrlib/bundle/__init__.py:
(read_bundle_from_url.redirected_transport): Catch TooManyRedirections.
------------------------------------------------------------
revno: 2164.2.21
merged: v.ladeuil+lp at free.fr-20070225183336-ifty38ijssbqkcli
parent: v.ladeuil+lp at free.fr-20070225154955-0zcc6vbuyx0kab7y
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.redirection
timestamp: Sun 2007-02-25 19:33:36 +0100
message:
Take bundles into account.
* bzrlib/transport/__init__.py:
(do_catching_redirections): Factored out from
BzrDir.open_from_transport.
* bzrlib/bzrdir.py:
(BzrDir.open_from_transport): Simplified.
* bzrlib/bundle/__init__.py:
(read_bundle_from_url): Follow redirections if needed.
Revert BzrDirFormat1 registering.
* bzrlib/bzrdir.py:
Register BzrDirFormat as control format.
------------------------------------------------------------
revno: 2164.2.20
merged: v.ladeuil+lp at free.fr-20070225154955-0zcc6vbuyx0kab7y
parent: v.ladeuil+lp at free.fr-20070225154720-iazxg33pvg5hwa4y
parent: pqm at pqm.ubuntu.com-20070222144505-5f7551602cad9332
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.redirection
timestamp: Sun 2007-02-25 16:49:55 +0100
message:
merge bzr.dev
------------------------------------------------------------
revno: 2164.2.19
merged: v.ladeuil+lp at free.fr-20070225154720-iazxg33pvg5hwa4y
parent: v.ladeuil+lp at free.fr-20070213221044-a79y2pyxzjskmkd5
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.redirection
timestamp: Sun 2007-02-25 16:47:20 +0100
message:
Revert BzrDirFormat1 registering.
* bzrlib/bzrdir.py:
Register BzrDirFormat as control format.
------------------------------------------------------------
revno: 2164.2.18
merged: v.ladeuil+lp at free.fr-20070213221044-a79y2pyxzjskmkd5
parent: v.ladeuil+lp at free.fr-20070212141359-yb92gzmyvam8izsz
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.redirection
timestamp: Tue 2007-02-13 23:10:44 +0100
message:
Take Aaron comments into account.
* bzrlib/bzrdir.py:
(BzrDir.open_from_transport): Use for... else idiom.
------------------------------------------------------------
revno: 2164.2.17
merged: v.ladeuil+lp at free.fr-20070212141359-yb92gzmyvam8izsz
parent: v.ladeuil+lp at free.fr-20070212140201-khf5tnm6skh2ic0k
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.redirection
timestamp: Mon 2007-02-12 15:13:59 +0100
message:
Add comments and fix typos
------------------------------------------------------------
revno: 2164.2.16
merged: v.ladeuil+lp at free.fr-20070212140201-khf5tnm6skh2ic0k
parent: v.ladeuil+lp at free.fr-20070211160613-9k1vwo0e1x0si26z
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.redirection
timestamp: Mon 2007-02-12 15:02:01 +0100
message:
Add tests.
* bzrlib/transport/http/_urllib.py:
(HttpTransport_urllib.has): Ignores 302 error code, it is already
handled.
* bzrlib/transport/http/_pycurl.py:
(PyCurlTransport.has): Set headers acquisition. Pass headers to
_curl_perform. Ignores 302 error code, it is already
handled.
(PyCurlTransport._get_full, PyCurlTransport._get_ranged): Pass
headers to _curl_perform.
(PyCurlTransport._post): Pass headers to _curl_perform.
(PyCurlTransport._set_curl_options): Do not follow redirections
anymore.
(PyCurlTransport._curl_perform): Handle redirections by raising
* bzrlib/tests/test_http.py:
(TestHTTPRedirections): Simplified.
(TestHTTPRedirections_pycurl): New class.
* bzrlib/tests/test_bzrdir.py:
(TestHTTPRedirectionLoop, TestHTTPRedirections_urllib,
TestHTTPRedirections_pycurl): New classes to test redirection
loops when opening bzrdirs.
* bzrlib/tests/HTTPTestUtil.py:
(HTTPServerRedirecting.redirect_to,
HTTPServerRedirecting.redirected_to_address): New methods.
* bzrlib/bzrdir.py:
(BzrDirMetaFormat1.probe_transport): Deleted.
------------------------------------------------------------
revno: 2164.2.15
merged: v.ladeuil+lp at free.fr-20070211160613-9k1vwo0e1x0si26z
parent: v.ladeuil+lp at free.fr-20070208145219-7mdy3d2r3hqybamz
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.redirection
timestamp: Sun 2007-02-11 17:06:13 +0100
message:
Http redirections are not followed by default. Do not use hints
anymore.
* bzrlib/transport/smart.py:
(SmartTransport.get): Do not use hints.
* bzrlib/transport/sftp.py:
(SFTPTransport.get): Do not use hints.
* bzrlib/transport/memory.py:
(MemoryTransport.get): Do not use hints.
* bzrlib/transport/local.py:
(LocalTransport.get): Do not use hints.
* bzrlib/transport/http/_urllib2_wrappers.py:
(Request.__init__): Redirections are *not* followed by default.
* bzrlib/transport/http/_urllib.py:
(HttpTransport_urllib._get): Do not use hints.
* bzrlib/transport/http/_pycurl.py:
(PyCurlTransport._get): Do not use hints.
* bzrlib/transport/http/__init__.py:
(HttpTransportBase.get, HttpTransportBase._get): Do not use hints.
Fix _get doc anyway.
* bzrlib/transport/ftp.py:
(FtpTransport.get): Do not use hints.
* bzrlib/transport/fakevfat.py:
(FakeVFATTransportDecorator.get): Do not use hints.
* bzrlib/transport/decorator.py
(TransportDecorator.get): Do not use hints.
* bzrlib/transport/chroot.py:
(ChrootTransportDecorator.get): Do not use hints.
* bzrlib/tests/test_transport_hints.py:
Deleted.
* bzrlib/tests/__init__.py:
(test_suite): Do not test hints.
* bzrlib/errors.py:
(UnknownHint): Deleted.
* bzrlib/bzrdir.py:
(BzrDirMetaFormat1.probe_transport): Do not use hints.
------------------------------------------------------------
revno: 2164.2.14
merged: v.ladeuil+lp at free.fr-20070208145219-7mdy3d2r3hqybamz
parent: v.ladeuil+lp at free.fr-20070204174112-iv6gxzinnjddlaxj
committer: v.ladeuil+lp at free.fr
branch nick: bzr.http.redirection
timestamp: Thu 2007-02-08 15:52:19 +0100
message:
Typo in comment
------------------------------------------------------------
revno: 2164.2.13
merged: v.ladeuil+lp at free.fr-20070204174112-iv6gxzinnjddlaxj
parent: vila at vilabuntu-20070125100028-uahmvcdfxro7ye9x
committer: v.ladeuil+lp at free.fr
branch nick: bzr.http.redirection
timestamp: Sun 2007-02-04 18:41:12 +0100
message:
Add tests for redirection. Preserve transport decorations.
* bzrlib/tests/test_http.py:
(TestRedirections): new tests.
* bzrlib/tests/HttpServer.py:
(HttpServer): Make server host and port public once the socket
have been established.
* bzrlib/tests/HTTPTestUtil.py:
(RedirectRequestHandler, HTTPServerRedirecting): New http test
server for redirections. Only a whole host can be redirected, so
far.
* bzrlib/errors.py:
(RedirectRequested.__init__): Add a 'qual_proto' oso that
transport decorations can be transmitted to redirected transport.
(RedirectRequested._requalify_url,
RedirectRequested.get_source_url,
RedirectRequested.get_target_url): New methods providing fully
decorated urls.
* bzrlib/bzrdir.py:
(BzrDir.open_from_transport): The redirection should preserve
transport decorations.
(BzrDirMetaFormat1): To be able to specialize bzr branches from
foreign branches, we need to register BzrDirMetaFormat1 as the
default control format (instead of BzrDirMetaFormat which is
abstract and can still be used by foreign branches).
------------------------------------------------------------
revno: 2164.2.12
merged: vila at vilabuntu-20070125100028-uahmvcdfxro7ye9x
parent: vila at vilabuntu-20070125095850-0g2ggjjtvq13o8e7
parent: pqm at pqm.ubuntu.com-20070125051817-53a80525dbdf87b4
committer: Vincent Ladeuil <vila at vilabuntu>
branch nick: redir
timestamp: Thu 2007-01-25 11:00:28 +0100
message:
merge bzr.dev
------------------------------------------------------------
revno: 2164.2.11
merged: vila at vilabuntu-20070125095850-0g2ggjjtvq13o8e7
parent: vila at vilabuntu-20070123142936-gyxoqeyfqzkf6r3r
committer: Vincent Ladeuil <vila at vilabuntu>
branch nick: redir
timestamp: Thu 2007-01-25 10:58:50 +0100
message:
Explicit tests.
* bzrlib/transport/__init__.py:
(register_lazy_transport._loader): Provide a better localisation
of the get declaration.
* bzrlib/tests/test_transport_implementations.py:
(_append): Deleted. Nobody use it anymore.
* bzrlib/tests/test_transport.py:
(TestTransportAPI): Test the get compatibility wrapping.
------------------------------------------------------------
revno: 2164.2.10
merged: vila at vilabuntu-20070123142936-gyxoqeyfqzkf6r3r
parent: v.ladeuil+lp at free.fr-20070110104208-m510xzaw55nca20d
parent: pqm at pqm.ubuntu.com-20070120020104-a192555a9165b259
committer: Vincent Ladeuil <vila at vilabuntu>
branch nick: redir
timestamp: Tue 2007-01-23 15:29:36 +0100
message:
merge bzr.dev
------------------------------------------------------------
revno: 2164.2.9
merged: v.ladeuil+lp at free.fr-20070110104208-m510xzaw55nca20d
parent: v.ladeuil+lp at free.fr-20070109154423-lyvr5gmkwv6e0v6h
committer: v.ladeuil+lp at free.fr
branch nick: bzr.http.redirection
timestamp: Wed 2007-01-10 11:42:08 +0100
message:
Simplify the get wrapping and restrict redirection to bzr branches.
* bzrlib/transport/local.py:
(LocalTransport.get): Really declare the hint parameters or the
deprecation warning make some tests fail (they rely on a specific
output from the command issued, with is, IMHO, bad, but that's not
the problem I try to address now).
* bzrlib/transport/__init__.py:
(_inject_get_with_hints): Deleted.
(_add_hints_to_get.get): Renamed from _check_get_with_hints and
simplified. KISS principle is good, use it.
(register_lazy_transport._loader): Issue a deprecation warning if
needed.
(Transport.create_get_hints): Usage is to use the name 'klass' for
class methods.
* bzrlib/bzrdir.py:
(BzrDirFormat.probe_transport): Leave that one alone.
(BzrDirMetaFormat1.probe_transport): New method so that
redirection is applied to bzr branches only.
------------------------------------------------------------
revno: 2164.2.8
merged: v.ladeuil+lp at free.fr-20070109154423-lyvr5gmkwv6e0v6h
parent: v.ladeuil+lp at free.fr-20070109153336-8iucozbcxmpb1az6
parent: pqm at pqm.ubuntu.com-20070109142832-337c25188ea46f2d
committer: v.ladeuil+lp at free.fr
branch nick: bzr.http.redirection
timestamp: Tue 2007-01-09 16:44:23 +0100
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2164.2.7
merged: v.ladeuil+lp at free.fr-20070109153336-8iucozbcxmpb1az6
parent: v.ladeuil+lp at free.fr-20070108142722-722eundbwxzyra00
committer: v.ladeuil+lp at free.fr
branch nick: bzr.http.redirection
timestamp: Tue 2007-01-09 16:33:36 +0100
message:
First implementation of transport hints.
* bzrlib/tests/test_transport_hints.py:
New file.
* bzrlib/transport/__init__.py:
(TransportHints, TransportGetHints): New hints classes.
(Transport.create_get_hints): New method creating a suitable hints
object.
* bzrlib/tests/__init__.py:
(test_suite): Add test_transport_hints.
* bzrlib/errors.py:
(RedirectRequested.__init__): Fix typo.
(UnknownHint): New exception class.
* bzrlib/bzrdir.py:
(BzrDirFormat.probe_transport): Pass a hints object to
transport.get.
------------------------------------------------------------
revno: 2164.2.6
merged: v.ladeuil+lp at free.fr-20070108142722-722eundbwxzyra00
parent: v.ladeuil+lp at free.fr-20070108141242-nhuevwtx8216ymgz
committer: v.ladeuil+lp at free.fr
branch nick: bzr.http.redirection
timestamp: Mon 2007-01-08 15:27:22 +0100
message:
Fix typo.
* bzrlib/transport/__init__.py:
(register_lazy_transport): Oops, module is a mandatory attribute
for _loader. Add classname too to make good measure.
------------------------------------------------------------
revno: 2164.2.5
merged: v.ladeuil+lp at free.fr-20070108141242-nhuevwtx8216ymgz
parent: v.ladeuil+lp at free.fr-20070108102120-rhp9vvuhmshrrd92
committer: v.ladeuil+lp at free.fr
branch nick: bzr.http.redirection
timestamp: Mon 2007-01-08 15:12:42 +0100
message:
Simpler implementation using inspect. 'hints' is a kwargs.
* bzrlib/transport/smart.py:
(SmartTransport.get): Make hints a kwargs.
* bzrlib/transport/sftp.py:
(SFTPTransport.get): Make hints a kwargs.
* bzrlib/transport/memory.py:
(MemoryTransport.get): Make hints a kwargs.
* bzrlib/transport/local.py:
(LocalTransport.get): Make hints a kwargs (but still commented out).
* bzrlib/transport/ftp.py:
(FtpTransport.get): Make hints a kwargs (but still commented out).
* bzrlib/transport/http/_urllib.py:
(HttpTransport_urllib._get): Make hints a kwargs.
* bzrlib/transport/http/_pycurl.py:
(PyCurlTransport._get): Make hints a kwargs. Still nothing done
with it.
(PyCurlTransport._get_full): Delete hints parameter until we need
it.
* bzrlib/transport/http/__init__.py:
(HttpTransportBase.get, HttpTransportBase._get): Make hints a
kwargs.
* bzrlib/transport/fakevfat.py:
(FakeVFATTransportDecorator.get): Make hints a kwargs.
* bzrlib/transport/decorator.py:
(TransportDecorator.get): Make hints a kwargs.
* bzrlib/transport/chroot.py:
(ChrootTransportDecorator.get): Make hints a kwargs.
* bzrlib/transport/__init__.py:
Python provides inspect: use it.
(_get_prototype_infos, _build_arglist): Deleted.
(_inject_get_with_hints, _check_get_with_hints): Simplified.
(_inject_get_with_hints): Make _get_without_hints a private
method.
(Transport.get, TransportLogger.get): Make hints a kwargs.
* bzrlib/bzrdir.py:
(BzrDirFormat.probe_transport): get's hint is a kwargs.
------------------------------------------------------------
revno: 2164.2.4
merged: v.ladeuil+lp at free.fr-20070108102120-rhp9vvuhmshrrd92
parent: v.ladeuil+lp at free.fr-20070103155403-wfbwe5w5md9jzked
parent: pqm at pqm.ubuntu.com-20070105024018-b849a96645a25c39
committer: v.ladeuil+lp at free.fr
branch nick: bzr.http.redirection
timestamp: Mon 2007-01-08 11:21:20 +0100
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2164.2.3
merged: v.ladeuil+lp at free.fr-20070103155403-wfbwe5w5md9jzked
parent: v.ladeuil+lp at free.fr-20061221102819-308frw80r38lluqa
committer: v.ladeuil+lp at free.fr
branch nick: bzr.http.redirection
timestamp: Wed 2007-01-03 16:54:03 +0100
message:
* bzrlib/bzrdir.py:
(BzrDir.open_from_transport): Make MAX_REDIRECTIONS a static class
variable.
------------------------------------------------------------
revno: 2164.2.2
merged: v.ladeuil+lp at free.fr-20061221102819-308frw80r38lluqa
parent: v.ladeuil+lp at free.fr-20061213173707-a1gflgoke6b3eboc
committer: v.ladeuil+lp at free.fr
branch nick: bzr.http.redirection
timestamp: Thu 2006-12-21 11:28:19 +0100
message:
Automates the 'hints' parameter addition to get transport prototypes.
* bzrlib/transport/__init__.py:
(_get_prototype_infos, _build_arglist, _inject_get_with_hints,
_check_get_with_hints): New methods to ensure the compatibility
with old code while adding a new parameter to the transport.get
method.
* bzrlib/transport/local.py:
(LocalTransport.get): Delete the 'hints' parameter to demonstrate
the solution.
* bzrlib/transport/ftp.py:
(FtpTransport.get): Delete the 'hints' parameter to demonstrate
the solution.
* bzrlib/bzrdir.py:
(BzrDir.open_from_transport): Try to not use magic values. Clean
up transport.follow_redirections uses.
* bzrlib/transport/http/_urllib.py:
(HttpTransport_urllib._get): dict objects already provides a 'get'
with a default value, you silly.
* bzrlib/transport/http/_pycurl.py:
(PyCurlTransport._get_full): Give a default value to the hints
parameter as this is called explicitely without it.
* bzrlib/transport/chroot.py:
(ChrootTransportDecorator.get): Forward the 'hints' parameter.
------------------------------------------------------------
revno: 2164.2.1
merged: v.ladeuil+lp at free.fr-20061213173707-a1gflgoke6b3eboc
parent: pqm at pqm.ubuntu.com-20061206021529-c4235ec44babfd5b
committer: v.ladeuil+lp at free.fr
branch nick: bzr.http.redirection
timestamp: Wed 2006-12-13 18:37:07 +0100
message:
First rough http branch redirection implementation.
* bzrlib/transport/http/_urllib2_wrappers.py:
(Request.__init__): Unless told otherwise, redirections are
followed silently.
(HTTPRedirectHandler.http_error_30x): Follow redirection or return
a 30x error.
* bzrlib/transport/http/_urllib.py:
(HttpTransport_urllib._perform): Raises RedirectRequested if the
request requires it.
(HttpTransport_urllib._get): Update the request from the hints
parameter if needed.
* bzrlib/errors.py:
(RedirectRequested): New TransportError.
* bzrlib/bzrdir.py:
(BzrDir.open_from_transport): Catch RedirectRequested and retry
with the redirected url until we get to the final destination.
(BzrDirFormat.probe_transport): Hints get to not follow the
redirections but instead tell us where this branch is redirected.
* bzrlib/transport/smart.py:
(SmartTransport.get): Add a 'hint' parameter.
* bzrlib/transport/sftp.py:
(SFTPTransport.get): Add a 'hint' parameter.
* bzrlib/transport/memory.py:
(MemoryTransport.get): Add a 'hint' parameter.
* bzrlib/transport/local.py:
(LocalTransport.get): Add a 'hint' parameter.
* bzrlib/transport/http/_pycurl.py:
(PyCurlTransport._get): Add a 'hint' parameter and pass it to
_get_full.
* bzrlib/transport/http/__init__.py:
(HttpTransportBase.get): Add a 'hint' parameter and pass
it to _get.
* bzrlib/transport/ftp.py:
(FtpTransport.get): Add a 'hint' parameter.
* bzrlib/transport/fakevfat.py:
(FakeVFATTransportDecorator.get): Add a 'hint' parameter and pass
it to the decorated transport.
* bzrlib/transport/decorator.py:
(TransportDecorator.get): Add a 'hint' parameter and pass it to the
decorated transport.
* bzrlib/transport/chroot.py:
(ChrootTransportDecorator.get): Add a 'hint' parameter. Delete a
duplicated definition of the method.
* bzrlib/transport/__init__.py:
(Transport.get): Add a 'hint' parameter.
(TransportLogger.get): Add a 'hint' parameter and pass it to the
------------------------------------------------------------
revno: 2323.2.3.1.7
merged: mbp at sourcefrog.net-20070326081645-o8epw58i1hk0mexj
parent: mbp at sourcefrog.net-20070326054413-16tep1hw0h1dx2lh
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.15-integration
timestamp: Mon 2007-03-26 18:16:45 +1000
message:
Better DirState._validate and tests for it.
------------------------------------------------------------
revno: 2323.2.3.1.6
merged: mbp at sourcefrog.net-20070326054413-16tep1hw0h1dx2lh
parent: mbp at sourcefrog.net-20070326020040-sa23lls1uavv0lvz
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.15-integration
timestamp: Mon 2007-03-26 15:44:13 +1000
message:
Add some tests and better messages for DirState._validate
------------------------------------------------------------
revno: 2323.2.3.1.5
merged: mbp at sourcefrog.net-20070326020040-sa23lls1uavv0lvz
parent: mbp at sourcefrog.net-20070326013304-98dx5c6gzhadf369
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.15-integration
timestamp: Mon 2007-03-26 12:00:40 +1000
message:
override TestCase.assertRaises to return the exception
------------------------------------------------------------
revno: 2323.2.3.1.4
merged: mbp at sourcefrog.net-20070326013304-98dx5c6gzhadf369
parent: pqm at pqm.ubuntu.com-20070325130603-35a88369597194ee
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.15-integration
timestamp: Mon 2007-03-26 11:33:04 +1000
message:
Move some dirstate test setup methods into the base class
so they can be reused.
Add a simple DirState._validate test for correct dirstates.
------------------------------------------------------------
revno: 2323.2.3.1.3
merged: pqm at pqm.ubuntu.com-20070325130603-35a88369597194ee
parent: pqm at pqm.ubuntu.com-20070323235555-58270f32490599ea
parent: mbp at sourcefrog.net-20070325124716-u9b3xr49h1kpjj7l
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: 0.15
timestamp: Sun 2007-03-25 14:06:03 +0100
message:
(mbp) more integrated 0.15 fixes
------------------------------------------------------------
revno: 2323.2.3.1.1.1.15
merged: mbp at sourcefrog.net-20070325124716-u9b3xr49h1kpjj7l
parent: mbp at sourcefrog.net-20070325124604-sabilbi5m4902ot8
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.15-integration
timestamp: Sun 2007-03-25 22:47:16 +1000
message:
Disable some questionable checks in Dirstate._validate
------------------------------------------------------------
revno: 2323.2.3.1.1.1.14
merged: mbp at sourcefrog.net-20070325124604-sabilbi5m4902ot8
parent: mbp at sourcefrog.net-20070325081559-uhe1bo23m9kqltm3
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.15-integration
timestamp: Sun 2007-03-25 22:46:04 +1000
message:
clearer test data for test merge_swapping_rename
------------------------------------------------------------
revno: 2323.2.3.1.1.1.13
merged: mbp at sourcefrog.net-20070325081559-uhe1bo23m9kqltm3
parent: mbp at sourcefrog.net-20070325081533-enj6iq0mp5a0sn33
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.15-integration
timestamp: Sun 2007-03-25 18:15:59 +1000
message:
Fix some tests that need to lock dirstate before validating
------------------------------------------------------------
revno: 2323.2.3.1.1.1.12
merged: mbp at sourcefrog.net-20070325081533-enj6iq0mp5a0sn33
parent: mbp at sourcefrog.net-20070324000657-fkotsej7quseardh
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.15-integration
timestamp: Sun 2007-03-25 18:15:33 +1000
message:
These changes still intended for 0.15 branch
------------------------------------------------------------
revno: 2323.2.3.1.1.1.11
merged: mbp at sourcefrog.net-20070324000657-fkotsej7quseardh
parent: mbp at sourcefrog.net-20070324000213-3iiz8gtjfebxt5ht
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.15-integration
timestamp: Sat 2007-03-24 11:06:57 +1100
message:
prepare rc3
------------------------------------------------------------
revno: 2323.2.3.1.1.1.10
merged: mbp at sourcefrog.net-20070324000213-3iiz8gtjfebxt5ht
parent: mbp at sourcefrog.net-20070323234558-rcdpyv3h6b0um0t8
parent: john at arbash-meinel.com-20070322235912-fd5dehajuqhg64em
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.15-integration
timestamp: Sat 2007-03-24 11:02:13 +1100
message:
merge john's directory-move fix
------------------------------------------------------------
revno: 2371.2.3
merged: john at arbash-meinel.com-20070322235912-fd5dehajuqhg64em
parent: john at arbash-meinel.com-20070322235549-q802rg14wurej850
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: move_children_correctly
timestamp: Thu 2007-03-22 18:59:12 -0500
message:
NEWS for fixing bug #94037
------------------------------------------------------------
revno: 2371.2.2
merged: john at arbash-meinel.com-20070322235549-q802rg14wurej850
parent: john at arbash-meinel.com-20070322234720-re8l7jtva8msgbsv
parent: pqm at pqm.ubuntu.com-20070322230820-f8735ba918f51539
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: move_children_correctly
timestamp: Thu 2007-03-22 18:55:49 -0500
message:
[merge] bzr.dev 2374
------------------------------------------------------------
revno: 2371.2.1
merged: john at arbash-meinel.com-20070322234720-re8l7jtva8msgbsv
parent: pqm at pqm.ubuntu.com-20070322152522-228285cac46c0dbc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: move_children_correctly
timestamp: Thu 2007-03-22 18:47:20 -0500
message:
Update DirState._validate() to detect rename errors.
WorkingTree.move() would incorrectly update children of a renamed directory.
(Some of the references would point to the directory instead of the child)
This also adds WorkingTree._validate() which is a no-op for most trees,
and just calls self._dirstate._validate() for WT4 trees.
It then updates test_move() to have the WT validate itself after all tests.
------------------------------------------------------------
revno: 2323.2.3.1.1.1.9
merged: mbp at sourcefrog.net-20070323234558-rcdpyv3h6b0um0t8
parent: mbp at sourcefrog.net-20070323231411-22dcr2pg0kulg3px
parent: aaron.bentley at utoronto.ca-20070323033701-gc7swnd0lgr0xm3a
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.15-integration
timestamp: Sat 2007-03-24 10:45:58 +1100
message:
merge aaron's empty merge directive fix
------------------------------------------------------------
revno: 2323.2.3.1.2
merged: pqm at pqm.ubuntu.com-20070323235555-58270f32490599ea
parent: pqm at pqm.ubuntu.com-20070321043308-436d9f24274a7e49
parent: mbp at sourcefrog.net-20070323231411-22dcr2pg0kulg3px
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: 0.15
timestamp: Fri 2007-03-23 23:55:55 +0000
message:
(mbp) various integrated fixes for 0.15
------------------------------------------------------------
revno: 2323.2.3.1.1.1.8
merged: mbp at sourcefrog.net-20070323231411-22dcr2pg0kulg3px
parent: mbp at sourcefrog.net-20070323214646-zfvwiprkvbhuvz6o
parent: john at arbash-meinel.com-20070323202928-e39fjjn3u1ktj2t5
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.15-integration
timestamp: Sat 2007-03-24 10:14:11 +1100
message:
merge john's fix for committing kind changes
------------------------------------------------------------
revno: 2374.2.4
merged: john at arbash-meinel.com-20070323202928-e39fjjn3u1ktj2t5
parent: john at arbash-meinel.com-20070323202323-u2rkmkkcily01t6o
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: commit_kind_change_90111
timestamp: Fri 2007-03-23 15:29:28 -0500
message:
Another workaround for trees that are already in the broken state.
If the kind has changed from a parent, we know that this cannot be
a copy of that parent.
------------------------------------------------------------
revno: 2374.2.3
merged: john at arbash-meinel.com-20070323202323-u2rkmkkcily01t6o
parent: john at arbash-meinel.com-20070323201901-2m5hfkh8xe26wywh
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: commit_kind_change_90111
timestamp: Fri 2007-03-23 15:23:23 -0500
message:
NEWS for fixing bug 90111
------------------------------------------------------------
revno: 2374.2.2
merged: john at arbash-meinel.com-20070323201901-2m5hfkh8xe26wywh
parent: john at arbash-meinel.com-20070323192548-f81b8vw3irmyclhe
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: commit_kind_change_90111
timestamp: Fri 2007-03-23 15:19:01 -0500
message:
Fix the small bug that ie.snapshot() didn't think about kind changes.
------------------------------------------------------------
revno: 2374.2.1
merged: john at arbash-meinel.com-20070323192548-f81b8vw3irmyclhe
parent: pqm at pqm.ubuntu.com-20070322230820-f8735ba918f51539
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: commit_kind_change_90111
timestamp: Fri 2007-03-23 14:25:48 -0500
message:
(broken) merge a test case showing that commiting a merge of a kind change fails.
------------------------------------------------------------
revno: 2323.2.3.1.1.1.7
merged: mbp at sourcefrog.net-20070323214646-zfvwiprkvbhuvz6o
parent: mbp at sourcefrog.net-20070323075854-5o2n6k8a8kuejges
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tester
timestamp: Sat 2007-03-24 08:46:46 +1100
message:
Don't warn about old wt format when getting bzr's version
This fixes selftest when bzr is run from an old-format tree
(as pqm does)
------------------------------------------------------------
revno: 2323.2.3.1.1.1.6
merged: mbp at sourcefrog.net-20070323075854-5o2n6k8a8kuejges
parent: mbp at sourcefrog.net-20070323073333-d17401ai6jvjkqup
parent: pqm at pqm.ubuntu.com-20070322230820-f8735ba918f51539
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.15-integration
timestamp: Fri 2007-03-23 18:58:54 +1100
message:
merge jam's integrated changes from trunk
------------------------------------------------------------
revno: 2323.2.3.1.1.1.5
merged: mbp at sourcefrog.net-20070323073333-d17401ai6jvjkqup
parent: mbp at sourcefrog.net-20070323014137-7rvpygb42i2tyrfc
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: please-upgrade
timestamp: Fri 2007-03-23 18:33:33 +1100
message:
Recommended-upgrade message should give base dir not the control dir url
------------------------------------------------------------
revno: 2323.2.3.1.1.1.4
merged: mbp at sourcefrog.net-20070323014137-7rvpygb42i2tyrfc
parent: mbp at sourcefrog.net-20070322235658-kkdu0drfwmok2l3y
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: please-upgrade
timestamp: Fri 2007-03-23 12:41:37 +1100
message:
BzrDir._check_supported now also takes care of recommending upgrades, which
should be less disruptive to other workingtree formats.
------------------------------------------------------------
revno: 2323.2.3.1.1.1.3
merged: mbp at sourcefrog.net-20070322235658-kkdu0drfwmok2l3y
parent: mbp at sourcefrog.net-20070322070404-zzhbluric9k4wox1
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: please-upgrade
timestamp: Fri 2007-03-23 10:56:58 +1100
message:
bound-branch ui tests should now use the default branch format
------------------------------------------------------------
revno: 2323.2.3.1.1.1.2
merged: mbp at sourcefrog.net-20070322070404-zzhbluric9k4wox1
parent: mbp at sourcefrog.net-20070322052708-t4g4iv46n2dcjjaa
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: please-upgrade
timestamp: Thu 2007-03-22 18:04:04 +1100
message:
Move responsibility for suggesting upgrades to ui object
------------------------------------------------------------
revno: 2323.2.3.1.1.1.1
merged: mbp at sourcefrog.net-20070322052708-t4g4iv46n2dcjjaa
parent: pqm at pqm.ubuntu.com-20070321043308-436d9f24274a7e49
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: please-upgrade
timestamp: Thu 2007-03-22 16:27:08 +1100
message:
(broken) Give a message when opening old workingtree formats suggesting upgrade
This breaks some blackbox tests of old formats that don't expect to see this
message.
Add WorkingTree._after_opening callback
------------------------------------------------------------
revno: 2323.2.3.1.1
merged: pqm at pqm.ubuntu.com-20070321043308-436d9f24274a7e49
parent: robertc at robertcollins.net-20070321033137-8tj3jiz2nxqdk7pa
parent: robertc at robertcollins.net-20070321041435-lyb7a2hxgb1547mj
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: 0.15
timestamp: Wed 2007-03-21 04:33:08 +0000
message:
(robertc) Merge (hopefully the last time) mainline fixes for 0.15.
------------------------------------------------------------
revno: 2376.1.13
merged: pqm at pqm.ubuntu.com-20070401051140-280aed4369df0386
parent: pqm at pqm.ubuntu.com-20070330064022-bdce9356befc3795
parent: aaron.bentley at utoronto.ca-20070401043208-trrrj3rmubg9b785
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2007-04-01 06:11:40 +0100
message:
merge and pull support merge directives
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.54.1.13
merged: aaron.bentley at utoronto.ca-20070401043208-trrrj3rmubg9b785
parent: aaron.bentley at utoronto.ca-20070401040614-3f0tytdrc2jtv8f6
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Sun 2007-04-01 00:32:08 -0400
message:
Update NEWS
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.54.1.12
merged: aaron.bentley at utoronto.ca-20070401040614-3f0tytdrc2jtv8f6
parent: aaron.bentley at utoronto.ca-20070401040347-0raf64jx909yhs6q
parent: pqm at pqm.ubuntu.com-20070330064022-bdce9356befc3795
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Sun 2007-04-01 00:06:14 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.54.1.11
merged: aaron.bentley at utoronto.ca-20070401040347-0raf64jx909yhs6q
parent: aaron.bentley at utoronto.ca-20070401035812-bankq62dvnuyq0gx
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Sun 2007-04-01 00:03:47 -0400
message:
rename rev_id and other_rev_id
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.54.1.10
merged: aaron.bentley at utoronto.ca-20070401035812-bankq62dvnuyq0gx
parent: aaron.bentley at utoronto.ca-20070401035231-w87zy7hrpre4v81m
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Sat 2007-03-31 23:58:12 -0400
message:
Remove 'manual' from test names
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.54.1.9
merged: aaron.bentley at utoronto.ca-20070401035231-w87zy7hrpre4v81m
parent: aaron.bentley at utoronto.ca-20070319010545-1n2gkcvcr76sb6lx
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Sat 2007-03-31 23:52:31 -0400
message:
rename get_target_revision to install_revisions
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.54.1.8
merged: aaron.bentley at utoronto.ca-20070319010545-1n2gkcvcr76sb6lx
parent: abentley at panoramicfeedback.com-20070316174716-0se6k7b4sqr9t12d
parent: pqm at pqm.ubuntu.com-20070317015305-7b7562331da9f786
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Sun 2007-03-18 21:05:45 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.54.1.7
merged: abentley at panoramicfeedback.com-20070316174716-0se6k7b4sqr9t12d
parent: abentley at panoramicfeedback.com-20070316152110-crvg8yllxe1zt105
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Fri 2007-03-16 13:47:16 -0400
message:
test suite fixes
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.54.1.6
merged: abentley at panoramicfeedback.com-20070316152110-crvg8yllxe1zt105
parent: abentley at panoramicfeedback.com-20070316151629-g2p2eyd85juh3a9k
parent: pqm at pqm.ubuntu.com-20070314155044-47c0c6257a6c6717
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Fri 2007-03-16 11:21:10 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.54.1.5
merged: abentley at panoramicfeedback.com-20070316151629-g2p2eyd85juh3a9k
parent: abentley at panoramicfeedback.com-20070316151440-kwqaumvxjcyiurv2
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Fri 2007-03-16 11:16:29 -0400
message:
cleanup
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.54.1.4
merged: abentley at panoramicfeedback.com-20070316151440-kwqaumvxjcyiurv2
parent: abentley at panoramicfeedback.com-20070313182421-cdkkqs8lltdfzr4d
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Fri 2007-03-16 11:14:40 -0400
message:
Change bundle reader and merge directive to both be 'mergeables'
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.54.1.3
merged: abentley at panoramicfeedback.com-20070313182421-cdkkqs8lltdfzr4d
parent: abentley at panoramicfeedback.com-20070313174130-uyqqjc9erz4ej3cd
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Tue 2007-03-13 14:24:21 -0400
message:
Remove unused include
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.54.1.2
merged: abentley at panoramicfeedback.com-20070313174130-uyqqjc9erz4ej3cd
parent: abentley at panoramicfeedback.com-20070313171325-8x3xsmisicrpam53
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Tue 2007-03-13 13:41:30 -0400
message:
Support manual merge from merge directives
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.54.1.1
merged: abentley at panoramicfeedback.com-20070313171325-8x3xsmisicrpam53
parent: abentley at panoramicfeedback.com-20070313165944-pzj5m0xkzjlgnaa2
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Tue 2007-03-13 13:13:25 -0400
message:
Allow pull from a merge directive
------------------------------------------------------------
revno: 2376.1.12
merged: pqm at pqm.ubuntu.com-20070330064022-bdce9356befc3795
parent: pqm at pqm.ubuntu.com-20070329191009-2b533e883212576c
parent: robertc at robertcollins.net-20070330060600-c3p4tucl0q77al2d
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-03-30 07:40:22 +0100
message:
(robertc) Remove the --basis parameter to clone etc. (Robert Collins)
------------------------------------------------------------
revno: 2376.1.11.1.2
merged: robertc at robertcollins.net-20070330060600-c3p4tucl0q77al2d
parent: robertc at robertcollins.net-20070330023636-v6k82rwz5isl6k3a
committer: Robert Collins <robertc at robertcollins.net>
branch nick: unbasis
timestamp: Fri 2007-03-30 16:06:00 +1000
message:
Mention fixed bugs as per reviewer feedback.
------------------------------------------------------------
revno: 2376.1.11.1.1
merged: robertc at robertcollins.net-20070330023636-v6k82rwz5isl6k3a
parent: pqm at pqm.ubuntu.com-20070329191009-2b533e883212576c
committer: Robert Collins <robertc at robertcollins.net>
branch nick: unbasis
timestamp: Fri 2007-03-30 12:36:36 +1000
message:
Remove the --basis parameter to clone etc. (Robert Collins)
------------------------------------------------------------
revno: 2376.1.11
merged: pqm at pqm.ubuntu.com-20070329191009-2b533e883212576c
parent: pqm at pqm.ubuntu.com-20070329173056-ace36f6e5a0e3b1c
parent: john at arbash-meinel.com-20070329184742-npx69aia97o6qc0v
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-03-29 20:10:09 +0100
message:
(Robert Widhopf-Fenk, bug #98591) Remove '--verbose' flag from 'bzr bundle'
------------------------------------------------------------
revno: 2376.1.3.5.2
merged: john at arbash-meinel.com-20070329184742-npx69aia97o6qc0v
parent: john at arbash-meinel.com-20070329140749-8pb42n6lu0k96z3y
parent: pqm at pqm.ubuntu.com-20070329173056-ace36f6e5a0e3b1c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: remove_bundle_verbose
timestamp: Thu 2007-03-29 13:47:42 -0500
message:
[merge] bzr.dev 2386
------------------------------------------------------------
revno: 2376.1.3.5.1
merged: john at arbash-meinel.com-20070329140749-8pb42n6lu0k96z3y
parent: pqm at pqm.ubuntu.com-20070327081802-271be0d343108f4f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: remove_bundle_verbose
timestamp: Thu 2007-03-29 09:07:49 -0500
message:
(Robert Widhopf-Fenk, bug #98591) Remove --verbose flag from 'bzr bundle'.
The old changeset code used to use --verbose to change the output format slightly.
By making a rename pair be a full delete + add. But it is no longer used, and
is not even a parameter for run() anymore.
------------------------------------------------------------
revno: 2376.1.10
merged: pqm at pqm.ubuntu.com-20070329173056-ace36f6e5a0e3b1c
parent: pqm at pqm.ubuntu.com-20070329142155-a485b446dd1ae203
parent: john at arbash-meinel.com-20070329162349-3g8dxtgpbrzlqir0
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-03-29 18:30:56 +0100
message:
(John Arbash Meinel) Make it clearer what to do if you have a (very) old branch.
------------------------------------------------------------
revno: 2376.1.3.4.1
merged: john at arbash-meinel.com-20070329162349-3g8dxtgpbrzlqir0
parent: pqm at pqm.ubuntu.com-20070327081802-271be0d343108f4f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: unsupported_formats
timestamp: Thu 2007-03-29 11:23:49 -0500
message:
(John Arbash Meinel) Make it clearer what to do if you have a (very) old branch.
------------------------------------------------------------
revno: 2376.1.9
merged: pqm at pqm.ubuntu.com-20070329142155-a485b446dd1ae203
parent: pqm at pqm.ubuntu.com-20070329064515-7bfc20fbcf9cf1a7
parent: john at arbash-meinel.com-20070329140138-md8j2y6tm6g43xuc
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-03-29 15:21:55 +0100
message:
(John Arbash Meinel) A couple of OS Lock fixes.
------------------------------------------------------------
revno: 2376.1.3.3.1
merged: john at arbash-meinel.com-20070329140138-md8j2y6tm6g43xuc
parent: pqm at pqm.ubuntu.com-20070327081802-271be0d343108f4f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking_0_16_errors
timestamp: Thu 2007-03-29 09:01:38 -0500
message:
Cherry-pick the 2 locking fixes from the 0.15 branch.
------------------------------------------------------------
revno: 2376.1.8
merged: pqm at pqm.ubuntu.com-20070329064515-7bfc20fbcf9cf1a7
parent: pqm at pqm.ubuntu.com-20070329043540-952aff23533c1c26
parent: robertc at robertcollins.net-20070329062419-opz8c5abjdxxakg6
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-03-29 07:45:15 +0100
message:
(robertc) Ensure that all Repository formats declare their require attributes. (Robert Collins)
------------------------------------------------------------
revno: 2376.1.5.2.2
merged: robertc at robertcollins.net-20070329062419-opz8c5abjdxxakg6
parent: robertc at robertcollins.net-20070329013644-wajruf79j3we0iu8
parent: pqm at pqm.ubuntu.com-20070329043540-952aff23533c1c26
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2007-03-29 16:24:19 +1000
message:
(robertc) Ensure that all Repository formats declare their require attributes. (Robert Collins)
------------------------------------------------------------
revno: 2376.1.5.2.1
merged: robertc at robertcollins.net-20070329013644-wajruf79j3we0iu8
parent: pqm at pqm.ubuntu.com-20070328065822-999550a858a3ced3
committer: Robert Collins <robertc at robertcollins.net>
branch nick: format-attributes
timestamp: Thu 2007-03-29 11:36:44 +1000
message:
Ensure that all Repository formats declare their require attributes. (Robert Collins)
------------------------------------------------------------
revno: 2376.1.7
merged: pqm at pqm.ubuntu.com-20070329043540-952aff23533c1c26
parent: pqm at pqm.ubuntu.com-20070329014424-0947dae124353e1f
parent: robertc at robertcollins.net-20070329014154-2syh5qahvcokiq3p
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-03-29 05:35:40 +0100
message:
(robertc) Various test suite changes and cleanups in preparation for the next hpss branch. (Robert Collins, Andrew Bennetts)
------------------------------------------------------------
revno: 2376.1.5.1.4
merged: robertc at robertcollins.net-20070329014154-2syh5qahvcokiq3p
parent: robertc at robertcollins.net-20070328223141-sfyiqllwuimpvj06
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss-test-correctness
timestamp: Thu 2007-03-29 11:41:54 +1000
message:
Unbreak lockdir tests after adding fast lockdir timeouts to the test suite default environment.
------------------------------------------------------------
revno: 2376.1.5.1.3
merged: robertc at robertcollins.net-20070328223141-sfyiqllwuimpvj06
parent: robertc at robertcollins.net-20070328133358-wn7wgnzmb0cjohjk
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss-test-correctness
timestamp: Thu 2007-03-29 08:31:41 +1000
message:
Review feedback.
------------------------------------------------------------
revno: 2376.1.5.1.2
merged: robertc at robertcollins.net-20070328133358-wn7wgnzmb0cjohjk
parent: robertc at robertcollins.net-20070328073307-ni7dcww9b1rf0udp
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss-test-correctness
timestamp: Wed 2007-03-28 23:33:58 +1000
message:
Fixup the test changes made for hpss to be clean and self contained.
------------------------------------------------------------
revno: 2376.1.5.1.1
merged: robertc at robertcollins.net-20070328073307-ni7dcww9b1rf0udp
parent: pqm at pqm.ubuntu.com-20070328065822-999550a858a3ced3
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss-test-correctness
timestamp: Wed 2007-03-28 17:33:07 +1000
message:
Split out hpss test fixes which dont depend on new or altered API's.
------------------------------------------------------------
revno: 2376.1.6
merged: pqm at pqm.ubuntu.com-20070329014424-0947dae124353e1f
parent: pqm at pqm.ubuntu.com-20070328065822-999550a858a3ced3
parent: aaron.bentley at utoronto.ca-20070328232821-x42jbaadrfstx5xe
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-03-29 02:44:24 +0100
message:
deprecate Branch.get_root_id
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.7
merged: aaron.bentley at utoronto.ca-20070328232821-x42jbaadrfstx5xe
parent: aaron.bentley at utoronto.ca-20070328232201-68j4rmrzd4saaenf
parent: pqm at pqm.ubuntu.com-20070328065822-999550a858a3ced3
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2007-03-28 19:28:21 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.6
merged: aaron.bentley at utoronto.ca-20070328232201-68j4rmrzd4saaenf
parent: abentley at panoramicfeedback.com-20070327132624-4v0gvw2iraaov6su
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2007-03-28 19:22:01 -0400
message:
Add NEWS entry
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.5
merged: abentley at panoramicfeedback.com-20070327132624-4v0gvw2iraaov6su
parent: abentley at panoramicfeedback.com-20070327132355-pw9rf1lt8bp1aprk
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-03-27 09:26:24 -0400
message:
Deprecate Branch.get_root_id
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.4
merged: abentley at panoramicfeedback.com-20070327132355-pw9rf1lt8bp1aprk
parent: aaron.bentley at utoronto.ca-20070319070804-om44daawwxu6vi5c
parent: pqm at pqm.ubuntu.com-20070326073003-37941d0fa5a5a6c4
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-03-27 09:23:55 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2376.1.5
merged: pqm at pqm.ubuntu.com-20070328065822-999550a858a3ced3
parent: pqm at pqm.ubuntu.com-20070328022809-40aa40f8edf4e502
parent: robertc at robertcollins.net-20070328051901-x5osh1c7fk75ira8
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-03-28 07:58:22 +0100
message:
(robertc) Fix chroot urls to not expose the url of the transport they are protecting, allowing regular url operations to work on them. (Robert Collins, Andrew Bennetts)
------------------------------------------------------------
revno: 2376.1.3.2.3
merged: robertc at robertcollins.net-20070328051901-x5osh1c7fk75ira8
parent: robertc at robertcollins.net-20070328033235-sph663bdtwynteg9
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss-chroot
timestamp: Wed 2007-03-28 15:19:01 +1000
message:
Review feedback.
------------------------------------------------------------
revno: 2376.1.3.2.2
merged: robertc at robertcollins.net-20070328033235-sph663bdtwynteg9
parent: robertc at robertcollins.net-20070328030232-uunyt91y60b584j9
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss-chroot
timestamp: Wed 2007-03-28 13:32:35 +1000
message:
Further test-usability for chroots.
------------------------------------------------------------
revno: 2376.1.3.2.1
merged: robertc at robertcollins.net-20070328030232-uunyt91y60b584j9
parent: pqm at pqm.ubuntu.com-20070327081802-271be0d343108f4f
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss-chroot
timestamp: Wed 2007-03-28 13:02:32 +1000
message:
Rewritten chroot transport that prevents accidental chroot escapes when
using urlutils against the transport's url.
(Robert Collins, Andrew Bennetts)
------------------------------------------------------------
revno: 2376.1.4
merged: pqm at pqm.ubuntu.com-20070328022809-40aa40f8edf4e502
parent: pqm at pqm.ubuntu.com-20070327081802-271be0d343108f4f
parent: robertc at robertcollins.net-20070327214317-2hqvbmbcztm9ycqb
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-03-28 03:28:09 +0100
message:
(robertc) urlutils improvements split out from the hpss branch (Andrew Bennetts, Robert Collins)
------------------------------------------------------------
revno: 2376.1.3.1.1
merged: robertc at robertcollins.net-20070327214317-2hqvbmbcztm9ycqb
parent: pqm at pqm.ubuntu.com-20070327081802-271be0d343108f4f
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss-urlutils
timestamp: Wed 2007-03-28 07:43:17 +1000
message:
urlutils improvements from hpss.
------------------------------------------------------------
revno: 2376.1.3
merged: pqm at pqm.ubuntu.com-20070327081802-271be0d343108f4f
parent: pqm at pqm.ubuntu.com-20070327070037-cd7e6fa939b1d08d
parent: robertc at robertcollins.net-20070327075834-51wgidn6o63h8lqo
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-03-27 09:18:02 +0100
message:
(robertc) Merge bzrlib.strace module which adds support for stracing individual callables from within bzrlib.
------------------------------------------------------------
revno: 2376.1.2.1.1
merged: robertc at robertcollins.net-20070327075834-51wgidn6o63h8lqo
parent: pqm at pqm.ubuntu.com-20070327070037-cd7e6fa939b1d08d
parent: robertc at robertcollins.net-20070327073712-6v27yeyl9unj6p9o
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2007-03-27 17:58:34 +1000
message:
(robertc) Merge bzrlib.strace module which adds support for stracing individual callables from within bzrlib.
------------------------------------------------------------
revno: 2367.1.9
merged: robertc at robertcollins.net-20070327073712-6v27yeyl9unj6p9o
parent: robertc at robertcollins.net-20070327070732-jrx0o1jgqond0xpb
committer: Robert Collins <robertc at robertcollins.net>
branch nick: benchmark-strace
timestamp: Tue 2007-03-27 17:37:12 +1000
message:
Review feedback.
------------------------------------------------------------
revno: 2367.1.8
merged: robertc at robertcollins.net-20070327070732-jrx0o1jgqond0xpb
parent: robertc at robertcollins.net-20070323001831-czc15dtustiat7j7
committer: Robert Collins <robertc at robertcollins.net>
branch nick: benchmark-strace
timestamp: Tue 2007-03-27 17:07:32 +1000
message:
Whitespace.
------------------------------------------------------------
revno: 2367.1.7
merged: robertc at robertcollins.net-20070323001831-czc15dtustiat7j7
parent: robertc at robertcollins.net-20070322214342-58nmsg7pvh6ghc8b
committer: Robert Collins <robertc at robertcollins.net>
branch nick: benchmark-strace
timestamp: Fri 2007-03-23 11:18:31 +1100
message:
Added ``bzrlib.strace.strace`` which will strace a single callable and
return a StraceResult object which contains just the syscalls involved
in running it. (Robert Collins)
------------------------------------------------------------
revno: 2367.1.6
merged: robertc at robertcollins.net-20070322214342-58nmsg7pvh6ghc8b
parent: robertc at robertcollins.net-20070322121903-8sqxzfr5eqvsx5yp
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test-prereqs
timestamp: Fri 2007-03-23 08:43:42 +1100
message:
Allow per-test-fixture feature requirements via 'requireFeature'.(Robert Collins)
------------------------------------------------------------
revno: 2367.1.5
merged: robertc at robertcollins.net-20070322121903-8sqxzfr5eqvsx5yp
parent: robertc at robertcollins.net-20070322105438-gt9qu83u9ml5aubo
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test-prereqs
timestamp: Thu 2007-03-22 23:19:03 +1100
message:
Implement reporting of Unsupported tests in the bzr test result and runner
classes. (Robert Collins)
------------------------------------------------------------
revno: 2367.1.4
merged: robertc at robertcollins.net-20070322105438-gt9qu83u9ml5aubo
parent: robertc at robertcollins.net-20070322100744-96m81fcue8hgsfnd
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test-prereqs
timestamp: Thu 2007-03-22 21:54:38 +1100
message:
Add operating system Feature model to bzrlib.tests to allow writing tests
that can declare their needed dependencies and be cleanly disabled.
------------------------------------------------------------
revno: 2367.1.3
merged: robertc at robertcollins.net-20070322100744-96m81fcue8hgsfnd
parent: robertc at robertcollins.net-20070322090459-q0gjq21qgrj453hf
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test-prereqs
timestamp: Thu 2007-03-22 21:07:44 +1100
message:
Add support for calling addNotSupported on TestResults to bzr TestCase's
when _test_needs_features contains unavailable features. (Robert Collins)
------------------------------------------------------------
revno: 2367.1.2
merged: robertc at robertcollins.net-20070322090459-q0gjq21qgrj453hf
parent: robertc at robertcollins.net-20070321042802-1bxr1t97046woojb
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test-prereqs
timestamp: Thu 2007-03-22 20:04:59 +1100
message:
Some minor cleanups of test code, and implement KnownFailure support as
per http://bazaar-vcs.org/BzrExtendTestSuite. (Robert Collins)
------------------------------------------------------------
revno: 2376.1.2
merged: pqm at pqm.ubuntu.com-20070327070037-cd7e6fa939b1d08d
parent: pqm at pqm.ubuntu.com-20070327061205-24256d9f15f6757d
parent: ian.clatworthy at internode.on.net-20070327003529-dwroi8lgq0nxouov
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-03-27 08:00:37 +0100
message:
(ianc) manual and documentation improvements
------------------------------------------------------------
revno: 2374.1.2
merged: ian.clatworthy at internode.on.net-20070327003529-dwroi8lgq0nxouov
parent: ian.clatworthy at internode.on.net-20070326095949-mbs36oe73rer2l3r
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.quick
timestamp: Tue 2007-03-27 10:35:29 +1000
message:
Improved after feedback from reviewers
------------------------------------------------------------
revno: 2374.1.1
merged: ian.clatworthy at internode.on.net-20070326095949-mbs36oe73rer2l3r
parent: pqm at pqm.ubuntu.com-20070322230820-f8735ba918f51539
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.quick
timestamp: Mon 2007-03-26 19:59:49 +1000
message:
Help and man page fixes
------------------------------------------------------------
revno: 2376.1.1
merged: pqm at pqm.ubuntu.com-20070327061205-24256d9f15f6757d
parent: pqm at pqm.ubuntu.com-20070326073003-37941d0fa5a5a6c4
parent: robertc at robertcollins.net-20070327055302-bvzpk1bmf6jxxpau
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-03-27 07:12:05 +0100
message:
(robertc) Merge 0.8 API removal cleanup.
------------------------------------------------------------
revno: 2376.2.1
merged: robertc at robertcollins.net-20070327055302-bvzpk1bmf6jxxpau
parent: pqm at pqm.ubuntu.com-20070326073003-37941d0fa5a5a6c4
parent: robertc at robertcollins.net-20070321013441-x99h538fq62wwt46
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2007-03-27 15:53:02 +1000
message:
(robertc) Merge 0.8 API removal cleanup.
------------------------------------------------------------
revno: 2367.2.1
merged: robertc at robertcollins.net-20070321013441-x99h538fq62wwt46
parent: pqm at pqm.ubuntu.com-20070320223938-97fdc295a1111e36
committer: Robert Collins <robertc at robertcollins.net>
branch nick: cleanup-0.8
timestamp: Wed 2007-03-21 12:34:41 +1100
message:
Remove bzrlib 0.8 compatability where it was making the code unclear or messy. (Robert Collins)
Diff too large for email (8254 lines, the limit is 1000).
More information about the bazaar-commits
mailing list