Rev 1993: Merge bzr.dev. in file:///home/robertc/source/baz/test-performance/
Robert Collins
robertc at robertcollins.net
Fri Sep 15 02:21:42 BST 2006
------------------------------------------------------------
revno: 1993
revision-id: robertc at robertcollins.net-20060915012138-7d6fb0a40a980f36
parent: robertc at robertcollins.net-20060914032717-1706ea260c3c77c9
parent: andrew.bennetts at canonical.com-20060914080720-e0ad8034add462d6
committer: Robert Collins <robertc at robertcollins.net>
branch nick: Move Repository escaping test into repository_implementations/test_repository.py
timestamp: Fri 2006-09-15 11:21:38 +1000
message:
Merge bzr.dev.
added:
bzrlib/inspect_for_copy.py inspect_for_copy.py-20060912223659-9ccpdogzwxqznpq1-1
bzrlib/lazy_import.py lazy_import.py-20060910203832-f77c54gf3n232za0-1
bzrlib/tests/test_lazy_import.py test_lazy_import.py-20060910203832-f77c54gf3n232za0-2
bzrlib/xml6.py xml6.py-20060823042456-dbaaq4atrche7xy5-1
doc/centralized_workflow.txt centralized_workflow-20060830194948-kspf52565xvgrlil-1
modified:
HACKING HACKING-20050805200004-2a5dc975d870f78c
NEWS NEWS-20050323055033-4e00b5db738777ff
README README-20050309040720-8f368abf9f346b9d
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/add.py add.py-20050323030017-3a77d63feda58e33
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/bundle_data.py read_changeset.py-20050619171944-c0d95aa685537640
bzrlib/bundle/serializer/__init__.py __init__.py-20051118175413-86b97db0b618feef
bzrlib/bundle/serializer/v08.py v06.py-20051119041339-ee43f97270b01823
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/conflicts.py conflicts.py-20051001061850-78ef952ba63d2b42
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/help.py help.py-20050505025907-4dd7a6d63912f894
bzrlib/info.py info.py-20050323235939-6bbfe7d9700b0b9b
bzrlib/inter.py inter.py-20060302012326-a57300cb382c618f
bzrlib/intset.py intset.py-20050717175247-81cd658f9aaa2731
bzrlib/lockdir.py lockdir.py-20060220222025-98258adf27fbdda3
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/lsprof.py lsprof.py-20051208071030-833790916798ceed
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/rio.py rio.py-20051128032247-770b120b34dfff60
bzrlib/shellcomplete.py shellcomplete.py-20050822153127-3be115ff5e70fc39
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/store/__init__.py store.py-20050309040759-164dc5173d6406c2
bzrlib/store/text.py text.py-20050928201105-c26468dcb5d9b18b
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/blackbox/test_cat.py test_cat.py-20051201162916-f0937e4e19ea24b3
bzrlib/tests/blackbox/test_checkout.py test_checkout.py-20060211231752-a5cde67cf70af854
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/blackbox/test_locale.py test_lang.py-20060824204205-80v50j25qkuop7yn-1
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
bzrlib/tests/blackbox/test_reconcile.py test_fix.py-20060223013051-9a188e15a5ee9451
bzrlib/tests/blackbox/test_uncommit.py test_uncommit.py-20051027212835-84944b63adae51be
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
bzrlib/tests/repository_implementations/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
bzrlib/tests/repository_implementations/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
bzrlib/tests/repository_implementations/test_reconcile.py test_reconcile.py-20060223022332-572ef70a3288e369
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/stub_sftp.py stub_sftp.py-20051027032739-0e7ef4f7bab0e174
bzrlib/tests/test_bad_files.py test_bad_files.py-20050918155938-c76a2295c8ab9503
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_hashcache.py testhashcache.py-20050706091800-0288ab2659338981
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
bzrlib/tests/test_permissions.py test_permissions.py-20051215004520-ccf475789c80e80c
bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/test_tree.py test_tree.py-20060724065232-khgrr0vvmt6ih0mi-1
bzrlib/tests/test_upgrade.py test_upgrade.py-20051004040251-555fe1d2bae1bc71
bzrlib/tests/test_version.py test_version.py-20060816024207-ves6ult9a11taj9t-2
bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
bzrlib/tests/workingtree_implementations/test_basis_inventory.py test_basis_inventory.py-20051218151655-3650468941091309
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
bzrlib/tests/workingtree_implementations/test_executable.py test_executable.py-20060628162557-tr7h57kl80l3ma8i-1
bzrlib/tests/workingtree_implementations/test_get_parent_ids.py test_get_parent_ids.py-20060616123734-jq0zc755ud2u644s-1
bzrlib/tests/workingtree_implementations/test_locking.py test_locking.py-20060707151933-tav3o2hpibwi53u4-3
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
bzrlib/tests/workingtree_implementations/test_pull.py test_pull.py-20060222044334-43594dd8e143b708
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/uncommit.py uncommit.py-20050626215513-5ec509fa425b305c
bzrlib/upgrade.py history2weaves.py-20050818063535-e7d319791c19a8b2
bzrlib/util/configobj/configobj.py configobj.py-20051018184548-06992a2246425e3e
bzrlib/util/elementtree/ElementTree.py ElementTree.py-20050323061623-cfa8eefe86f35391
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weavefile.py weavefile.py-20050629135233-2ffe0200f103f6c2
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/xml4.py xml4.py-20050916091259-db5ab55e7e6ca324
bzrlib/xml5.py xml5.py-20050907032657-aac8f960815b66b1
bzrlib/xml_serializer.py xml.py-20050309040759-57d51586fdec365d
contrib/newinventory.py newinventory.py-20050330222648-12642a6a7ae875e9
profile_imports.py profile_imports.py-20060618020306-k5uw80achysrokj9-1
setup.py* setup.py-20050314065409-02f8a0a6e3f9bc70
tools/http_client.py http_client.py-20050819224207-b29be8324c55b359
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060914080720-e0ad8034add462d6
parent: andrew.bennetts at canonical.com-20060914072340-9163d614bf1df7a5
parent: andrew.bennetts at canonical.com-20060913120713-8dfa23177c7ba128
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: preserve transport when creating bzrdir
timestamp: Thu 2006-09-14 18:07:20 +1000
message:
Merge from workingtree-creation-bug-fix.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060913120713-8dfa23177c7ba128
parent: andrew.bennetts at canonical.com-20060830025300-8157f78673676a55
parent: andrew.bennetts at canonical.com-20060913120233-a3b6a97c1d56c7ab
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: workingtree creation bug fix.
timestamp: Wed 2006-09-13 22:07:13 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060830025300-8157f78673676a55
parent: andrew.bennetts at canonical.com-20060830024447-7faafe45c8018857
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: workingtree creation bug fix.
timestamp: Wed 2006-08-30 12:53:00 +1000
message:
Fix to make_branch_and_tree's behavior when used with an sftp transport.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060914072340-9163d614bf1df7a5
parent: andrew.bennetts at canonical.com-20060914060341-616d267e38f89349
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: preserve transport when creating bzrdir
timestamp: Thu 2006-09-14 17:23:40 +1000
message:
Fix TestCaseWithTransport.get_url so that e.g. test_nonascii passes.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060914060341-616d267e38f89349
parent: andrew.bennetts at canonical.com-20060914060017-b25dbda5594e8358
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: preserve transport when creating bzrdir
timestamp: Thu 2006-09-14 16:03:41 +1000
message:
Do slightly less splitting.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060914060017-b25dbda5594e8358
parent: andrew.bennetts at canonical.com-20060913120233-a3b6a97c1d56c7ab
parent: andrew.bennetts at canonical.com-20060914055128-ce1a13335dbb3663
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: preserve transport when creating bzrdir
timestamp: Thu 2006-09-14 16:00:17 +1000
message:
Merge from BzrNewError.__str__
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060914055128-ce1a13335dbb3663
parent: andrew.bennetts at canonical.com-20060914053504-9f8e96a89223d392
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: BzrNewError.__str__
timestamp: Thu 2006-09-14 15:51:28 +1000
message:
Add test for BzrNewError.__str__ error handling.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060914053504-9f8e96a89223d392
parent: andrew.bennetts at canonical.com-20060913113149-e50e3da90823fc47
parent: andrew.bennetts at canonical.com-20060914045530-504386af0d074c2e
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: BzrNewError.__str__
timestamp: Thu 2006-09-14 15:35:04 +1000
message:
Merge from cosmetic.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060914045530-504386af0d074c2e
parent: andrew.bennetts at canonical.com-20060914045520-ad0a186e90e01a13
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: open_from_transport
timestamp: Thu 2006-09-14 14:55:30 +1000
message:
Add tests for BzrDir.open_from_transport.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060914045520-ad0a186e90e01a13
parent: andrew.bennetts at canonical.com-20060914041819-eb8fbadb197a39d3
parent: andrew.bennetts at canonical.com-20060914043845-e00b4cbb19ef8442
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: open_from_transport
timestamp: Thu 2006-09-14 14:55:20 +1000
message:
Merge from cosmetic
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060914043845-e00b4cbb19ef8442
parent: andrew.bennetts at canonical.com-20060914041448-b283087c65c19a8a
parent: andrew.bennetts at canonical.com-20060914043322-b4bb1dc5b6655cf1
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: sort os.listdir in add.py
timestamp: Thu 2006-09-14 14:38:45 +1000
message:
Merge from cosmetic.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060914043322-b4bb1dc5b6655cf1
parent: andrew.bennetts at canonical.com-20060914041040-531ddb8fbe9787f4
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: cosmetic
timestamp: Thu 2006-09-14 14:33:22 +1000
message:
Re-instate copy import, which is actually needed.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060914041819-eb8fbadb197a39d3
parent: andrew.bennetts at canonical.com-20060913111406-5948c590279949c3
parent: andrew.bennetts at canonical.com-20060914041448-b283087c65c19a8a
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: open_from_transport
timestamp: Thu 2006-09-14 14:18:19 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060914041448-b283087c65c19a8a
parent: andrew.bennetts at canonical.com-20060913105126-f67427690b700b48
parent: andrew.bennetts at canonical.com-20060914041040-531ddb8fbe9787f4
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: sort os.listdir in add.py
timestamp: Thu 2006-09-14 14:14:48 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060914041040-531ddb8fbe9787f4
parent: andrew.bennetts at canonical.com-20060914032814-6817446cff1ee398
parent: pqm at pqm.ubuntu.com-20060913022700-feca914a6d5495f2
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: cosmetic
timestamp: Thu 2006-09-14 14:10:40 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060913022700-feca914a6d5495f2
parent: pqm at pqm.ubuntu.com-20060912235634-1c39364c1566488a
parent: john at arbash-meinel.com-20060913021602-3a0be26095515136
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-09-13 03:27:00 +0100
message:
(jam) lazy_import module allows on-demand loading of objects, can help startup time
------------------------------------------------------------
merged: john at arbash-meinel.com-20060913021602-3a0be26095515136
parent: john at arbash-meinel.com-20060913020937-2df2f49f9a28ec43
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Tue 2006-09-12 21:16:02 -0500
message:
Add a test for side-effects from using ScopeReplacer
------------------------------------------------------------
merged: john at arbash-meinel.com-20060913020937-2df2f49f9a28ec43
parent: john at arbash-meinel.com-20060913015742-26daf2a7676b904e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Tue 2006-09-12 21:09:37 -0500
message:
Update HACKING and docstrings
------------------------------------------------------------
merged: john at arbash-meinel.com-20060913015742-26daf2a7676b904e
parent: john at arbash-meinel.com-20060913015231-b2d4a34beacbd0c0
parent: pqm at pqm.ubuntu.com-20060912235634-1c39364c1566488a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Tue 2006-09-12 20:57:42 -0500
message:
[merge] bzr.dev 2003
------------------------------------------------------------
merged: john at arbash-meinel.com-20060913015231-b2d4a34beacbd0c0
parent: john at arbash-meinel.com-20060912231013-10a9f5573a3bae44
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Tue 2006-09-12 20:52:31 -0500
message:
cherry-pick the inspect_for_copy changes
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912231013-10a9f5573a3bae44
parent: john at arbash-meinel.com-20060912220202-36e9c6beb4113b05
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Tue 2006-09-12 18:10:13 -0500
message:
Clean up comment as suggested by Robert
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912220202-36e9c6beb4113b05
parent: john at arbash-meinel.com-20060912203631-00b158854d709a81
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Tue 2006-09-12 17:02:02 -0500
message:
Update --profile-imports to support the new lazy_import code
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912203631-00b158854d709a81
parent: john at arbash-meinel.com-20060912193702-22c752299731a663
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Tue 2006-09-12 15:36:31 -0500
message:
fix typo
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912193702-22c752299731a663
parent: john at arbash-meinel.com-20060912190727-35ae1dff7a95b789
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Tue 2006-09-12 14:37:02 -0500
message:
HACKING and NEWS
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912190727-35ae1dff7a95b789
parent: john at arbash-meinel.com-20060912184249-83efc58bcc327550
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Tue 2006-09-12 14:07:27 -0500
message:
Write a simple wrapper function to make lazy imports easy.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912184249-83efc58bcc327550
parent: john at arbash-meinel.com-20060912173452-ef9e20b8a52ec3e6
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Tue 2006-09-12 13:42:49 -0500
message:
Add more structured error handling
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912173452-ef9e20b8a52ec3e6
parent: john at arbash-meinel.com-20060912173323-112d28652516fd94
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Tue 2006-09-12 12:34:52 -0500
message:
Small cleanup
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912173323-112d28652516fd94
parent: john at arbash-meinel.com-20060912003109-ac4e59e3a2acee16
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Tue 2006-09-12 12:33:23 -0500
message:
Raise an exception when ScopeReplacer has been misused
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912003109-ac4e59e3a2acee16
parent: john at arbash-meinel.com-20060911232801-d7930bab42c6a81d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Mon 2006-09-11 19:31:09 -0500
message:
Everything is now hooked up
------------------------------------------------------------
merged: john at arbash-meinel.com-20060911232801-d7930bab42c6a81d
parent: john at arbash-meinel.com-20060911225535-b20aae01acc390b8
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Mon 2006-09-11 18:28:01 -0500
message:
Add tests for converting from a string to the final map
------------------------------------------------------------
merged: john at arbash-meinel.com-20060911225535-b20aae01acc390b8
parent: john at arbash-meinel.com-20060911224857-d7008be21aeee33e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Mon 2006-09-11 17:55:35 -0500
message:
small test updates
------------------------------------------------------------
merged: john at arbash-meinel.com-20060911224857-d7008be21aeee33e
parent: john at arbash-meinel.com-20060911224313-dbd20de5b9c8f5eb
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Mon 2006-09-11 17:48:57 -0500
message:
Switch from individual functions to a class
------------------------------------------------------------
merged: john at arbash-meinel.com-20060911224313-dbd20de5b9c8f5eb
parent: john at arbash-meinel.com-20060911220906-41ee1e306aad0464
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Mon 2006-09-11 17:43:13 -0500
message:
Test the ability to take a bunch of import lines and canonicalize them
------------------------------------------------------------
merged: john at arbash-meinel.com-20060911220906-41ee1e306aad0464
parent: john at arbash-meinel.com-20060911215626-0bbe834149b22b07
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Mon 2006-09-11 17:09:06 -0500
message:
Handle 'from foo import bar' syntax
This includes:
from foo import bar
from foo import bar, baz
from foo import bar as bing, baz as bar
------------------------------------------------------------
merged: john at arbash-meinel.com-20060911215626-0bbe834149b22b07
parent: john at arbash-meinel.com-20060911205344-177a893284ee9ff7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Mon 2006-09-11 16:56:26 -0500
message:
Create a method for handling 'import *' syntax.
This handles:
import foo
import foo.bar
import foo.bar as baz
import foo, foo.bar, baz.bing
------------------------------------------------------------
merged: john at arbash-meinel.com-20060911205344-177a893284ee9ff7
parent: john at arbash-meinel.com-20060911205155-e86e48e3fa709e7f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Mon 2006-09-11 15:53:44 -0500
message:
Split up TestImportReplacer into a helper class
Getting ready to test a simple import line parser.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060911205155-e86e48e3fa709e7f
parent: john at arbash-meinel.com-20060911201045-2a703743d89ce392
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Mon 2006-09-11 15:51:55 -0500
message:
Test a nested import with multiple deep children
------------------------------------------------------------
merged: john at arbash-meinel.com-20060911201045-2a703743d89ce392
parent: john at arbash-meinel.com-20060911200350-e4f917892ea062f2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Mon 2006-09-11 15:10:45 -0500
message:
Test that we can add more children to the existing lazy object
------------------------------------------------------------
merged: john at arbash-meinel.com-20060911200350-e4f917892ea062f2
parent: john at arbash-meinel.com-20060911195518-1a2bc78a3ab51ba9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Mon 2006-09-11 15:03:50 -0500
message:
Test that we can lazy import a module, and its children
------------------------------------------------------------
merged: john at arbash-meinel.com-20060911195518-1a2bc78a3ab51ba9
parent: john at arbash-meinel.com-20060910212031-13eaac6b8e5a1f7b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Mon 2006-09-11 14:55:18 -0500
message:
Change how parameters are passed to support 'import root1.mod1 as mod1'
------------------------------------------------------------
merged: john at arbash-meinel.com-20060910212031-13eaac6b8e5a1f7b
parent: john at arbash-meinel.com-20060910205901-ceb5929c1497f81f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Sun 2006-09-10 16:20:31 -0500
message:
Basic single-level imports work
------------------------------------------------------------
merged: john at arbash-meinel.com-20060910205901-ceb5929c1497f81f
parent: john at arbash-meinel.com-20060910203926-ae731f6bb165d6fa
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Sun 2006-09-10 15:59:01 -0500
message:
start working on some lazy importing code
------------------------------------------------------------
merged: john at arbash-meinel.com-20060910203926-ae731f6bb165d6fa
parent: pqm at pqm.ubuntu.com-20060909180200-96e41112dff213f3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Sun 2006-09-10 15:39:26 -0500
message:
Adding a ScopeReplacer class, which can replace itself on demand
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060912235634-1c39364c1566488a
parent: pqm at pqm.ubuntu.com-20060912225150-4e223573354de097
parent: john at arbash-meinel.com-20060912225807-ce62ca758f3dab56
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-09-13 00:56:34 +0100
message:
(jam) add more verbose logging when run_bzr_subprocess fails
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912225807-ce62ca758f3dab56
parent: pqm at pqm.ubuntu.com-20060912225150-4e223573354de097
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2006-09-12 17:58:07 -0500
message:
Add more verbose output when run_bzr_subprocess fails
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060912225150-4e223573354de097
parent: pqm at pqm.ubuntu.com-20060912153932-5ad746328277317a
parent: john at arbash-meinel.com-20060912220526-9d06572ba24012d8
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-09-12 23:51:50 +0100
message:
merge bzr-0.10 into bzr.dev
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912220526-9d06572ba24012d8
parent: john at arbash-meinel.com-20060912215631-b827909408542a9b
parent: jelmer at samba.org-20060912212501-350ff35ed68bc2fb
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2006-09-12 17:05:26 -0500
message:
[merge] typo fix from Jelmer
------------------------------------------------------------
merged: jelmer at samba.org-20060912212501-350ff35ed68bc2fb
parent: pqm at pqm.ubuntu.com-20060912153932-5ad746328277317a
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: bzr.dev
timestamp: Tue 2006-09-12 21:25:01 +0000
message:
Fix typo in encoding warning.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912215631-b827909408542a9b
parent: pqm at pqm.ubuntu.com-20060912153932-5ad746328277317a
parent: pqm at pqm.ubuntu.com-20060904005919-d595cc974f859400
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2006-09-12 16:56:31 -0500
message:
merge bzr-0.10 into bzr.dev
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060904005919-d595cc974f859400
parent: pqm at pqm.ubuntu.com-20060829010426-0688b3338fbc2925
parent: robertc at robertcollins.net-20060904004738-8c584f1f41fe19d3
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: 0.10
timestamp: Mon 2006-09-04 01:59:19 +0100
message:
(robertc) Turn bzr 0.10rc2 into 0.10 final.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060904004738-8c584f1f41fe19d3
parent: pqm at pqm.ubuntu.com-20060829010426-0688b3338fbc2925
committer: Robert Collins <robertc at robertcollins.net>
branch nick: 0.10
timestamp: Mon 2006-09-04 10:47:38 +1000
message:
(robertc) Turn bzr 0.10rc2 into 0.10 final.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060829010426-0688b3338fbc2925
parent: pqm at pqm.ubuntu.com-20060828011724-4ee7f77cc8a97a64
parent: robertc at robertcollins.net-20060829005214-595a26f2a2188d58
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: 0.10
timestamp: Tue 2006-08-29 02:04:26 +0100
message:
The bzr selftest was failing on installed versions due to a bug in a new
------------------------------------------------------------
merged: robertc at robertcollins.net-20060829005214-595a26f2a2188d58
parent: pqm at pqm.ubuntu.com-20060828011724-4ee7f77cc8a97a64
committer: Robert Collins <robertc at robertcollins.net>
branch nick: 0.10
timestamp: Tue 2006-08-29 10:52:14 +1000
message:
The bzr selftest was failing on installed versions due to a bug in a new
test helper. (John Arbash Meinel, Robert Collins, #58057)
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060828011724-4ee7f77cc8a97a64
parent: pqm at pqm.ubuntu.com-20060826132727-76ef12b67201fbf8
parent: robertc at robertcollins.net-20060828010333-9cc845dca3dcd015
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: 0.10
timestamp: Mon 2006-08-28 02:17:24 +0100
message:
(robertc) Update version strings for 0.10rc1.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060828010333-9cc845dca3dcd015
parent: pqm at pqm.ubuntu.com-20060826132727-76ef12b67201fbf8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: 0.10
timestamp: Mon 2006-08-28 11:03:33 +1000
message:
Update version strings for 0.10rc1.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060912153932-5ad746328277317a
parent: pqm at pqm.ubuntu.com-20060912014025-49963eb2d73c6827
parent: john at arbash-meinel.com-20060912152907-f6f310a88437b17f
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-09-12 16:39:32 +0100
message:
(vila) Fix bug #59835: avoid e.code for URLErrors
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912152907-f6f310a88437b17f
parent: john at arbash-meinel.com-20060912152802-64ced185121942af
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2006-09-12 10:29:07 -0500
message:
NEWS for fixing bug #59835
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912152802-64ced185121942af
parent: john at arbash-meinel.com-20060912152325-08f75e88cc926c77
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2006-09-12 10:28:02 -0500
message:
Update the urllib.has test.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912152325-08f75e88cc926c77
parent: pqm at pqm.ubuntu.com-20060912014025-49963eb2d73c6827
parent: v.ladeuil+lp at free.fr-20060912105446-b2acda6c722bcda9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2006-09-12 10:23:25 -0500
message:
[merge] vila: fix bug #59835 with test
------------------------------------------------------------
merged: v.ladeuil+lp at free.fr-20060912105446-b2acda6c722bcda9
parent: pqm at pqm.ubuntu.com-20060912014025-49963eb2d73c6827
committer: v.ladeuil+lp at free.fr
branch nick: bug.59835
timestamp: Tue 2006-09-12 12:54:46 +0200
message:
Fix bug 59835 with test.
* bzrlib/transport/http/_urllib.py:
(HttpTransport_urllib.has): Only HTTPError have a 'code'
attribute. Separate them from URLError exceptions.
* bzrlib/tests/test_http.py:
(TestHttpConnections_urllib.test_bogus_host): Check that an
URLError can be raised safely.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060912014025-49963eb2d73c6827
parent: pqm at pqm.ubuntu.com-20060911165531-9e9b9a022a53fef5
parent: robertc at robertcollins.net-20060910235657-56a542e8af8f28de
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-09-12 02:40:25 +0100
message:
(robertc) Partial fix for bug #39542 - allow lightweight checkouts over http.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060910235657-56a542e8af8f28de
parent: robertc at robertcollins.net-20060910234217-0ae24d8e666d60d6
committer: Robert Collins <robertc at robertcollins.net>
branch nick: anonymous lightweight checkout
timestamp: Mon 2006-09-11 09:56:57 +1000
message:
``bzr checkout --lightweight`` now operates on readonly branches as well
as readwrite branches. This fixes bug #39542 for lightweight checkouts
but not for heavyweight ones (the default). (Robert Collins)
------------------------------------------------------------
merged: robertc at robertcollins.net-20060910234217-0ae24d8e666d60d6
parent: robertc at robertcollins.net-20060910225337-eeb90bb6ebad85d0
committer: Robert Collins <robertc at robertcollins.net>
branch nick: convert-tree-decorators
timestamp: Mon 2006-09-11 09:42:17 +1000
message:
All WorkingTree methods which write to the tree, but not to the branch
have been converted to use ``needs_tree_write_lock`` rather than
``needs_write_lock``. Also converted is the revert, conflicts and tree
transform modules. This provides a modest performance improvement on
metadir style trees, due to the reduce lock-acquisition, and a more
significant performance improvement on lightweight checkouts from
remote branches, where trivial operations used to pay a significant
penalty. It also provides the basis for allowing readonly checkouts.
(Robert Collins)
------------------------------------------------------------
merged: robertc at robertcollins.net-20060910225337-eeb90bb6ebad85d0
parent: robertc at robertcollins.net-20060910225011-c46f2b78a0f5cb7d
committer: Robert Collins <robertc at robertcollins.net>
branch nick: lock_tree_write
timestamp: Mon 2006-09-11 08:53:37 +1000
message:
Update NEWS too.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060910225011-c46f2b78a0f5cb7d
parent: pqm at pqm.ubuntu.com-20060910185720-1bcc17b99fe77687
committer: Robert Collins <robertc at robertcollins.net>
branch nick: lock_tree_write
timestamp: Mon 2006-09-11 08:50:11 +1000
message:
Add WorkingTree.lock_tree_write.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060911165531-9e9b9a022a53fef5
parent: pqm at pqm.ubuntu.com-20060911152532-3762ad5c8c6c98dd
parent: john at arbash-meinel.com-20060911162245-225331216fd26a9f
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-09-11 17:55:31 +0100
message:
(moy) fixes for revno:N:branch/path
------------------------------------------------------------
merged: john at arbash-meinel.com-20060911162245-225331216fd26a9f
parent: pqm at pqm.ubuntu.com-20060911152532-3762ad5c8c6c98dd
parent: Matthieu.Moy at imag.fr-20060911093451-24ef653833ff7477
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2006-09-11 11:22:45 -0500
message:
(moy) fixes for revno:N:branch/path
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060911093451-24ef653833ff7477
parent: Matthieu.Moy at imag.fr-20060911083310-6fb1c822a556e34b
parent: pqm at pqm.ubuntu.com-20060910185720-1bcc17b99fe77687
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.merge-revno-n-path
timestamp: Mon 2006-09-11 11:34:51 +0200
message:
merge
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060911083310-6fb1c822a556e34b
parent: Matthieu.Moy at imag.fr-20060911082714-7efc23fff2d862c4
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.merge-revno-n-path
timestamp: Mon 2006-09-11 14:03:10 +0530
message:
Better testcase for revno:N:branch/path error.
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060911082714-7efc23fff2d862c4
parent: Matthieu.Moy at imag.fr-20060911075850-dac85ac1c8d9f022
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.merge-revno-n-path
timestamp: Mon 2006-09-11 13:57:14 +0530
message:
Made merge work with two revisions in different branches.
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060911075850-dac85ac1c8d9f022
parent: Matthieu.Moy at imag.fr-20060911060702-e9ba0bad0fb3b443
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.merge-revno-n-path
timestamp: Mon 2006-09-11 13:28:50 +0530
message:
Canceled an incorrect "path = None".
Indeed, the "path" problem is managed in the revisionspec for revno:N:branch/path.
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060911060702-e9ba0bad0fb3b443
parent: Matthieu.Moy at imag.fr-20060903155815-9009ac7d567b0c2a
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.merge-revno-n-path
timestamp: Mon 2006-09-11 11:37:02 +0530
message:
Cut long lines, prevent "path" component from being used in revno:branch/path.
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060903155815-9009ac7d567b0c2a
parent: Matthieu.Moy at imag.fr-20060903155603-5967ff3f7b648291
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.merge-revno-n-path
timestamp: Sun 2006-09-03 21:28:15 +0530
message:
missing newline
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060903155603-5967ff3f7b648291
parent: Matthieu.Moy at imag.fr-20060828064741-53102882e33ab249
parent: pqm at pqm.ubuntu.com-20060901173735-543e9acad03760d1
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.merge-revno-n-path
timestamp: Sun 2006-09-03 21:26:03 +0530
message:
merge
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060828064741-53102882e33ab249
parent: Matthieu.Moy at imag.fr-20060812135610-34e8ad03d56d38ad
parent: pqm at pqm.ubuntu.com-20060828012417-06e65a27028c9476
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.merge-revno-n-path
timestamp: Mon 2006-08-28 12:17:41 +0530
message:
merge
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060812135610-34e8ad03d56d38ad
parent: Matthieu.Moy at imag.fr-20060812134823-4d94a2dd75210d48
parent: pqm at pqm.ubuntu.com-20060810061423-3ae5999a70b60211
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.merge-revno-n-path
timestamp: Sat 2006-08-12 19:26:10 +0530
message:
merge
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060812134823-4d94a2dd75210d48
parent: Matthieu.Moy at imag.fr-20060812112413-98aee99e87c2ecc3
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.merge-revno-n-path
timestamp: Sat 2006-08-12 19:18:23 +0530
message:
Make bzr cat -r revno:N:foo consistant with bzr cat -r branch:foo.
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060812112413-98aee99e87c2ecc3
parent: Matthieu.Moy at imag.fr-20060806181316-6e6d46134491e7de
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.merge-revno-n-path
timestamp: Sat 2006-08-12 16:54:13 +0530
message:
Explain the error messages in the code.
Keep the errors for merge and log called with two revno:N:path with
different paths, but add a comment to explain why.
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060806181316-6e6d46134491e7de
parent: Matthieu.Moy at imag.fr-20060806173140-b14cd3af89b64d6a
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.merge-revno-n-path
timestamp: Sun 2006-08-06 23:43:16 +0530
message:
bzr cat now works nicely with revno:N:path too
(even outside a branch or working tree).
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060806173140-b14cd3af89b64d6a
parent: Matthieu.Moy at imag.fr-20060806150948-6bb9550a89d54324
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.merge-revno-n-path
timestamp: Sun 2006-08-06 23:01:40 +0530
message:
Make log work nicely with revno:N:path too.
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060806150948-6bb9550a89d54324
parent: pqm at pqm.ubuntu.com-20060802020654-9d81db40bba14f69
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.merge-revno-n-path
timestamp: Sun 2006-08-06 20:39:48 +0530
message:
Fixed merge to work nicely with -r revno:N:path
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060911152532-3762ad5c8c6c98dd
parent: pqm at pqm.ubuntu.com-20060910185720-1bcc17b99fe77687
parent: john at arbash-meinel.com-20060909005219-eee5bd7a64aa0256
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-09-11 16:25:32 +0100
message:
(jam) save a round trip during locking using put_bytes_non_atomic
------------------------------------------------------------
merged: john at arbash-meinel.com-20060909005219-eee5bd7a64aa0256
parent: john at arbash-meinel.com-20060909001007-bd2a0fed41df131c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2006-09-08 19:52:19 -0500
message:
Use Stanza.to_string() rather than a RioWriter
------------------------------------------------------------
merged: john at arbash-meinel.com-20060909001007-bd2a0fed41df131c
parent: pqm at pqm.ubuntu.com-20060908003811-74eab872c372a895
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2006-09-08 19:10:07 -0500
message:
Use put_file_non_atomic in lockdir() to save some sftp round trips
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060910185720-1bcc17b99fe77687
parent: pqm at pqm.ubuntu.com-20060909180200-96e41112dff213f3
parent: aaron.bentley at utoronto.ca-20060910021831-51f5888a7e62a02d
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2006-09-10 19:57:20 +0100
message:
Add new format to support nested trees
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060910021831-51f5888a7e62a02d
parent: aaron.bentley at utoronto.ca-20060909185257-ce0ee03ee5125ff1
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-bumps
timestamp: Sat 2006-09-09 22:18:31 -0400
message:
Update from review comments
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060909185257-ce0ee03ee5125ff1
parent: aaron.bentley at utoronto.ca-20060825222518-8f4db8abdb56b17e
parent: pqm at pqm.ubuntu.com-20060909180200-96e41112dff213f3
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-bumps
timestamp: Sat 2006-09-09 14:52:57 -0400
message:
Merge bzr.dev
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060825222518-8f4db8abdb56b17e
parent: aaron.bentley at utoronto.ca-20060825215159-4c2bbf9c597f0c4b
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-bumps
timestamp: Fri 2006-08-25 18:25:18 -0400
message:
Whitespace fix
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060825215159-4c2bbf9c597f0c4b
parent: aaron.bentley at utoronto.ca-20060825215118-352f6465e332ac0a
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-bumps
timestamp: Fri 2006-08-25 17:51:59 -0400
message:
Support experimental knit2 at commandline
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060825215118-352f6465e332ac0a
parent: aaron.bentley at utoronto.ca-20060825214947-62b9eea88621dc01
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-bumps
timestamp: Fri 2006-08-25 17:51:18 -0400
message:
Retrieve only 500 revision trees at once
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060825214947-62b9eea88621dc01
parent: aaron.bentley at utoronto.ca-20060825021843-7410628c4371b2fb
parent: abentley at panoramicfeedback.com-20060825161848-99c2e65edfd9ecad
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-bumps
timestamp: Fri 2006-08-25 17:49:47 -0400
message:
Merge from other branch
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060825161848-99c2e65edfd9ecad
parent: abentley at panoramicfeedback.com-20060824215105-aac3cbf80b33bae3
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Fri 2006-08-25 12:18:48 -0400
message:
Handle inventories with no revision_ids
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060825021843-7410628c4371b2fb
parent: aaron.bentley at utoronto.ca-20060825020646-02fd636892cd576f
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-bumps
timestamp: Thu 2006-08-24 22:18:43 -0400
message:
Restore RepositoryFormatKnit1 as the default
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060825020646-02fd636892cd576f
parent: abentley at panoramicfeedback.com-20060824215105-aac3cbf80b33bae3
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-bumps
timestamp: Thu 2006-08-24 22:06:46 -0400
message:
Clean up clone format creation
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060824215105-aac3cbf80b33bae3
parent: abentley at panoramicfeedback.com-20060824195956-e0f01d4fe1fb1e9c
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Thu 2006-08-24 17:51:05 -0400
message:
Stopped sprout from setting repository_format on _matchingbzrdir
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060824195956-e0f01d4fe1fb1e9c
parent: abentley at panoramicfeedback.com-20060824185829-16911fcce7b8e50b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Thu 2006-08-24 15:59:56 -0400
message:
Fix checkout bug
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060824185829-16911fcce7b8e50b
parent: abentley at panoramicfeedback.com-20060824183724-7a648a260a5b587d
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Thu 2006-08-24 14:58:29 -0400
message:
Fix info test to use knit1 for bound branches
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060824183724-7a648a260a5b587d
parent: abentley at panoramicfeedback.com-20060824164500-d46c1e2c45d06147
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Thu 2006-08-24 14:37:24 -0400
message:
Handle empty commits, fix test
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060824164500-d46c1e2c45d06147
parent: abentley at panoramicfeedback.com-20060824154907-67295a1f6ed299b5
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Thu 2006-08-24 12:45:00 -0400
message:
Get upgrade from format4 under test and fixed for all formats
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060824154907-67295a1f6ed299b5
parent: abentley at panoramicfeedback.com-20060824135626-1966834952027cf7
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Thu 2006-08-24 11:49:07 -0400
message:
Better fix for convesion test
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060824135626-1966834952027cf7
parent: abentley at panoramicfeedback.com-20060824134807-9067153963809b6c
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Thu 2006-08-24 09:56:26 -0400
message:
Ensure we get a Knit1 in conversion test
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060824134807-9067153963809b6c
parent: abentley at panoramicfeedback.com-20060824134032-a0697d7c3604756b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Thu 2006-08-24 09:48:07 -0400
message:
Fix default format test
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060824134032-a0697d7c3604756b
parent: aaron.bentley at utoronto.ca-20060824033548-104450f485b42c75
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Thu 2006-08-24 09:40:32 -0400
message:
Handle capital-letter file-ids
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060824033548-104450f485b42c75
parent: aaron.bentley at utoronto.ca-20060824014206-bd2263d3f0c80a26
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-bumps
timestamp: Wed 2006-08-23 23:35:48 -0400
message:
Fix bugs in basis inventory handling, change filename
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060824014206-bd2263d3f0c80a26
parent: aaron.bentley at utoronto.ca-20060824011334-2ad4529b3eb1a038
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-bumps
timestamp: Wed 2006-08-23 21:42:06 -0400
message:
Make RepositoryFormatKnit2 the default (for testing)
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060824011334-2ad4529b3eb1a038
parent: abentley at panoramicfeedback.com-20060823181736-a36a1d286cfed4be
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-bumps
timestamp: Wed 2006-08-23 21:13:34 -0400
message:
Fix up sprout, nuke workaround
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060823181736-a36a1d286cfed4be
parent: abentley at panoramicfeedback.com-20060823175017-81ab8d717a4228ad
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Wed 2006-08-23 14:17:36 -0400
message:
Fix sprout for fileid involved test
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060823175017-81ab8d717a4228ad
parent: abentley at panoramicfeedback.com-20060823170820-dbdf5a6ffd020c6c
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Wed 2006-08-23 13:50:17 -0400
message:
Fixed conversion test
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060823170820-dbdf5a6ffd020c6c
parent: abentley at panoramicfeedback.com-20060823153340-f9c4bdf70a3e4457
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Wed 2006-08-23 13:08:20 -0400
message:
Fix up some test cases
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060823153340-f9c4bdf70a3e4457
parent: abentley at panoramicfeedback.com-20060823152119-7b8e92f344f65b35
parent: pqm at pqm.ubuntu.com-20060823140849-674057caaed0edc0
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Wed 2006-08-23 11:33:40 -0400
message:
Merge bzr.dev
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060823152119-7b8e92f344f65b35
parent: abentley at panoramicfeedback.com-20060823131545-fb490208e25b82e0
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Wed 2006-08-23 11:21:19 -0400
message:
Got intra-repository fetch working between model1 and 2 for all types
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060823131545-fb490208e25b82e0
parent: aaron.bentley at utoronto.ca-20060823042506-98adf009e8bd90d1
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Wed 2006-08-23 09:15:45 -0400
message:
Fix up test cases that manually construct inventories
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060823042506-98adf009e8bd90d1
parent: aaron.bentley at utoronto.ca-20060822224421-c1a6e96d13785cba
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-bumps
timestamp: Wed 2006-08-23 00:25:06 -0400
message:
Make commits preserve root entry data
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060822224421-c1a6e96d13785cba
parent: abentley at panoramicfeedback.com-20060822215047-43838f0c93497109
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-bumps
timestamp: Tue 2006-08-22 18:44:21 -0400
message:
Remove workingtree 4 for now
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060822215047-43838f0c93497109
parent: abentley at panoramicfeedback.com-20060822203753-b6c1b05b757efda0
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Tue 2006-08-22 17:50:47 -0400
message:
Add WorkingTreeFormat4
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060822203753-b6c1b05b757efda0
parent: abentley at panoramicfeedback.com-20060822184032-6417522b3ab98f69
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Tue 2006-08-22 16:37:53 -0400
message:
Test whether revision id for root is retained
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060822184032-6417522b3ab98f69
parent: abentley at panoramicfeedback.com-20060822181146-9d1b10a76fd1ec21
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Tue 2006-08-22 14:40:32 -0400
message:
Implement creation of knits for tree roots
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060822181146-9d1b10a76fd1ec21
parent: abentley at panoramicfeedback.com-20060822165718-9b3c880b36bf2276
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Tue 2006-08-22 14:11:46 -0400
message:
Get fetching from 1 to 2 under test
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060822165718-9b3c880b36bf2276
parent: abentley at panoramicfeedback.com-20060822161417-29c1eb4790285db9
parent: pqm at pqm.ubuntu.com-20060822164041-3ff8e0735c0cb7c0
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Tue 2006-08-22 12:57:18 -0400
message:
Merge bzr.dev
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060822161417-29c1eb4790285db9
parent: abentley at panoramicfeedback.com-20060818205305-2df0367482c62222
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Tue 2006-08-22 12:14:17 -0400
message:
Back out inter.get changes, make optimizers an ordered list
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060818205305-2df0367482c62222
parent: abentley at panoramicfeedback.com-20060817220230-959cf1bc3f61b57e
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Fri 2006-08-18 16:53:05 -0400
message:
Fail when trying to use interrepository on Knit2 and Knit1
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060817220230-959cf1bc3f61b57e
parent: abentley at panoramicfeedback.com-20060817195154-af960bfc59351ebf
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Thu 2006-08-17 18:02:30 -0400
message:
Start work on converter
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060817195154-af960bfc59351ebf
parent: aaron.bentley at utoronto.ca-20060817120634-8d9db345165c55d9
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Thu 2006-08-17 15:51:54 -0400
message:
Implement knit repo format 2
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060817120634-8d9db345165c55d9
parent: aaron.bentley at utoronto.ca-20060817013139-9f128dc0fbddadca
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-bumps
timestamp: Thu 2006-08-17 08:06:34 -0400
message:
Start work on Knit format 2
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060914032814-6817446cff1ee398
parent: andrew.bennetts at canonical.com-20060913103603-48b8cf5e2c7a463a
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: cosmetic
timestamp: Thu 2006-09-14 13:28:14 +1000
message:
Expand comment about lock_read/lock_write.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060913120233-a3b6a97c1d56c7ab
parent: andrew.bennetts at canonical.com-20060830024447-7faafe45c8018857
parent: andrew.bennetts at canonical.com-20060913113149-e50e3da90823fc47
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: preserve transport when creating bzrdir
timestamp: Wed 2006-09-13 22:02:33 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060913113149-e50e3da90823fc47
parent: andrew.bennetts at canonical.com-20060830023336-5f83ffbce98c0c64
parent: andrew.bennetts at canonical.com-20060913111406-5948c590279949c3
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: BzrNewError.__str__
timestamp: Wed 2006-09-13 21:31:49 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060913111406-5948c590279949c3
parent: andrew.bennetts at canonical.com-20060829081622-bf61f64bcae7b67c
parent: andrew.bennetts at canonical.com-20060913105126-f67427690b700b48
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: open_from_transport
timestamp: Wed 2006-09-13 21:14:06 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060913105126-f67427690b700b48
parent: andrew.bennetts at canonical.com-20060912063001-7f832d0244311ed5
parent: andrew.bennetts at canonical.com-20060913103603-48b8cf5e2c7a463a
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: sort os.listdir in add.py
timestamp: Wed 2006-09-13 20:51:26 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060913103603-48b8cf5e2c7a463a
parent: andrew.bennetts at canonical.com-20060829081253-c55c0ddc482231a0
parent: andrew.bennetts at canonical.com-20060913100310-05b757fd7ec1ecbd
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: cosmetic
timestamp: Wed 2006-09-13 20:36:03 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060913100310-05b757fd7ec1ecbd
parent: andrew.bennetts at canonical.com-20060829013108-eee0301e190437aa
parent: andrew.bennetts at canonical.com-20060913094056-b311a460a4fca603
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: list_dir return type
timestamp: Wed 2006-09-13 20:03:10 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060913094056-b311a460a4fca603
parent: andrew.bennetts at canonical.com-20060829012540-e6285c443460fa06
parent: pqm at pqm.ubuntu.com-20060909180200-96e41112dff213f3
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: sftp refactoring 2
timestamp: Wed 2006-09-13 19:40:56 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060909180200-96e41112dff213f3
parent: pqm at pqm.ubuntu.com-20060909160418-376f106672f0163b
parent: robey at lag.net-20060908185217-6a4406e1d41753f5
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2006-09-09 19:02:00 +0100
message:
(robey) remove hasattr and == None in favor of getattr() and is None
------------------------------------------------------------
merged: robey at lag.net-20060908185217-6a4406e1d41753f5
parent: robey at lag.net-20060908184629-e3fc4c61ca21508c
parent: pqm at pqm.ubuntu.com-20060908003811-74eab872c372a895
committer: Robey Pointer <robey at lag.net>
branch nick: bzr.dev.no_has_key
timestamp: Fri 2006-09-08 11:52:17 -0700
message:
merge from bzr.dev
------------------------------------------------------------
merged: robey at lag.net-20060908184629-e3fc4c61ca21508c
parent: robey at lag.net-20060903002818-71ca5c7bfea93a26
committer: Robey Pointer <robey at lag.net>
branch nick: bzr.dev.no_has_key
timestamp: Fri 2006-09-08 11:46:29 -0700
message:
pychecker is on crack; go back to using 'is None'.
------------------------------------------------------------
merged: robey at lag.net-20060903002818-71ca5c7bfea93a26
parent: robey at lag.net-20060903001354-1f596a529c9c4934
parent: pqm at pqm.ubuntu.com-20060901173735-543e9acad03760d1
committer: Robey Pointer <robey at lag.net>
branch nick: bzr.dev.no_has_key
timestamp: Sat 2006-09-02 17:28:18 -0700
message:
merge from bzr.dev
------------------------------------------------------------
merged: robey at lag.net-20060903001354-1f596a529c9c4934
parent: robey at lag.net-20060902222155-1d1ed3d3c31120ee
committer: Robey Pointer <robey at lag.net>
branch nick: bzr.dev.no_has_key
timestamp: Sat 2006-09-02 17:13:54 -0700
message:
remove usage of hasattr
------------------------------------------------------------
merged: robey at lag.net-20060902222155-1d1ed3d3c31120ee
parent: robey at lag.net-20060830022017-53f9005cacd0b1e2
committer: Robey Pointer <robey at lag.net>
branch nick: bzr.dev.no_has_key
timestamp: Sat 2006-09-02 15:21:55 -0700
message:
be explicit about the deprecation of setup_caching and remove no-op destructor
------------------------------------------------------------
merged: robey at lag.net-20060830022017-53f9005cacd0b1e2
parent: robey at lag.net-20060829204702-6d40ae7a33ec62c7
committer: Robey Pointer <robey at lag.net>
branch nick: bzr.dev.no_has_key
timestamp: Tue 2006-08-29 19:20:17 -0700
message:
make return (x in y) explicit with parens
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060909160418-376f106672f0163b
parent: pqm at pqm.ubuntu.com-20060909154533-ffb28f628144941d
parent: john at arbash-meinel.com-20060909155501-3d39643be1accab1
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2006-09-09 17:04:18 +0100
message:
(jam) remove more env vars than just LANG
------------------------------------------------------------
merged: john at arbash-meinel.com-20060909155501-3d39643be1accab1
parent: john at arbash-meinel.com-20060909153900-a7d8b960eaac71d6
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locale-35392
timestamp: Sat 2006-09-09 10:55:01 -0500
message:
Unset a few other LANG type variables when spawning diff
------------------------------------------------------------
merged: john at arbash-meinel.com-20060909153900-a7d8b960eaac71d6
parent: john at arbash-meinel.com-20060902152121-2aa9f40fccfc8cb5
parent: pqm at pqm.ubuntu.com-20060908003811-74eab872c372a895
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locale-35392
timestamp: Sat 2006-09-09 10:39:00 -0500
message:
[merge] bzr.dev 1993
------------------------------------------------------------
merged: john at arbash-meinel.com-20060902152121-2aa9f40fccfc8cb5
parent: john at arbash-meinel.com-20060902151948-be48553dd9b43625
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locale-35392
timestamp: Sat 2006-09-02 10:21:21 -0500
message:
Update locale tests to remove more env vars
Some systems have LC_ALL or LC_CTYPE setup, which overrides LANG.
Now we remove them, to give us a cleaner testing area.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060902151948-be48553dd9b43625
parent: john at arbash-meinel.com-20060902151815-1c0aa36eb69e0a60
parent: john at arbash-meinel.com-20060902150748-720dd94b32896aac
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locale-35392
timestamp: Sat 2006-09-02 10:19:48 -0500
message:
[merge] run_bzr_subprocess fixes
------------------------------------------------------------
merged: john at arbash-meinel.com-20060902151815-1c0aa36eb69e0a60
parent: john at arbash-meinel.com-20060828150419-f5077aa755c10f88
parent: pqm at pqm.ubuntu.com-20060901173735-543e9acad03760d1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locale-35392
timestamp: Sat 2006-09-02 10:18:15 -0500
message:
[merge] bzr.dev 1981
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060909154533-ffb28f628144941d
parent: pqm at pqm.ubuntu.com-20060908003811-74eab872c372a895
parent: john at arbash-meinel.com-20060909140450-787dc70dce713090
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2006-09-09 16:45:33 +0100
message:
(jam) add a tutorial on centralized workflow
------------------------------------------------------------
merged: john at arbash-meinel.com-20060909140450-787dc70dce713090
parent: john at arbash-meinel.com-20060830195010-96618b54d5a83404
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: documentation
timestamp: Sat 2006-09-09 09:04:50 -0500
message:
Adding a footnote to help understand nesting
------------------------------------------------------------
merged: john at arbash-meinel.com-20060830195010-96618b54d5a83404
parent: pqm at pqm.ubuntu.com-20060828164122-9c1715bd268374ae
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: documentation
timestamp: Wed 2006-08-30 14:50:10 -0500
message:
Adding basic documentation about working with a central repository
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060908003811-74eab872c372a895
parent: pqm at pqm.ubuntu.com-20060907230608-4f18ec1bbe03eb8f
parent: robertc at robertcollins.net-20060908001948-87b1b268cec30ede
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-09-08 01:38:11 +0100
message:
(robertc) Deprecate WorkingTree.pending_merges.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060908001948-87b1b268cec30ede
parent: robertc at robertcollins.net-20060905234449-baeb0612c8847493
parent: pqm at pqm.ubuntu.com-20060907230608-4f18ec1bbe03eb8f
committer: Robert Collins <robertc at robertcollins.net>
branch nick: deprecate-old-tree-parent-apis
timestamp: Fri 2006-09-08 10:19:48 +1000
message:
Merge bzr.dev and undeprecated WorkingTree.last_revision as per review feedback.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060905234449-baeb0612c8847493
parent: robertc at robertcollins.net-20060905231530-8d7d1e497c574089
parent: robertc at robertcollins.net-20060905231840-bd95f673d0205a81
committer: Robert Collins <robertc at robertcollins.net>
branch nick: deprecate-old-tree-parent-apis
timestamp: Wed 2006-09-06 09:44:49 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060905231530-8d7d1e497c574089
parent: robertc at robertcollins.net-20060905230803-eceb0203f2f4c238
committer: Robert Collins <robertc at robertcollins.net>
branch nick: deprecate-old-tree-parent-apis
timestamp: Wed 2006-09-06 09:15:30 +1000
message:
WorkingTree.last_revision and WorkingTree.pending_merges are deprecated.
Please use the get_parent_ids (introduced in 0.10) method instead.
(Robert Collins)
------------------------------------------------------------
merged: robertc at robertcollins.net-20060905230803-eceb0203f2f4c238
parent: robertc at robertcollins.net-20060905094940-d7ff941c7dfc56a9
parent: robertc at robertcollins.net-20060905230133-2c68611e38fd7922
committer: Robert Collins <robertc at robertcollins.net>
branch nick: deprecate-old-tree-parent-apis
timestamp: Wed 2006-09-06 09:08:03 +1000
message:
Merge improved test deprecation helpers, simplifying handling of deprecated WorkingTree function tests.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060905094940-d7ff941c7dfc56a9
parent: robertc at robertcollins.net-20060905081423-b1bc9b092a9f8597
committer: Robert Collins <robertc at robertcollins.net>
branch nick: deprecate-old-tree-parent-apis
timestamp: Tue 2006-09-05 19:49:40 +1000
message:
Deprecated WorkingTree.pending_merges.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060905081423-b1bc9b092a9f8597
parent: robertc at robertcollins.net-20060905052834-d84078bf055d0345
committer: Robert Collins <robertc at robertcollins.net>
branch nick: deprecate-old-tree-parent-apis
timestamp: Tue 2006-09-05 18:14:23 +1000
message:
Deprecate WorkingTree.last_revision.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060905052834-d84078bf055d0345
parent: robertc at robertcollins.net-20060901041734-7b9c3e1a65ca2810
parent: pqm at pqm.ubuntu.com-20060904084408-ebdbb37a1cdb0c53
committer: Robert Collins <robertc at robertcollins.net>
branch nick: deprecate-old-tree-parent-apis
timestamp: Tue 2006-09-05 15:28:34 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060901041734-7b9c3e1a65ca2810
parent: robertc at robertcollins.net-20060830063901-eb22406724834a24
parent: pqm at pqm.ubuntu.com-20060831182704-2de4cd234a448ed1
committer: Robert Collins <robertc at robertcollins.net>
branch nick: deprecate-old-tree-parent-apis
timestamp: Fri 2006-09-01 14:17:34 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060830063901-eb22406724834a24
parent: robertc at robertcollins.net-20060830043650-bcca487b06085a14
parent: pqm at pqm.ubuntu.com-20060830043844-d570350402a5ad15
committer: Robert Collins <robertc at robertcollins.net>
branch nick: deprecate-old-tree-parent-apis
timestamp: Wed 2006-08-30 16:39:01 +1000
message:
sync with bzr.dev.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060830043650-bcca487b06085a14
parent: robertc at robertcollins.net-20060825065644-41d5b8d507c94d38
parent: robertc at robertcollins.net-20060830041458-c0b772f8932bf454
committer: Robert Collins <robertc at robertcollins.net>
branch nick: deprecate-old-tree-parent-apis
timestamp: Wed 2006-08-30 14:36:50 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060825065644-41d5b8d507c94d38
parent: robertc at robertcollins.net-20060811120610-ae75892349d3f2e4
parent: robertc at robertcollins.net-20060825065618-75b5d54af758e21b
committer: Robert Collins <robertc at robertcollins.net>
branch nick: deprecate-old-tree-parent-apis
timestamp: Fri 2006-08-25 16:56:44 +1000
message:
Merge bzr.dev and fully converted uses of new parents api.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060912063001-7f832d0244311ed5
parent: andrew.bennetts at canonical.com-20060829081253-c55c0ddc482231a0
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: sort os.listdir in add.py
timestamp: Tue 2006-09-12 16:30:01 +1000
message:
Sort os.listdir results in add.py.
Some filesystems (like ext3 with the 'dir_index' option set) don't necessarily
return directory listings in alphabetical order, contrary to what some tests
assume.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060830024447-7faafe45c8018857
parent: andrew.bennetts at canonical.com-20060830023336-5f83ffbce98c0c64
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: preserve transport when creating bzrdir
timestamp: Wed 2006-08-30 12:44:47 +1000
message:
Make make_bzrdir preserve the transport.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060830023336-5f83ffbce98c0c64
parent: andrew.bennetts at canonical.com-20060829081622-bf61f64bcae7b67c
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: BzrNewError.__str__
timestamp: Wed 2006-08-30 12:33:36 +1000
message:
Catch TypeError in BzrNewError.__str__, and print more information if an exception happens in that.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060829081622-bf61f64bcae7b67c
parent: andrew.bennetts at canonical.com-20060829081253-c55c0ddc482231a0
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: open_from_transport
timestamp: Tue 2006-08-29 18:16:22 +1000
message:
Add BzrDir.open_from_transport, refactored from duplicate code, no explicit tests.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060829081253-c55c0ddc482231a0
parent: andrew.bennetts at canonical.com-20060829013108-eee0301e190437aa
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: cosmetic
timestamp: Tue 2006-08-29 18:12:53 +1000
message:
Various cosmetic changes.
More information about the bazaar-commits
mailing list