Rev 3888: Merge bzr.dev 4157, this breaks a couple per-repository tests. in http://bazaar.launchpad.net/%7Ebzr/bzr/brisbane-core
John Arbash Meinel
john at arbash-meinel.com
Tue Mar 17 20:29:33 GMT 2009
At http://bazaar.launchpad.net/%7Ebzr/bzr/brisbane-core
------------------------------------------------------------
revno: 3888
revision-id: john at arbash-meinel.com-20090317201340-amjnj1wl78iwcxae
parent: john at arbash-meinel.com-20090316213544-fgyr9slbmo3n2arr
parent: pqm at pqm.ubuntu.com-20090317120304-4brn8hqgc79ybdhx
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: brisbane-core
timestamp: Tue 2009-03-17 15:13:40 -0500
message:
Merge bzr.dev 4157, this breaks a couple per-repository tests.
Looks like removing some of the InterRepo optimizers is revealing places
that we haven't fully finished the RemoteRepo api.
added:
bzrlib/help_topics/en/debug-flags.txt debugflags.txt-20090312050229-rdspqbqq4fzbjtpe-1
bzrlib/tests/per_repository/test_refresh_data.py test_refresh_data.py-20090316045630-5sw0ipqwk7rvpn3h-1
doc/en/user-guide/shelving_changes.txt shelving_changes.txt-20090312060214-kfn9smg37syy9kcl-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/debug.py debug.py-20061102062349-vdhrw9qdpck8cl35-1
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/lockable_files.py control_files.py-20051111201905-bb88546e799d669f
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/plugins/netrc_credential_store/tests/test_netrc.py test_netrc.py-20081006090414-vm3or4tz6c9wk2oi-1
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/shelf.py prepare_shelf.py-20081005181341-n74qe6gu1e65ad4v-1
bzrlib/shelf_ui.py shelver.py-20081005210102-33worgzwrtdw0yrm-1
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/smart/request.py request.py-20061108095550-gunadhxmzkdjfeek-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/blackbox/test_ignore.py test_ignore.py-20060703063225-4tm8dc2pa7wwg2t3-1
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_shared_repository.py test_shared_repository.py-20060317053531-ed30c0d79325e483
bzrlib/tests/branch_implementations/test_push.py test_push.py-20070130153159-fhfap8uoifevg30j-1
bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/interrepository_implementations/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
bzrlib/tests/per_repository/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/per_repository/test_fetch.py test_fetch.py-20070814052151-5cxha9slx4c93uog-1
bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/per_repository_reference/__init__.py __init__.py-20080220025549-nnm2s80it1lvcwnc-2
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_commands.py test_command.py-20051019190109-3b17be0f52eaa7a8
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_generate_docs.py test_generate_docs.p-20070102123151-cqctnsrlqwmiljd7-1
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_http_response.py test_http_response.py-20060628233143-950b2a482a32505d
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_osutils_encodings.py test_osutils_encodin-20061226013130-kkp732tpt3lm91vv-1
bzrlib/tests/test_pack.py test_container.py-20070607160755-tr8zc26q18rn0jnb-2
bzrlib/tests/test_progress.py test_progress.py-20060308160359-978c397bc79b7fda
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_shelf.py test_prepare_shelf.p-20081005181341-n74qe6gu1e65ad4v-2
bzrlib/tests/test_shelf_ui.py test_shelf_ui.py-20081027155203-wtcuazg85wp9u4fv-1
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
bzrlib/tests/test_smart_request.py test_smart_request.p-20090211070731-o38wayv3asm25d6a-1
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_symbol_versioning.py test_symbol_versioning.py-20060105104851-51d7722c2018d42b
bzrlib/tests/test_ui.py test_ui.py-20051130162854-458e667a7414af09
bzrlib/tests/test_xml.py test_xml.py-20050905091053-80b45588931a9b35
bzrlib/ui/text.py text.py-20051130153916-2e438cffc8afc478
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/developers/releasing.txt releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
doc/en/user-guide/bzrtools_plugin.txt bzrtools_plugin.txt-20080509065016-cjc90f46407vi9a0-1
doc/en/user-guide/index.txt index.txt-20060622101119-tgwtdci8z769bjb9-2
------------------------------------------------------------
revno: 3735.370.101
revision-id: pqm at pqm.ubuntu.com-20090317120304-4brn8hqgc79ybdhx
parent: pqm at pqm.ubuntu.com-20090317070537-zaud24vjs2szna87
parent: v.ladeuil+lp at free.fr-20090317102828-6uj7yo4ih7syhpm9
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2009-03-17 12:03:04 +0000
message:
(vila) Trivial spelling correction to "bzr missing" documentation
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 3735.488.1
revision-id: v.ladeuil+lp at free.fr-20090317102828-6uj7yo4ih7syhpm9
parent: pqm at pqm.ubuntu.com-20090317070537-zaud24vjs2szna87
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: cleanup.various
timestamp: Tue 2009-03-17 11:28:28 +0100
message:
Trivial spelling correction to "bzr missing" documentation
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 3735.370.100
revision-id: pqm at pqm.ubuntu.com-20090317070537-zaud24vjs2szna87
parent: pqm at pqm.ubuntu.com-20090317061133-6do3bjfp3sptf1pu
parent: robertc at robertcollins.net-20090317061816-5usnnyaoj0e0322t
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2009-03-17 07:05:37 +0000
message:
(robertc) Add client-side streaming from stacked branches (over
bzr:// protocols) when the sort order is compatible with doing
that. (Robert Collins, Andrew Bennetts)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3735.487.2
revision-id: robertc at robertcollins.net-20090317061816-5usnnyaoj0e0322t
parent: robertc at robertcollins.net-20090317030232-y7nhlxwe1i1q3xec
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch.stacked.streams
timestamp: Tue 2009-03-17 17:18:16 +1100
message:
Add streaming from a stacked branch when the sort order is compatible with doing so.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3735.487.1
revision-id: robertc at robertcollins.net-20090317030232-y7nhlxwe1i1q3xec
parent: pqm at pqm.ubuntu.com-20090317005047-1qd1zwlgpc5y8t1i
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch.stacked.streams
timestamp: Tue 2009-03-17 14:02:32 +1100
message:
Add specific tests for fetch streaming in the bzr protocol client.
modified:
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3735.370.99
revision-id: pqm at pqm.ubuntu.com-20090317061133-6do3bjfp3sptf1pu
parent: pqm at pqm.ubuntu.com-20090317023551-f1jm1klbuy1eg4hv
parent: andrew.bennetts at canonical.com-20090317053024-t6nxsi8i5efwpfco
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2009-03-17 06:11:33 +0000
message:
(andrew) Fail tests that subclass bzrlib.tests.TestCase but don't use
its setUp/tearDown.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_commands.py test_command.py-20051019190109-3b17be0f52eaa7a8
bzrlib/tests/test_generate_docs.py test_generate_docs.p-20070102123151-cqctnsrlqwmiljd7-1
bzrlib/tests/test_http_response.py test_http_response.py-20060628233143-950b2a482a32505d
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_osutils_encodings.py test_osutils_encodin-20061226013130-kkp732tpt3lm91vv-1
bzrlib/tests/test_pack.py test_container.py-20070607160755-tr8zc26q18rn0jnb-2
bzrlib/tests/test_progress.py test_progress.py-20060308160359-978c397bc79b7fda
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_symbol_versioning.py test_symbol_versioning.py-20060105104851-51d7722c2018d42b
bzrlib/tests/test_xml.py test_xml.py-20050905091053-80b45588931a9b35
------------------------------------------------------------
revno: 3735.486.5
revision-id: andrew.bennetts at canonical.com-20090317053024-t6nxsi8i5efwpfco
parent: andrew.bennetts at canonical.com-20090317052557-t979dms2wk662967
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: test-run-paranoia
timestamp: Tue 2009-03-17 16:30:24 +1100
message:
Tweak assertions based on Robert's review.
modified:
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
------------------------------------------------------------
revno: 3735.486.4
revision-id: andrew.bennetts at canonical.com-20090317052557-t979dms2wk662967
parent: andrew.bennetts at canonical.com-20090317051526-b32we674o5np5hzm
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: test-run-paranoia
timestamp: Tue 2009-03-17 16:25:57 +1100
message:
Add NEWS entry.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3735.486.3
revision-id: andrew.bennetts at canonical.com-20090317051526-b32we674o5np5hzm
parent: andrew.bennetts at canonical.com-20090317030233-u30v9qyztu11cjh5
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: test-run-paranoia
timestamp: Tue 2009-03-17 16:15:26 +1100
message:
Check that bzrlib.tests.TestCase.tearDown is called too.
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
------------------------------------------------------------
revno: 3735.486.2
revision-id: andrew.bennetts at canonical.com-20090317030233-u30v9qyztu11cjh5
parent: andrew.bennetts at canonical.com-20090317020659-eq1894sj8hziwnsm
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: test-run-paranoia
timestamp: Tue 2009-03-17 14:02:33 +1100
message:
Add missing TestCase.setUp upcalls.
modified:
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_commands.py test_command.py-20051019190109-3b17be0f52eaa7a8
bzrlib/tests/test_generate_docs.py test_generate_docs.p-20070102123151-cqctnsrlqwmiljd7-1
bzrlib/tests/test_http_response.py test_http_response.py-20060628233143-950b2a482a32505d
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_osutils_encodings.py test_osutils_encodin-20061226013130-kkp732tpt3lm91vv-1
bzrlib/tests/test_pack.py test_container.py-20070607160755-tr8zc26q18rn0jnb-2
bzrlib/tests/test_progress.py test_progress.py-20060308160359-978c397bc79b7fda
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_symbol_versioning.py test_symbol_versioning.py-20060105104851-51d7722c2018d42b
bzrlib/tests/test_xml.py test_xml.py-20050905091053-80b45588931a9b35
------------------------------------------------------------
revno: 3735.486.1
revision-id: andrew.bennetts at canonical.com-20090317020659-eq1894sj8hziwnsm
parent: pqm at pqm.ubuntu.com-20090317013621-d8sbugz1b1jrmzjk
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: test-run-paranoia
timestamp: Tue 2009-03-17 13:06:59 +1100
message:
Check that TestCase.setUp was called in TestCase.run. If not, fail the test.
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
------------------------------------------------------------
revno: 3735.370.98
revision-id: pqm at pqm.ubuntu.com-20090317023551-f1jm1klbuy1eg4hv
parent: pqm at pqm.ubuntu.com-20090317013621-d8sbugz1b1jrmzjk
parent: andrew.bennetts at canonical.com-20090317013115-bp6jn12nhzhj3ww8
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2009-03-17 02:35:51 +0000
message:
(andrew) Remove InterPackToRemotePack too.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 3735.477.12
revision-id: andrew.bennetts at canonical.com-20090317013115-bp6jn12nhzhj3ww8
parent: andrew.bennetts at canonical.com-20090317012851-xst9bpei4j066v5q
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: simplify-interrepo-stack
timestamp: Tue 2009-03-17 12:31:15 +1100
message:
Remove target_get_graph and target_get_parent_map attributes from InterRepository; nothing overrides them anymore.
modified:
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 3735.477.11
revision-id: andrew.bennetts at canonical.com-20090317012851-xst9bpei4j066v5q
parent: andrew.bennetts at canonical.com-20090317004445-2ya4gfeavitj0np8
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: simplify-interrepo-stack
timestamp: Tue 2009-03-17 12:28:51 +1100
message:
Remove InterPackToRemotePack too.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 3735.370.97
revision-id: pqm at pqm.ubuntu.com-20090317013621-d8sbugz1b1jrmzjk
parent: pqm at pqm.ubuntu.com-20090317005047-1qd1zwlgpc5y8t1i
parent: andrew.bennetts at canonical.com-20090317004445-2ya4gfeavitj0np8
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2009-03-17 01:36:21 +0000
message:
(andrew) Remove InterRemoteToOther and InterOtherToRemote.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/branch_implementations/test_push.py test_push.py-20070130153159-fhfap8uoifevg30j-1
------------------------------------------------------------
revno: 3735.477.10
revision-id: andrew.bennetts at canonical.com-20090317004445-2ya4gfeavitj0np8
parent: andrew.bennetts at canonical.com-20090316112049-8ukpfaqacjhh2j44
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: simplify-interrepo-stack
timestamp: Tue 2009-03-17 11:44:45 +1100
message:
Add NEWS entry.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3735.477.9
revision-id: andrew.bennetts at canonical.com-20090316112049-8ukpfaqacjhh2j44
parent: andrew.bennetts at canonical.com-20090316103301-407rqwjck4p7b6l8
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: simplify-interrepo-stack
timestamp: Mon 2009-03-16 22:20:49 +1100
message:
Remove InterRemoteToOther.
modified:
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 3735.477.8
revision-id: andrew.bennetts at canonical.com-20090316103301-407rqwjck4p7b6l8
parent: andrew.bennetts at canonical.com-20090316084238-s61dh1n6nx6k6l8p
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: simplify-interrepo-stack
timestamp: Mon 2009-03-16 21:33:01 +1100
message:
Fix disableOptimisticGetParentMap for removed InterOtherToRemote.
modified:
bzrlib/tests/branch_implementations/test_push.py test_push.py-20070130153159-fhfap8uoifevg30j-1
------------------------------------------------------------
revno: 3735.477.7
revision-id: andrew.bennetts at canonical.com-20090316084238-s61dh1n6nx6k6l8p
parent: andrew.bennetts at canonical.com-20090316084220-6pkwzgau9uf4ijqv
parent: pqm at pqm.ubuntu.com-20090316082629-xuzqut3b3ur5bn3b
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: simplify-interrepo-stack
timestamp: Mon 2009-03-16 19:42:38 +1100
message:
Merge from bzr.dev.
added:
bzrlib/tests/per_repository/test_refresh_data.py test_refresh_data.py-20090316045630-5sw0ipqwk7rvpn3h-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/lockable_files.py control_files.py-20051111201905-bb88546e799d669f
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_shared_repository.py test_shared_repository.py-20060317053531-ed30c0d79325e483
bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
bzrlib/tests/per_repository/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/per_repository/test_fetch.py test_fetch.py-20070814052151-5cxha9slx4c93uog-1
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
------------------------------------------------------------
revno: 3735.477.6
revision-id: andrew.bennetts at canonical.com-20090316084220-6pkwzgau9uf4ijqv
parent: andrew.bennetts at canonical.com-20090316055842-6jmbqwy3q4apljtn
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: simplify-interrepo-stack
timestamp: Mon 2009-03-16 19:42:20 +1100
message:
Remove InterOtherToRemote.
modified:
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 3735.370.96
revision-id: pqm at pqm.ubuntu.com-20090317005047-1qd1zwlgpc5y8t1i
parent: pqm at pqm.ubuntu.com-20090316232437-0hj1iw4cedo312l3
parent: mbp at sourcefrog.net-20090303002910-i94np5zftoj4c7vv
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2009-03-17 00:50:47 +0000
message:
(mbp) small doc corrections
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
doc/developers/releasing.txt releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
------------------------------------------------------------
revno: 3735.485.2
revision-id: mbp at sourcefrog.net-20090303002910-i94np5zftoj4c7vv
parent: mbp at sourcefrog.net-20090303002754-3eezfty73azm8hm4
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Tue 2009-03-03 11:29:10 +1100
message:
doc to maintain bzr/current branch
modified:
doc/developers/releasing.txt releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
------------------------------------------------------------
revno: 3735.485.1
revision-id: mbp at sourcefrog.net-20090303002754-3eezfty73azm8hm4
parent: pqm at pqm.ubuntu.com-20090302155409-89pygn9tisbc0lir
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Tue 2009-03-03 11:27:54 +1100
message:
Fix mislabelled NEWS entry
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3735.370.95
revision-id: pqm at pqm.ubuntu.com-20090316232437-0hj1iw4cedo312l3
parent: pqm at pqm.ubuntu.com-20090316131816-p0a3ugbpmbqm3a04
parent: ian.clatworthy at canonical.com-20090316222206-xgiuko42s5bui64z
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2009-03-16 23:24:37 +0000
message:
faster check (Ian Clatworthy)
modified:
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 3735.484.1
revision-id: ian.clatworthy at canonical.com-20090316222206-xgiuko42s5bui64z
parent: pqm at pqm.ubuntu.com-20090316131816-p0a3ugbpmbqm3a04
parent: ian.clatworthy at canonical.com-20090316131644-r7kevoidcxw30i8d
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: ianc-integration
timestamp: Tue 2009-03-17 08:22:06 +1000
message:
faster check (Ian Clatworthy)
modified:
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 3735.483.1
revision-id: ian.clatworthy at canonical.com-20090316131644-r7kevoidcxw30i8d
parent: pqm at pqm.ubuntu.com-20090316024046-58qc87pfdgu2ugok
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.faster-check
timestamp: Mon 2009-03-16 23:16:44 +1000
message:
faster check
modified:
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 3735.370.94
revision-id: pqm at pqm.ubuntu.com-20090316131816-p0a3ugbpmbqm3a04
parent: pqm at pqm.ubuntu.com-20090316082629-xuzqut3b3ur5bn3b
parent: v.ladeuil+lp at free.fr-20090316123531-9r9dk2awewft7efi
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2009-03-16 13:18:16 +0000
message:
(vila,
jfroy) Provides all request parameters to authentication providers
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/plugins/netrc_credential_store/tests/test_netrc.py test_netrc.py-20081006090414-vm3or4tz6c9wk2oi-1
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
------------------------------------------------------------
revno: 3735.482.1
revision-id: v.ladeuil+lp at free.fr-20090316123531-9r9dk2awewft7efi
parent: pqm at pqm.ubuntu.com-20090316082629-xuzqut3b3ur5bn3b
parent: v.ladeuil+lp at free.fr-20090313041051-ese5rdqlno7ybped
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.integration
timestamp: Mon 2009-03-16 13:35:31 +0100
message:
Provides all request parameters to authentication providers
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/plugins/netrc_credential_store/tests/test_netrc.py test_netrc.py-20081006090414-vm3or4tz6c9wk2oi-1
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
------------------------------------------------------------
revno: 3735.480.12
revision-id: v.ladeuil+lp at free.fr-20090313041051-ese5rdqlno7ybped
parent: jeanfrancois at apple.com-20090313030033-sznp7sfhpc869php
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: authconfig-provider
timestamp: Fri 2009-03-13 14:10:51 +1000
message:
Easier patched than said :)
* bzrlib/plugins/netrc_credential_store/tests/test_netrc.py:
Fix cStringIO import.
(TestNetrcCS.test_get_netrc_credentials_via_auth_config): Create
the AuthenticationConfig locally.
modified:
bzrlib/plugins/netrc_credential_store/tests/test_netrc.py test_netrc.py-20081006090414-vm3or4tz6c9wk2oi-1
------------------------------------------------------------
revno: 3735.480.11
revision-id: jeanfrancois at apple.com-20090313030033-sznp7sfhpc869php
parent: jeanfrancois at apple.com-20090313030028-whrbh7zc4657owyx
parent: jeanfrancois at apple.com-20090313025946-m9yr79l1bdlawb3w
committer: Jean-Francois Roy <jeanfrancois at apple.com>
branch nick: authconfig-provider-fix
timestamp: Thu 2009-03-12 20:00:33 -0700
message:
Merge from netrc AuthenticationConfig test branch.
modified:
bzrlib/plugins/netrc_credential_store/tests/test_netrc.py test_netrc.py-20081006090414-vm3or4tz6c9wk2oi-1
------------------------------------------------------------
revno: 3735.481.2
revision-id: jeanfrancois at apple.com-20090313025946-m9yr79l1bdlawb3w
parent: jeanfrancois at apple.com-20090313025837-r0e28h6xczqvr9ny
committer: Jean-Francois Roy <jeanfrancois at apple.com>
branch nick: netrc-tests-fix
timestamp: Thu 2009-03-12 19:59:46 -0700
message:
Use assertEquals, not assertIs in test_get_credentials.
modified:
bzrlib/plugins/netrc_credential_store/tests/test_netrc.py test_netrc.py-20081006090414-vm3or4tz6c9wk2oi-1
------------------------------------------------------------
revno: 3735.480.10
revision-id: jeanfrancois at apple.com-20090313030028-whrbh7zc4657owyx
parent: jeanfrancois at apple.com-20090313024549-izyvizmriham3g30
parent: jeanfrancois at apple.com-20090313025837-r0e28h6xczqvr9ny
committer: Jean-Francois Roy <jeanfrancois at apple.com>
branch nick: authconfig-provider-fix
timestamp: Thu 2009-03-12 20:00:28 -0700
message:
Merge from netrc AuthenticationConfig test branch.
modified:
bzrlib/plugins/netrc_credential_store/tests/test_netrc.py test_netrc.py-20081006090414-vm3or4tz6c9wk2oi-1
------------------------------------------------------------
revno: 3735.481.1
revision-id: jeanfrancois at apple.com-20090313025837-r0e28h6xczqvr9ny
parent: pqm at pqm.ubuntu.com-20090312152735-08tf1fguf6b7mpaw
committer: Jean-Francois Roy <jeanfrancois at apple.com>
branch nick: netrc-tests-fix
timestamp: Thu 2009-03-12 19:58:37 -0700
message:
Added new netrc crendential store plug-in test to verify its usage through get_credentials.
modified:
bzrlib/plugins/netrc_credential_store/tests/test_netrc.py test_netrc.py-20081006090414-vm3or4tz6c9wk2oi-1
------------------------------------------------------------
revno: 3735.480.9
revision-id: jeanfrancois at apple.com-20090313024549-izyvizmriham3g30
parent: jeanfrancois at apple.com-20090313024046-80qx69ppgqbhhzoq
committer: Jean-Francois Roy <jeanfrancois at apple.com>
branch nick: authconfig-provider-fix
timestamp: Thu 2009-03-12 19:45:49 -0700
message:
Reverted the chages made to the netrc tests for this patch.
modified:
bzrlib/plugins/netrc_credential_store/tests/test_netrc.py test_netrc.py-20081006090414-vm3or4tz6c9wk2oi-1
------------------------------------------------------------
revno: 3735.480.8
revision-id: jeanfrancois at apple.com-20090313024046-80qx69ppgqbhhzoq
parent: jeanfrancois at apple.com-20090313022839-e9t39iby5sln5s1m
committer: Jean-Francois Roy <jeanfrancois at apple.com>
branch nick: authconfig-provider-fix
timestamp: Thu 2009-03-12 19:40:46 -0700
message:
Updated test_config to account for the new credentials keys.
modified:
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
------------------------------------------------------------
revno: 3735.480.7
revision-id: jeanfrancois at apple.com-20090313022839-e9t39iby5sln5s1m
parent: jeanfrancois at apple.com-20090313020921-p43tex9isioqnrm3
committer: Jean-Francois Roy <jeanfrancois at apple.com>
branch nick: authconfig-provider-fix
timestamp: Thu 2009-03-12 19:28:39 -0700
message:
No longer deleting the extra credentials keys in get_credentials.
modified:
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
------------------------------------------------------------
revno: 3735.480.6
revision-id: jeanfrancois at apple.com-20090313020921-p43tex9isioqnrm3
parent: jeanfrancois at apple.com-20090311171127-1r7957lprlaxwi4e
parent: pqm at pqm.ubuntu.com-20090312152735-08tf1fguf6b7mpaw
committer: Jean-Francois Roy <jeanfrancois at apple.com>
branch nick: authconfig-provider-fix
timestamp: Thu 2009-03-12 19:09:21 -0700
message:
Merged in bzr.dev.
removed:
bzrlib/help_topics/en/hooks.txt hooks.txt-20070830033044-xxu2rced13f72dka-1
added:
tools/check-newsbugs.py checknewsbugs.py-20090128204947-lsdwd8nlswm1yrwv-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/bugtracker.py bugtracker.py-20070410073305-vu1vu1qosjurg8kb-1
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/hooks.py hooks.py-20070325015548-ix4np2q0kd8452au-1
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/lock.py lock.py-20050527050856-ec090bb51bc03349
bzrlib/lockable_files.py control_files.py-20051111201905-bb88546e799d669f
bzrlib/lockdir.py lockdir.py-20060220222025-98258adf27fbdda3
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/mail_client.py mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
bzrlib/msgeditor.py msgeditor.py-20050901111708-ef6d8de98f5d8f2f
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
bzrlib/push.py push.py-20080606021927-5fe39050e8xne9un-1
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/registry.py lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/shelf.py prepare_shelf.py-20081005181341-n74qe6gu1e65ad4v-1
bzrlib/shelf_ui.py shelver.py-20081005210102-33worgzwrtdw0yrm-1
bzrlib/smart/client.py client.py-20061116014825-2k6ada6xgulslami-1
bzrlib/smart/server.py server.py-20061110062051-chzu10y32vx8gvur-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_cat.py test_cat.py-20051201162916-f0937e4e19ea24b3
bzrlib/tests/blackbox/test_hooks.py test_hooks.py-20080308163236-xljgf9j41hik1x21-1
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_shelve.py test_ls_shelf.py-20081202053526-thlo8yt0pi1cgor1-1
bzrlib/tests/branch_implementations/test_revision_history.py test_revision_histor-20070326062311-v7co92liyuchb80w-1
bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
bzrlib/tests/interrepository_implementations/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
bzrlib/tests/inventory_implementations/basics.py basics.py-20070903044446-kdjwbiu1p1zi9phs-1
bzrlib/tests/per_repository/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_bugtracker.py test_bugtracker.py-20070410073305-vu1vu1qosjurg8kb-2
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_help.py test_help.py-20070419045354-6q6rq15j9e2n5fna-1
bzrlib/tests/test_hooks.py test_hooks.py-20070628030849-89rtsbe5dmer5npz-1
bzrlib/tests/test_mail_client.py test_mail_client.py-20070809192806-vuxt3t19srtpjpdn-2
bzrlib/tests/test_mutabletree.py test_mutabletree.py-20080405014429-2v0cdi3re320p8db-1
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
bzrlib/tests/test_shelf.py test_prepare_shelf.p-20081005181341-n74qe6gu1e65ad4v-2
bzrlib/tests/test_shelf_ui.py test_shelf_ui.py-20081027155203-wtcuazg85wp9u4fv-1
bzrlib/tests/test_source.py test_source.py-20051207061333-a58dea6abecc030d
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/tree_implementations/test_path_content_summary.py test_path_content_su-20070904100855-3vrwedz6akn34kl5-1
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/ui/text.py text.py-20051130153916-2e438cffc8afc478
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
doc/developers/releasing.txt releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
------------------------------------------------------------
revno: 3735.480.5
revision-id: jeanfrancois at apple.com-20090311171127-1r7957lprlaxwi4e
parent: jeanfrancois at apple.com-20090310182355-rz00psthdhtbllsi
parent: pqm at pqm.ubuntu.com-20090311110102-y233cktxicmatxjc
committer: Jean-Francois Roy <jeanfrancois at apple.com>
branch nick: authconfig-provider-fix
timestamp: Wed 2009-03-11 10:11:27 -0700
message:
Merged in bzr.dev.
added:
bzrlib/tests/per_repository_reference/test_default_stacking.py test_default_stackin-20090311055345-9ajahgm58oq3wh6h-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/_dirstate_helpers_c.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
bzrlib/bugtracker.py bugtracker.py-20070410073305-vu1vu1qosjurg8kb-1
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/lock.py lock.py-20050527050856-ec090bb51bc03349
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
bzrlib/tests/per_repository_reference/__init__.py __init__.py-20080220025549-nnm2s80it1lvcwnc-2
bzrlib/tests/test__dirstate_helpers.py test_dirstate_helper-20070504035751-jsbn00xodv0y1eve-2
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_urlutils.py test_urlutils.py-20060502192900-46b1f9579987cf9c
bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
bzrlib/tests/workingtree_implementations/test_mkdir.py test_mkdir.py-20060907214856-4omn6hf1u7fvrart-3
bzrlib/tests/workingtree_implementations/test_nested_specifics.py test_nested_specific-20070306004443-qut978c488jr11sg-1
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/urlutils.py urlutils.py-20060502195429-e8a161ecf8fac004
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 3735.480.4
revision-id: jeanfrancois at apple.com-20090310182355-rz00psthdhtbllsi
parent: jeanfrancois at apple.com-20090310182120-s8hydao03ze9x6fh
committer: Jean-Francois Roy <jeanfrancois at apple.com>
branch nick: authconfig-provider-fix
timestamp: Tue 2009-03-10 11:23:55 -0700
message:
Rephrased the NEWS entry.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3735.480.3
revision-id: jeanfrancois at apple.com-20090310182120-s8hydao03ze9x6fh
parent: jeanfrancois at apple.com-20090310181339-l1sz361kcxdu5kb0
committer: Jean-Francois Roy <jeanfrancois at apple.com>
branch nick: authconfig-provider-fix
timestamp: Tue 2009-03-10 11:21:20 -0700
message:
Updated the test_default_password_without_user to access the netrc credential store directly.
modified:
bzrlib/plugins/netrc_credential_store/tests/test_netrc.py test_netrc.py-20081006090414-vm3or4tz6c9wk2oi-1
------------------------------------------------------------
revno: 3735.480.2
revision-id: jeanfrancois at apple.com-20090310181339-l1sz361kcxdu5kb0
parent: jeanfrancois at apple.com-20090310172317-o0s7ns2ccidyhhfb
committer: Jean-Francois Roy <jeanfrancois at apple.com>
branch nick: authconfig-provider-fix
timestamp: Tue 2009-03-10 11:13:39 -0700
message:
Modified the netrc credential store plug-in to use an AuthenticationConfig object.
modified:
bzrlib/plugins/netrc_credential_store/tests/test_netrc.py test_netrc.py-20081006090414-vm3or4tz6c9wk2oi-1
------------------------------------------------------------
revno: 3735.480.1
revision-id: jeanfrancois at apple.com-20090310172317-o0s7ns2ccidyhhfb
parent: pqm at pqm.ubuntu.com-20090310095511-627bx4kwirxdx12y
parent: jeanfrancois at apple.com-20090305182858-nrej0ki105629d3u
committer: Jean-Francois Roy <jeanfrancois at apple.com>
branch nick: authconfig-provider-fix
timestamp: Tue 2009-03-10 10:23:17 -0700
message:
Merged patch with bzr.dev.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
------------------------------------------------------------
revno: 3735.479.2
revision-id: jeanfrancois at apple.com-20090305182858-nrej0ki105629d3u
parent: jeanfrancois at apple.com-20090305181554-0uw591glkcd9evv2
committer: Jean-Francois Roy <jeanfrancois at apple.com>
branch nick: bzr.dev
timestamp: Thu 2009-03-05 10:28:58 -0800
message:
Updated the NEWS file with notes about the fixes to AuthenticationConfig.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3735.479.1
revision-id: jeanfrancois at apple.com-20090305181554-0uw591glkcd9evv2
parent: pqm at pqm.ubuntu.com-20090305091217-h813qd8f83wghtpr
committer: Jean-Francois Roy <jeanfrancois at apple.com>
branch nick: bzr.dev
timestamp: Thu 2009-03-05 10:15:54 -0800
message:
A 'realm' optional argument was added to the get_credentials and set_credentials
methods of the AuthenticationConfig class to provide that information to
credential providers which may require it. In addition, additional keys
are included in the credentials dictionary passed to credential
providers to match the expectations of credential providers
as determined by existing tests.
modified:
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
------------------------------------------------------------
revno: 3735.370.93
revision-id: pqm at pqm.ubuntu.com-20090316082629-xuzqut3b3ur5bn3b
parent: pqm at pqm.ubuntu.com-20090316065136-1g3udxbvvlgtsbup
parent: robertc at robertcollins.net-20090316074405-t9guvf13rj4mlhuk
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2009-03-16 08:26:29 +0000
message:
(robertc) Add a new repository method refresh_data to allow clean
handling of _real_repositories after inserting a stream via the
smart server. (Robert Collins, Andrew Bennetts)
added:
bzrlib/tests/per_repository/test_refresh_data.py test_refresh_data.py-20090316045630-5sw0ipqwk7rvpn3h-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/lockable_files.py control_files.py-20051111201905-bb88546e799d669f
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_shared_repository.py test_shared_repository.py-20060317053531-ed30c0d79325e483
bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
bzrlib/tests/per_repository/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/per_repository/test_fetch.py test_fetch.py-20070814052151-5cxha9slx4c93uog-1
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
------------------------------------------------------------
revno: 3735.478.6
revision-id: robertc at robertcollins.net-20090316074405-t9guvf13rj4mlhuk
parent: robertc at robertcollins.net-20090316055532-n2i9etfgbf8sd13y
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Mon 2009-03-16 18:44:05 +1100
message:
More test fallout, but all caught now.
modified:
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
------------------------------------------------------------
revno: 3735.478.5
revision-id: robertc at robertcollins.net-20090316055532-n2i9etfgbf8sd13y
parent: robertc at robertcollins.net-20090316053331-84t8k9hv0xw7kak4
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Mon 2009-03-16 16:55:32 +1100
message:
More fixes from grabbing the Repository implementation of fetch for RemoteRepository.
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
------------------------------------------------------------
revno: 3735.478.4
revision-id: robertc at robertcollins.net-20090316053331-84t8k9hv0xw7kak4
parent: robertc at robertcollins.net-20090316050819-unhkpvsvu3mzaore
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Mon 2009-03-16 16:33:31 +1100
message:
Prevent regression to overhead of lock_read on pack repositories.
modified:
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_shared_repository.py test_shared_repository.py-20060317053531-ed30c0d79325e483
------------------------------------------------------------
revno: 3735.478.3
revision-id: robertc at robertcollins.net-20090316050819-unhkpvsvu3mzaore
parent: robertc at robertcollins.net-20090316050552-hqcgx49ugew0facc
parent: pqm at pqm.ubuntu.com-20090316041621-taek91nogxt42bfy
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository.refresh_data
timestamp: Mon 2009-03-16 16:08:19 +1100
message:
NEWS conflicts.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
------------------------------------------------------------
revno: 3735.478.2
revision-id: robertc at robertcollins.net-20090316050552-hqcgx49ugew0facc
parent: robertc at robertcollins.net-20090316033405-wpq3do6shludp1bh
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository.refresh_data
timestamp: Mon 2009-03-16 16:05:52 +1100
message:
Add a refresh_data method on Repository allowing cleaner handling of insertions into RemoteRepository objects with _real_repository instances.
added:
bzrlib/tests/per_repository/test_refresh_data.py test_refresh_data.py-20090316045630-5sw0ipqwk7rvpn3h-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/lockable_files.py control_files.py-20051111201905-bb88546e799d669f
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
bzrlib/tests/per_repository/__init__.py __init__.py-20060131092037-9564957a7d4a841b
------------------------------------------------------------
revno: 3735.478.1
revision-id: robertc at robertcollins.net-20090316033405-wpq3do6shludp1bh
parent: pqm at pqm.ubuntu.com-20090316024046-58qc87pfdgu2ugok
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository.refresh_data
timestamp: Mon 2009-03-16 14:34:05 +1100
message:
Explicitly prevent fetching while the target repository is in a write group.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/per_repository/test_fetch.py test_fetch.py-20070814052151-5cxha9slx4c93uog-1
------------------------------------------------------------
revno: 3735.370.92
revision-id: pqm at pqm.ubuntu.com-20090316065136-1g3udxbvvlgtsbup
parent: pqm at pqm.ubuntu.com-20090316041621-taek91nogxt42bfy
parent: andrew.bennetts at canonical.com-20090316055842-6jmbqwy3q4apljtn
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2009-03-16 06:51:36 +0000
message:
(andrew) Add RPC that can insert a stream into older (i.e. lockable)
repository formats.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/smart/request.py request.py-20061108095550-gunadhxmzkdjfeek-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
bzrlib/tests/test_smart_request.py test_smart_request.p-20090211070731-o38wayv3asm25d6a-1
------------------------------------------------------------
revno: 3735.477.5
revision-id: andrew.bennetts at canonical.com-20090316055842-6jmbqwy3q4apljtn
parent: andrew.bennetts at canonical.com-20090316055832-fn87u872p0kctjrt
parent: pqm at pqm.ubuntu.com-20090316041621-taek91nogxt42bfy
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: simplify-interrepo-stack
timestamp: Mon 2009-03-16 16:58:42 +1100
message:
Merge from bzr.dev
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
------------------------------------------------------------
revno: 3735.477.4
revision-id: andrew.bennetts at canonical.com-20090316055832-fn87u872p0kctjrt
parent: andrew.bennetts at canonical.com-20090316055542-8dpb2i3xvmairepn
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: simplify-interrepo-stack
timestamp: Mon 2009-03-16 16:58:32 +1100
message:
Add NEWS entry.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3735.477.3
revision-id: andrew.bennetts at canonical.com-20090316055542-8dpb2i3xvmairepn
parent: andrew.bennetts at canonical.com-20090316054753-0mfo07r21tsjl5p0
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: simplify-interrepo-stack
timestamp: Mon 2009-03-16 16:55:42 +1100
message:
Tweaks based on review from Robert.
modified:
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3735.477.2
revision-id: andrew.bennetts at canonical.com-20090316054753-0mfo07r21tsjl5p0
parent: andrew.bennetts at canonical.com-20090316044809-0bsw43pof8fq7byl
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: simplify-interrepo-stack
timestamp: Mon 2009-03-16 16:47:53 +1100
message:
Use Repository.insert_stream_locked if there is a lock_token for the remote repo.
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3735.477.1
revision-id: andrew.bennetts at canonical.com-20090316044809-0bsw43pof8fq7byl
parent: andrew.bennetts at canonical.com-20090316022525-49vw2o0on4foz3u0
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: simplify-interrepo-stack
timestamp: Mon 2009-03-16 15:48:09 +1100
message:
Add Repository.insert_stream_locked server-side implementation, plus tests for server-side _translate_error.
modified:
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/smart/request.py request.py-20061108095550-gunadhxmzkdjfeek-1
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
bzrlib/tests/test_smart_request.py test_smart_request.p-20090211070731-o38wayv3asm25d6a-1
------------------------------------------------------------
revno: 3735.370.91
revision-id: pqm at pqm.ubuntu.com-20090316041621-taek91nogxt42bfy
parent: pqm at pqm.ubuntu.com-20090316033045-cs5dvs2r9xjmqirh
parent: andrew.bennetts at canonical.com-20090316033534-po2sxdg6k6cr3mxf
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2009-03-16 04:16:21 +0000
message:
(andrew) Always batch in _walk_to_common_revisions,
rather than special-casing RemoteRepository.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 3735.476.3
revision-id: andrew.bennetts at canonical.com-20090316033534-po2sxdg6k6cr3mxf
parent: andrew.bennetts at canonical.com-20090316022525-49vw2o0on4foz3u0
parent: pqm at pqm.ubuntu.com-20090316033045-cs5dvs2r9xjmqirh
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: batch-walk-to-common-always
timestamp: Mon 2009-03-16 14:35:34 +1100
message:
Merge from bzr.dev, resolving NEWS conflict.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
------------------------------------------------------------
revno: 3735.476.2
revision-id: andrew.bennetts at canonical.com-20090316022525-49vw2o0on4foz3u0
parent: andrew.bennetts at canonical.com-20090316022104-ed132jdzbpwi5k3p
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: batch-walk-to-common-always
timestamp: Mon 2009-03-16 13:25:25 +1100
message:
Add NEWS entry.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3735.476.1
revision-id: andrew.bennetts at canonical.com-20090316022104-ed132jdzbpwi5k3p
parent: pqm at pqm.ubuntu.com-20090313062142-ndr3o27uwgysx9dv
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: batch-walk-to-common-always
timestamp: Mon 2009-03-16 13:21:04 +1100
message:
Always batch revisions to ask of target when doing _walk_to_common_revisions, rather than special-casing in Inter*Remote*.
modified:
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 3735.370.90
revision-id: pqm at pqm.ubuntu.com-20090316033045-cs5dvs2r9xjmqirh
parent: pqm at pqm.ubuntu.com-20090316024046-58qc87pfdgu2ugok
parent: robertc at robertcollins.net-20090313064625-ufwahhop77x1v139
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2009-03-16 03:30:45 +0000
message:
(robertc) Fix a regression in merge where --force was ignored.
(Robert Collins)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
------------------------------------------------------------
revno: 3735.475.1
revision-id: robertc at robertcollins.net-20090313064625-ufwahhop77x1v139
parent: pqm at pqm.ubuntu.com-20090313035623-vn0615cs6bd6590e
committer: Robert Collins <robertc at robertcollins.net>
branch nick: merge
timestamp: Fri 2009-03-13 17:46:25 +1100
message:
Make merge --force work again.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
------------------------------------------------------------
revno: 3735.370.89
revision-id: pqm at pqm.ubuntu.com-20090316024046-58qc87pfdgu2ugok
parent: pqm at pqm.ubuntu.com-20090313062142-ndr3o27uwgysx9dv
parent: robertc at robertcollins.net-20090316015618-rnbq60s0w5rr8ta8
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2009-03-16 02:40:46 +0000
message:
(robertc) New assertLength method based on one Martin has squirreled
away somewhere. (Robert Collins, Martin Pool)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
------------------------------------------------------------
revno: 3735.474.1
revision-id: robertc at robertcollins.net-20090316015618-rnbq60s0w5rr8ta8
parent: pqm at pqm.ubuntu.com-20090313062142-ndr3o27uwgysx9dv
committer: Robert Collins <robertc at robertcollins.net>
branch nick: assertLength
timestamp: Mon 2009-03-16 12:56:18 +1100
message:
New assertLength method based on one Martin has squirreled away somewhere.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
------------------------------------------------------------
revno: 3735.370.88
revision-id: pqm at pqm.ubuntu.com-20090313062142-ndr3o27uwgysx9dv
parent: pqm at pqm.ubuntu.com-20090313044136-mvoy4mgr8az583ih
parent: mbp at sourcefrog.net-20090313054003-cfrlg0ybpmzqy29o
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2009-03-13 06:21:42 +0000
message:
(mbp) fetch progress bars, code cleanups, and debug-flags topic
added:
bzrlib/help_topics/en/debug-flags.txt debugflags.txt-20090312050229-rdspqbqq4fzbjtpe-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/debug.py debug.py-20061102062349-vdhrw9qdpck8cl35-1
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/tests/interrepository_implementations/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
bzrlib/tests/per_repository/test_fetch.py test_fetch.py-20070814052151-5cxha9slx4c93uog-1
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_ui.py test_ui.py-20051130162854-458e667a7414af09
bzrlib/ui/text.py text.py-20051130153916-2e438cffc8afc478
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 3735.473.26
revision-id: mbp at sourcefrog.net-20090313054003-cfrlg0ybpmzqy29o
parent: mbp at sourcefrog.net-20090313050550-p1va8dzl8z0y7q9e
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: progress
timestamp: Fri 2009-03-13 15:40:03 +1000
message:
Remove outdated progress bar test
modified:
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
------------------------------------------------------------
revno: 3735.473.25
revision-id: mbp at sourcefrog.net-20090313050550-p1va8dzl8z0y7q9e
parent: mbp at sourcefrog.net-20090313030114-y723gefxl8tfynsd
parent: pqm at pqm.ubuntu.com-20090313044136-mvoy4mgr8az583ih
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: progress
timestamp: Fri 2009-03-13 15:05:50 +1000
message:
merge trunk
added:
doc/en/user-guide/shelving_changes.txt shelving_changes.txt-20090312060214-kfn9smg37syy9kcl-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/shelf.py prepare_shelf.py-20081005181341-n74qe6gu1e65ad4v-1
bzrlib/shelf_ui.py shelver.py-20081005210102-33worgzwrtdw0yrm-1
bzrlib/tests/blackbox/test_ignore.py test_ignore.py-20060703063225-4tm8dc2pa7wwg2t3-1
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/per_repository_reference/__init__.py __init__.py-20080220025549-nnm2s80it1lvcwnc-2
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_shelf.py test_prepare_shelf.p-20081005181341-n74qe6gu1e65ad4v-2
bzrlib/tests/test_shelf_ui.py test_shelf_ui.py-20081027155203-wtcuazg85wp9u4fv-1
doc/en/user-guide/bzrtools_plugin.txt bzrtools_plugin.txt-20080509065016-cjc90f46407vi9a0-1
doc/en/user-guide/index.txt index.txt-20060622101119-tgwtdci8z769bjb9-2
------------------------------------------------------------
revno: 3735.473.24
revision-id: mbp at sourcefrog.net-20090313030114-y723gefxl8tfynsd
parent: mbp at sourcefrog.net-20090313025552-x3i9oc0z3r7q1oco
parent: pqm at pqm.ubuntu.com-20090313010135-3huetgz68wxrhsb3
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: progress
timestamp: Fri 2009-03-13 13:01:14 +1000
message:
merge trunk
removed:
bzrlib/help_topics/en/hooks.txt hooks.txt-20070830033044-xxu2rced13f72dka-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/bugtracker.py bugtracker.py-20070410073305-vu1vu1qosjurg8kb-1
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/hooks.py hooks.py-20070325015548-ix4np2q0kd8452au-1
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/lock.py lock.py-20050527050856-ec090bb51bc03349
bzrlib/lockdir.py lockdir.py-20060220222025-98258adf27fbdda3
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/mail_client.py mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
bzrlib/msgeditor.py msgeditor.py-20050901111708-ef6d8de98f5d8f2f
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
bzrlib/push.py push.py-20080606021927-5fe39050e8xne9un-1
bzrlib/registry.py lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-1
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/shelf.py prepare_shelf.py-20081005181341-n74qe6gu1e65ad4v-1
bzrlib/shelf_ui.py shelver.py-20081005210102-33worgzwrtdw0yrm-1
bzrlib/smart/client.py client.py-20061116014825-2k6ada6xgulslami-1
bzrlib/smart/server.py server.py-20061110062051-chzu10y32vx8gvur-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_cat.py test_cat.py-20051201162916-f0937e4e19ea24b3
bzrlib/tests/blackbox/test_hooks.py test_hooks.py-20080308163236-xljgf9j41hik1x21-1
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_shelve.py test_ls_shelf.py-20081202053526-thlo8yt0pi1cgor1-1
bzrlib/tests/branch_implementations/test_revision_history.py test_revision_histor-20070326062311-v7co92liyuchb80w-1
bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
bzrlib/tests/inventory_implementations/basics.py basics.py-20070903044446-kdjwbiu1p1zi9phs-1
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_bugtracker.py test_bugtracker.py-20070410073305-vu1vu1qosjurg8kb-2
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_help.py test_help.py-20070419045354-6q6rq15j9e2n5fna-1
bzrlib/tests/test_hooks.py test_hooks.py-20070628030849-89rtsbe5dmer5npz-1
bzrlib/tests/test_mail_client.py test_mail_client.py-20070809192806-vuxt3t19srtpjpdn-2
bzrlib/tests/test_mutabletree.py test_mutabletree.py-20080405014429-2v0cdi3re320p8db-1
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
bzrlib/tests/test_shelf.py test_prepare_shelf.p-20081005181341-n74qe6gu1e65ad4v-2
bzrlib/tests/test_shelf_ui.py test_shelf_ui.py-20081027155203-wtcuazg85wp9u4fv-1
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
------------------------------------------------------------
revno: 3735.473.23
revision-id: mbp at sourcefrog.net-20090313025552-x3i9oc0z3r7q1oco
parent: mbp at sourcefrog.net-20090313023626-7xn5siauidkgm1jw
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: progress
timestamp: Fri 2009-03-13 12:55:52 +1000
message:
blackbox hpss test should check repository was remotely locked
modified:
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
------------------------------------------------------------
revno: 3735.473.22
revision-id: mbp at sourcefrog.net-20090313023626-7xn5siauidkgm1jw
parent: mbp at sourcefrog.net-20090313023616-l8brsh92kuzuoq7i
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: progress
timestamp: Fri 2009-03-13 12:36:26 +1000
message:
Re-add mutter calls during fetch
modified:
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
------------------------------------------------------------
revno: 3735.473.21
revision-id: mbp at sourcefrog.net-20090313023616-l8brsh92kuzuoq7i
parent: mbp at sourcefrog.net-20090312080742-j42k53e5vy8vhocs
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: progress
timestamp: Fri 2009-03-13 12:36:16 +1000
message:
Update NEWS
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3735.473.20
revision-id: mbp at sourcefrog.net-20090312080742-j42k53e5vy8vhocs
parent: mbp at sourcefrog.net-20090312072603-2encofaehyg1iplv
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: progress-fetch
timestamp: Thu 2009-03-12 18:07:42 +1000
message:
Developer docs of progress bars
modified:
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 3735.473.19
revision-id: mbp at sourcefrog.net-20090312072603-2encofaehyg1iplv
parent: mbp at sourcefrog.net-20090312071353-usd2dh37dsriuses
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: progress-fetch
timestamp: Thu 2009-03-12 17:26:03 +1000
message:
Transport activity now shows scheme and direction
modified:
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/ui/text.py text.py-20051130153916-2e438cffc8afc478
------------------------------------------------------------
revno: 3735.473.18
revision-id: mbp at sourcefrog.net-20090312071353-usd2dh37dsriuses
parent: mbp at sourcefrog.net-20090312070928-f110be8twil0w4ye
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: progress-fetch
timestamp: Thu 2009-03-12 17:13:53 +1000
message:
Progress bars always repaint when task structure is changed
modified:
bzrlib/tests/test_ui.py test_ui.py-20051130162854-458e667a7414af09
bzrlib/ui/text.py text.py-20051130153916-2e438cffc8afc478
------------------------------------------------------------
revno: 3735.473.17
revision-id: mbp at sourcefrog.net-20090312070928-f110be8twil0w4ye
parent: mbp at sourcefrog.net-20090312065333-h0kotewsx4l52gqs
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: progress-fetch
timestamp: Thu 2009-03-12 17:09:28 +1000
message:
If one ProgressTask has no count, it passes through that of its child
modified:
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
bzrlib/tests/test_ui.py test_ui.py-20051130162854-458e667a7414af09
------------------------------------------------------------
revno: 3735.473.16
revision-id: mbp at sourcefrog.net-20090312065333-h0kotewsx4l52gqs
parent: mbp at sourcefrog.net-20090312064449-mrw7183pcdgospc2
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: progress-fetch
timestamp: Thu 2009-03-12 16:53:33 +1000
message:
Refactor TextProgressView a bit and add another test
modified:
bzrlib/tests/test_ui.py test_ui.py-20051130162854-458e667a7414af09
bzrlib/ui/text.py text.py-20051130153916-2e438cffc8afc478
------------------------------------------------------------
revno: 3735.473.15
revision-id: mbp at sourcefrog.net-20090312064449-mrw7183pcdgospc2
parent: mbp at sourcefrog.net-20090312063647-06u94f77mk52dg7k
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: progress-fetch
timestamp: Thu 2009-03-12 16:44:49 +1000
message:
Fix bug in showing task progress and add a test
modified:
bzrlib/tests/test_ui.py test_ui.py-20051130162854-458e667a7414af09
bzrlib/ui/text.py text.py-20051130153916-2e438cffc8afc478
------------------------------------------------------------
revno: 3735.473.14
revision-id: mbp at sourcefrog.net-20090312063647-06u94f77mk52dg7k
parent: mbp at sourcefrog.net-20090312063625-4lmum7kwqu4syole
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: progress-fetch
timestamp: Thu 2009-03-12 16:36:47 +1000
message:
Small fetch progress tweaks
modified:
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
------------------------------------------------------------
revno: 3735.473.13
revision-id: mbp at sourcefrog.net-20090312063625-4lmum7kwqu4syole
parent: mbp at sourcefrog.net-20090312061200-xit38nboplch5b9b
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: progress-fetch
timestamp: Thu 2009-03-12 16:36:25 +1000
message:
doc
modified:
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
------------------------------------------------------------
revno: 3735.473.12
revision-id: mbp at sourcefrog.net-20090312061200-xit38nboplch5b9b
parent: mbp at sourcefrog.net-20090312054443-rz5kodxh1cjjx2id
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: progress-fetch
timestamp: Thu 2009-03-12 16:12:00 +1000
message:
Add more fetch progress
modified:
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
------------------------------------------------------------
revno: 3735.473.11
revision-id: mbp at sourcefrog.net-20090312054443-rz5kodxh1cjjx2id
parent: mbp at sourcefrog.net-20090312054349-z5wkz6mskostowtg
parent: pqm at pqm.ubuntu.com-20090312052102-ksjfiyd5ctzibuo1
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: progress-fetch
timestamp: Thu 2009-03-12 15:44:43 +1000
message:
merge trunk
added:
bzrlib/tests/per_repository_reference/test_default_stacking.py test_default_stackin-20090311055345-9ajahgm58oq3wh6h-1
tools/check-newsbugs.py checknewsbugs.py-20090128204947-lsdwd8nlswm1yrwv-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/_dirstate_helpers_c.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/hooks.py hooks.py-20070325015548-ix4np2q0kd8452au-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/lock.py lock.py-20050527050856-ec090bb51bc03349
bzrlib/lockable_files.py control_files.py-20051111201905-bb88546e799d669f
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
bzrlib/tests/interrepository_implementations/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
bzrlib/tests/per_repository/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
bzrlib/tests/per_repository_reference/__init__.py __init__.py-20080220025549-nnm2s80it1lvcwnc-2
bzrlib/tests/test__dirstate_helpers.py test_dirstate_helper-20070504035751-jsbn00xodv0y1eve-2
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_hooks.py test_hooks.py-20070628030849-89rtsbe5dmer5npz-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_source.py test_source.py-20051207061333-a58dea6abecc030d
bzrlib/tests/test_urlutils.py test_urlutils.py-20060502192900-46b1f9579987cf9c
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
bzrlib/tests/tree_implementations/test_path_content_summary.py test_path_content_su-20070904100855-3vrwedz6akn34kl5-1
bzrlib/tests/workingtree_implementations/test_mkdir.py test_mkdir.py-20060907214856-4omn6hf1u7fvrart-3
bzrlib/tests/workingtree_implementations/test_nested_specifics.py test_nested_specific-20070306004443-qut978c488jr11sg-1
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/ui/text.py text.py-20051130153916-2e438cffc8afc478
bzrlib/urlutils.py urlutils.py-20060502195429-e8a161ecf8fac004
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/releasing.txt releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
------------------------------------------------------------
revno: 3735.473.10
revision-id: mbp at sourcefrog.net-20090312054349-z5wkz6mskostowtg
parent: mbp at sourcefrog.net-20090312053653-7jx6tuj14xqpnje0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: progress-fetch
timestamp: Thu 2009-03-12 15:43:49 +1000
message:
Tweak iter_lines progress messages
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
------------------------------------------------------------
revno: 3735.473.9
revision-id: mbp at sourcefrog.net-20090312053653-7jx6tuj14xqpnje0
parent: mbp at sourcefrog.net-20090312051213-ix4cu4a315gmemyv
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: progress-fetch
timestamp: Thu 2009-03-12 15:36:53 +1000
message:
Re-add very basic top-level pb for fetch
modified:
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
------------------------------------------------------------
revno: 3735.473.8
revision-id: mbp at sourcefrog.net-20090312051213-ix4cu4a315gmemyv
parent: mbp at sourcefrog.net-20090312051105-ee7vcl1ocgxntxmk
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: progress-fetch
timestamp: Thu 2009-03-12 15:12:13 +1000
message:
Remove stray unguarded mutter call in fetch
modified:
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
------------------------------------------------------------
revno: 3735.473.7
revision-id: mbp at sourcefrog.net-20090312051105-ee7vcl1ocgxntxmk
parent: mbp at sourcefrog.net-20090312045527-7sxtcfa19z518m8h
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: progress-fetch
timestamp: Thu 2009-03-12 15:11:05 +1000
message:
Split debug flags into their own help topic
added:
bzrlib/help_topics/en/debug-flags.txt debugflags.txt-20090312050229-rdspqbqq4fzbjtpe-1
modified:
bzrlib/debug.py debug.py-20061102062349-vdhrw9qdpck8cl35-1
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
------------------------------------------------------------
revno: 3735.473.6
revision-id: mbp at sourcefrog.net-20090312045527-7sxtcfa19z518m8h
parent: mbp at sourcefrog.net-20090311075514-9vudl1frb30ng8sb
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: progress-fetch
timestamp: Thu 2009-03-12 14:55:27 +1000
message:
Remove more progressbar cruft from fetch
modified:
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
------------------------------------------------------------
revno: 3735.473.5
revision-id: mbp at sourcefrog.net-20090311075514-9vudl1frb30ng8sb
parent: mbp at sourcefrog.net-20090311073528-8gyu3dkrkxz3lvj3
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: progress-fetch
timestamp: Wed 2009-03-11 17:55:14 +1000
message:
Deprecate passing pbs in to fetch()
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/interrepository_implementations/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
bzrlib/tests/per_repository/test_fetch.py test_fetch.py-20070814052151-5cxha9slx4c93uog-1
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
------------------------------------------------------------
revno: 3735.473.4
revision-id: mbp at sourcefrog.net-20090311073528-8gyu3dkrkxz3lvj3
parent: mbp at sourcefrog.net-20090311072102-bbh7i462c7knq2md
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: progress-fetch
timestamp: Wed 2009-03-11 17:35:28 +1000
message:
Deprecate passing a pb in to RepoFetcher
modified:
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
------------------------------------------------------------
revno: 3735.473.3
revision-id: mbp at sourcefrog.net-20090311072102-bbh7i462c7knq2md
parent: mbp at sourcefrog.net-20090311070455-gay4qlayiamcq50k
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: progress-fetch
timestamp: Wed 2009-03-11 17:21:02 +1000
message:
Remove redundant variable from fetch.
modified:
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
------------------------------------------------------------
revno: 3735.473.2
revision-id: mbp at sourcefrog.net-20090311070455-gay4qlayiamcq50k
parent: mbp at sourcefrog.net-20090311070122-r27fbj0crxx0xi2r
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: progress-fetch
timestamp: Wed 2009-03-11 17:04:55 +1000
message:
Remove obsolete comments
modified:
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
------------------------------------------------------------
revno: 3735.473.1
revision-id: mbp at sourcefrog.net-20090311070122-r27fbj0crxx0xi2r
parent: pqm at pqm.ubuntu.com-20090311015637-v73ocbv9bcexe4dm
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: progress-fetch
timestamp: Wed 2009-03-11 17:01:22 +1000
message:
Remove duplicated code from InterRepository implementations.
modified:
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 3735.370.87
revision-id: pqm at pqm.ubuntu.com-20090313044136-mvoy4mgr8az583ih
parent: pqm at pqm.ubuntu.com-20090313035623-vn0615cs6bd6590e
parent: v.ladeuil+lp at free.fr-20090313034919-mcfvnt005co93pyl
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2009-03-13 04:41:36 +0000
message:
(vila) Restore the test that the OSError exception raised from
walkdirs includes the file the error occured on in its str()
modified:
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
------------------------------------------------------------
revno: 3735.472.1
revision-id: v.ladeuil+lp at free.fr-20090313034919-mcfvnt005co93pyl
parent: pqm at pqm.ubuntu.com-20090313010135-3huetgz68wxrhsb3
parent: v.ladeuil+lp at free.fr-20090313011055-yvqqtdejc7ferth7
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: trunk
timestamp: Fri 2009-03-13 13:49:19 +1000
message:
Restore the test that the OSError exception raised from walkdirs includes the file the error occured on in its str()
modified:
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
------------------------------------------------------------
revno: 3735.464.2
revision-id: v.ladeuil+lp at free.fr-20090313011055-yvqqtdejc7ferth7
parent: v.ladeuil+lp at free.fr-20090312132005-cdcrdk8ps85c17o2
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 341648-fragile-test
timestamp: Fri 2009-03-13 11:10:55 +1000
message:
Fixed as per Martin's remark about the intent of the test :-}
modified:
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
------------------------------------------------------------
revno: 3735.370.86
revision-id: pqm at pqm.ubuntu.com-20090313035623-vn0615cs6bd6590e
parent: pqm at pqm.ubuntu.com-20090313031626-cy59iwvd5csfcmez
parent: andrew.bennetts at canonical.com-20090313021308-e3engqnzk1yg34aj
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2009-03-13 03:56:23 +0000
message:
(andrew) Fix performance regression (many small round-trips) when
pushing to a remote pack, and improve some tests.
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/per_repository_reference/__init__.py __init__.py-20080220025549-nnm2s80it1lvcwnc-2
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3735.471.5
revision-id: andrew.bennetts at canonical.com-20090313021308-e3engqnzk1yg34aj
parent: andrew.bennetts at canonical.com-20090313011808-t6cq2iix4i7g922f
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: fix-stackable-remote-repo
timestamp: Fri 2009-03-13 12:13:08 +1000
message:
Fix test_remote tests.
modified:
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3735.471.4
revision-id: andrew.bennetts at canonical.com-20090313011808-t6cq2iix4i7g922f
parent: andrew.bennetts at canonical.com-20090313011750-1f4d1s2tvuq20xpd
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: fix-stackable-remote-repo
timestamp: Fri 2009-03-13 11:18:08 +1000
message:
Remove redundant lock_reads in test.
modified:
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
------------------------------------------------------------
revno: 3735.471.3
revision-id: andrew.bennetts at canonical.com-20090313011750-1f4d1s2tvuq20xpd
parent: andrew.bennetts at canonical.com-20090313010442-nr05pqjqdgio3zc6
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: fix-stackable-remote-repo
timestamp: Fri 2009-03-13 11:17:50 +1000
message:
Remove redundant assertion method.
modified:
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
------------------------------------------------------------
revno: 3735.471.2
revision-id: andrew.bennetts at canonical.com-20090313010442-nr05pqjqdgio3zc6
parent: andrew.bennetts at canonical.com-20090312085004-tshz11l4qpcmnxjc
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: fix-stackable-remote-repo
timestamp: Fri 2009-03-13 11:04:42 +1000
message:
Fix failing test by adding assertRepositoriesEqual.
modified:
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
------------------------------------------------------------
revno: 3735.471.1
revision-id: andrew.bennetts at canonical.com-20090312085004-tshz11l4qpcmnxjc
parent: pqm at pqm.ubuntu.com-20090311233307-n6zmhg1y074svja6
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: fix-stackable-remote-repo
timestamp: Thu 2009-03-12 18:50:04 +1000
message:
Fix performance regression (many small round-trips) when pushing to a remote pack, and tidy the tests.
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/per_repository_reference/__init__.py __init__.py-20080220025549-nnm2s80it1lvcwnc-2
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3735.370.85
revision-id: pqm at pqm.ubuntu.com-20090313031626-cy59iwvd5csfcmez
parent: pqm at pqm.ubuntu.com-20090313023629-g9v7xglb6rvfopba
parent: james.westby at canonical.com-20090313012436-w3ui1gnjjv5b42oe
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2009-03-13 03:16:26 +0000
message:
(jamesw) Shelve now supports shelving changes to symlink targets.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/shelf.py prepare_shelf.py-20081005181341-n74qe6gu1e65ad4v-1
bzrlib/shelf_ui.py shelver.py-20081005210102-33worgzwrtdw0yrm-1
bzrlib/tests/test_shelf.py test_prepare_shelf.p-20081005181341-n74qe6gu1e65ad4v-2
bzrlib/tests/test_shelf_ui.py test_shelf_ui.py-20081027155203-wtcuazg85wp9u4fv-1
------------------------------------------------------------
revno: 3735.467.2
revision-id: james.westby at canonical.com-20090313012436-w3ui1gnjjv5b42oe
parent: james.westby at canonical.com-20090313001311-qbjce58f0fcke5p4
parent: james.westby at canonical.com-20090312082635-s0ofpsqb647kleru
committer: James Westby <james.westby at canonical.com>
branch nick: jamesw-integration
timestamp: Fri 2009-03-13 11:24:36 +1000
message:
Shelve can now shelve changes to a symlink's target.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/shelf.py prepare_shelf.py-20081005181341-n74qe6gu1e65ad4v-1
bzrlib/shelf_ui.py shelver.py-20081005210102-33worgzwrtdw0yrm-1
bzrlib/tests/test_shelf.py test_prepare_shelf.p-20081005181341-n74qe6gu1e65ad4v-2
bzrlib/tests/test_shelf_ui.py test_shelf_ui.py-20081027155203-wtcuazg85wp9u4fv-1
------------------------------------------------------------
revno: 3735.470.1
revision-id: james.westby at canonical.com-20090312082635-s0ofpsqb647kleru
parent: james.westby at canonical.com-20090312030241-8owjma3iw40a8ulv
committer: James Westby <james.westby at canonical.com>
branch nick: bzr.dev.shelve-symlink
timestamp: Thu 2009-03-12 18:26:35 +1000
message:
Shelve can now shelve changes to a symlink's target.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/shelf.py prepare_shelf.py-20081005181341-n74qe6gu1e65ad4v-1
bzrlib/shelf_ui.py shelver.py-20081005210102-33worgzwrtdw0yrm-1
bzrlib/tests/test_shelf.py test_prepare_shelf.p-20081005181341-n74qe6gu1e65ad4v-2
bzrlib/tests/test_shelf_ui.py test_shelf_ui.py-20081027155203-wtcuazg85wp9u4fv-1
------------------------------------------------------------
revno: 3735.370.84
revision-id: pqm at pqm.ubuntu.com-20090313023629-g9v7xglb6rvfopba
parent: pqm at pqm.ubuntu.com-20090313014131-ysd8da1qo8woaby9
parent: mbp at sourcefrog.net-20090313012747-igvrav6sr7irhz1l
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2009-03-13 02:36:29 +0000
message:
(mbp) integrated small fixes
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_ignore.py test_ignore.py-20060703063225-4tm8dc2pa7wwg2t3-1
------------------------------------------------------------
revno: 3735.423.9
revision-id: mbp at sourcefrog.net-20090313012747-igvrav6sr7irhz1l
parent: mbp at sourcefrog.net-20090312053256-071khr6k4wwuuyja
parent: pqm at pqm.ubuntu.com-20090313010135-3huetgz68wxrhsb3
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: integration
timestamp: Fri 2009-03-13 12:27:47 +1100
message:
merge news
removed:
bzrlib/help_topics/en/hooks.txt hooks.txt-20070830033044-xxu2rced13f72dka-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/bugtracker.py bugtracker.py-20070410073305-vu1vu1qosjurg8kb-1
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/hooks.py hooks.py-20070325015548-ix4np2q0kd8452au-1
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/lock.py lock.py-20050527050856-ec090bb51bc03349
bzrlib/lockdir.py lockdir.py-20060220222025-98258adf27fbdda3
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/mail_client.py mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
bzrlib/msgeditor.py msgeditor.py-20050901111708-ef6d8de98f5d8f2f
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
bzrlib/push.py push.py-20080606021927-5fe39050e8xne9un-1
bzrlib/registry.py lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-1
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/shelf.py prepare_shelf.py-20081005181341-n74qe6gu1e65ad4v-1
bzrlib/shelf_ui.py shelver.py-20081005210102-33worgzwrtdw0yrm-1
bzrlib/smart/client.py client.py-20061116014825-2k6ada6xgulslami-1
bzrlib/smart/server.py server.py-20061110062051-chzu10y32vx8gvur-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_cat.py test_cat.py-20051201162916-f0937e4e19ea24b3
bzrlib/tests/blackbox/test_hooks.py test_hooks.py-20080308163236-xljgf9j41hik1x21-1
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_shelve.py test_ls_shelf.py-20081202053526-thlo8yt0pi1cgor1-1
bzrlib/tests/branch_implementations/test_revision_history.py test_revision_histor-20070326062311-v7co92liyuchb80w-1
bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
bzrlib/tests/inventory_implementations/basics.py basics.py-20070903044446-kdjwbiu1p1zi9phs-1
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_bugtracker.py test_bugtracker.py-20070410073305-vu1vu1qosjurg8kb-2
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_help.py test_help.py-20070419045354-6q6rq15j9e2n5fna-1
bzrlib/tests/test_hooks.py test_hooks.py-20070628030849-89rtsbe5dmer5npz-1
bzrlib/tests/test_mail_client.py test_mail_client.py-20070809192806-vuxt3t19srtpjpdn-2
bzrlib/tests/test_mutabletree.py test_mutabletree.py-20080405014429-2v0cdi3re320p8db-1
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
bzrlib/tests/test_shelf.py test_prepare_shelf.p-20081005181341-n74qe6gu1e65ad4v-2
bzrlib/tests/test_shelf_ui.py test_shelf_ui.py-20081027155203-wtcuazg85wp9u4fv-1
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
------------------------------------------------------------
revno: 3735.423.8
revision-id: mbp at sourcefrog.net-20090312053256-071khr6k4wwuuyja
parent: mbp at sourcefrog.net-20090312044443-dabkh2yeci9p1u4j
parent: pqm at pqm.ubuntu.com-20090312052102-ksjfiyd5ctzibuo1
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: integration
timestamp: Thu 2009-03-12 15:32:56 +1000
message:
merge news
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/ui/text.py text.py-20051130153916-2e438cffc8afc478
------------------------------------------------------------
revno: 3735.423.7
revision-id: mbp at sourcefrog.net-20090312044443-dabkh2yeci9p1u4j
parent: mbp at sourcefrog.net-20090312024302-aynicfx1ywm0k9dl
parent: mbp at sourcefrog.net-20090312031249-h77w1hh8wae7v3zf
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: integration
timestamp: Thu 2009-03-12 14:44:43 +1000
message:
merge back 1.13
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/tree_implementations/test_path_content_summary.py test_path_content_su-20070904100855-3vrwedz6akn34kl5-1
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
revno: 3735.469.1
revision-id: mbp at sourcefrog.net-20090312031249-h77w1hh8wae7v3zf
parent: pqm at pqm.ubuntu.com-20090312025908-v6s9pjhxubuqrnxe
parent: pqm at pqm.ubuntu.com-20090311094306-qdrxqed2k7sgxf7z
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: integrate-1.13
timestamp: Thu 2009-03-12 13:12:49 +1000
message:
Merge back 1.13 and bump version to 1.14dev
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
bzrlib/tests/tree_implementations/test_path_content_summary.py test_path_content_su-20070904100855-3vrwedz6akn34kl5-1
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
revno: 3735.423.6
revision-id: mbp at sourcefrog.net-20090312024302-aynicfx1ywm0k9dl
parent: mbp at sourcefrog.net-20090312024231-wp8aqy67cjypwll4
parent: pqm at pqm.ubuntu.com-20090312021804-624908fcy28eisfn
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: integration
timestamp: Thu 2009-03-12 12:43:02 +1000
message:
merge trunk
added:
bzrlib/tests/per_repository_reference/test_default_stacking.py test_default_stackin-20090311055345-9ajahgm58oq3wh6h-1
tools/check-newsbugs.py checknewsbugs.py-20090128204947-lsdwd8nlswm1yrwv-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/_dirstate_helpers_c.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
bzrlib/bugtracker.py bugtracker.py-20070410073305-vu1vu1qosjurg8kb-1
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/hooks.py hooks.py-20070325015548-ix4np2q0kd8452au-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/lock.py lock.py-20050527050856-ec090bb51bc03349
bzrlib/lockable_files.py control_files.py-20051111201905-bb88546e799d669f
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
bzrlib/tests/interrepository_implementations/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
bzrlib/tests/per_repository/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
bzrlib/tests/per_repository_reference/__init__.py __init__.py-20080220025549-nnm2s80it1lvcwnc-2
bzrlib/tests/test__dirstate_helpers.py test_dirstate_helper-20070504035751-jsbn00xodv0y1eve-2
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_hooks.py test_hooks.py-20070628030849-89rtsbe5dmer5npz-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_source.py test_source.py-20051207061333-a58dea6abecc030d
bzrlib/tests/test_urlutils.py test_urlutils.py-20060502192900-46b1f9579987cf9c
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
bzrlib/tests/workingtree_implementations/test_mkdir.py test_mkdir.py-20060907214856-4omn6hf1u7fvrart-3
bzrlib/tests/workingtree_implementations/test_nested_specifics.py test_nested_specific-20070306004443-qut978c488jr11sg-1
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/urlutils.py urlutils.py-20060502195429-e8a161ecf8fac004
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/releasing.txt releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
tools/doc_generate/autodoc_man.py bzrman.py-20050601153041-0ff7f74de456d15e
------------------------------------------------------------
revno: 3735.423.5
revision-id: mbp at sourcefrog.net-20090312024231-wp8aqy67cjypwll4
parent: mbp at sourcefrog.net-20090310020305-o1eq68r43q0uek7i
parent: pqm at pqm.ubuntu.com-20090310033520-f2ynw0fprjw433m2
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: integration
timestamp: Thu 2009-03-12 12:42:31 +1000
message:
merge trunk
modified:
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/lsprof.py lsprof.py-20051208071030-833790916798ceed
------------------------------------------------------------
revno: 3735.423.4
revision-id: mbp at sourcefrog.net-20090310020305-o1eq68r43q0uek7i
parent: mbp at sourcefrog.net-20090310020233-sbr2qvnqnv84y7f6
parent: nmb at wartburg.edu-20090309195518-zgangfenh061dks3
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: integration
timestamp: Tue 2009-03-10 12:03:05 +1000
message:
merge better messages from bzr ignore
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_ignore.py test_ignore.py-20060703063225-4tm8dc2pa7wwg2t3-1
------------------------------------------------------------
revno: 3735.468.1
revision-id: nmb at wartburg.edu-20090309195518-zgangfenh061dks3
parent: pqm at pqm.ubuntu.com-20090309084556-9i2m12qlud2qcrtw
committer: Neil Martinsen-Burrell <nmb at wartburg.edu>
branch nick: better-ignore-warning
timestamp: Mon 2009-03-09 14:55:18 -0500
message:
Use a more informative message when an ignore pattern matches existing version controlled files. Fixes #248895
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_ignore.py test_ignore.py-20060703063225-4tm8dc2pa7wwg2t3-1
------------------------------------------------------------
revno: 3735.423.3
revision-id: mbp at sourcefrog.net-20090310020233-sbr2qvnqnv84y7f6
parent: mbp at sourcefrog.net-20090310012257-rvtds5ic7ard4iza
parent: pqm at pqm.ubuntu.com-20090310012923-c8el0n6v75v4ycd1
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: integration
timestamp: Tue 2009-03-10 12:02:33 +1000
message:
merge trunk
added:
bzrlib/clean_tree.py clean_tree.py-20050827022328-5ba46e22d074695c
bzrlib/tests/blackbox/test_clean_tree.py test_clean_tree.py-20090219235516-em1ybc01twsqacx9-1
bzrlib/tests/test_clean_tree.py test_clean_tree.py-20060603174249-ozlk5sl2166opxbk-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
------------------------------------------------------------
revno: 3735.370.83
revision-id: pqm at pqm.ubuntu.com-20090313014131-ysd8da1qo8woaby9
parent: pqm at pqm.ubuntu.com-20090313010135-3huetgz68wxrhsb3
parent: james.westby at canonical.com-20090312060454-f04pmpufns32zyk6
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2009-03-13 01:41:31 +0000
message:
(jamesw) Move the shelve docs from bzrtools to the main help.
added:
doc/en/user-guide/shelving_changes.txt shelving_changes.txt-20090312060214-kfn9smg37syy9kcl-1
modified:
doc/en/user-guide/bzrtools_plugin.txt bzrtools_plugin.txt-20080509065016-cjc90f46407vi9a0-1
doc/en/user-guide/index.txt index.txt-20060622101119-tgwtdci8z769bjb9-2
------------------------------------------------------------
revno: 3735.449.2
revision-id: james.westby at canonical.com-20090312060454-f04pmpufns32zyk6
parent: james.westby at canonical.com-20090312030241-8owjma3iw40a8ulv
committer: James Westby <james.westby at canonical.com>
branch nick: bzr.dev.shelve-help
timestamp: Thu 2009-03-12 16:04:54 +1000
message:
Move the shelve docs from bzrtools to the main help.
Also change them to document the new "shelve" rather than the old one.
added:
doc/en/user-guide/shelving_changes.txt shelving_changes.txt-20090312060214-kfn9smg37syy9kcl-1
modified:
doc/en/user-guide/bzrtools_plugin.txt bzrtools_plugin.txt-20080509065016-cjc90f46407vi9a0-1
doc/en/user-guide/index.txt index.txt-20060622101119-tgwtdci8z769bjb9-2
------------------------------------------------------------
revno: 3735.370.82
revision-id: pqm at pqm.ubuntu.com-20090313010135-3huetgz68wxrhsb3
parent: pqm at pqm.ubuntu.com-20090312152735-08tf1fguf6b7mpaw
parent: james.westby at canonical.com-20090313001311-qbjce58f0fcke5p4
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2009-03-13 01:01:35 +0000
message:
(kikuyo) Small improvements to the GNU ChangeLog formatter.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
------------------------------------------------------------
revno: 3735.467.1
revision-id: james.westby at canonical.com-20090313001311-qbjce58f0fcke5p4
parent: pqm at pqm.ubuntu.com-20090312152735-08tf1fguf6b7mpaw
parent: eof at kiyuko.org-20090312125654-lo1f1y0s9ef0w7mq
committer: James Westby <james.westby at canonical.com>
branch nick: jamesw-integration
timestamp: Fri 2009-03-13 10:13:11 +1000
message:
Small improvements to the GNU ChangeLog formatter.
Add NEWS and fix PEP-8 nit.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
------------------------------------------------------------
revno: 3735.466.3
revision-id: eof at kiyuko.org-20090312125654-lo1f1y0s9ef0w7mq
parent: eof at kiyuko.org-20090312125545-rxltuhw1im92fvma
committer: Andrea Bolognani <eof at kiyuko.org>
branch nick: gnu-changelog
timestamp: Thu 2009-03-12 13:56:54 +0100
message:
Don't print an extra line if there are no changes in the delta.
modified:
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
------------------------------------------------------------
revno: 3735.466.2
revision-id: eof at kiyuko.org-20090312125545-rxltuhw1im92fvma
parent: eof at kiyuko.org-20090312125344-sy02m2o640453ha0
committer: Andrea Bolognani <eof at kiyuko.org>
branch nick: gnu-changelog
timestamp: Thu 2009-03-12 13:55:45 +0100
message:
The GNU ChangeLog formatter doesn't support tags.
modified:
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
------------------------------------------------------------
revno: 3735.466.1
revision-id: eof at kiyuko.org-20090312125344-sy02m2o640453ha0
parent: pqm at pqm.ubuntu.com-20090312091731-9trx3k1cehgpwhbm
committer: Andrea Bolognani <eof at kiyuko.org>
branch nick: gnu-changelog
timestamp: Thu 2009-03-12 13:53:44 +0100
message:
Renamed the ChangeLogLogFormatter class to GnuChangelogLogFormatter.
modified:
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
-------------- next part --------------
Diff too large for email (4211 lines, the limit is 1000).
More information about the bazaar-commits
mailing list