Rev 2008: Merge bzr.dev. in file:///home/robertc/source/baz/test-performance/

Robert Collins robertc at robertcollins.net
Mon Oct 16 02:14:04 BST 2006


------------------------------------------------------------
revno: 2008
revision-id: robertc at robertcollins.net-20061016011359-803135f6f6a5c793
parent: robertc at robertcollins.net-20061013073925-c5ffa47050a07d5e
parent: pqm at pqm.ubuntu.com-20061015163229-648b1f2ebe692136
committer: Robert Collins <robertc at robertcollins.net>
branch nick: init-tree-overhead
timestamp: Mon 2006-10-16 11:13:59 +1000
message:
  Merge bzr.dev.
added:
  bzrlib/registry.py             lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-1
  bzrlib/tests/test_registry.py  test_lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-2
modified:
  HACKING                        HACKING-20050805200004-2a5dc975d870f78c
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/bundle/bundle_data.py   read_changeset.py-20050619171944-c0d95aa685537640
  bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
  bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
  bzrlib/delta.py                delta.py-20050729221636-54cf14ef94783d0a
  bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
  bzrlib/info.py                 info.py-20050323235939-6bbfe7d9700b0b9b
  bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
  bzrlib/memorytree.py           memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
  bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
  bzrlib/mutabletree.py          mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
  bzrlib/revisiontree.py         revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
  bzrlib/tests/blackbox/test_serve.py test_serve.py-20060913064329-8t2pvmsikl4s3xhl-1
  bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
  bzrlib/tests/repository_implementations/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
  bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
  bzrlib/tests/test_ancestry.py  test_ancestry.py-20050913023709-69768e94848312c6
  bzrlib/tests/test_commit_merge.py test_commit_merge.py-20050920084723-819eeeff77907bc5
  bzrlib/tests/test_errors.py    test_errors.py-20060210110251-41aba2deddf936a8
  bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
  bzrlib/tests/test_inv.py       testinv.py-20050722220913-1dc326138d1a5892
  bzrlib/tests/test_memorytree.py test_memorytree.py-20060906023413-4wlkalbdpsxi2r4y-3
  bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
  bzrlib/tests/test_revisiontree.py test_revisiontree.py-20060615095324-aij44ndxbv1h4c9f-1
  bzrlib/tests/test_smart_add.py test_smart_add.py-20050824235919-c60dcdb0c8e999ce
  bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
  bzrlib/tests/test_testament.py testtestament.py-20051011100429-5df1657310caa929
  bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
  bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
  bzrlib/tests/test_tree.py      test_tree.py-20060724065232-khgrr0vvmt6ih0mi-1
  bzrlib/tests/test_version_info.py test_version_info.py-20051228204928-2c364e30b702b41b
  bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
  bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
  bzrlib/tests/tree_implementations/test_test_trees.py test_tree_trees.py-20060720091921-3nwi5h21lf06vf5p-1
  bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
  bzrlib/textinv.py              textinv.py-20050411024435-e3898231b7d1897b26c38878
  bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
  bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
  bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
  bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
  bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
  bzrlib/transport/http/response.py _response.py-20060613154423-a2ci7hd4iw5c7fnt-1
  bzrlib/transport/smart.py      ssh.py-20060608202016-c25gvf1ob7ypbus6-1
  bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
  bzrlib/treebuilder.py          treebuilder.py-20060907214856-4omn6hf1u7fvrart-1
  bzrlib/version_info_formats/__init__.py generate_version_info.py-20051228204928-8358edabcddcd97e
  bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20061015163229-648b1f2ebe692136
    parent: pqm at pqm.ubuntu.com-20061013075108-5846f14f6dfe63b2
    parent: aaron.bentley at utoronto.ca-20061015162242-2de5677dd0495500
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sun 2006-10-15 17:32:29 +0100
    message:
      New trees have unique root ids
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20061015162242-2de5677dd0495500
        parent: aaron.bentley at utoronto.ca-20061015160126-2705455850b0979d
        parent: pqm at pqm.ubuntu.com-20061013075108-5846f14f6dfe63b2
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: unique-root
        timestamp: Sun 2006-10-15 12:22:42 -0400
        message:
          Merge from bzr.dev
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20061015160126-2705455850b0979d
        parent: aaron.bentley at utoronto.ca-20061015155957-b44e738e2764352b
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: unique-root
        timestamp: Sun 2006-10-15 12:01:26 -0400
        message:
          add NEWS entry
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20061015155957-b44e738e2764352b
        parent: aaron.bentley at utoronto.ca-20061015155532-d64a63ea5046f693
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: unique-root
        timestamp: Sun 2006-10-15 11:59:57 -0400
        message:
          Use all-lowercase in tree root ids
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20061015155532-d64a63ea5046f693
        parent: aaron.bentley at utoronto.ca-20061014162016-63669f40402fd7f8
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: unique-root
        timestamp: Sun 2006-10-15 11:55:32 -0400
        message:
          Fix up more memorytree tests
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20061014162016-63669f40402fd7f8
        parent: aaron.bentley at utoronto.ca-20061012031914-036d95e1296a45c4
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: unique-root
        timestamp: Sat 2006-10-14 12:20:16 -0400
        message:
          Avoid committing with None root in test_straightline_ancestry
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20061012031914-036d95e1296a45c4
        parent: aaron.bentley at utoronto.ca-20061012015046-a5a625ca88adf11c
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: unique-root
        timestamp: Wed 2006-10-11 23:19:14 -0400
        message:
          Changes from review comments
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20061012015046-a5a625ca88adf11c
        parent: abentley at panoramicfeedback.com-20061002130518-5aa716794d33cfe3
        parent: pqm at pqm.ubuntu.com-20061012005131-810e76839f2b0d1b
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: unique-root
        timestamp: Wed 2006-10-11 21:50:46 -0400
        message:
          Merge bzr.dev
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20061002130518-5aa716794d33cfe3
        parent: aaron.bentley at utoronto.ca-20060930002531-002829a43cd9014b
        parent: pqm at pqm.ubuntu.com-20061002004310-6e09ddd7fd28f71c
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: unique-root
        timestamp: Mon 2006-10-02 09:05:18 -0400
        message:
          Merge bzr.dev
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060930002531-002829a43cd9014b
        parent: aaron.bentley at utoronto.ca-20060929000413-bb6d513b7171b59f
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: unique-root
        timestamp: Fri 2006-09-29 20:25:31 -0400
        message:
          Ensure the null revision has no root
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060929000413-bb6d513b7171b59f
        parent: aaron.bentley at utoronto.ca-20060929000329-d0471ba98bc43652
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: unique-root
        timestamp: Thu 2006-09-28 20:04:13 -0400
        message:
          fix version_info stuff to deliberately include root
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060929000329-d0471ba98bc43652
        parent: aaron.bentley at utoronto.ca-20060928225604-415f1396ea1d2b97
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: unique-root
        timestamp: Thu 2006-09-28 20:03:29 -0400
        message:
          fix repeated root in WorkingTree.list_files
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060928225604-415f1396ea1d2b97
        parent: aaron.bentley at utoronto.ca-20060928225018-662b2319008ee69e
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: unique-root
        timestamp: Thu 2006-09-28 18:56:04 -0400
        message:
          Fix EmptyTree's default include_root
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060928225018-662b2319008ee69e
        parent: aaron.bentley at utoronto.ca-20060928020045-c5d9daf00073dbab
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: unique-root
        timestamp: Thu 2006-09-28 18:50:18 -0400
        message:
          Fix bundle handling
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060928020045-c5d9daf00073dbab
        parent: aaron.bentley at utoronto.ca-20060928015743-78fe237142e5446c
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: unique-root
        timestamp: Wed 2006-09-27 22:00:45 -0400
        message:
          Fix revision_tree tests
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060928015743-78fe237142e5446c
        parent: aaron.bentley at utoronto.ca-20060928015323-4e7367532c857e87
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: unique-root
        timestamp: Wed 2006-09-27 21:57:43 -0400
        message:
          Fix testament text now that root are variable
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060928015323-4e7367532c857e87
        parent: aaron.bentley at utoronto.ca-20060927022844-5f7f1374d31fd15b
        parent: pqm at pqm.ubuntu.com-20060927204431-5871ab3ef6affaf3
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: unique-root
        timestamp: Wed 2006-09-27 21:53:23 -0400
        message:
          Merge from bzr.dev
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060927022844-5f7f1374d31fd15b
        parent: aaron.bentley at utoronto.ca-20060922045217-4e775bf2fc6d0b3b
        parent: pqm at pqm.ubuntu.com-20060926233056-203e713964b2cd51
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: nested-trees
        timestamp: Tue 2006-09-26 22:28:44 -0400
        message:
          Merge bzr.dev
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060922045217-4e775bf2fc6d0b3b
        parent: aaron.bentley at utoronto.ca-20060910201200-828058f367980c5a
        parent: pqm at pqm.ubuntu.com-20060922002407-21dde3dd8419b20b
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: nested-trees
        timestamp: Fri 2006-09-22 00:52:17 -0400
        message:
          Merge bzr.dev
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060910201200-828058f367980c5a
        parent: aaron.bentley at utoronto.ca-20060910190448-2103188d0f449b1c
        parent: pqm at pqm.ubuntu.com-20060910185720-1bcc17b99fe77687
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: nested-trees
        timestamp: Sun 2006-09-10 16:12:00 -0400
        message:
          Merge bzr.dev
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060910190448-2103188d0f449b1c
        parent: aaron.bentley at utoronto.ca-20060903204145-8ba5ae2688f4ffdf
        parent: pqm at pqm.ubuntu.com-20060909180200-96e41112dff213f3
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: nested-trees
        timestamp: Sun 2006-09-10 15:04:48 -0400
        message:
          Merge from bzr.dev
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060903204145-8ba5ae2688f4ffdf
        parent: aaron.bentley at utoronto.ca-20060817001523-f23f3e0a6260dbc0
        parent: pqm at pqm.ubuntu.com-20060831182704-2de4cd234a448ed1
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: nested-trees
        timestamp: Sun 2006-09-03 16:41:45 -0400
        message:
          Merge bzr.dev
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060817001523-f23f3e0a6260dbc0
        parent: aaron.bentley at utoronto.ca-20060816231700-43cf87964e43f145
        parent: pqm at pqm.ubuntu.com-20060816165353-bc26ccbe32f89d60
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: nested-trees
        timestamp: Wed 2006-08-16 20:15:23 -0400
        message:
          merge from bzr.dev
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060816231700-43cf87964e43f145
        parent: abentley at panoramicfeedback.com-20060814160210-d4c1783917db8d5a
        parent: pqm at pqm.ubuntu.com-20060815031820-fde63c7ba995e484
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: nested-trees
        timestamp: Wed 2006-08-16 19:17:00 -0400
        message:
          Merge bzr.dev
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060814160210-d4c1783917db8d5a
        parent: abentley at panoramicfeedback.com-20060814155943-41a357981f0303b2
        parent: pqm at pqm.ubuntu.com-20060814155317-e2d508d6f2646a4b
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: nested-trees
        timestamp: Mon 2006-08-14 12:02:10 -0400
        message:
          Merge bzr.dev
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060814155943-41a357981f0303b2
        parent: abentley at panoramicfeedback.com-20060814141012-1c2e7e95b30001da
        parent: abentley at panoramicfeedback.com-20060814154505-f7182110bfcce1bc
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: nested-trees
        timestamp: Mon 2006-08-14 11:59:43 -0400
        message:
          Merge more checkout changes
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060814141012-1c2e7e95b30001da
        parent: aaron.bentley at utoronto.ca-20060808044819-507b81b4142f7914
        parent: abentley at panoramicfeedback.com-20060814134102-f8688153405a8ac7
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: nested-trees
        timestamp: Mon 2006-08-14 10:10:12 -0400
        message:
          Merge create_checkout_convenience update
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060808044819-507b81b4142f7914
        parent: aaron.bentley at utoronto.ca-20060808001903-b7b4cd49ff7b19d3
        parent: pqm at pqm.ubuntu.com-20060808002438-4b8baf2d9282e154
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: nested-trees
        timestamp: Tue 2006-08-08 00:48:19 -0400
        message:
          Merge bzr.dev
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060808001903-b7b4cd49ff7b19d3
        parent: aaron.bentley at utoronto.ca-20060807231938-12073b4a70941d3d
        parent: aaron.bentley at utoronto.ca-20060808001135-ae94c12d9631f432
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: nested-trees
        timestamp: Mon 2006-08-07 20:19:03 -0400
        message:
          Reject further no-special-roots change
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060807231938-12073b4a70941d3d
        parent: aaron.bentley at utoronto.ca-20060807171225-3692f9d3144e202c
        parent: aaron.bentley at utoronto.ca-20060807231445-618a867437f6e82c
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: nested-trees
        timestamp: Mon 2006-08-07 19:19:38 -0400
        message:
          Reject removing is_root
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060807171225-3692f9d3144e202c
        parent: aaron.bentley at utoronto.ca-20060806220931-04db236b05c26de6
        parent: aaron.bentley at utoronto.ca-20060804235649-c209f0255dc6284c
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: nested-trees
        timestamp: Mon 2006-08-07 13:12:25 -0400
        message:
          Merge create_checkout_convenience branch
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060806220931-04db236b05c26de6
        parent: aaron.bentley at utoronto.ca-20060806212623-17b5708292862d36
        parent: aaron.bentley at utoronto.ca-20060806215957-043656291c1fb8ce
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: nested-trees
        timestamp: Sun 2006-08-06 18:09:31 -0400
        message:
          Update from no-special-root
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060806212623-17b5708292862d36
        parent: aaron.bentley at utoronto.ca-20060806212220-3429f614122ac13b
        parent: aaron.bentley at utoronto.ca-20060806212422-850ea3d25256bbc1
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: nested-trees
        timestamp: Sun 2006-08-06 17:26:23 -0400
        message:
          Revert removal of include_root from EmptyTree.list_files
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060806212220-3429f614122ac13b
        parent: aaron.bentley at utoronto.ca-20060806202314-c11892c514d504fc
        parent: aaron.bentley at utoronto.ca-20060806212132-56b40ec5caf87658
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: nested-trees
        timestamp: Sun 2006-08-06 17:22:20 -0400
        message:
          Merge restoration of RootEntry and EmptyTree.kind
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060806202314-c11892c514d504fc
        parent: aaron.bentley at utoronto.ca-20060806002032-c493bfebcdc2f63b
        parent: aaron.bentley at utoronto.ca-20060806185906-8c033dc32180fb00
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: nested-trees
        timestamp: Sun 2006-08-06 16:23:14 -0400
        message:
          Merge unicode test case fixes
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060806002032-c493bfebcdc2f63b
        parent: abentley at panoramicfeedback.com-20060804140846-454dfd62c118d15b
        parent: aaron.bentley at utoronto.ca-20060805225938-e8b97cabbe70f571
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: nested-trees
        timestamp: Sat 2006-08-05 20:20:32 -0400
        message:
          Revert no-special-root changes
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20061013075108-5846f14f6dfe63b2
    parent: pqm at pqm.ubuntu.com-20061013071706-5ef72f540f9d3fe3
    parent: john at arbash-meinel.com-20061013074106-1c71354188ac0138
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2006-10-13 08:51:08 +0100
    message:
      (John Arbash Meinel) Change run_bzr_subprocess to default to supplying --no-plugins
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20061013074106-1c71354188ac0138
        parent: john at arbash-meinel.com-20061013072223-9d1320456e7df776
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: run_subprocess_no_plugins
        timestamp: Fri 2006-10-13 02:41:06 -0500
        message:
          fixup one test
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20061013072223-9d1320456e7df776
        parent: john at arbash-meinel.com-20061013071527-6043c93c2d3d6c5f
        parent: pqm at pqm.ubuntu.com-20061013071706-5ef72f540f9d3fe3
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: run_subprocess_no_plugins
        timestamp: Fri 2006-10-13 02:22:23 -0500
        message:
          [merge] bzr.dev 2076
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20061013071527-6043c93c2d3d6c5f
        parent: john at arbash-meinel.com-20061010081138-5d27a6fd0955bde7
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: run_subprocess_no_plugins
        timestamp: Fri 2006-10-13 02:15:27 -0500
        message:
          Review comments from Robert
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20061010081138-5d27a6fd0955bde7
        parent: pqm at pqm.ubuntu.com-20061010030628-7945de26f2489e6f
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: run_subprocess_no_plugins
        timestamp: Tue 2006-10-10 03:11:38 -0500
        message:
          Change run_bzr_subprocess to default to supplying --no-plugins.
          
          Tests that need it can supply allow_plugins=True to override this
          behavior.
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20061013071706-5ef72f540f9d3fe3
    parent: pqm at pqm.ubuntu.com-20061013070838-897847ef11ecdf72
    parent: robertc at robertcollins.net-20061013064514-2fddd7f772445db3
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2006-10-13 08:17:06 +0100
    message:
      (Robert Collins, John Arbash Meinel) Allow tests that require a specific branch or repository format to obtain that through TestCaseWithMemoryTree.make_branch_and_memory_tree.
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20061013070838-897847ef11ecdf72
    parent: pqm at pqm.ubuntu.com-20061013064121-50dd056d490840cd
    parent: john at arbash-meinel.com-20061013065326-dcf8dadee82f4afe
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2006-10-13 08:08:38 +0100
    message:
      (Andrew Bennetts) Implement bzr+http which lets us tunnel the smart protocol through an http connection
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20061013065326-dcf8dadee82f4afe
        parent: john at arbash-meinel.com-20061013064104-57dbb43c2ffa55ff
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Fri 2006-10-13 16:53:26 +1000
        message:
          Add NEWS entry for bzr+http://
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20061013064104-57dbb43c2ffa55ff
        parent: john at arbash-meinel.com-20061013063644-89370e8650ab1cd7
        parent: andrew.bennetts at canonical.com-20061011071615-32d2dc808a3d0a82
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Fri 2006-10-13 16:41:04 +1000
        message:
          (Andrew Bennetts) Implement bzr+http which lets us tunnel the smart protocol through an http connection
            ------------------------------------------------------------
            merged: andrew.bennetts at canonical.com-20061011071615-32d2dc808a3d0a82
            parent: andrew.bennetts at canonical.com-20061011055532-47bd2039b78674d2
            parent: pqm at pqm.ubuntu.com-20061010072307-037a6f63da8a1bdd
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: hpss HTTP support
            timestamp: Wed 2006-10-11 17:16:15 +1000
            message:
              Merge from bzr.dev.
            ------------------------------------------------------------
            merged: andrew.bennetts at canonical.com-20061011055532-47bd2039b78674d2
            parent: andrew.bennetts at canonical.com-20061009073415-636d73bf2b733bce
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: hpss HTTP support
            timestamp: Wed 2006-10-11 15:55:32 +1000
            message:
              Changes in response to review: re-use _base_curl, rather than keeping a seperate _post_curl object; add docstring to test_http.RecordingServer, set is_user_error on some new exceptions.
            ------------------------------------------------------------
            merged: andrew.bennetts at canonical.com-20061009073415-636d73bf2b733bce
            parent: andrew.bennetts at canonical.com-20061009071340-87345d71fadc673f
            parent: pqm at pqm.ubuntu.com-20061005041829-4f10f01c0c5ba3ac
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: hpss HTTP support
            timestamp: Mon 2006-10-09 17:34:15 +1000
            message:
              Merge from bzr.dev
            ------------------------------------------------------------
            merged: andrew.bennetts at canonical.com-20061009071340-87345d71fadc673f
            parent: andrew.bennetts at canonical.com-20061004022735-c362213df9239f22
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: hpss HTTP support
            timestamp: Mon 2006-10-09 17:13:40 +1000
            message:
              Changes prompted by j-a-meinel's review.
            ------------------------------------------------------------
            merged: andrew.bennetts at canonical.com-20061004022735-c362213df9239f22
            parent: andrew.bennetts at canonical.com-20061004022448-5b5cb552e3bc7647
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: hpss HTTP support
            timestamp: Wed 2006-10-04 12:27:35 +1000
            message:
              Tweak psuedo-EBNF to be in sync with the code.
            ------------------------------------------------------------
            merged: andrew.bennetts at canonical.com-20061004022448-5b5cb552e3bc7647
            parent: andrew.bennetts at canonical.com-20060929062858-4516689dc8de55ec
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: hpss HTTP support
            timestamp: Wed 2006-10-04 12:24:48 +1000
            message:
              Delete some obsolete code and comments.
            ------------------------------------------------------------
            merged: andrew.bennetts at canonical.com-20060929062858-4516689dc8de55ec
            parent: andrew.bennetts at canonical.com-20060929050436-08c49958f1752c88
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: hpss HTTP support
            timestamp: Fri 2006-09-29 16:28:58 +1000
            message:
              Clean up SmartServerStreamMedium implementations, including removing unnecessary flushes.
            ------------------------------------------------------------
            merged: andrew.bennetts at canonical.com-20060929050436-08c49958f1752c88
            parent: andrew.bennetts at canonical.com-20060929050153-ded347722daa93c8
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: hpss HTTP support
            timestamp: Fri 2006-09-29 15:04:36 +1000
            message:
              Remove commented cruft.
            ------------------------------------------------------------
            merged: andrew.bennetts at canonical.com-20060929050153-ded347722daa93c8
            parent: andrew.bennetts at canonical.com-20060929043519-3eb896e184213815
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: hpss HTTP support
            timestamp: Fri 2006-09-29 15:01:53 +1000
            message:
              Simplify do_POST, and add a comment.
            ------------------------------------------------------------
            merged: andrew.bennetts at canonical.com-20060929043519-3eb896e184213815
            parent: andrew.bennetts at canonical.com-20060929035741-0e33d90cd7229efb
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: hpss HTTP support
            timestamp: Fri 2006-09-29 14:35:19 +1000
            message:
              Tidy up _serve_one_request.
            ------------------------------------------------------------
            merged: andrew.bennetts at canonical.com-20060929035741-0e33d90cd7229efb
            parent: andrew.bennetts at canonical.com-20060929035223-7f1f1e4534d423dc
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: hpss HTTP support
            timestamp: Fri 2006-09-29 13:57:41 +1000
            message:
              Add TODOs about logging server exceptions.
            ------------------------------------------------------------
            merged: andrew.bennetts at canonical.com-20060929035223-7f1f1e4534d423dc
            parent: andrew.bennetts at canonical.com-20060929021737-e4b97746c53a3dcc
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: hpss HTTP support
            timestamp: Fri 2006-09-29 13:52:23 +1000
            message:
              Just close the pipe/socket if the medium catches an error, and add tests for medium exception handling.
            ------------------------------------------------------------
            merged: andrew.bennetts at canonical.com-20060929021737-e4b97746c53a3dcc
            parent: andrew.bennetts at canonical.com-20060929021708-921ba155bb431d52
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: hpss HTTP support
            timestamp: Fri 2006-09-29 12:17:37 +1000
            message:
              Remove old comments.
            ------------------------------------------------------------
            merged: andrew.bennetts at canonical.com-20060929021708-921ba155bb431d52
            parent: andrew.bennetts at canonical.com-20060929020944-928dfe5361c8c7ad
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: hpss HTTP support
            timestamp: Fri 2006-09-29 12:17:08 +1000
            message:
              Simplify SmartServerPipeStreamMedium._serve_one_request, and remove _recv_bulk, _recv_trailer and a _recv_tuple.
            ------------------------------------------------------------
            merged: andrew.bennetts at canonical.com-20060929020944-928dfe5361c8c7ad
            parent: andrew.bennetts at canonical.com-20060928080615-d7bc2a8e393ce711
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: hpss HTTP support
            timestamp: Fri 2006-09-29 12:09:44 +1000
            message:
              Remove SmartServerRequestProtocolOne.finished_reading attribute, replace with next_read_size method.
            ------------------------------------------------------------
            merged: andrew.bennetts at canonical.com-20060928080615-d7bc2a8e393ce711
            parent: andrew.bennetts at canonical.com-20060928050227-021df4f75bca5f88
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: hpss HTTP support
            timestamp: Thu 2006-09-28 18:06:15 +1000
            message:
              Seperate SmartServer{Pipe,Socket}StreamMedium out of SmartServerStreamMedium.  Use recv to make the socket server medium better.
            ------------------------------------------------------------
            merged: andrew.bennetts at canonical.com-20060928050227-021df4f75bca5f88
            parent: andrew.bennetts at canonical.com-20060928040135-c2c58bbb690acc08
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: hpss HTTP support
            timestamp: Thu 2006-09-28 15:02:27 +1000
            message:
              Update SmartClientRequestProtocolOne.read_body_bytes to use next_read_size.
            ------------------------------------------------------------
            merged: andrew.bennetts at canonical.com-20060928040135-c2c58bbb690acc08
            parent: andrew.bennetts at canonical.com-20060928034548-7d0a4e39d595ff17
            parent: pqm at pqm.ubuntu.com-20060927204431-5871ab3ef6affaf3
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: hpss HTTP support
            timestamp: Thu 2006-09-28 14:01:35 +1000
            message:
              Merge from bzr.dev
            ------------------------------------------------------------
            merged: andrew.bennetts at canonical.com-20060928034548-7d0a4e39d595ff17
            parent: andrew.bennetts at canonical.com-20060927052002-5d722be0a289aa4c
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: hpss HTTP support
            timestamp: Thu 2006-09-28 13:45:48 +1000
            message:
              Remove commented cruft, add a TODO comment.
            ------------------------------------------------------------
            merged: andrew.bennetts at canonical.com-20060927052002-5d722be0a289aa4c
            parent: andrew.bennetts at canonical.com-20060926054631-7d63ee5c801fb098
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: hpss HTTP support
            timestamp: Wed 2006-09-27 15:20:02 +1000
            message:
              Tidy up TODOs, further testing and fixes for SmartServerRequestProtocolOne, and remove a read_bytes(1) call.
            ------------------------------------------------------------
            merged: andrew.bennetts at canonical.com-20060926054631-7d63ee5c801fb098
            parent: andrew.bennetts at canonical.com-20060926022414-111422842abffe36
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: hpss HTTP support
            timestamp: Tue 2006-09-26 15:46:31 +1000
            message:
              (Andrew Bennetts, Robert Collins) Add test_http.RecordingServer, and use it to
              test HttpTransport._post.
            ------------------------------------------------------------
            merged: andrew.bennetts at canonical.com-20060926022414-111422842abffe36
            parent: andrew.bennetts at canonical.com-20060925164146-200a3de7084173eb
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: hpss HTTP support
            timestamp: Tue 2006-09-26 12:24:14 +1000
            message:
              Make HttpTransportBase.get_smart_client return self again.
              
              Move HTTP smart client code into http.py from smart.py.
            ------------------------------------------------------------
            merged: andrew.bennetts at canonical.com-20060925164146-200a3de7084173eb
            parent: andrew.bennetts at canonical.com-20060925095600-c4f9252728a1f51b
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: hpss HTTP support
            timestamp: Tue 2006-09-26 02:41:46 +1000
            message:
              Implement _post on HttpTransport_urllib.
            ------------------------------------------------------------
            merged: andrew.bennetts at canonical.com-20060925095600-c4f9252728a1f51b
            parent: andrew.bennetts at canonical.com-20060925064320-d3a8f0493f1e29ff
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: hpss HTTP support
            timestamp: Mon 2006-09-25 19:56:00 +1000
            message:
              HTTP client starting to work (pycurl for the moment).
            ------------------------------------------------------------
            merged: andrew.bennetts at canonical.com-20060925064320-d3a8f0493f1e29ff
            parent: robertc at robertcollins.net-20060922043958-628ce589a155a56e
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: hpss HTTP support
            timestamp: Mon 2006-09-25 16:43:20 +1000
            message:
              Clean up some pyflakes warnings, including making 'backing_transport' a required argument of SmartTCPServer.__init__.
            ------------------------------------------------------------
            merged: robertc at robertcollins.net-20060922043958-628ce589a155a56e
            parent: andrew.bennetts at canonical.com-20060921091520-673c55c101a86614
            committer: Robert Collins <robertc at robertcollins.net>
            branch nick: http-smart
            timestamp: Fri 2006-09-22 14:39:58 +1000
            message:
              separate out the client medium from the client encoding protocol for the smart server.
            ------------------------------------------------------------
            merged: andrew.bennetts at canonical.com-20060921091520-673c55c101a86614
            parent: andrew.bennetts at canonical.com-20060919111846-9853422711c0d27c
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: hpss HTTP support
            timestamp: Thu 2006-09-21 19:15:20 +1000
            message:
              Starting factoring out the smart server client "medium" from the protocol.
            ------------------------------------------------------------
            merged: andrew.bennetts at canonical.com-20060919111846-9853422711c0d27c
            parent: andrew.bennetts at canonical.com-20060919034701-9b801d527a1261f5
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: hpss HTTP support
            timestamp: Tue 2006-09-19 21:18:46 +1000
            message:
              Implement HTTP smart server.
            ------------------------------------------------------------
            merged: andrew.bennetts at canonical.com-20060919034701-9b801d527a1261f5
            parent: andrew.bennetts at canonical.com-20060919030924-df342f90b1527b3f
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: hpss HTTP support
            timestamp: Tue 2006-09-19 13:47:01 +1000
            message:
              Empty BRANCH.TODO
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20061013063644-89370e8650ab1cd7
        parent: pqm at pqm.ubuntu.com-20061012011808-6bdb1458abfdc13a
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Fri 2006-10-13 16:36:44 +1000
        message:
          Robert's comments: Refer to RFC2616 to explain how we handle missing Content-Type
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20061013064121-50dd056d490840cd
    parent: pqm at pqm.ubuntu.com-20061012011808-6bdb1458abfdc13a
    parent: john at arbash-meinel.com-20061013013159-8224e911d84e438a
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2006-10-13 07:41:21 +0100
    message:
      (John Arbash Meinel) Add a Registry class to help make registry functionality consistent
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20061013013159-8224e911d84e438a
    parent: john at arbash-meinel.com-20061013005526-b473dbb49c269e40
    parent: pqm at pqm.ubuntu.com-20061012011808-6bdb1458abfdc13a
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: registry
    timestamp: Fri 2006-10-13 11:31:59 +1000
    message:
      [merge] bzr.dev 2073
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20061013005526-b473dbb49c269e40
    parent: john at arbash-meinel.com-20061013002545-025556fc8e5b9d83
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: registry
    timestamp: Fri 2006-10-13 10:55:26 +1000
    message:
      cleanup doc strings as recommended by Aaron and Martin
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20061013002545-025556fc8e5b9d83
    parent: john at arbash-meinel.com-20061011012122-ae8ff84cf665d7e3
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: registry
    timestamp: Fri 2006-10-13 10:25:45 +1000
    message:
      Updated HACKING and docstrings per Martin's suggestions
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20061011012122-ae8ff84cf665d7e3
    parent: john at arbash-meinel.com-20061011012009-c2f60b15e4466737
    parent: pqm at pqm.ubuntu.com-20061010072307-037a6f63da8a1bdd
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: registry
    timestamp: Wed 2006-10-11 11:21:22 +1000
    message:
      [merge] bzr.dev 2070
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20061011012009-c2f60b15e4466737
    parent: john at arbash-meinel.com-20060927224045-1a4a59afa58632f0
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: registry
    timestamp: Wed 2006-10-11 11:20:09 +1000
    message:
      Cleanups suggested by Richard Wilbur
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060927224045-1a4a59afa58632f0
    parent: john at arbash-meinel.com-20060921222519-429864b017a1629e
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: registry
    timestamp: Wed 2006-09-27 17:40:45 -0500
    message:
      Use helper objects to handle lazy importing
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060921222519-429864b017a1629e
    parent: john at arbash-meinel.com-20060909182125-b80276593538c308
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: registry
    timestamp: Thu 2006-09-21 17:25:19 -0500
    message:
      Remove extra dict-like members, simplfying the api
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060909182125-b80276593538c308
    parent: john at arbash-meinel.com-20060909181901-93302c1b51b375ba
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: registry
    timestamp: Sat 2006-09-09 13:21:25 -0500
    message:
      A test which uses the callback to return information from the object.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060909181901-93302c1b51b375ba
    parent: john at arbash-meinel.com-20060909174443-7a3417310f453b5e
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: registry
    timestamp: Sat 2006-09-09 13:19:01 -0500
    message:
      A help callable should take the registry as the first parameter
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060909174443-7a3417310f453b5e
    parent: john at arbash-meinel.com-20060909173034-fd1e7849d827dcf8
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: registry
    timestamp: Sat 2006-09-09 12:44:43 -0500
    message:
      Add Registry.iterhelp and Registry.iterinfo
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060909173034-fd1e7849d827dcf8
    parent: john at arbash-meinel.com-20060909170355-487019ff329aea61
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: registry
    timestamp: Sat 2006-09-09 12:30:34 -0500
    message:
      Add help and info parameters, and tests for them
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060909170355-487019ff329aea61
    parent: john at arbash-meinel.com-20060909165226-205b4911cc273230
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: registry
    timestamp: Sat 2006-09-09 12:03:55 -0500
    message:
      first_is_default was not a good design
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060909165226-205b4911cc273230
    parent: john at arbash-meinel.com-20060901180210-3707e15493f19a8a
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: registry
    timestamp: Sat 2006-09-09 11:52:26 -0500
    message:
      Make a Registry look more like a dict, and allow anyone to register stuff lazily.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060901180210-3707e15493f19a8a
    parent: john at arbash-meinel.com-20060901175934-ab40fb137c471ec0
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: registry
    timestamp: Fri 2006-09-01 13:02:10 -0500
    message:
      move the NEWS entry to the correct location, update for final changes
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060901175934-ab40fb137c471ec0
    parent: john at arbash-meinel.com-20060901175610-45ac83a70f7f6794
    parent: dato at net.com.org.es-20060818215453-d59f041bb6d2f64d
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: registry
    timestamp: Fri 2006-09-01 12:59:34 -0500
    message:
      [merge] Adeodato Simó: change factory => registry
        ------------------------------------------------------------
        merged: dato at net.com.org.es-20060818215453-d59f041bb6d2f64d
        parent: dato at net.com.org.es-20060815180015-21aac59162d04066
        parent: pqm at pqm.ubuntu.com-20060818181719-90004a4648d8537a
        committer: Adeodato Simó <dato at net.com.org.es>
        branch nick: registry_class
        timestamp: Fri 2006-08-18 23:54:53 +0200
        message:
          [merge] bzr.dev 1947
        ------------------------------------------------------------
        merged: dato at net.com.org.es-20060815180015-21aac59162d04066
        parent: dato at net.com.org.es-20060815175745-2af07bdc1a6b5444
        committer: Adeodato Simó <dato at net.com.org.es>
        branch nick: registry_class
        timestamp: Tue 2006-08-15 20:00:15 +0200
        message:
          Mention Registry and LazyImportRegistry in NEWS/INTERNALS.
        ------------------------------------------------------------
        merged: dato at net.com.org.es-20060815175745-2af07bdc1a6b5444
        parent: dato at net.com.org.es-20060815175135-c8390000cdf6561a
        parent: pqm at pqm.ubuntu.com-20060815131500-a6ba92a17caa4aab
        committer: Adeodato Simó <dato at net.com.org.es>
        branch nick: registry_class
        timestamp: Tue 2006-08-15 19:57:45 +0200
        message:
          [merge] bzr.dev 1924
        ------------------------------------------------------------
        merged: dato at net.com.org.es-20060815175135-c8390000cdf6561a
        parent: dato at net.com.org.es-20060815020435-5972a9c8ad16b7de
        committer: Adeodato Simó <dato at net.com.org.es>
        branch nick: registry_class
        timestamp: Tue 2006-08-15 19:51:35 +0200
        message:
          Kill fallback_key parameter in Registry.get(), as discussed with John.
          
          This frees up the base class from unneeded complexity, and a subclass
          can implement that feature should it ever be needed (there are no known
          use cases at the moment).
        ------------------------------------------------------------
        merged: dato at net.com.org.es-20060815020435-5972a9c8ad16b7de
        parent: dato at net.com.org.es-20060815020051-0571fa7ebc3fa4ae
        committer: Adeodato Simó <dato at net.com.org.es>
        branch nick: registry_class
        timestamp: Tue 2006-08-15 04:04:35 +0200
        message:
          Improve description of :param key: in Registry.get().
        ------------------------------------------------------------
        merged: dato at net.com.org.es-20060815020051-0571fa7ebc3fa4ae
        parent: dato at net.com.org.es-20060815015006-93a80d808b0ae0a9
        committer: Adeodato Simó <dato at net.com.org.es>
        branch nick: registry_class
        timestamp: Tue 2006-08-15 04:00:51 +0200
        message:
          Make :param key: in Registry.get() default to None, instead of _marker,
          as suggested by John Arbash Meinel.
        ------------------------------------------------------------
        merged: dato at net.com.org.es-20060815015006-93a80d808b0ae0a9
        parent: dato at net.com.org.es-20060810214727-155eb44860689725
        committer: Adeodato Simó <dato at net.com.org.es>
        branch nick: registry_class
        timestamp: Tue 2006-08-15 03:50:06 +0200
        message:
          Rename default_key in Registry.get() to fallback_key.
        ------------------------------------------------------------
        merged: dato at net.com.org.es-20060810214727-155eb44860689725
        parent: dato at net.com.org.es-20060810194614-4033e490fa06840e
        committer: Adeodato Simó <dato at net.com.org.es>
        branch nick: registry_class
        timestamp: Thu 2006-08-10 23:47:27 +0200
        message:
          Morph John's LazyFactory into a generalized Registry class, and
          implement LazyImportRegistry as a subclass.
        ------------------------------------------------------------
        merged: dato at net.com.org.es-20060810194614-4033e490fa06840e
        parent: pqm at pqm.ubuntu.com-20060810061423-3ae5999a70b60211
        parent: john at arbash-meinel.com-20060809213743-677b61b84ed524dc
        committer: Adeodato Simó <dato at net.com.org.es>
        branch nick: registry_factory
        timestamp: Thu 2006-08-10 21:46:14 +0200
        message:
          [merge] jam's lazy-factory
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060901175610-45ac83a70f7f6794
    parent: john at arbash-meinel.com-20060809213743-677b61b84ed524dc
    parent: pqm at pqm.ubuntu.com-20060901173735-543e9acad03760d1
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: registry
    timestamp: Fri 2006-09-01 12:56:10 -0500
    message:
      [merge] bzr.dev 1981
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060809213743-677b61b84ed524dc
    parent: pqm at pqm.ubuntu.com-20060809170522-28c918e7d93365fe
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: lazy-factory
    timestamp: Wed 2006-08-09 16:37:43 -0500
    message:
      Creating a factory that can load modules on demand.



More information about the bazaar-commits mailing list