Rev 2403: Merge bzr.dev. in file:///home/robertc/source/baz/misc-fixen/

Robert Collins robertc at robertcollins.net
Fri Apr 20 08:07:01 BST 2007


At file:///home/robertc/source/baz/misc-fixen/

------------------------------------------------------------
revno: 2403
revision-id: robertc at robertcollins.net-20070420070654-0spvh2id8kd2hlyb
parent: robertc at robertcollins.net-20070405084449-xmkv95pa4cgn0het
parent: pqm at pqm.ubuntu.com-20070419224637-jvlshh6kibtj43a5
committer: Robert Collins <robertc at robertcollins.net>
branch nick: misc-fixen
timestamp: Fri 2007-04-20 17:06:54 +1000
message:
  Merge bzr.dev.
removed:
  build-api                      build-api-20050309064830-a0be0dc1452cda87
added:
  bzrlib/hooks.py                hooks.py-20070325015548-ix4np2q0kd8452au-1
  bzrlib/smart/                  smart-20061101100241-u0wzhkl4sjwmuzhd-1
  bzrlib/smart/__init__.py       __init__.py-20061101100249-8jwwl0d3jr080zim-1
  bzrlib/smart/client.py         client.py-20061116014825-2k6ada6xgulslami-1
  bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-1
  bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
  bzrlib/smart/request.py        request.py-20061108095550-gunadhxmzkdjfeek-1
  bzrlib/smart/server.py         server.py-20061110062051-chzu10y32vx8gvur-1
  bzrlib/smart/vfs.py            vfs.py-20061108095550-gunadhxmzkdjfeek-2
  bzrlib/tests/blackbox/test_cat_revision.py test_cat_revision.py-20070410204634-fq8mnld5l5aza9e2-1
  bzrlib/tests/test_help.py      test_help.py-20070419045354-6q6rq15j9e2n5fna-1
  bzrlib/tests/workingtree_implementations/test_get_file_mtime.py test_get_file_mtime.-20070411212918-dhentj8gk0hsu54z-1
  man1/                          man1-20070418045910-74ew7wm1oqo2tfv0-1
  tools/bzr_epydoc               bzr_epydoc-20070409231252-ec7uffstn62q7nhv-1
  tools/bzr_epydoc_uid.py        bzr_epydoc_uid.py-20070409231252-ec7uffstn62q7nhv-2
renamed:
  bzrlib/transport/smart.py => bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
modified:
  .bzrignore                     bzrignore-20050311232317-81f7b71efa2db11a
  HACKING                        HACKING-20050805200004-2a5dc975d870f78c
  Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
  bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
  bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
  bzrlib/help.py                 help.py-20050505025907-4dd7a6d63912f894
  bzrlib/lazy_import.py          lazy_import.py-20060910203832-f77c54gf3n232za0-1
  bzrlib/lockable_files.py       control_files.py-20051111201905-bb88546e799d669f
  bzrlib/lockdir.py              lockdir.py-20060220222025-98258adf27fbdda3
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
  bzrlib/revision.py             revision.py-20050309040759-e77802c08f3999d5
  bzrlib/tests/HTTPTestUtil.py   HTTPTestUtil.py-20050914180604-247d3aafb7a43343
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
  bzrlib/tests/blackbox/test_cat.py test_cat.py-20051201162916-f0937e4e19ea24b3
  bzrlib/tests/blackbox/test_help.py test_help.py-20060216004358-4ee8a2a338f75a62
  bzrlib/tests/blackbox/test_revision_info.py test_revision_info.py-20050917162600-21dab3877aa348d7
  bzrlib/tests/blackbox/test_serve.py test_serve.py-20060913064329-8t2pvmsikl4s3xhl-1
  bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
  bzrlib/tests/branch_implementations/test_locking.py test_locking.py-20060707151933-tav3o2hpibwi53u4-4
  bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
  bzrlib/tests/lock_helpers.py   LockHelpers.py-20060707151933-tav3o2hpibwi53u4-1
  bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
  bzrlib/tests/test_branch.py    test_branch.py-20060116013032-97819aa07b8ab3b5
  bzrlib/tests/test_commands.py  test_command.py-20051019190109-3b17be0f52eaa7a8
  bzrlib/tests/test_diff.py      testdiff.py-20050727164403-d1a3496ebb12e339
  bzrlib/tests/test_dirstate.py  test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
  bzrlib/tests/test_errors.py    test_errors.py-20060210110251-41aba2deddf936a8
  bzrlib/tests/test_ftp_transport.py test_aftp_transport.-20060823221619-98mwjzxtwtkt527k-1
  bzrlib/tests/test_lazy_import.py test_lazy_import.py-20060910203832-f77c54gf3n232za0-2
  bzrlib/tests/test_lockable_files.py test_lockable_files.py-20051225183927-365c7fd99591caf1
  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_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
  bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
  bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
  bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
  bzrlib/tests/tree_implementations/test_get_file_mtime.py test_get_file_mtime.-20070301003805-kjkpwfp4whbm39o1-1
  bzrlib/tests/tree_implementations/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
  bzrlib/tests/tree_implementations/test_test_trees.py test_tree_trees.py-20060720091921-3nwi5h21lf06vf5p-1
  bzrlib/tests/tree_implementations/test_walkdirs.py test_walkdirs.py-20060729160421-gmjnkotqgxdh98ce-1
  bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
  bzrlib/tests/workingtree_implementations/test_walkdirs.py test_walkdirs.py-20060731045042-ch366w6dve2m7ro9-1
  bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
  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/wsgi.py  wsgi.py-20061005091552-rz8pva0olkxv0sd8-2
  bzrlib/transport/memory.py     memory.py-20051016101338-cd008dbdf69f04fc
  bzrlib/tsort.py                tsort.py-20051025073946-7808f6aaf7d07208
  bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
  bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
  doc/index.txt                  index.txt-20060622101119-tgwtdci8z769bjb9-2
  tools/doc_generate/autodoc_man.py bzrman.py-20050601153041-0ff7f74de456d15e
  tools/doc_generate/autodoc_rstx.py autodoc_rstx.py-20060420024836-3e0d4a526452193c
  bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
    ------------------------------------------------------------
    revno: 2400.1.32
    merged: pqm at pqm.ubuntu.com-20070419224637-jvlshh6kibtj43a5
    parent: pqm at pqm.ubuntu.com-20070419220315-zw3uloe4se8laybs
    parent: john at arbash-meinel.com-20070419200532-4v2yyd7oqq03gl2s
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2007-04-19 23:46:37 +0100
    message:
      (John Arbash Meinel) Optimizations for MergeSorter
        ------------------------------------------------------------
        revno: 2400.1.25.4.5
        merged: john at arbash-meinel.com-20070419200532-4v2yyd7oqq03gl2s
        parent: john at arbash-meinel.com-20070419160300-21woae24a6cgfvpi
        parent: pqm at pqm.ubuntu.com-20070419095256-nq0n6puj11zm7n7r
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: merge_sort
        timestamp: Thu 2007-04-19 15:05:32 -0500
        message:
          Resolve NEWS conflict
        ------------------------------------------------------------
        revno: 2400.1.25.4.4
        merged: john at arbash-meinel.com-20070419160300-21woae24a6cgfvpi
        parent: john at arbash-meinel.com-20070419000301-ud6ambkulyaulnfr
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: merge_sort
        timestamp: Thu 2007-04-19 11:03:00 -0500
        message:
          NEWS about the MergeSorter improvement.
        ------------------------------------------------------------
        revno: 2400.1.25.4.3
        merged: john at arbash-meinel.com-20070419000301-ud6ambkulyaulnfr
        parent: john at arbash-meinel.com-20070418233737-c2qacsh1ko9pfroi
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: merge_sort
        timestamp: Wed 2007-04-18 19:03:01 -0500
        message:
          Inline self._pop_node and self._push_node
          These are still separate functions, but rather than using self._a_stack.append
          we assign a local variable a_stack_append, and call it directly.
          This drops the merge_sort() time down to approx 385ms-400ms
          With that large of a speed-up it seems worth the loss
          in readability. (This is almost 50% of the original time)
        ------------------------------------------------------------
        revno: 2400.1.25.4.2
        merged: john at arbash-meinel.com-20070418233737-c2qacsh1ko9pfroi
        parent: john at arbash-meinel.com-20070418232448-9gy9sweckh5f4mda
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: merge_sort
        timestamp: Wed 2007-04-18 18:37:37 -0500
        message:
          Change valid self._foo variables into local variables.
          Using __slots__ changed sort time from ~700ms => ~600ms.
          Using local variables drops it down to 530 - 550ms.
        ------------------------------------------------------------
        revno: 2400.1.25.4.1
        merged: john at arbash-meinel.com-20070418232448-9gy9sweckh5f4mda
        parent: pqm at pqm.ubuntu.com-20070417080415-5vn25svmf95ki88z
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: merge_sort
        timestamp: Wed 2007-04-18 18:24:48 -0500
        message:
          Use __slots__ for MergeSorter
    ------------------------------------------------------------
    revno: 2400.1.31
    merged: pqm at pqm.ubuntu.com-20070419220315-zw3uloe4se8laybs
    parent: pqm at pqm.ubuntu.com-20070419213243-7s1gu2czd44bht1t
    parent: john at arbash-meinel.com-20070417142905-3l0icevddeor3238
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2007-04-19 23:03:15 +0100
    message:
      (John Arbash Meinel) 'make api-docs' will generate api documentation using epydoc.
        ------------------------------------------------------------
        revno: 2400.1.13.4.2
        merged: john at arbash-meinel.com-20070417142905-3l0icevddeor3238
        parent: john at arbash-meinel.com-20070412202742-4cr2qmchdfe9mg7n
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: api-doc-builders
        timestamp: Tue 2007-04-17 09:29:05 -0500
        message:
          Remove the build-api script (as requested by Martin)
        ------------------------------------------------------------
        revno: 2400.1.13.4.1
        merged: john at arbash-meinel.com-20070412202742-4cr2qmchdfe9mg7n
        parent: pqm at pqm.ubuntu.com-20070412150356-jeie6iap22sae8xf
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: api-doc-builders
        timestamp: Thu 2007-04-12 15:27:42 -0500
        message:
          Cherrypick just the epydoc builder changes.
          This is just the piece of change that makes 'make api-docs' work,
          without any actual documentation changes.
    ------------------------------------------------------------
    revno: 2400.1.30
    merged: pqm at pqm.ubuntu.com-20070419213243-7s1gu2czd44bht1t
    parent: pqm at pqm.ubuntu.com-20070419203013-exud3vftmox30imx
    parent: john at arbash-meinel.com-20070413202923-al52jvkh1g7e2lsm
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2007-04-19 22:32:43 +0100
    message:
      (John Arbash Meinel) Remove the time dependency for a couple tests.
        ------------------------------------------------------------
        revno: 2400.1.18.3.1
        merged: john at arbash-meinel.com-20070413202923-al52jvkh1g7e2lsm
        parent: pqm at pqm.ubuntu.com-20070413174100-zpfqleaf5ph9ycx4
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: xfail_no_time
        timestamp: Fri 2007-04-13 15:29:23 -0500
        message:
          Remove timing dependencies from the selftest tests.
    ------------------------------------------------------------
    revno: 2400.1.29
    merged: pqm at pqm.ubuntu.com-20070419203013-exud3vftmox30imx
    parent: pqm at pqm.ubuntu.com-20070419095256-nq0n6puj11zm7n7r
    parent: john at arbash-meinel.com-20070419182756-rdg6e8zoaxy9mg9q
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2007-04-19 21:30:13 +0100
    message:
      (John Arbash Meinel) Simple test cleanup for win32
        ------------------------------------------------------------
        revno: 2400.1.25.3.1
        merged: john at arbash-meinel.com-20070419182756-rdg6e8zoaxy9mg9q
        parent: pqm at pqm.ubuntu.com-20070417080415-5vn25svmf95ki88z
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dirstate_locking_fixes
        timestamp: Thu 2007-04-19 13:27:56 -0500
        message:
          Change the DirState.test_initialize test so that we don't try to read a locked file.
    ------------------------------------------------------------
    revno: 2400.1.28
    merged: pqm at pqm.ubuntu.com-20070419095256-nq0n6puj11zm7n7r
    parent: pqm at pqm.ubuntu.com-20070419082117-znciscush3qbaky1
    parent: bialix at ukr.net-20070418194650-d7p4etnr0oaki6h2
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2007-04-19 10:52:56 +0100
    message:
      (bialix) some fixes for win32
        ------------------------------------------------------------
        revno: 2400.1.23.2.3
        merged: bialix at ukr.net-20070418194650-d7p4etnr0oaki6h2
        parent: bialix at ukr.net-20070418140646-jtfgh5592o6au3zn
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: selftest.win32
        timestamp: Wed 2007-04-18 22:46:50 +0300
        message:
          shutil no more needed in clean_selftest_output()
        ------------------------------------------------------------
        revno: 2400.1.23.2.2
        merged: bialix at ukr.net-20070418140646-jtfgh5592o6au3zn
        parent: bialix at ukr.net-20070417122024-276go12kd3yt8o4c
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: selftest.win32
        timestamp: Wed 2007-04-18 17:06:46 +0300
        message:
          Explicit error messages for test FTP server (Python 2.5 @ win32 compatibility)
        ------------------------------------------------------------
        revno: 2400.1.23.2.1
        merged: bialix at ukr.net-20070417122024-276go12kd3yt8o4c
        parent: pqm at pqm.ubuntu.com-20070417005930-rofskshyjsfzrahh
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: selftest.win32
        timestamp: Tue 2007-04-17 15:20:24 +0300
        message:
          Fix for walkdirs in missing dir with Py2.4 @ win32
    ------------------------------------------------------------
    revno: 2400.1.27
    merged: pqm at pqm.ubuntu.com-20070419082117-znciscush3qbaky1
    parent: pqm at pqm.ubuntu.com-20070419070906-5kdxs7n52472b7hg
    parent: robertc at robertcollins.net-20070419074042-v84lrlszidihjhdy
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2007-04-19 09:21:17 +0100
    message:
      (robertc) Merge see-also support for command help. (Robert Collins).
        ------------------------------------------------------------
        revno: 2400.1.25.1.3
        merged: robertc at robertcollins.net-20070419074042-v84lrlszidihjhdy
        parent: robertc at robertcollins.net-20070419071317-p1pem58mcxxwbg9j
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: integration
        timestamp: Thu 2007-04-19 17:40:42 +1000
        message:
          Python 2.4 compatability change for the new help see-also tests.
        ------------------------------------------------------------
        revno: 2400.1.25.1.2
        merged: robertc at robertcollins.net-20070419071317-p1pem58mcxxwbg9j
        parent: robertc at robertcollins.net-20070419022744-pfdqz42kp1wizh43
        parent: robertc at robertcollins.net-20070419053224-f5lkin1fbjj2ci0s
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: integration
        timestamp: Thu 2007-04-19 17:13:17 +1000
        message:
          (robertc) Merge see-also support for command help. (Robert Collins).
        ------------------------------------------------------------
        revno: 2400.1.25.2.4
        merged: robertc at robertcollins.net-20070419053224-f5lkin1fbjj2ci0s
        parent: robertc at robertcollins.net-20070419052137-vsncwlmi8epl5eel
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: see-also
        timestamp: Thu 2007-04-19 15:32:24 +1000
        message:
          Update the doc_generate logic to include see-also help topics.
          (Robert Collins)
        ------------------------------------------------------------
        revno: 2400.1.25.2.3
        merged: robertc at robertcollins.net-20070419052137-vsncwlmi8epl5eel
        parent: robertc at robertcollins.net-20070419045408-uvczw1fcfzprz7ep
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: see-also
        timestamp: Thu 2007-04-19 15:21:37 +1000
        message:
          Update existing builtin commands help text to use _see_also. (Robert Collins)
        ------------------------------------------------------------
        revno: 2400.1.25.2.2
        merged: robertc at robertcollins.net-20070419045408-uvczw1fcfzprz7ep
        parent: robertc at robertcollins.net-20070418083902-4o66h9fk7zeisvwa
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: see-also
        timestamp: Thu 2007-04-19 14:54:08 +1000
        message:
          ``bzr help`` now provides cross references to other help topics using the
          _see_also facility on command classes. (Robert Collins)
        ------------------------------------------------------------
        revno: 2400.1.25.2.1
        merged: robertc at robertcollins.net-20070418083902-4o66h9fk7zeisvwa
        parent: pqm at pqm.ubuntu.com-20070417080415-5vn25svmf95ki88z
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: see-also
        timestamp: Wed 2007-04-18 18:39:02 +1000
        message:
          Command objects can now declare related help topics by having _see_also
          set to a list of related topic. Updated the HACKING guide entry on
          documentation to be more clear about how the help for commands is
          generated and to reference this new feature. (Robert Collins)
    ------------------------------------------------------------
    revno: 2400.1.26
    merged: pqm at pqm.ubuntu.com-20070419070906-5kdxs7n52472b7hg
    parent: pqm at pqm.ubuntu.com-20070417080415-5vn25svmf95ki88z
    parent: robertc at robertcollins.net-20070419022744-pfdqz42kp1wizh43
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2007-04-19 08:09:06 +0100
    message:
      (robertc) ``make docs`` now creates a man page at ``man1/bzr.1`` fixing bug 107388. (Robert Collins).
        ------------------------------------------------------------
        revno: 2400.1.25.1.1
        merged: robertc at robertcollins.net-20070419022744-pfdqz42kp1wizh43
        parent: pqm at pqm.ubuntu.com-20070417080415-5vn25svmf95ki88z
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: make-man1
        timestamp: Thu 2007-04-19 12:27:44 +1000
        message:
          ``make docs`` now creates a man page at ``man1/bzr.1`` fixing bug 107388.
          (Robert Collins)
    ------------------------------------------------------------
    revno: 2400.1.25
    merged: pqm at pqm.ubuntu.com-20070417080415-5vn25svmf95ki88z
    parent: pqm at pqm.ubuntu.com-20070417070943-gzsrutg0oh9timob
    parent: mbp at sourcefrog.net-20070417073847-0daboq350rqofp73
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2007-04-17 09:04:15 +0100
    message:
      Also clear SmartTCPServer hooks from TestCase._clear_hooks
        ------------------------------------------------------------
        revno: 2400.1.23.1.2
        merged: mbp at sourcefrog.net-20070417073847-0daboq350rqofp73
        parent: mbp at sourcefrog.net-20070417065102-zabhms9y28q2ik00
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: benchmarks
        timestamp: Tue 2007-04-17 17:38:47 +1000
        message:
          Also clear SmartTCPServer hooks from TestCase._clear_hooks
        ------------------------------------------------------------
        revno: 2400.1.23.1.1
        merged: mbp at sourcefrog.net-20070417065102-zabhms9y28q2ik00
        parent: pqm at pqm.ubuntu.com-20070417005930-rofskshyjsfzrahh
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: benchmarks
        timestamp: Tue 2007-04-17 16:51:02 +1000
        message:
          fix import order dependency that broke benchmarks
    ------------------------------------------------------------
    revno: 2400.1.24
    merged: pqm at pqm.ubuntu.com-20070417070943-gzsrutg0oh9timob
    parent: pqm at pqm.ubuntu.com-20070417005930-rofskshyjsfzrahh
    parent: mbp at sourcefrog.net-20070417062623-qoqarrtsfnmokq70
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2007-04-17 08:09:43 +0100
    message:
      Add -1 option to selftest
        ------------------------------------------------------------
        revno: 2400.1.18.2.2
        merged: mbp at sourcefrog.net-20070417062623-qoqarrtsfnmokq70
        parent: mbp at sourcefrog.net-20070416043858-ed8ak4hh5a4tumh8
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: trivial
        timestamp: Tue 2007-04-17 16:26:23 +1000
        message:
          Add -1 option to selftest
        ------------------------------------------------------------
        revno: 2400.1.18.2.1
        merged: mbp at sourcefrog.net-20070416043858-ed8ak4hh5a4tumh8
        parent: pqm at pqm.ubuntu.com-20070413174100-zpfqleaf5ph9ycx4
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: trivial
        timestamp: Mon 2007-04-16 14:38:58 +1000
        message:
          Add -f alias for selftest --first
    ------------------------------------------------------------
    revno: 2400.1.23
    merged: pqm at pqm.ubuntu.com-20070417005930-rofskshyjsfzrahh
    parent: pqm at pqm.ubuntu.com-20070416210546-4ib7pt7wkkk71zzj
    parent: abentley at panoramicfeedback.com-20070416211229-xa9pdlxs721oxhyx
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2007-04-17 01:59:30 +0100
    message:
      Fix ftp transport with servers that don't support atomic rename
        ------------------------------------------------------------
        revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.4
        merged: abentley at panoramicfeedback.com-20070416211229-xa9pdlxs721oxhyx
        parent: abentley at panoramicfeedback.com-20070416210345-8btya3q24r5488md
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: Aaron's mergeable stuff
        timestamp: Mon 2007-04-16 17:12:29 -0400
        message:
          Revert now-unnecessary changes
        ------------------------------------------------------------
        revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.3
        merged: abentley at panoramicfeedback.com-20070416210345-8btya3q24r5488md
        parent: abentley at panoramicfeedback.com-20070416153810-llz9qggakjio05ku
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: Aaron's mergeable stuff
        timestamp: Mon 2007-04-16 17:03:45 -0400
        message:
          Separate FtpTransport.rename from FtpTransport.move
        ------------------------------------------------------------
        revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.2
        merged: abentley at panoramicfeedback.com-20070416153810-llz9qggakjio05ku
        parent: abentley at panoramicfeedback.com-20070416125430-a4qpwmrsz7h2hw39
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: Aaron's mergeable stuff
        timestamp: Mon 2007-04-16 11:38:10 -0400
        message:
          FTP does not require atomic rename. Fixes #89436
        ------------------------------------------------------------
        revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.1
        merged: abentley at panoramicfeedback.com-20070416125430-a4qpwmrsz7h2hw39
        parent: abentley at panoramicfeedback.com-20070410210517-0m7mhl5d2fhs66u5
        parent: pqm at pqm.ubuntu.com-20070413050623-10v4wozs1tu04kcu
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: Aaron's mergeable stuff
        timestamp: Mon 2007-04-16 08:54:30 -0400
        message:
          merge bzr.dev
    ------------------------------------------------------------
    revno: 2400.1.22
    merged: pqm at pqm.ubuntu.com-20070416210546-4ib7pt7wkkk71zzj
    parent: pqm at pqm.ubuntu.com-20070416180853-ucztrxo25i0fci62
    parent: bialix at ukr.net-20070416204259-tyi3ptqe80gpkwcl
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2007-04-16 22:05:46 +0100
    message:
      (bialix,r=john) win32-related selftest improvements
        ------------------------------------------------------------
        revno: 2400.1.8.1.8
        merged: bialix at ukr.net-20070416204259-tyi3ptqe80gpkwcl
        parent: bialix at ukr.net-20070414182636-cu2loiemveb20ljh
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: selftest.win32
        timestamp: Mon 2007-04-16 23:42:59 +0300
        message:
          forget to return tree
        ------------------------------------------------------------
        revno: 2400.1.8.1.7
        merged: bialix at ukr.net-20070414182636-cu2loiemveb20ljh
        parent: bialix at ukr.net-20070414121935-s673tupvwywawpwv
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: selftest.win32
        timestamp: Sat 2007-04-14 21:26:36 +0300
        message:
          Fix blackbox test_status_out_of_date: unlock WT before next command running
        ------------------------------------------------------------
        revno: 2400.1.8.1.6
        merged: bialix at ukr.net-20070414121935-s673tupvwywawpwv
        parent: bialix at ukr.net-20070414121842-otxkoravow2qrmyx
        parent: pqm at pqm.ubuntu.com-20070413174100-zpfqleaf5ph9ycx4
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: selftest.win32
        timestamp: Sat 2007-04-14 15:19:35 +0300
        message:
          merge bzr.dev
        ------------------------------------------------------------
        revno: 2400.1.8.1.5
        merged: bialix at ukr.net-20070414121842-otxkoravow2qrmyx
        parent: bialix at ukr.net-20070414121731-jtc76rfulndihkh3
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: selftest.win32
        timestamp: Sat 2007-04-14 15:18:42 +0300
        message:
          John's patch for WT4 on Windows+Python2.4
        ------------------------------------------------------------
        revno: 2400.1.8.1.4
        merged: bialix at ukr.net-20070414121731-jtc76rfulndihkh3
        parent: bialix at ukr.net-20070414115551-zb314hff40n9fe0a
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: selftest.win32
        timestamp: Sat 2007-04-14 15:17:31 +0300
        message:
          workingtree_implementations: make usage of symlinks optional
        ------------------------------------------------------------
        revno: 2400.1.8.1.3
        merged: bialix at ukr.net-20070414115551-zb314hff40n9fe0a
        parent: bialix at ukr.net-20070413070332-dtazdq7opt2v16sc
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: selftest.win32
        timestamp: Sat 2007-04-14 14:55:51 +0300
        message:
          tree_implementations: make usage of symlinks optional
        ------------------------------------------------------------
        revno: 2400.1.8.1.2
        merged: bialix at ukr.net-20070413070332-dtazdq7opt2v16sc
        parent: bialix at ukr.net-20070413070210-mlt8fx1awnlytx3n
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: selftest.win32
        timestamp: Fri 2007-04-13 10:03:32 +0300
        message:
          intertree_implementations: make usage of symlinks optional
        ------------------------------------------------------------
        revno: 2400.1.8.1.1
        merged: bialix at ukr.net-20070413070210-mlt8fx1awnlytx3n
        parent: pqm at pqm.ubuntu.com-20070412032019-axeg1wmcju0odfdr
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: selftest.win32
        timestamp: Fri 2007-04-13 10:02:10 +0300
        message:
          fix error handler in _rmtree_temp_dir()
    ------------------------------------------------------------
    revno: 2400.1.21
    merged: pqm at pqm.ubuntu.com-20070416180853-ucztrxo25i0fci62
    parent: pqm at pqm.ubuntu.com-20070416080254-bf3rfk77k5bgfdl7
    parent: andrew.bennetts at canonical.com-20070416163837-9oujyp3f2mzuvlqr
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2007-04-16 19:08:53 +0100
    message:
      (Andrew Bennetts) Rename SmartClient to _SmartClient.
        ------------------------------------------------------------
        revno: 2400.1.14.1.4
        merged: andrew.bennetts at canonical.com-20070416163837-9oujyp3f2mzuvlqr
        parent: andrew.bennetts at canonical.com-20070416052458-t2shorpdp62yodh3
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss-miscellany-2
        timestamp: Tue 2007-04-17 02:38:37 +1000
        message:
          Rename SmartClient to _SmartClient.
    ------------------------------------------------------------
    revno: 2400.1.20
    merged: pqm at pqm.ubuntu.com-20070416080254-bf3rfk77k5bgfdl7
    parent: pqm at pqm.ubuntu.com-20070416054515-up6lmy0v3elcru80
    parent: andrew.bennetts at canonical.com-20070416052458-t2shorpdp62yodh3
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2007-04-16 09:02:54 +0100
    message:
      (Andrew Bennetts) Add some unicode-related tests from the hpss branch, and a few other nits (also from the hpss branch).
        ------------------------------------------------------------
        revno: 2400.1.14.1.3
        merged: andrew.bennetts at canonical.com-20070416052458-t2shorpdp62yodh3
        parent: andrew.bennetts at canonical.com-20070416024404-3wwt2juvu7ai8nvn
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss-miscellany-2
        timestamp: Mon 2007-04-16 15:24:58 +1000
        message:
          Fix test failures under 'python2.4 -O' ('python2.5 -O' was already passing).
        ------------------------------------------------------------
        revno: 2400.1.14.1.2
        merged: andrew.bennetts at canonical.com-20070416024404-3wwt2juvu7ai8nvn
        parent: andrew.bennetts at canonical.com-20070413075917-jlvhfi0s607smiu6
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss-miscellany-2
        timestamp: Mon 2007-04-16 12:44:04 +1000
        message:
          Deal with review comments.
        ------------------------------------------------------------
        revno: 2400.1.14.1.1
        merged: andrew.bennetts at canonical.com-20070413075917-jlvhfi0s607smiu6
        parent: pqm at pqm.ubuntu.com-20070413050623-10v4wozs1tu04kcu
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss-miscellany-2
        timestamp: Fri 2007-04-13 17:59:17 +1000
        message:
          Add some unicode-related tests from the hpss branch, and a few other nits (also from the hpss branch).
    ------------------------------------------------------------
    revno: 2400.1.19
    merged: pqm at pqm.ubuntu.com-20070416054515-up6lmy0v3elcru80
    parent: pqm at pqm.ubuntu.com-20070413174100-zpfqleaf5ph9ycx4
    parent: robertc at robertcollins.net-20070416032630-2hsgzasuh7oej82u
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2007-04-16 06:45:15 +0100
    message:
      (robertc) Use 'python setup.py' instead of './setup.py' (Matthew Fuller)
        ------------------------------------------------------------
        revno: 2400.1.18.1.1
        merged: robertc at robertcollins.net-20070416032630-2hsgzasuh7oej82u
        parent: pqm at pqm.ubuntu.com-20070413174100-zpfqleaf5ph9ycx4
        parent: fullermd at over-yonder.net-20070320224923-txgp33pfz6727duo
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: integration
        timestamp: Mon 2007-04-16 13:26:30 +1000
        message:
          (robertc) Use 'python setup.py' instead of './setup.py' (Matthew Fuller)
        ------------------------------------------------------------
        revno: 2366.2.1
        merged: fullermd at over-yonder.net-20070320224923-txgp33pfz6727duo
        parent: pqm at pqm.ubuntu.com-20070320222307-30c846e90ac18c65
        committer: Matthew Fuller <fullermd at over-yonder.net>
        branch nick: mk-fix
        timestamp: Tue 2007-03-20 17:49:23 -0500
        message:
          (trivial) Use 'python setup.py' instead of './setup.py'.
    ------------------------------------------------------------
    revno: 2400.1.18
    merged: pqm at pqm.ubuntu.com-20070413174100-zpfqleaf5ph9ycx4
    parent: pqm at pqm.ubuntu.com-20070413160237-0weampli2rrmzjht
    parent: john at arbash-meinel.com-20070413163747-sje4hwskt2esvry5
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2007-04-13 18:41:00 +0100
    message:
      (Dmitry Vasiliev) Fix win32 executable checks for unknown files and _iter_changes with WT3.
        ------------------------------------------------------------
        revno: 2400.1.17.1.1
        merged: john at arbash-meinel.com-20070413163747-sje4hwskt2esvry5
        parent: pqm at pqm.ubuntu.com-20070413160237-0weampli2rrmzjht
        parent: dima at hlabs.spb.ru-20070413155114-rln7u6xqod14m7uu
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Fri 2007-04-13 11:37:47 -0500
        message:
          (Dmitry Vasiliev) Fix win32 executable checks for unknown files and _iter_changes with WT3.
        ------------------------------------------------------------
        revno: 2400.1.9.1.2
        merged: dima at hlabs.spb.ru-20070413155114-rln7u6xqod14m7uu
        parent: dima at hlabs.spb.ru-20070412114748-49tt18zdwzmodcbh
        committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
        branch nick: Small fixes
        timestamp: Fri 2007-04-13 19:51:14 +0400
        message:
          Used one-line conditional expression instead of the multi-line one
        ------------------------------------------------------------
        revno: 2400.1.9.1.1
        merged: dima at hlabs.spb.ru-20070412114748-49tt18zdwzmodcbh
        parent: pqm at pqm.ubuntu.com-20070412063453-ogf089v98ktaopbk
        committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
        branch nick: Small fixes
        timestamp: Thu 2007-04-12 15:47:48 +0400
        message:
          Fixed _comparison_data() on Windows in case of the entry is None
    ------------------------------------------------------------
    revno: 2400.1.17
    merged: pqm at pqm.ubuntu.com-20070413160237-0weampli2rrmzjht
    parent: pqm at pqm.ubuntu.com-20070413153758-6rwva0hs3h07wmpl
    parent: john at arbash-meinel.com-20070413142902-28o8mnhj2sk5qcpg
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2007-04-13 17:02:37 +0100
    message:
      (John Arbash Meinel) When shutting down the test FtpServer, trap EBADF
        ------------------------------------------------------------
        revno: 2400.1.13.3.2
        merged: john at arbash-meinel.com-20070413142902-28o8mnhj2sk5qcpg
        parent: john at arbash-meinel.com-20070412213837-cim2mupcek5kjyw3
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: ftp_ignore_ebadf
        timestamp: Fri 2007-04-13 09:29:02 -0500
        message:
          cleanup comment (from Martin)
        ------------------------------------------------------------
        revno: 2400.1.13.3.1
        merged: john at arbash-meinel.com-20070412213837-cim2mupcek5kjyw3
        parent: pqm at pqm.ubuntu.com-20070412150356-jeie6iap22sae8xf
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: ftp_ignore_ebadf
        timestamp: Thu 2007-04-12 16:38:37 -0500
        message:
          Trap EBADF during shutdown of asyncore.loop()
    ------------------------------------------------------------
    revno: 2400.1.16
    merged: pqm at pqm.ubuntu.com-20070413153758-6rwva0hs3h07wmpl
    parent: pqm at pqm.ubuntu.com-20070413143426-6aj60em3rta94aw0
    parent: andrew.bennetts at canonical.com-20070413051536-omtgid0zygdfbvra
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2007-04-13 16:37:58 +0100
    message:
      (Andrew Bennetts) Rename Smart.*Transport classes to RemoteTransport, RemoteTCPTransport, etc.
        ------------------------------------------------------------
        revno: 2400.1.13.2.1
        merged: andrew.bennetts at canonical.com-20070413051536-omtgid0zygdfbvra
        parent: pqm at pqm.ubuntu.com-20070412150356-jeie6iap22sae8xf
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: rename-SmartTransport
        timestamp: Fri 2007-04-13 15:15:36 +1000
        message:
          Rename Smart.*Transport classes to RemoteTransport, RemoteTCPTransport, etc.
    ------------------------------------------------------------
    revno: 2400.1.15
    merged: pqm at pqm.ubuntu.com-20070413143426-6aj60em3rta94aw0
    parent: pqm at pqm.ubuntu.com-20070413050623-10v4wozs1tu04kcu
    parent: john at arbash-meinel.com-20070412211829-dduwktk8in0e6zpl
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2007-04-13 15:34:26 +0100
    message:
      (John Arbash Meinel) Update FtpServer for setUp(vfs_server), and MedusaFeature
        ------------------------------------------------------------
        revno: 2400.1.13.1.2
        merged: john at arbash-meinel.com-20070412211829-dduwktk8in0e6zpl
        parent: john at arbash-meinel.com-20070412205634-so7gafs8m0xc7v8x
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: test_case_with_ftp_server
        timestamp: Thu 2007-04-12 16:18:29 -0500
        message:
          Clean up test ordering
        ------------------------------------------------------------
        revno: 2400.1.13.1.1
        merged: john at arbash-meinel.com-20070412205634-so7gafs8m0xc7v8x
        parent: pqm at pqm.ubuntu.com-20070412150356-jeie6iap22sae8xf
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: test_case_with_ftp_server
        timestamp: Thu 2007-04-12 15:56:34 -0500
        message:
          Implement TestCaseWithFTPServer using the new shiny Feature mechanism.
          Also update FtpServer so that it conforms to the expected setUp(vfs_server)
          functionality.
    ------------------------------------------------------------
    revno: 2400.1.14
    merged: pqm at pqm.ubuntu.com-20070413050623-10v4wozs1tu04kcu
    parent: pqm at pqm.ubuntu.com-20070412150356-jeie6iap22sae8xf
    parent: andrew.bennetts at canonical.com-20070413010947-wdy5e6gexv20k98b
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2007-04-13 06:06:23 +0100
    message:
      (Andrew Bennetts, Robert Collins) Add a 'token' argument to lock_write.
        ------------------------------------------------------------
        revno: 2279.7.13
        merged: andrew.bennetts at canonical.com-20070413010947-wdy5e6gexv20k98b
        parent: andrew.bennetts at canonical.com-20070412082651-cwzuhh5xqwdtchsw
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: bzr.dev.hpss.api.changes
        timestamp: Fri 2007-04-13 11:09:47 +1000
        message:
          Add a brief explanation of what tokens are used for to lock_write docstrings.
        ------------------------------------------------------------
        revno: 2279.7.12
        merged: andrew.bennetts at canonical.com-20070412082651-cwzuhh5xqwdtchsw
        parent: andrew.bennetts at canonical.com-20070412080310-syj0orzfluo3ywb6
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: bzr.dev.hpss.api.changes
        timestamp: Thu 2007-04-12 18:26:51 +1000
        message:
          Update NEWS.
        ------------------------------------------------------------
        revno: 2279.7.11
        merged: andrew.bennetts at canonical.com-20070412080310-syj0orzfluo3ywb6
        parent: andrew.bennetts at canonical.com-20070412074331-otphanb3q0tx6rfz
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: bzr.dev.hpss.api.changes
        timestamp: Thu 2007-04-12 18:03:10 +1000
        message:
          Remove some XXXs.
        ------------------------------------------------------------
        revno: 2279.7.10
        merged: andrew.bennetts at canonical.com-20070412074331-otphanb3q0tx6rfz
        parent: andrew.bennetts at canonical.com-20070412073725-pzd8641vf9oh6v5g
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: bzr.dev.hpss.api.changes
        timestamp: Thu 2007-04-12 17:43:31 +1000
        message:
          Change Branch.lock_token to only accept and receive the branch lock token (rather than the branch and repo lock tokens).  (copied from hpss branch)
        ------------------------------------------------------------
        revno: 2279.7.9
        merged: andrew.bennetts at canonical.com-20070412073725-pzd8641vf9oh6v5g
        parent: andrew.bennetts at canonical.com-20070412033450-zbjs6vgxmsw6s7ts
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: bzr.dev.hpss.api.changes
        timestamp: Thu 2007-04-12 17:37:25 +1000
        message:
          Remove some redundant code pointed out by Robert's review, and remove some unused imports while I'm there.
        ------------------------------------------------------------
        revno: 2279.7.8
        merged: andrew.bennetts at canonical.com-20070412033450-zbjs6vgxmsw6s7ts
        parent: andrew.bennetts at canonical.com-20070411133532-u6x6edf3dmzamnaq
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: bzr.dev.hpss.api.changes
        timestamp: Thu 2007-04-12 13:34:50 +1000
        message:
          Update NEWS
        ------------------------------------------------------------
        revno: 2279.7.7
        merged: andrew.bennetts at canonical.com-20070411133532-u6x6edf3dmzamnaq
        parent: andrew.bennetts at canonical.com-20070411064005-zylli6el5cz7kwnb
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: bzr.dev.hpss.api.changes
        timestamp: Wed 2007-04-11 23:35:32 +1000
        message:
          LockDir, Repository and Branch lock token changes from the hpss branch.
        ------------------------------------------------------------
        revno: 2279.7.6
        merged: andrew.bennetts at canonical.com-20070411064005-zylli6el5cz7kwnb
        parent: andrew.bennetts at canonical.com-20070329051401-kqbu8ootnk9dlbgn
        parent: pqm at pqm.ubuntu.com-20070411022359-403a2155afb207cf
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: bzr.dev.hpss.api.changes
        timestamp: Wed 2007-04-11 16:40:05 +1000
        message:
          Merge from bzr.dev.
        ------------------------------------------------------------
        revno: 2279.7.5
        merged: andrew.bennetts at canonical.com-20070329051401-kqbu8ootnk9dlbgn
        parent: andrew.bennetts at canonical.com-20070328075403-ibqxtr196emuc4ut
        parent: pqm at pqm.ubuntu.com-20070329043540-952aff23533c1c26
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: bzr.dev.hpss.api.changes
        timestamp: Thu 2007-03-29 15:14:01 +1000
        message:
          Merge from bzr.dev
        ------------------------------------------------------------
        revno: 2279.7.4
        merged: andrew.bennetts at canonical.com-20070328075403-ibqxtr196emuc4ut
        parent: andrew.bennetts at canonical.com-20070328073853-yje2ikoflt6a4jos
        parent: pqm at pqm.ubuntu.com-20070328065822-999550a858a3ced3
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: bzr.dev.hpss.api.changes
        timestamp: Wed 2007-03-28 17:54:03 +1000
        message:
          Merge from bzr.dev.
        ------------------------------------------------------------
        revno: 2279.7.3
        merged: andrew.bennetts at canonical.com-20070328073853-yje2ikoflt6a4jos
        parent: andrew.bennetts at canonical.com-20070328070842-r843houy668oxb9o
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: bzr.dev.hpss.api.changes
        timestamp: Wed 2007-03-28 17:38:53 +1000
        message:
          Some tweaks in response to review.
        ------------------------------------------------------------
        revno: 2279.7.2
        merged: andrew.bennetts at canonical.com-20070328070842-r843houy668oxb9o
        parent: andrew.bennetts at canonical.com-20070212044932-k9keo85c0s9gg5wv
        parent: pqm at pqm.ubuntu.com-20070328022809-40aa40f8edf4e502
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: bzr.dev.hpss.api.changes
        timestamp: Wed 2007-03-28 17:08:42 +1000
        message:
          Merge from bzr.dev.
        ------------------------------------------------------------
        revno: 2279.7.1
        merged: andrew.bennetts at canonical.com-20070212044932-k9keo85c0s9gg5wv
        parent: pqm at pqm.ubuntu.com-20070209195330-312ec52588462782
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: bzr.dev.hpss.api.changes
        timestamp: Mon 2007-02-12 15:49:32 +1100
        message:
          ``LockableFiles.lock_write()`` now accepts a ``token`` keyword argument, so that
          a seperate LockableFiles instance can share a lock if it has the right token.
          (Andrew Bennetts, Robert Collins)
    ------------------------------------------------------------
    revno: 2400.1.13
    merged: pqm at pqm.ubuntu.com-20070412150356-jeie6iap22sae8xf
    parent: pqm at pqm.ubuntu.com-20070412141938-72ysaak1x6brlfmm
    parent: john at arbash-meinel.com-20070412143944-w1tdz5wvpaf6791p
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2007-04-12 16:03:56 +0100
    message:
      (Ian Clatworthy) Help text fixes for add, commit, and export
        ------------------------------------------------------------
        revno: 2371.1.2
        merged: john at arbash-meinel.com-20070412143944-w1tdz5wvpaf6791p
        parent: john at arbash-meinel.com-20070322190703-qx2xft42j64hfp88
        parent: ian.clatworthy at internode.on.net-20070412060957-m8l5xx0cte108s3d
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Thu 2007-04-12 09:39:44 -0500
        message:
          (Ian Clatworthy) Help text fixes for add, commit, and export
        ------------------------------------------------------------
        revno: 2374.1.6
        merged: ian.clatworthy at internode.on.net-20070412060957-m8l5xx0cte108s3d
        parent: ian.clatworthy at internode.on.net-20070412060105-p8xvixkc0or94nxp
        committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
        branch nick: bzr.help-fixes
        timestamp: Thu 2007-04-12 16:09:57 +1000
        message:
          explained selected fail commit failure by design
        ------------------------------------------------------------
        revno: 2374.1.5
        merged: ian.clatworthy at internode.on.net-20070412060105-p8xvixkc0or94nxp
        parent: ian.clatworthy at internode.on.net-20070402011840-ad1dombhee1vr88x
        committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
        branch nick: bzr.help-fixes
        timestamp: Thu 2007-04-12 16:01:05 +1000
        message:
          explained selected fail commit failure by design
        ------------------------------------------------------------
        revno: 2374.1.4
        merged: ian.clatworthy at internode.on.net-20070402011840-ad1dombhee1vr88x
        parent: ian.clatworthy at internode.on.net-20070329091803-1774b7u9isk2z0p4
        committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
        branch nick: bzr.quick
        timestamp: Mon 2007-04-02 11:18:40 +1000
        message:
          Include feedback from mailing list.
        ------------------------------------------------------------
        revno: 2374.1.3
        merged: ian.clatworthy at internode.on.net-20070329091803-1774b7u9isk2z0p4
        parent: ian.clatworthy at internode.on.net-20070327003529-dwroi8lgq0nxouov
        committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
        branch nick: bzr.quick
        timestamp: Thu 2007-03-29 19:18:03 +1000
        message:
          Minor man page fixes for add, commit, export
    ------------------------------------------------------------
    revno: 2400.1.12
    merged: pqm at pqm.ubuntu.com-20070412141938-72ysaak1x6brlfmm
    parent: pqm at pqm.ubuntu.com-20070412095902-nen3rbeeppe9yrz0
    parent: john at arbash-meinel.com-20070412135716-tqs9n87s9gjefkdx
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2007-04-12 15:19:38 +0100
    message:
      (John Arbash Meinel) Add more get_file_mtime tests.
        ------------------------------------------------------------
        revno: 2400.1.5.3.2
        merged: john at arbash-meinel.com-20070412135716-tqs9n87s9gjefkdx
        parent: john at arbash-meinel.com-20070411221459-h6l619a85w7nimfc
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: get_file_mtime_tests
        timestamp: Thu 2007-04-12 08:57:16 -0500
        message:
          Fix one test.
        ------------------------------------------------------------
        revno: 2400.1.5.3.1
        merged: john at arbash-meinel.com-20070411221459-h6l619a85w7nimfc
        parent: pqm at pqm.ubuntu.com-20070411044855-b83c4dc6fd093648
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: get_file_mtime_tests
        timestamp: Wed 2007-04-11 17:14:59 -0500
        message:
          Add some tests for get_file_mtime, and clean up others.
    ------------------------------------------------------------
    revno: 2400.1.11
    merged: pqm at pqm.ubuntu.com-20070412095902-nen3rbeeppe9yrz0
    parent: pqm at pqm.ubuntu.com-20070412093242-8r2pilxsjtxs46dj
    parent: andrew.bennetts at canonical.com-20070412092148-bg68kyofc8k702yf
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2007-04-12 10:59:02 +0100
    message:
      Link to HACKING.htm from doc/index.txt.
        ------------------------------------------------------------
        revno: 2400.1.5.2.3
        merged: andrew.bennetts at canonical.com-20070412092148-bg68kyofc8k702yf
        parent: andrew.bennetts at canonical.com-20070411104619-f9hdzo9s4p63je91
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: HACKING-portability
        timestamp: Thu 2007-04-12 19:21:48 +1000
        message:
          Link to HACKING.htm from doc/index.txt.
    ------------------------------------------------------------
    revno: 2400.1.10
    merged: pqm at pqm.ubuntu.com-20070412093242-8r2pilxsjtxs46dj
    parent: pqm at pqm.ubuntu.com-20070412063453-ogf089v98ktaopbk
    parent: andrew.bennetts at canonical.com-20070411104619-f9hdzo9s4p63je91
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2007-04-12 10:32:42 +0100
    message:
      (Andrew Bennetts) Add a brief Portability section to HACKING, build HACKING.htm from 'make docs'.
        ------------------------------------------------------------
        revno: 2400.1.5.2.2
        merged: andrew.bennetts at canonical.com-20070411104619-f9hdzo9s4p63je91
        parent: andrew.bennetts at canonical.com-20070411080906-4mgvcy6focqyhl0a
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: HACKING-portability
        timestamp: Wed 2007-04-11 20:46:19 +1000
        message:
          Add a brief section on portability to HACKING.
        ------------------------------------------------------------
        revno: 2400.1.5.2.1
        merged: andrew.bennetts at canonical.com-20070411080906-4mgvcy6focqyhl0a
        parent: pqm at pqm.ubuntu.com-20070411044855-b83c4dc6fd093648
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: HACKING-portability
        timestamp: Wed 2007-04-11 18:09:06 +1000
        message:
          Build HACKING.htm from 'make docs'.
    ------------------------------------------------------------
    revno: 2400.1.9
    merged: pqm at pqm.ubuntu.com-20070412063453-ogf089v98ktaopbk
    parent: pqm at pqm.ubuntu.com-20070412032019-axeg1wmcju0odfdr
    parent: mbp at sourcefrog.net-20070412050145-e139sv6el1h8j243
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2007-04-12 07:34:53 +0100
    message:
      Better tag upgrade message
        ------------------------------------------------------------
        revno: 2382.2.4.1.1
        merged: mbp at sourcefrog.net-20070412050145-e139sv6el1h8j243
        parent: mbp at sourcefrog.net-20070404012211-sq269me6bai9m6xk
        parent: ian.clatworthy at internode.on.net-20070329022831-5pql3da3g87rueu2
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: doc
        timestamp: Thu 2007-04-12 15:01:45 +1000
        message:
          Better tag upgrade message
        ------------------------------------------------------------
        revno: 2382.3.1
        merged: ian.clatworthy at internode.on.net-20070329022831-5pql3da3g87rueu2
        parent: pqm at pqm.ubuntu.com-20070329014424-0947dae124353e1f
        committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
        branch nick: bzr.better-tag-msgs
        timestamp: Thu 2007-03-29 12:28:31 +1000
        message:
          Better tag/tags error message (#97674)
    ------------------------------------------------------------
    revno: 2400.1.8
    merged: pqm at pqm.ubuntu.com-20070412032019-axeg1wmcju0odfdr
    parent: pqm at pqm.ubuntu.com-20070412005953-vow66znisuxhrauk
    parent: john at arbash-meinel.com-20070411220839-0eyz5nrq4vv1chcb
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2007-04-12 04:20:19 +0100
    message:
      (John Arbash Meinel) Fix bug #103870 by teaching show_diff_trees about modified files in renamed directories
        ------------------------------------------------------------
        revno: 2400.1.5.1.4
        merged: john at arbash-meinel.com-20070411220839-0eyz5nrq4vv1chcb
        parent: john at arbash-meinel.com-20070411220516-bz4941rayeilvjac
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: diff_renamed_103870
        timestamp: Wed 2007-04-11 17:08:39 -0500
        message:
          NEWS for fixing bug #103870
        ------------------------------------------------------------
        revno: 2400.1.5.1.3
        merged: john at arbash-meinel.com-20070411220516-bz4941rayeilvjac
        parent: john at arbash-meinel.com-20070411220215-o07i1rcajpghkpom
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: diff_renamed_103870
        timestamp: Wed 2007-04-11 17:05:16 -0500
        message:
          Do a better fix, which recognizes that we should pass the correct old path.
        ------------------------------------------------------------
        revno: 2400.1.5.1.2
        merged: john at arbash-meinel.com-20070411220215-o07i1rcajpghkpom
        parent: john at arbash-meinel.com-20070411215736-rii53nkqb42hezup
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: diff_renamed_103870
        timestamp: Wed 2007-04-11 17:02:15 -0500
        message:
          Fix bug #103870 by passing None instead of a (sometimes wrong) path
        ------------------------------------------------------------
        revno: 2400.1.5.1.1
        merged: john at arbash-meinel.com-20070411215736-rii53nkqb42hezup
        parent: pqm at pqm.ubuntu.com-20070411044855-b83c4dc6fd093648
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: diff_renamed_103870
        timestamp: Wed 2007-04-11 16:57:36 -0500
        message:
          Add a bunch of direct tests for 'show_diff_trees'
    ------------------------------------------------------------
    revno: 2400.1.7
    merged: pqm at pqm.ubuntu.com-20070412005953-vow66znisuxhrauk
    parent: pqm at pqm.ubuntu.com-20070412003351-vvhci6f1lvpelk24
    parent: bialix at ukr.net-20070410124409-9ma7vrslw37ildiz
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2007-04-12 01:59:53 +0100
    message:
      (bialix,r=john) win32-related selftest improvements
        ------------------------------------------------------------
        revno: 2379.6.4
        merged: bialix at ukr.net-20070410124409-9ma7vrslw37ildiz
        parent: bialix at ukr.net-20070405223343-7v14l68sicl8u8qi
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: selftest.win32
        timestamp: Tue 2007-04-10 15:44:09 +0300
        message:
          Teach `bzr selftest --clean-output` to remove read-only files (win32-specific)
        ------------------------------------------------------------
        revno: 2379.6.3
        merged: bialix at ukr.net-20070405223343-7v14l68sicl8u8qi
        parent: bialix at ukr.net-20070405213029-wz2erv57mbq5hm2j
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: selftest.win32
        timestamp: Fri 2007-04-06 01:33:43 +0300
        message:
          Rework NUMBERED_DIRS usage to keep test_selftest.py passing the tests on win32
        ------------------------------------------------------------
        revno: 2379.6.2
        merged: bialix at ukr.net-20070405213029-wz2erv57mbq5hm2j
        parent: bialix at ukr.net-20070328144807-dhektxjnz7axuq8j
        parent: pqm at pqm.ubuntu.com-20070405073143-8fa894c829ab5e50
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: selftest.win32
        timestamp: Fri 2007-04-06 00:30:29 +0300
        message:
          merge bzr.dev
        ------------------------------------------------------------
        revno: 2379.6.1
        merged: bialix at ukr.net-20070328144807-dhektxjnz7axuq8j
        parent: pqm at pqm.ubuntu.com-20070327081802-271be0d343108f4f
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: selftest.win32
        timestamp: Wed 2007-03-28 17:48:07 +0300
        message:
          blackbox: test_cat_different_id: calling bzr as another process require free lock on win32
    ------------------------------------------------------------
    revno: 2400.1.6
    merged: pqm at pqm.ubuntu.com-20070412003351-vvhci6f1lvpelk24
    parent: pqm at pqm.ubuntu.com-20070411044855-b83c4dc6fd093648
    parent: andrew.bennetts at canonical.com-20070411054339-b01z0zc1bj21x16o
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2007-04-12 01:33:51 +0100
    message:
      (Andrew Bennetts) Use repo.supports_rich_root() rather than repo._format.rich_root_data
        ------------------------------------------------------------
        revno: 2305.2.4
        merged: andrew.bennetts at canonical.com-20070411054339-b01z0zc1bj21x16o
        parent: andrew.bennetts at canonical.com-20070411054121-t3qnk4z25j27l7zc
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: supports-rich-root
        timestamp: Wed 2007-04-11 15:43:39 +1000
        message:
          Reinstate checking of source & targer _serializer that I accidentally clobbered.
        ------------------------------------------------------------
        revno: 2305.2.3
        merged: andrew.bennetts at canonical.com-20070411054121-t3qnk4z25j27l7zc
        parent: andrew.bennetts at canonical.com-20070411053753-99pjtm3yfpj9amzz
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: supports-rich-root
        timestamp: Wed 2007-04-11 15:41:21 +1000
        message:
          Bring across test_repository improvements from the hpss branch to fix the last test failures.
        ------------------------------------------------------------
        revno: 2305.2.2
        merged: andrew.bennetts at canonical.com-20070411053753-99pjtm3yfpj9amzz
        parent: andrew.bennetts at canonical.com-20070301035839-mgsenxqgx4oveeob
        parent: pqm at pqm.ubuntu.com-20070411022359-403a2155afb207cf
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: supports-rich-root
        timestamp: Wed 2007-04-11 15:37:53 +1000
        message:
          Merge from bzr.dev.
        ------------------------------------------------------------
        revno: 2305.2.1
        merged: andrew.bennetts at canonical.com-20070301035839-mgsenxqgx4oveeob
        parent: pqm at pqm.ubuntu.com-20070228211048-30e18ddd8dd9c205
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: supports-rich-root
        timestamp: Thu 2007-03-01 14:58:39 +1100
        message:
          Use repo.supports_rich_root() everywhere rather than
          repo._format.rich_root_data.
          
          This is needed for the smart server work, because a RemoteRepository's _format
          doesn't know whether or not the actual repository supports rich root data or
          not.  But the RemoteRepository does (by asking the underlying repository it is
          connected to).
          
          This also removes some unnecessary isinstance(..., Repository), which also
          hinders smart server work, because RemoteRepository doesn't inherit from
          Repository, even though it implements the same interface.
    ------------------------------------------------------------
    revno: 2400.1.5
    merged: pqm at pqm.ubuntu.com-20070411044855-b83c4dc6fd093648
    parent: pqm at pqm.ubuntu.com-20070411022359-403a2155afb207cf
    parent: aaron.bentley at utoronto.ca-20070411041259-pfl82a4kg9q5j3n2
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2007-04-11 05:48:55 +0100
    message:
      Fix bzr cat-revision REVISION_ID
        ------------------------------------------------------------
        revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.18
        merged: aaron.bentley at utoronto.ca-20070411041259-pfl82a4kg9q5j3n2
        parent: abentley at panoramicfeedback.com-20070410210517-0m7mhl5d2fhs66u5
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: Aaron's mergeable stuff
        timestamp: Wed 2007-04-11 00:12:59 -0400
        message:
          Add copyright notice
        ------------------------------------------------------------
        revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17
        merged: abentley at panoramicfeedback.com-20070410210517-0m7mhl5d2fhs66u5
        parent: abentley at panoramicfeedback.com-20070410204657-nqvx7b7t2zou61gu
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: Aaron's mergeable stuff
        timestamp: Tue 2007-04-10 17:05:17 -0400
        message:
          Move cat-revision tests out of test_revision_info
        ------------------------------------------------------------
        revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.16
        merged: abentley at panoramicfeedback.com-20070410204657-nqvx7b7t2zou61gu
        parent: abentley at panoramicfeedback.com-20070405202732-f9b8pvfd1h699cd4
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: Aaron's mergeable stuff
        timestamp: Tue 2007-04-10 16:46:57 -0400
        message:
          Fix cat-revision REVISION
        ------------------------------------------------------------
        revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.15
        merged: abentley at panoramicfeedback.com-20070405202732-f9b8pvfd1h699cd4
        parent: aaron.bentley at utoronto.ca-20070404024116-8lm1319fn59e2eww
        parent: pqm at pqm.ubuntu.com-20070405073143-8fa894c829ab5e50
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: Aaron's mergeable stuff
        timestamp: Thu 2007-04-05 16:27:32 -0400
        message:
          merge bzr.dev
    ------------------------------------------------------------
    revno: 2400.1.4
    merged: pqm at pqm.ubuntu.com-20070411022359-403a2155afb207cf
    parent: pqm at pqm.ubuntu.com-20070411015343-51539420298ee77c
    parent: andrew.bennetts at canonical.com-20070411020118-yie55yxj8v9ke3b8
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2007-04-11 03:23:59 +0100
    message:
      Use the Command pattern for smart server request handling
        ------------------------------------------------------------
        revno: 2400.1.2.1.2
        merged: andrew.bennetts at canonical.com-20070411020118-yie55yxj8v9ke3b8
        parent: andrew.bennetts at canonical.com-20070410141235-wtmjydzktegq64cz
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss-part-two-server-commands
        timestamp: Wed 2007-04-11 12:01:18 +1000
        message:
          Deal with review comments.
        ------------------------------------------------------------
        revno: 2400.1.2.1.1
        merged: andrew.bennetts at canonical.com-20070410141235-wtmjydzktegq64cz
        parent: pqm at pqm.ubuntu.com-20070410074302-cf6b95587a1058cd
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss-part-two-server-commands
        timestamp: Wed 2007-04-11 00:12:35 +1000
        message:
          Use the Command pattern for handling smart server commands.
          
          This improves readability and testability.
          
          This change has been extracted from the hpss branch.
    ------------------------------------------------------------
    revno: 2400.1.3
    merged: pqm at pqm.ubuntu.com-20070411015343-51539420298ee77c
    parent: pqm at pqm.ubuntu.com-20070410074302-cf6b95587a1058cd
    parent: john at arbash-meinel.com-20070411012920-wnp7rnqdwe13xmhx
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2007-04-11 02:53:43 +0100
    message:
      (John Arbash Meinel) Fix bug #103757 by teaching common_ancestor to shortcut when a tip is in the other ancestry.
        ------------------------------------------------------------
        revno: 2400.1.1.1.5
        merged: john at arbash-meinel.com-20070411012920-wnp7rnqdwe13xmhx
        parent: john at arbash-meinel.com-20070410191541-rj635kcwkp305bo7
        parent: pqm at pqm.ubuntu.com-20070410074302-cf6b95587a1058cd
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: shortcut-common-ancestor
        timestamp: Tue 2007-04-10 20:29:20 -0500
        message:
          [merge] bzr.dev 2402
        ------------------------------------------------------------
        revno: 2400.1.1.1.4
        merged: john at arbash-meinel.com-20070410191541-rj635kcwkp305bo7
        parent: john at arbash-meinel.com-20070410183032-rw4d3kpb8f9cesfw
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: shortcut-common-ancestor
        timestamp: Tue 2007-04-10 14:15:41 -0500
        message:
          NEWS about fixing bug #103757
        ------------------------------------------------------------
        revno: 2400.1.1.1.3
        merged: john at arbash-meinel.com-20070410183032-rw4d3kpb8f9cesfw
        parent: john at arbash-meinel.com-20070410181305-9y6qbm51we9k37kz
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: shortcut-common-ancestor
        timestamp: Tue 2007-04-10 13:30:32 -0500
        message:
          We don't need to extract ancestry_b until we after we've checked for existence.
          It seems to make sense to check 'b in ancestry_a' first, though we might consider checking
          a in ancestry_b first.
          b in a is merging something which has already been merged.
          a in b is merging something which has merged you.
          And 'a in b' may actually be more common.
          The timing difference is fairly small, though.
        ------------------------------------------------------------
        revno: 2400.1.1.1.2
        merged: john at arbash-meinel.com-20070410181305-9y6qbm51we9k37kz
        parent: john at arbash-meinel.com-20070410175723-9a3rljph39ot4e35
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: shortcut-common-ancestor
        timestamp: Tue 2007-04-10 13:13:05 -0500
        message:
          Ancestry checks can be done using the dictionaries
          And we don't need to create 2 sets, one will do just fine.
        ------------------------------------------------------------
        revno: 2400.1.1.1.1
        merged: john at arbash-meinel.com-20070410175723-9a3rljph39ot4e35
        parent: pqm at pqm.ubuntu.com-20070405073143-8fa894c829ab5e50
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: shortcut-common-ancestor
        timestamp: Tue 2007-04-10 12:57:23 -0500
        message:
          Shortcut the common_ancestor code when one tip is in the ancestry of the other.
    ------------------------------------------------------------
    revno: 2400.1.2
    merged: pqm at pqm.ubuntu.com-20070410074302-cf6b95587a1058cd
    parent: pqm at pqm.ubuntu.com-20070405073143-8fa894c829ab5e50
    parent: andrew.bennetts at canonical.com-20070410072043-5vqutcw42bsml4tl
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2007-04-10 08:43:02 +0100
    message:
      (Andrew Bennetts) Split bzrlib/transport/smart.py into several smaller modules.
        ------------------------------------------------------------
        revno: 2400.2.9
        merged: andrew.bennetts at canonical.com-20070410072043-5vqutcw42bsml4tl
        parent: andrew.bennetts at canonical.com-20070410055415-58qifwhu6xfrb5sr
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: split-smart-part-1-rename
        timestamp: Tue 2007-04-10 17:20:43 +1000
        message:
          Fix blackbox/test_serve, there were some trivial changes that needed to be brought across from the hpss branch.
        ------------------------------------------------------------
        revno: 2400.2.8
        merged: andrew.bennetts at canonical.com-20070410055415-58qifwhu6xfrb5sr
        parent: andrew.bennetts at canonical.com-20070410054902-iphhiovkapcnzl9k
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: split-smart-part-1-rename
        timestamp: Tue 2007-04-10 15:54:15 +1000
        message:
          Add a NEWS entry.
        ------------------------------------------------------------
        revno: 2400.2.7
        merged: andrew.bennetts at canonical.com-20070410054902-iphhiovkapcnzl9k
        parent: andrew.bennetts at canonical.com-20070410023142-7xgeph6572ikrnu8
        parent: pqm at pqm.ubuntu.com-20070405073143-8fa894c829ab5e50
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: split-smart-part-1-rename
        timestamp: Tue 2007-04-10 15:49:02 +1000
        message:
          Merge from bzr.dev.
        ------------------------------------------------------------
        revno: 2400.2.6
        merged: andrew.bennetts at canonical.com-20070410023142-7xgeph6572ikrnu8
        parent: andrew.bennetts at canonical.com-20070410022255-e1dhysj2zhukca5c
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: split-smart-part-1-rename
        timestamp: Tue 2007-04-10 12:31:42 +1000
        message:
          Cosmetic changes to minimise the difference between this branch and the hpss branch.
        ------------------------------------------------------------
        revno: 2400.2.5
        merged: andrew.bennetts at canonical.com-20070410022255-e1dhysj2zhukca5c
        parent: andrew.bennetts at canonical.com-20070410020914-rjhtq6bfcbrj2vjs
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: split-smart-part-1-rename
        timestamp: Tue 2007-04-10 12:22:55 +1000
        message:
          Add some missing docstrings and copyright boilerplate.
        ------------------------------------------------------------
        revno: 2400.2.4
        merged: andrew.bennetts at canonical.com-20070410020914-rjhtq6bfcbrj2vjs
        parent: andrew.bennetts at canonical.com-20070409044955-h3ijql5cvqxia4d4
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: split-smart-part-1-rename
        timestamp: Tue 2007-04-10 12:09:14 +1000
        message:
          Tidy up accidental changes.
        ------------------------------------------------------------
        revno: 2400.2.3
        merged: andrew.bennetts at canonical.com-20070409044955-h3ijql5cvqxia4d4
        parent: andrew.bennetts at canonical.com-20070406011930-wy4emdgu3yu527pm
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: split-smart-part-1-rename
        timestamp: Mon 2007-04-09 14:49:55 +1000
        message:
          Split smart transport code into several separate modules.
        ------------------------------------------------------------
        revno: 2400.2.2
        merged: andrew.bennetts at canonical.com-20070406011930-wy4emdgu3yu527pm
        parent: andrew.bennetts at canonical.com-20070405152057-gokz8syll1lk2nrm
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: split-smart-part-1-rename
        timestamp: Fri 2007-04-06 11:19:30 +1000
        message:
          Move SmartTCPServer classes into bzrlib/smart/server.py
        ------------------------------------------------------------
        revno: 2400.2.1
        merged: andrew.bennetts at canonical.com-20070405152057-gokz8syll1lk2nrm
        parent: pqm at pqm.ubuntu.com-20070404213903-fe78a7a55c37ee95
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: split-smart-part-1-rename
        timestamp: Fri 2007-04-06 01:20:57 +1000
        message:
          Rename bzrlib/transport/smart.py to bzrlib/transport/remote.py.
          
          First part of the code reorganisation from the hpss branch.
    ------------------------------------------------------------
    revno: 2400.1.1
    merged: pqm at pqm.ubuntu.com-20070405073143-8fa894c829ab5e50
    parent: pqm at pqm.ubuntu.com-20070404213903-fe78a7a55c37ee95
    parent: robertc at robertcollins.net-20070405065917-mu99paqftpq55f5m
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2007-04-05 08:31:43 +0100
    message:
      (robertc) SmartServer startup and shutdown hooks, and smart server shutdown logic implementation. (Robert Collins)
    ------------------------------------------------------------
    revno: 2376.3.9
    merged: robertc at robertcollins.net-20070405065917-mu99paqftpq55f5m
    parent: robertc at robertcollins.net-20070405003903-u1ys8t2lo5gs6b35
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: hpss-hooks
    timestamp: Thu 2007-04-05 16:59:17 +1000
    message:
      Review comments.
    ------------------------------------------------------------
    revno: 2376.3.8
    merged: robertc at robertcollins.net-20070405003903-u1ys8t2lo5gs6b35
    parent: robertc at robertcollins.net-20070404085028-abgpe4zylhsdoaqd
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: hpss-hooks
    timestamp: Thu 2007-04-05 10:39:03 +1000
    message:
      Overhaul the SmartTCPServer connect-thread logic to synchronise on startup and shutdown and notify the server if it is in accept.
    ------------------------------------------------------------
    revno: 2376.3.7
    merged: robertc at robertcollins.net-20070404085028-abgpe4zylhsdoaqd
    parent: robertc at robertcollins.net-20070404051938-2lnvpsm2tbo5a6g2
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Wed 2007-04-04 18:50:28 +1000
    message:
      Avoid logging smart server errors when ctrl-C'd.
    ------------------------------------------------------------
    revno: 2376.3.6
    merged: robertc at robertcollins.net-20070404051938-2lnvpsm2tbo5a6g2
    parent: robertc at robertcollins.net-20070327214048-286uc943sgxma2xe
    parent: pqm at pqm.ubuntu.com-20070404022946-b93fc2e49b3bb195
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: hpss-hooks
    timestamp: Wed 2007-04-04 15:19:38 +1000
    message:
      Merge bzr.dev.
    ------------------------------------------------------------
    revno: 2376.3.5
    merged: robertc at robertcollins.net-20070327214048-286uc943sgxma2xe
    parent: robertc at robertcollins.net-20070327045759-hb7j634wpm1ris7l
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Wed 2007-03-28 07:40:48 +1000
    message:
      Fix Branch hook tests for the new eans of preserving hooks by the test suite.
    ------------------------------------------------------------
    revno: 2376.3.4
    merged: robertc at robertcollins.net-20070327045759-hb7j634wpm1ris7l
    parent: robertc at robertcollins.net-20070327043224-9ql8frcekqjbb64g
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Tue 2007-03-27 14:57:59 +1000
    message:
      Add more debugging code to the smart server to debug pqm failures.
    ------------------------------------------------------------
    revno: 2376.3.3
    merged: robertc at robertcollins.net-20070327043224-9ql8frcekqjbb64g
    parent: robertc at robertcollins.net-20070327042126-32pgs6ityvdt72tg
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Tue 2007-03-27 14:32:24 +1000
    message:
      Fix all smart_transport tests.
    ------------------------------------------------------------
    revno: 2376.3.2
    merged: robertc at robertcollins.net-20070327042126-32pgs6ityvdt72tg
    parent: robertc at robertcollins.net-20070327024546-c7t95nl7j9t4x3jq
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Tue 2007-03-27 14:21:26 +1000
    message:
      Convert unconvered SmartServer subclass to use the cached sockname.
    ------------------------------------------------------------
    revno: 2376.3.1
    merged: robertc at robertcollins.net-20070327024546-c7t95nl7j9t4x3jq
    parent: pqm at pqm.ubuntu.com-20070326073003-37941d0fa5a5a6c4
    parent: robertc at robertcollins.net-20070327024201-ntm3ek1rrkkmg2yd
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Tue 2007-03-27 12:45:46 +1000
    message:
      New SmartServer hooks facility. There are two initial hooks documented in
      bzrlib.transport.smart.SmartServerHooks. The two initial hooks allow
      plugins to execute code upon server startup and shutdown.
      (Robert Collins).
      
      SmartServer in standalone mode will now close its listening socket when it
      stops, rather than waiting for garbage collection.  This primarily fixes
      test suite hangs when a test tries to connect to a shutdown server.  It
      may also help improve behaviour when dealing with a server running on a
      specific port (rather than dynamically assigned ports).  (Robert Collins)
    ------------------------------------------------------------
    revno: 2370.4.2
    merged: robertc at robertcollins.net-20070327024201-ntm3ek1rrkkmg2yd
    parent: robertc at robertcollins.net-20070325085956-my8jv7cifqzyltyz
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: hpss-hooks
    timestamp: Tue 2007-03-27 12:42:01 +1000
    message:
      Review feedback.
    ------------------------------------------------------------
    revno: 2370.4.1
    merged: robertc at robertcollins.net-20070325085956-my8jv7cifqzyltyz
    parent: pqm at pqm.ubuntu.com-20070321071219-55447700ec71371f
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: hpss-hooks
    timestamp: Sun 2007-03-25 18:59:56 +1000
    message:
      New SmartServer hooks facility. There are two initial hooks documented
      in bzrlib.transport.smart.SmartServerHooks. The two initial hooks allow
      plugins to execute code upon server startup and shutdown.
      (Robert Collins).
      
      SmartServer in standalone mode will now close its listening socket
      when it stops, rather than waiting for garbage collection. This primarily
      fixes test suite hangs when a test tries to connect to a shutdown server.
      It may also help improve behaviour when dealing with a server running
      on a specific port (rather than dynamically assigned ports).
      (Robert Collins)

Diff too large for email (9341 lines, the limit is 1000).



More information about the bazaar-commits mailing list