Rev 3731: merge bzr.dev and clean up NEWS in http://bzr.arbash-meinel.com/branches/bzr/1.8-dev/lighter_log_file

John Arbash Meinel john at arbash-meinel.com
Sun Sep 21 15:16:34 BST 2008


At http://bzr.arbash-meinel.com/branches/bzr/1.8-dev/lighter_log_file

------------------------------------------------------------
revno: 3731
revision-id: john at arbash-meinel.com-20080921141555-r6npeijzl5ic1r6r
parent: john at arbash-meinel.com-20080921140124-kvoi3sdig2owjukf
parent: pqm at pqm.ubuntu.com-20080921012105-ote1u11mokjim9ir
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lighter_log_file
timestamp: Sun 2008-09-21 09:15:55 -0500
message:
  merge bzr.dev and clean up NEWS
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/directory_service.py    directory_service.py-20080305221044-vr2mkvlsk8jypa2y-1
  bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
  bzrlib/revisionspec.py         revisionspec.py-20050907152633-17567659fd5c0ddb
  bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-1
  bzrlib/smart/server.py         server.py-20061110062051-chzu10y32vx8gvur-1
  bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
  bzrlib/tests/blackbox/test_remove_tree.py test_remove_tree.py-20061110192919-5j3xjciiaqbs2dvo-1
  bzrlib/tests/blackbox/test_switch.py test_switch.py-20071122111948-0c5en6uz92bwl76h-1
  bzrlib/tests/test_directory_service.py test_directory_servi-20080305221044-vr2mkvlsk8jypa2y-2
  bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
  bzrlib/tests/tree_implementations/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
  bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
  bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
  bzrlib/transport/local.py      local_transport.py-20050711165921-9b1f142bfe480c24
  bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
    ------------------------------------------------------------
    revno: 3711.2.8
    revision-id: pqm at pqm.ubuntu.com-20080921012105-ote1u11mokjim9ir
    parent: pqm at pqm.ubuntu.com-20080920200119-5q2m3kn9foc56quu
    parent: lalinsky at gmail.com-20080831065142-dmj7vbnryqqid1tb
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sun 2008-09-21 02:21:05 +0100
    message:
      make  halt on uncommitted changes (luks)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/tests/blackbox/test_remove_tree.py test_remove_tree.py-20061110192919-5j3xjciiaqbs2dvo-1
        ------------------------------------------------------------
        revno: 3667.2.1
        revision-id: lalinsky at gmail.com-20080831065142-dmj7vbnryqqid1tb
        parent: pqm at pqm.ubuntu.com-20080829214033-n9tclw44g7b42hsc
        committer: Lukáš Lalinský <lalinsky at gmail.com>
        branch nick: remove_tree_changed_wt
        timestamp: Sun 2008-08-31 08:51:42 +0200
        message:
          Make `bzr remove-tree` not remove trees with uncommitted changes by default
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/tests/blackbox/test_remove_tree.py test_remove_tree.py-20061110192919-5j3xjciiaqbs2dvo-1
    ------------------------------------------------------------
    revno: 3711.2.7
    revision-id: pqm at pqm.ubuntu.com-20080920200119-5q2m3kn9foc56quu
    parent: pqm at pqm.ubuntu.com-20080920185508-g6uoij1vgokthw5m
    parent: aaron at aaronbentley.com-20080920193118-2o9nxfzwtxucz8hg
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sat 2008-09-20 21:01:19 +0100
    message:
      Add '--standalone' option to branch (oddbloke)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
        ------------------------------------------------------------
        revno: 3711.5.4
        revision-id: aaron at aaronbentley.com-20080920193118-2o9nxfzwtxucz8hg
        parent: aaron at aaronbentley.com-20080920184158-9lixzzpm1f9c97tq
        parent: pqm at pqm.ubuntu.com-20080920185508-g6uoij1vgokthw5m
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: bzr.ab.integration
        timestamp: Sat 2008-09-20 15:31:18 -0400
        message:
          Merge with bzr.dev
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/directory_service.py    directory_service.py-20080305221044-vr2mkvlsk8jypa2y-1
          bzrlib/tests/test_directory_service.py test_directory_servi-20080305221044-vr2mkvlsk8jypa2y-2
          bzrlib/tests/tree_implementations/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
          bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
        ------------------------------------------------------------
        revno: 3711.5.3
        revision-id: aaron at aaronbentley.com-20080920184158-9lixzzpm1f9c97tq
        parent: aaron at aaronbentley.com-20080920175123-uwkdfa9i97k6g5es
        parent: daniel at daniel-watkins.co.uk-20080913120402-jfxlnz83xowycfnf
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: bzr.ab.integration
        timestamp: Sat 2008-09-20 14:41:58 -0400
        message:
          Merge from branch-standalone
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
        ------------------------------------------------------------
        revno: 3696.2.6
        revision-id: daniel at daniel-watkins.co.uk-20080913120402-jfxlnz83xowycfnf
        parent: daniel at daniel-watkins.co.uk-20080913112419-s4jzw08eu5kbdcim
        committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
        branch nick: branch-standalone
        timestamp: Sat 2008-09-13 13:04:02 +0100
        message:
          Added NEWS entry.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 3696.2.5
        revision-id: daniel at daniel-watkins.co.uk-20080913112419-s4jzw08eu5kbdcim
        parent: daniel at daniel-watkins.co.uk-20080913111700-yg8j2x4cwri1pph6
        parent: pqm at pqm.ubuntu.com-20080912142101-kj49buaas8zsqf5x
        committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
        branch nick: branch-standalone
        timestamp: Sat 2008-09-13 12:24:19 +0100
        message:
          Merged bzr.dev r3708.
        renamed:
          bzrlib/tests/repository_implementations => bzrlib/tests/per_repository repository_implementations-20060131092037-ec97814745cc6128
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzr                            bzr.py-20050313053754-5485f144c7006fa6
          bzr.ico                        bzr.ico-20060629083000-q18ip0hk7lq55i4y-1
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/bundle/__init__.py      changeset.py-20050513021216-b02ab57fb9738913
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/missing.py              missing.py-20050812153334-097f7097e2a8bcd1
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
          bzrlib/smart/message.py        message.py-20080222013625-ncqmh3nrxjkxab87-1
          bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/test_export.py test_export.py-20051229024010-e6c26658e460fb1c
          bzrlib/tests/per_repository/__init__.py __init__.py-20060131092037-9564957a7d4a841b
          bzrlib/tests/per_repository/helpers.py helpers.py-20070924032407-m460yl9j5gu5ju85-2
          bzrlib/tests/per_repository/test__generate_text_key_index.py test__generate_text_-20071114232121-00h9fd8qg8kjfa5k-1
          bzrlib/tests/per_repository/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
          bzrlib/tests/per_repository/test_break_lock.py test_break_lock.py-20060504111704-ee09a107f9f42e43
          bzrlib/tests/per_repository/test_check.py test_check.py-20070824124512-38g4d135gcqxo4zb-1
          bzrlib/tests/per_repository/test_check_reconcile.py test_broken.py-20070928125406-62236394w0jpbpd6-2
          bzrlib/tests/per_repository/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
          bzrlib/tests/per_repository/test_fetch.py test_fetch.py-20070814052151-5cxha9slx4c93uog-1
          bzrlib/tests/per_repository/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
          bzrlib/tests/per_repository/test_find_text_key_references.py test_find_text_key_r-20071114033605-v73bakal8x77qlfi-1
          bzrlib/tests/per_repository/test_get_parent_map.py test_get_parent_map.-20080421172708-x1z6ot341osr0jq1-1
          bzrlib/tests/per_repository/test_has_revisions.py test_has_revisions.p-20080111035443-xaupgdsx5fw1q54b-1
          bzrlib/tests/per_repository/test_has_same_location.py test_has_same_locati-20070807074648-2i2ah82fbe83iys7-1
          bzrlib/tests/per_repository/test_is_write_locked.py test_is_write_locked-20071012063748-vk062lmu683qgbc3-1
          bzrlib/tests/per_repository/test_iter_reverse_revision_history.py test_iter_reverse_re-20070217015036-spu7j5ggch7pbpyd-1
          bzrlib/tests/per_repository/test_pack.py test_pack.py-20070712120702-0c7585lh56p894mo-2
          bzrlib/tests/per_repository/test_reconcile.py test_reconcile.py-20060223022332-572ef70a3288e369
          bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
          bzrlib/tests/per_repository/test_revision.py testrevprops.py-20051013073044-92bc3c68302ce1bf
          bzrlib/tests/per_repository/test_statistics.py test_statistics.py-20070203082432-6738e8fl0mm7ikre-1
          bzrlib/tests/per_repository/test_write_group.py test_write_group.py-20070716105516-89n34xtogq5frn0m-1
          bzrlib/tests/per_repository_reference/__init__.py __init__.py-20080220025549-nnm2s80it1lvcwnc-2
          bzrlib/tests/test_annotate.py  test_annotate.py-20061213215015-sttc9agsxomls7q0-1
          bzrlib/tests/test_bundle.py    test.py-20050630184834-092aa401ab9f039c
          bzrlib/tests/test_missing.py   test_missing.py-20051212000028-694fa4f658a81f48
          bzrlib/tests/test_reconcile.py test_reconcile.py-20060225054842-50aa618584a86f26
          bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
          bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
          bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
          bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
          bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
          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_test_trees.py test_tree_trees.py-20060720091921-3nwi5h21lf06vf5p-1
          bzrlib/tests/workingtree_implementations/test_rename_one.py test_rename_one.py-20070226161242-2d8ibdedl700jgio-1
          bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
          bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
          bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
          doc/en/user-guide/http_smart_server.txt fastcgi.txt-20061005091552-rz8pva0olkxv0sd8-3
          profile_imports.py             profile_imports.py-20060618020306-k5uw80achysrokj9-1
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
        ------------------------------------------------------------
        revno: 3696.2.4
        revision-id: daniel at daniel-watkins.co.uk-20080913111700-yg8j2x4cwri1pph6
        parent: daniel at daniel-watkins.co.uk-20080913111140-pe7f8tj9szris6r5
        committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
        branch nick: branch-standalone
        timestamp: Sat 2008-09-13 12:17:00 +0100
        message:
          Fixed test to cope with trailing slashes.
        modified:
          bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
        ------------------------------------------------------------
        revno: 3696.2.3
        revision-id: daniel at daniel-watkins.co.uk-20080913111140-pe7f8tj9szris6r5
        parent: daniel at daniel-watkins.co.uk-20080913111107-z2xgnl2fq02mdamc
        committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
        branch nick: branch-standalone
        timestamp: Sat 2008-09-13 12:11:40 +0100
        message:
          Added --standalone option to branch.
        modified:
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
        ------------------------------------------------------------
        revno: 3696.2.2
        revision-id: daniel at daniel-watkins.co.uk-20080913111107-z2xgnl2fq02mdamc
        parent: daniel at daniel-watkins.co.uk-20080913110622-9wmaanrkdx300200
        committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
        branch nick: branch-standalone
        timestamp: Sat 2008-09-13 12:11:07 +0100
        message:
          Added urlutils to test imports.
        modified:
          bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
        ------------------------------------------------------------
        revno: 3696.2.1
        revision-id: daniel at daniel-watkins.co.uk-20080913110622-9wmaanrkdx300200
        parent: pqm at pqm.ubuntu.com-20080908061835-nz7hj7o0pms1nf9p
        committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
        branch nick: branch-standalone
        timestamp: Sat 2008-09-13 12:06:22 +0100
        message:
          Added test for 'branch --standalone'.
        modified:
          bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
    ------------------------------------------------------------
    revno: 3711.2.6
    revision-id: pqm at pqm.ubuntu.com-20080920185508-g6uoij1vgokthw5m
    parent: pqm at pqm.ubuntu.com-20080920182113-2mnuiiv5bg6x97fe
    parent: aaron at aaronbentley.com-20080920182521-fihr2oqa20dasm2e
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sat 2008-09-20 19:55:08 +0100
    message:
      Location aliases now accept a trailing path (mwhudson)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/directory_service.py    directory_service.py-20080305221044-vr2mkvlsk8jypa2y-1
      bzrlib/tests/test_directory_service.py test_directory_servi-20080305221044-vr2mkvlsk8jypa2y-2
        ------------------------------------------------------------
        revno: 3711.6.4
        revision-id: aaron at aaronbentley.com-20080920182521-fihr2oqa20dasm2e
        parent: aaron at aaronbentley.com-20080920182341-109v6gy3u1dh2qh6
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: bzr.ab.integration2
        timestamp: Sat 2008-09-20 14:25:21 -0400
        message:
          Update NEWS
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 3711.6.3
        revision-id: aaron at aaronbentley.com-20080920182341-109v6gy3u1dh2qh6
        parent: aaron at aaronbentley.com-20080920181622-h91pl0beqjpg8iyy
        parent: pqm at pqm.ubuntu.com-20080920182113-2mnuiiv5bg6x97fe
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: bzr.ab.integration2
        timestamp: Sat 2008-09-20 14:23:41 -0400
        message:
          Merge with bzr.dev
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/tests/blackbox/test_switch.py test_switch.py-20071122111948-0c5en6uz92bwl76h-1
          bzrlib/tests/tree_implementations/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
          bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
        ------------------------------------------------------------
        revno: 3711.6.2
        revision-id: aaron at aaronbentley.com-20080920181622-h91pl0beqjpg8iyy
        parent: aaron at aaronbentley.com-20080920180732-ele9qmalgf0pl0n1
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: bzr.ab.integration2
        timestamp: Sat 2008-09-20 14:16:22 -0400
        message:
          Tweak logic to reduce string searching
        modified:
          bzrlib/directory_service.py    directory_service.py-20080305221044-vr2mkvlsk8jypa2y-1
        ------------------------------------------------------------
        revno: 3711.6.1
        revision-id: aaron at aaronbentley.com-20080920180732-ele9qmalgf0pl0n1
        parent: pqm at pqm.ubuntu.com-20080919110131-v81t8izemtywe4vu
        parent: michael.hudson at canonical.com-20080814031355-a0qts3o42dcxrleb
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: bzr.ab.integration2
        timestamp: Sat 2008-09-20 14:07:32 -0400
        message:
          Merge from mwhudson
        modified:
          bzrlib/directory_service.py    directory_service.py-20080305221044-vr2mkvlsk8jypa2y-1
          bzrlib/tests/test_directory_service.py test_directory_servi-20080305221044-vr2mkvlsk8jypa2y-2
        ------------------------------------------------------------
        revno: 3625.1.2
        revision-id: michael.hudson at canonical.com-20080814031355-a0qts3o42dcxrleb
        parent: michael.hudson at canonical.com-20080813234232-nzwpyo7u42zrkom5
        committer: Michael Hudson <michael.hudson at canonical.com>
        branch nick: extend-alias-locations
        timestamp: Thu 2008-08-14 15:13:55 +1200
        message:
          import urlutils and write urlutils.join rather than join
        modified:
          bzrlib/directory_service.py    directory_service.py-20080305221044-vr2mkvlsk8jypa2y-1
          bzrlib/tests/test_directory_service.py test_directory_servi-20080305221044-vr2mkvlsk8jypa2y-2
        ------------------------------------------------------------
        revno: 3625.1.1
        revision-id: michael.hudson at canonical.com-20080813234232-nzwpyo7u42zrkom5
        parent: pqm at pqm.ubuntu.com-20080813232540-mgtcd9chtkd9kda0
        committer: Michael Hudson <michael.hudson at canonical.com>
        branch nick: extend-alias-locations
        timestamp: Thu 2008-08-14 11:42:32 +1200
        message:
          Allow appending path segments to the :<name> style aliases.
        modified:
          bzrlib/directory_service.py    directory_service.py-20080305221044-vr2mkvlsk8jypa2y-1
          bzrlib/tests/test_directory_service.py test_directory_servi-20080305221044-vr2mkvlsk8jypa2y-2
    ------------------------------------------------------------
    revno: 3711.2.5
    revision-id: pqm at pqm.ubuntu.com-20080920182113-2mnuiiv5bg6x97fe
    parent: pqm at pqm.ubuntu.com-20080920174109-rrml3htu12o56j1h
    parent: aaron at aaronbentley.com-20080920175123-uwkdfa9i97k6g5es
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sat 2008-09-20 19:21:13 +0100
    message:
      In checkouts, switch uses master branch context (awilkins)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/tests/blackbox/test_switch.py test_switch.py-20071122111948-0c5en6uz92bwl76h-1
        ------------------------------------------------------------
        revno: 3711.5.2
        revision-id: aaron at aaronbentley.com-20080920175123-uwkdfa9i97k6g5es
        parent: aaron at aaronbentley.com-20080920175049-0bchxyf8oeqjzylr
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: bzr.ab.integration
        timestamp: Sat 2008-09-20 13:51:23 -0400
        message:
          Update NEWS
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 3711.5.1
        revision-id: aaron at aaronbentley.com-20080920175049-0bchxyf8oeqjzylr
        parent: pqm at pqm.ubuntu.com-20080919110131-v81t8izemtywe4vu
        parent: adrian.wilkins at gmail.com-20080807091247-ka2b7thkrsap69jr
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: bzr.ab.integration
        timestamp: Sat 2008-09-20 13:50:49 -0400
        message:
          Merge awilkins' changes
        modified:
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/tests/blackbox/test_switch.py test_switch.py-20071122111948-0c5en6uz92bwl76h-1
        ------------------------------------------------------------
        revno: 3602.3.4
        revision-id: adrian.wilkins at gmail.com-20080807091247-ka2b7thkrsap69jr
        parent: adrian.wilkins at gmail.com-20080804150515-0kstr2dih843lzob
        committer: Adrian Wilkins <adrian.wilkins at gmail.com>
        branch nick: bzr.switch-heavy-checkout-sibling
        timestamp: Thu 2008-08-07 10:12:47 +0100
        message:
          Improved comments and documentation
          Used urlutils.join to join the url
        modified:
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/tests/blackbox/test_switch.py test_switch.py-20071122111948-0c5en6uz92bwl76h-1
        ------------------------------------------------------------
        revno: 3602.3.3
        revision-id: adrian.wilkins at gmail.com-20080804150515-0kstr2dih843lzob
        parent: adrian.wilkins at gmail.com-20080804142844-bvxt4avnorzks2dx
        committer: Adrian Wilkins <adrian.wilkins at gmail.com>
        branch nick: bzr.switch_heavy_checkout_siblings
        timestamp: Mon 2008-08-04 16:05:15 +0100
        message:
          Tweaked as suggested to be more lightweight about opening branches.
        modified:
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
        ------------------------------------------------------------
        revno: 3602.3.2
        revision-id: adrian.wilkins at gmail.com-20080804142844-bvxt4avnorzks2dx
        parent: adrian.wilkins at gmail.com-20080804142739-dkdnqdhvrhxsb449
        committer: Adrian Wilkins <adrian.wilkins at gmail.com>
        branch nick: bzr.switch_heavy_checkout_siblings
        timestamp: Mon 2008-08-04 15:28:44 +0100
        message:
          `bzr switch` now finds the sibling of the bound branch of a heavy checkout when passed a location that does not immediately resolve to a branch.
          
          It no longer finds siblings of the heavy checkout itself, which could be considered a regression if this was the intended function of this convenience feature.
        modified:
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
        ------------------------------------------------------------
        revno: 3602.3.1
        revision-id: adrian.wilkins at gmail.com-20080804142739-dkdnqdhvrhxsb449
        parent: pqm at pqm.ubuntu.com-20080804032751-myaykx8azatkvlf8
        committer: Adrian Wilkins <adrian.wilkins at gmail.com>
        branch nick: bzr.switch_heavy_checkout_siblings
        timestamp: Mon 2008-08-04 15:27:39 +0100
        message:
          Test that `bzr switch` finds the sibling of the bound branch of heavy checkout.
        modified:
          bzrlib/tests/blackbox/test_switch.py test_switch.py-20071122111948-0c5en6uz92bwl76h-1
    ------------------------------------------------------------
    revno: 3711.2.4
    revision-id: pqm at pqm.ubuntu.com-20080920174109-rrml3htu12o56j1h
    parent: pqm at pqm.ubuntu.com-20080919110131-v81t8izemtywe4vu
    parent: aaron at aaronbentley.com-20080920164041-z4gepzn2shjj02ll
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sat 2008-09-20 18:41:09 +0100
    message:
      Support path2ids better for PreviewTree
    modified:
      bzrlib/tests/tree_implementations/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
      bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
      bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
      bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
        ------------------------------------------------------------
        revno: 3363.12.9
        revision-id: aaron at aaronbentley.com-20080920164041-z4gepzn2shjj02ll
        parent: aaron at aaronbentley.com-20080920160857-4jzwvlrha3b2n1oa
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: paths2ids
        timestamp: Sat 2008-09-20 12:40:41 -0400
        message:
          Revert changed select-all test
        modified:
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
        ------------------------------------------------------------
        revno: 3363.12.8
        revision-id: aaron at aaronbentley.com-20080920160857-4jzwvlrha3b2n1oa
        parent: aaron at aaronbentley.com-20080908203327-pr4ajs9fjtlk9av7
        parent: pqm at pqm.ubuntu.com-20080919110131-v81t8izemtywe4vu
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: paths2ids
        timestamp: Sat 2008-09-20 12:08:57 -0400
        message:
          Merge with bzr.dev
        renamed:
          bzrlib/tests/repository_implementations => bzrlib/tests/per_repository repository_implementations-20060131092037-ec97814745cc6128
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzr                            bzr.py-20050313053754-5485f144c7006fa6
          bzr.ico                        bzr.ico-20060629083000-q18ip0hk7lq55i4y-1
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/bundle/__init__.py      changeset.py-20050513021216-b02ab57fb9738913
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
          bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/missing.py              missing.py-20050812153334-097f7097e2a8bcd1
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/revisionspec.py         revisionspec.py-20050907152633-17567659fd5c0ddb
          bzrlib/smart/branch.py         branch.py-20061124031907-mzh3pla28r83r97f-1
          bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-1
          bzrlib/smart/message.py        message.py-20080222013625-ncqmh3nrxjkxab87-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/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/test_export.py test_export.py-20051229024010-e6c26658e460fb1c
          bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
          bzrlib/tests/per_repository/__init__.py __init__.py-20060131092037-9564957a7d4a841b
          bzrlib/tests/per_repository/helpers.py helpers.py-20070924032407-m460yl9j5gu5ju85-2
          bzrlib/tests/per_repository/test__generate_text_key_index.py test__generate_text_-20071114232121-00h9fd8qg8kjfa5k-1
          bzrlib/tests/per_repository/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
          bzrlib/tests/per_repository/test_break_lock.py test_break_lock.py-20060504111704-ee09a107f9f42e43
          bzrlib/tests/per_repository/test_check.py test_check.py-20070824124512-38g4d135gcqxo4zb-1
          bzrlib/tests/per_repository/test_check_reconcile.py test_broken.py-20070928125406-62236394w0jpbpd6-2
          bzrlib/tests/per_repository/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
          bzrlib/tests/per_repository/test_fetch.py test_fetch.py-20070814052151-5cxha9slx4c93uog-1
          bzrlib/tests/per_repository/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
          bzrlib/tests/per_repository/test_find_text_key_references.py test_find_text_key_r-20071114033605-v73bakal8x77qlfi-1
          bzrlib/tests/per_repository/test_get_parent_map.py test_get_parent_map.-20080421172708-x1z6ot341osr0jq1-1
          bzrlib/tests/per_repository/test_has_revisions.py test_has_revisions.p-20080111035443-xaupgdsx5fw1q54b-1
          bzrlib/tests/per_repository/test_has_same_location.py test_has_same_locati-20070807074648-2i2ah82fbe83iys7-1
          bzrlib/tests/per_repository/test_is_write_locked.py test_is_write_locked-20071012063748-vk062lmu683qgbc3-1
          bzrlib/tests/per_repository/test_iter_reverse_revision_history.py test_iter_reverse_re-20070217015036-spu7j5ggch7pbpyd-1
          bzrlib/tests/per_repository/test_pack.py test_pack.py-20070712120702-0c7585lh56p894mo-2
          bzrlib/tests/per_repository/test_reconcile.py test_reconcile.py-20060223022332-572ef70a3288e369
          bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
          bzrlib/tests/per_repository/test_revision.py testrevprops.py-20051013073044-92bc3c68302ce1bf
          bzrlib/tests/per_repository/test_statistics.py test_statistics.py-20070203082432-6738e8fl0mm7ikre-1
          bzrlib/tests/per_repository/test_write_group.py test_write_group.py-20070716105516-89n34xtogq5frn0m-1
          bzrlib/tests/per_repository_reference/__init__.py __init__.py-20080220025549-nnm2s80it1lvcwnc-2
          bzrlib/tests/test_annotate.py  test_annotate.py-20061213215015-sttc9agsxomls7q0-1
          bzrlib/tests/test_bundle.py    test.py-20050630184834-092aa401ab9f039c
          bzrlib/tests/test_missing.py   test_missing.py-20051212000028-694fa4f658a81f48
          bzrlib/tests/test_reconcile.py test_reconcile.py-20060225054842-50aa618584a86f26
          bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
          bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
          bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
          bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
          bzrlib/tests/test_smart.py     test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
          bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
          bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
          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_test_trees.py test_tree_trees.py-20060720091921-3nwi5h21lf06vf5p-1
          bzrlib/tests/workingtree_implementations/test_rename_one.py test_rename_one.py-20070226161242-2d8ibdedl700jgio-1
          bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
          bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
          bzrlib/transport/local.py      local_transport.py-20050711165921-9b1f142bfe480c24
          bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
          doc/en/user-guide/http_smart_server.txt fastcgi.txt-20061005091552-rz8pva0olkxv0sd8-3
          profile_imports.py             profile_imports.py-20060618020306-k5uw80achysrokj9-1
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
          tools/doc_generate/autodoc_man.py bzrman.py-20050601153041-0ff7f74de456d15e
        ------------------------------------------------------------
        revno: 3363.12.7
        revision-id: aaron at aaronbentley.com-20080908203327-pr4ajs9fjtlk9av7
        parent: aaron at aaronbentley.com-20080908202641-7w9dyg04344t262b
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: paths2ids
        timestamp: Mon 2008-09-08 16:33:27 -0400
        message:
          Add HasId test
        modified:
          bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
        ------------------------------------------------------------
        revno: 3363.12.6
        revision-id: aaron at aaronbentley.com-20080908202641-7w9dyg04344t262b
        parent: aaron at aaronbentley.com-20080829013034-nsublotthu1je11p
        parent: pqm at pqm.ubuntu.com-20080908061835-nz7hj7o0pms1nf9p
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: paths2ids
        timestamp: Mon 2008-09-08 16:26:41 -0400
        message:
          Merge with bzr.dev
        added:
          bzrlib/_readdir_py.py          readdir.py-20060609152855-rm6v321vuaqyh9tu-3
          bzrlib/_readdir_pyx.pyx        readdir.pyx-20060609152855-rm6v321vuaqyh9tu-1
          bzrlib/readdir.h               readdir.h-20060609152855-rm6v321vuaqyh9tu-2
          bzrlib/tests/test_transport_log.py test_transport_log.p-20080902041816-vh8x5yt5nvdzvew3-3
          bzrlib/transport/log.py        log.py-20080902041816-vh8x5yt5nvdzvew3-5
          doc/developers/overview.txt    overview.txt-20080904022501-ww2ggomrs5elxfm0-1
        renamed:
          doc/en/developer-guide/testing.txt => doc/developers/testing.txt testing.txt-20080812140359-i70zzh6v2z7grqex-1
        modified:
          .bzrignore                     bzrignore-20050311232317-81f7b71efa2db11a
          Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/_dirstate_helpers_c.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
          bzrlib/_dirstate_helpers_py.py _dirstate_helpers_py-20070710145033-90nz6cqglsk150jy-1
          bzrlib/atomicfile.py           atomicfile.py-20050509044450-dbd24e6c564f7c66
          bzrlib/benchmarks/bench_osutils.py bench_osutils.py-20060608153714-apso8cyz1bu2z1ig-1
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/btree_index.py          index.py-20080624222253-p0x5f92uyh5hw734-7
          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/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
          bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
          bzrlib/index.py                index.py-20070712131115-lolkarso50vjr64s-1
          bzrlib/lockdir.py              lockdir.py-20060220222025-98258adf27fbdda3
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/mail_client.py          mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
          bzrlib/memorytree.py           memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
          bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
          bzrlib/missing.py              missing.py-20050812153334-097f7097e2a8bcd1
          bzrlib/option.py               option.py-20051014052914-661fb36e76e7362f
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
          bzrlib/push.py                 push.py-20080606021927-5fe39050e8xne9un-1
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/smart/message.py        message.py-20080222013625-ncqmh3nrxjkxab87-1
          bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
          bzrlib/smart/repository.py     repository.py-20061128022038-vr5wy5bubyb8xttk-1
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
          bzrlib/tests/blackbox/test_cat_revision.py test_cat_revision.py-20070410204634-fq8mnld5l5aza9e2-1
          bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
          bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
          bzrlib/tests/blackbox/test_outside_wt.py test_outside_wt.py-20060116200058-98edd33e7db8bdde
          bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
          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/branch_implementations/test_permissions.py test_permissions.py-20060210110243-245c01403bf0fde6
          bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
          bzrlib/tests/repository_implementations/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
          bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
          bzrlib/tests/test__dirstate_helpers.py test_dirstate_helper-20070504035751-jsbn00xodv0y1eve-2
          bzrlib/tests/test_btree_index.py test_index.py-20080624222253-p0x5f92uyh5hw734-13
          bzrlib/tests/test_bundle.py    test.py-20050630184834-092aa401ab9f039c
          bzrlib/tests/test_bzrdir.py    test_bzrdir.py-20060131065654-deba40eef51cf220
          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_fetch.py     testfetch.py-20050825090644-f73e07e7dfb1765a
          bzrlib/tests/test_index.py     test_index.py-20070712131115-lolkarso50vjr64s-2
          bzrlib/tests/test_info.py      test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
          bzrlib/tests/test_options.py   testoptions.py-20051014093702-96457cfc86319a8f
          bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
          bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
          bzrlib/tests/test_permissions.py test_permissions.py-20051215004520-ccf475789c80e80c
          bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
          bzrlib/tests/test_revisiontree.py test_revisiontree.py-20060615095324-aij44ndxbv1h4c9f-1
          bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
          bzrlib/tests/test_setup.py     test_setup.py-20051208073730-4a59a6368c4efa04
          bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
          bzrlib/tests/test_upgrade_stacked.py test_upgrade_stacked-20080804072225-jd13yami19nskns5-1
          bzrlib/tests/test_whitebox.py  whitebox.py-20050530064534-a063aafb4a0a3a04
          bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
          bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
          bzrlib/transport/__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/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
          bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
          bzrlib/transport/trace.py      trace.py-20070828055009-7kt0bbc4t4b92apz-1
          bzrlib/win32utils.py           win32console.py-20051021033308-123c6c929d04973d
          bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
          doc/developers/HACKING.txt     HACKING-20050805200004-2a5dc975d870f78c
          doc/developers/development-repo.txt developmentrepo.txt-20080102200205-raj42k61dch8pjmj-1
          doc/developers/index.txt       index.txt-20070508041241-qznziunkg0nffhiw-1
          doc/en/user-guide/undoing_mistakes.txt undoing_mistakes.txt-20071121092300-8fyacngt1w98e5mp-1
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
        ------------------------------------------------------------
        revno: 3363.12.5
        revision-id: aaron at aaronbentley.com-20080829013034-nsublotthu1je11p
        parent: aaron at aaronbentley.com-20080829000029-tgk5jfyu8pdkmulo
        parent: aaron at aaronbentley.com-20080829011534-9uyv0pngb7w2pskl
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: paths2ids
        timestamp: Thu 2008-08-28 21:30:34 -0400
        message:
          Merge with preview-post
        removed:
          tools/win32/survey.txt         survey.txt-20070809075950-sf265mgu9oog8jjb-1
        added:
          bzrlib/_btree_serializer_c.pyx _parse_btree_c.pyx-20080703034413-3q25bklkenti3p8p-2
          bzrlib/_btree_serializer_py.py _parse_btree_py.py-20080703034413-3q25bklkenti3p8p-3
          bzrlib/btree_index.py          index.py-20080624222253-p0x5f92uyh5hw734-7
          bzrlib/chunk_writer.py         chunk_writer.py-20080630234519-6ggn4id17nipovny-1
          bzrlib/tests/test_btree_index.py test_index.py-20080624222253-p0x5f92uyh5hw734-13
          bzrlib/tests/test_chunk_writer.py test_chunk_writer.py-20080630234519-6ggn4id17nipovny-2
          bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
          bzrlib/tests/test_upgrade_stacked.py test_upgrade_stacked-20080804072225-jd13yami19nskns5-1
          bzrlib/transport/ftp/          ftp-20080611185801-3vm145h8dmnfgh25-1
          bzrlib/transport/ftp/_gssapi.py _gssapi.py-20080611190840-7ejrtp884bk5eu72-2
          doc/en/developer-guide/testing.txt testing.txt-20080812140359-i70zzh6v2z7grqex-1
          tools/packaging/               packaging-20080825202834-3j433iaawnt72wqa-1
          tools/packaging/build-packages.sh buildpackages.sh-20080821102059-fzlodktas65qmo1k-1
          tools/packaging/update-changelogs.sh updatechangelogs.sh-20080821102059-fzlodktas65qmo1k-2
          tools/packaging/update-packaging-branches.sh updatepackagingbranc-20080825210254-6is8ciit1yzyd3a2-1
        renamed:
          bzrlib/transport/ftp.py => bzrlib/transport/ftp/__init__.py ftp.py-20051116161804-58dc9506548c2a53
        modified:
          .bzrignore                     bzrignore-20050311232317-81f7b71efa2db11a
          Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzr                            bzr.py-20050313053754-5485f144c7006fa6
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
          bzrlib/_patiencediff_c.c       _patiencediff_c.c-20070721205602-q3imkipwlgagp3cy-1
          bzrlib/annotate.py             annotate.py-20050922133147-7c60541d2614f022
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/branchbuilder.py        branchbuilder.py-20070427022007-zlxpqz2lannhk6y8-1
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
          bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
          bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
          bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
          bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/export/__init__.py      __init__.py-20051114235828-1ba62cb4062304e6
          bzrlib/export/dir_exporter.py  dir_exporter.py-20051114235828-b51397f56bc7b117
          bzrlib/export/tar_exporter.py  tar_exporter.py-20051114235828-1f6349a2f090a5d0
          bzrlib/export/zip_exporter.py  zip_exporter.py-20051114235828-8f57f954fba6497e
          bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
          bzrlib/help_topics/en/rules.txt rules.txt-20080516063844-ghr5l6pvvrhiycun-1
          bzrlib/index.py                index.py-20070712131115-lolkarso50vjr64s-1
          bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/mail_client.py          mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
          bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
          bzrlib/merge_directive.py      merge_directive.py-20070228184838-ja62280spt1g7f4x-1
          bzrlib/option.py               option.py-20051014052914-661fb36e76e7362f
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
          bzrlib/plugin.py               plugin.py-20050622060424-829b654519533d69
          bzrlib/reconcile.py            reweave_inventory.py-20051108164726-1e5e0934febac06e
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
          bzrlib/repofmt/weaverepo.py    presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-1
          bzrlib/status.py               status.py-20050505062338-431bfa63ec9b19e6
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
          bzrlib/tests/blackbox/test_export.py test_export.py-20051229024010-e6c26658e460fb1c
          bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
          bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
          bzrlib/tests/blackbox/test_missing.py test_missing.py-20051211212735-a2cf4c1840bb84c4
          bzrlib/tests/blackbox/test_non_ascii.py test_non_ascii.py-20060105214030-68010be784a5d854
          bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
          bzrlib/tests/blackbox/test_remove.py test_remove.py-20060530011439-fika5rm84lon0goe-1
          bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
          bzrlib/tests/blackbox/test_shared_repository.py test_shared_repository.py-20060317053531-ed30c0d79325e483
          bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
          bzrlib/tests/blackbox/test_uncommit.py test_uncommit.py-20051027212835-84944b63adae51be
          bzrlib/tests/branch_implementations/test_permissions.py test_permissions.py-20060210110243-245c01403bf0fde6
          bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
          bzrlib/tests/commands/test_init.py test_init.py-20070514074921-audbcdd8o56dpame-1
          bzrlib/tests/commands/test_init_repository.py test_init_repository-20070525163812-87xw0678ky573l27-1
          bzrlib/tests/http_utils.py     HTTPTestUtil.py-20050914180604-247d3aafb7a43343
          bzrlib/tests/interrepository_implementations/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
          bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
          bzrlib/tests/inventory_implementations/basics.py basics.py-20070903044446-kdjwbiu1p1zi9phs-1
          bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
          bzrlib/tests/test_annotate.py  test_annotate.py-20061213215015-sttc9agsxomls7q0-1
          bzrlib/tests/test_branch.py    test_branch.py-20060116013032-97819aa07b8ab3b5
          bzrlib/tests/test_branchbuilder.py test_branchbuilder.p-20070427022007-zlxpqz2lannhk6y8-2
          bzrlib/tests/test_bzrdir.py    test_bzrdir.py-20060131065654-deba40eef51cf220
          bzrlib/tests/test_config.py    testconfig.py-20051011041908-742d0c15d8d8c8eb
          bzrlib/tests/test_diff.py      testdiff.py-20050727164403-d1a3496ebb12e339
          bzrlib/tests/test_errors.py    test_errors.py-20060210110251-41aba2deddf936a8
          bzrlib/tests/test_fetch.py     testfetch.py-20050825090644-f73e07e7dfb1765a
          bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
          bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
          bzrlib/tests/test_memorytree.py test_memorytree.py-20060906023413-4wlkalbdpsxi2r4y-3
          bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
          bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
          bzrlib/tests/test_options.py   testoptions.py-20051014093702-96457cfc86319a8f
          bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
          bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
          bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
          bzrlib/tests/test_source.py    test_source.py-20051207061333-a58dea6abecc030d
          bzrlib/tests/test_status.py    test_status.py-20060516190614-fbf6432e4a6e8aa5
          bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
          bzrlib/tests/test_tree.py      test_tree.py-20060724065232-khgrr0vvmt6ih0mi-1
          bzrlib/tests/test_tsort.py     testtsort.py-20051025073946-27da871c394d5be4
          bzrlib/tests/tree_implementations/test_iter_search_rules.py test_iter_search_rul-20080528065532-1ml1ttb12az20cxf-1
          bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
          bzrlib/tests/workingtree_implementations/test_remove.py test_remove.py-20070413183901-rvnp85rtc0q0sclp-1
          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/local.py      local_transport.py-20050711165921-9b1f142bfe480c24
          bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
          bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
          bzrlib/tsort.py                tsort.py-20051025073946-7808f6aaf7d07208
          bzrlib/upgrade.py              history2weaves.py-20050818063535-e7d319791c19a8b2
          bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
          doc/developers/HACKING.txt     HACKING-20050805200004-2a5dc975d870f78c
          doc/developers/ppa.txt         ppa.txt-20080722055539-606u7t2z32t3ae4w-1
          doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
          doc/en/user-guide/configuring_bazaar.txt configuring_bazaar.t-20071128000722-ncxiua259xwbdbg7-1
          doc/es/mini-tutorial/index.txt index.txt-20080504182136-wmoc35u2t6kom8ca-1
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
          tools/win32/bzr.iss.cog        bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
        ------------------------------------------------------------
        revno: 3363.12.4
        revision-id: aaron at aaronbentley.com-20080829000029-tgk5jfyu8pdkmulo
        parent: aaron at aaronbentley.com-20080729051118-k6e5mlogtlh5aiu8
        parent: aaron at aaronbentley.com-20080828234421-662ij42irh0j8gs7
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: paths2ids
        timestamp: Thu 2008-08-28 20:00:29 -0400
        message:
          Merge with preview-post
        modified:
          bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
        ------------------------------------------------------------
        revno: 3363.12.3
        revision-id: aaron at aaronbentley.com-20080729051118-k6e5mlogtlh5aiu8
        parent: aaron at aaronbentley.com-20080724162830-a8ibxvc75czvqffn
        parent: aaron at aaronbentley.com-20080729051051-gk5lj1rfsj1jkxyy
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: paths2ids
        timestamp: Tue 2008-07-29 17:11:18 +1200
        message:
          Merge with preview-post
        added:
          doc/developers/ppa.txt         ppa.txt-20080722055539-606u7t2z32t3ae4w-1
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/_dirstate_helpers_py.py _dirstate_helpers_py-20070710145033-90nz6cqglsk150jy-1
          bzrlib/_patiencediff_py.py     cdvdifflib.py-20051106064558-f8f8097fbf0db4e4
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
          bzrlib/check.py                check.py-20050309040759-f3a679400c06bcc1
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/repofmt/knitrepo.py     knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
          bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
          bzrlib/repofmt/weaverepo.py    presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/revisionspec.py         revisionspec.py-20050907152633-17567659fd5c0ddb
          bzrlib/smart/branch.py         branch.py-20061124031907-mzh3pla28r83r97f-1
          bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
          bzrlib/tests/blackbox/test_check.py test_check.py-20071024054728-mn44rt3z5hnqcbke-1
          bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
          bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
          bzrlib/tests/branch_implementations/test_hooks.py test_hooks.py-20070129154855-blhpwxmvjs07waei-1
          bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
          bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
          bzrlib/tests/test_errors.py    test_errors.py-20060210110251-41aba2deddf936a8
          bzrlib/tests/test_info.py      test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
          bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
          bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
          bzrlib/tests/test_smart.py     test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
          bzrlib/tests/test_urlutils.py  test_urlutils.py-20060502192900-46b1f9579987cf9c
          bzrlib/urlutils.py             urlutils.py-20060502195429-e8a161ecf8fac004
          doc/developers/index.txt       index.txt-20070508041241-qznziunkg0nffhiw-1
          doc/developers/releasing.txt   releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
          tools/doc_generate/autodoc_rstx.py autodoc_rstx.py-20060420024836-3e0d4a526452193c
        ------------------------------------------------------------
        revno: 3363.12.2
        revision-id: aaron at aaronbentley.com-20080724162830-a8ibxvc75czvqffn
        parent: aaron at aaronbentley.com-20080724160828-3r380riih4b0xt7c
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: paths2ids
        timestamp: Thu 2008-07-24 12:28:30 -0400
        message:
          Implement tree.iter_children to instead of adjusting InventoryEntry handling
        modified:
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
        ------------------------------------------------------------
        revno: 3363.12.1
        revision-id: aaron at aaronbentley.com-20080724160828-3r380riih4b0xt7c
        parent: aaron at aaronbentley.com-20080723191954-zn7nmtj7ama6q8vs
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: paths2ids
        timestamp: Thu 2008-07-24 12:08:28 -0400
        message:
          Remove new implementation of paths2ids, implement has_id
        modified:
          bzrlib/tests/tree_implementations/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
    ------------------------------------------------------------
    revno: 3711.2.3
    revision-id: pqm at pqm.ubuntu.com-20080919110131-v81t8izemtywe4vu
    parent: pqm at pqm.ubuntu.com-20080919034851-21510mhvx3xwyrta
    parent: jelmer at samba.org-20080919101218-w00fsqqxv0zy6j6r
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2008-09-19 12:01:31 +0100
    message:
      (Jelmer) Support IPv6 in the smart server.
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-1
      bzrlib/smart/server.py         server.py-20061110062051-chzu10y32vx8gvur-1
        ------------------------------------------------------------
        revno: 3711.4.3
        revision-id: jelmer at samba.org-20080919101218-w00fsqqxv0zy6j6r
        parent: jelmer at samba.org-20080919005726-sbvjd808xkjbbroe
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: bzr.dev
        timestamp: Fri 2008-09-19 12:12:18 +0200
        message:
          Add comment.
        modified:
          bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-1
        ------------------------------------------------------------
        revno: 3711.4.2
        revision-id: jelmer at samba.org-20080919005726-sbvjd808xkjbbroe
        parent: jelmer at samba.org-20080919002853-r47mvu07ldqowbq2
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: bzr.dev
        timestamp: Fri 2008-09-19 02:57:26 +0200
        message:
          Avoid using AI_ADDRCONFIG since it's not portable.
        modified:
          bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-1
          bzrlib/smart/server.py         server.py-20061110062051-chzu10y32vx8gvur-1
        ------------------------------------------------------------
        revno: 3711.4.1
        revision-id: jelmer at samba.org-20080919002853-r47mvu07ldqowbq2
        parent: pqm at pqm.ubuntu.com-20080917230446-p0wippqwikt511sp
        parent: jelmer at samba.org-20080830184812-9fcdxoxlrkdk85s8
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: bzr.dev
        timestamp: Fri 2008-09-19 02:28:53 +0200
        message:
          Merge ipv6 changes.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-1
          bzrlib/smart/server.py         server.py-20061110062051-chzu10y32vx8gvur-1
        ------------------------------------------------------------
        revno: 3665.4.2
        revision-id: jelmer at samba.org-20080830184812-9fcdxoxlrkdk85s8
        parent: jelmer at samba.org-20080830163506-wal9a9xcah391p2g
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: ip6
        timestamp: Sat 2008-08-30 20:48:12 +0200
        message:
          Fall through to next available address if previous fails.
        modified:
          bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-1
        ------------------------------------------------------------
        revno: 3665.4.1
        revision-id: jelmer at samba.org-20080830163506-wal9a9xcah391p2g
        parent: pqm at pqm.ubuntu.com-20080829062746-ny482m2f2pukdhqt
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: bzr.dev
        timestamp: Sat 2008-08-30 18:35:06 +0200
        message:
          Support IPv6 in the smart server.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-1
          bzrlib/smart/server.py         server.py-20061110062051-chzu10y32vx8gvur-1
    ------------------------------------------------------------
    revno: 3711.2.2
    revision-id: pqm at pqm.ubuntu.com-20080919034851-21510mhvx3xwyrta
    parent: pqm at pqm.ubuntu.com-20080919010941-eu2yokwzyw7ezvh9
    parent: ian.clatworthy at canonical.com-20080919031709-59dexi51pf0g2cho
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2008-09-19 04:48:51 +0100
    message:
      LocalTransport.abspath returns drive letter if transport has one
      	(Mark Hammond)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
      bzrlib/transport/local.py      local_transport.py-20050711165921-9b1f142bfe480c24
        ------------------------------------------------------------
        revno: 3711.3.1
        revision-id: ian.clatworthy at canonical.com-20080919031709-59dexi51pf0g2cho
        parent: pqm at pqm.ubuntu.com-20080919010941-eu2yokwzyw7ezvh9
        parent: mhammond at skippinet.com.au-20080919002858-lj7fjayefxp9grdm
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: ianc-integration
        timestamp: Fri 2008-09-19 13:17:09 +1000
        message:
          LocalTransport.abspath returns drive letter if transport has one (Mark Hammond)
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
          bzrlib/transport/local.py      local_transport.py-20050711165921-9b1f142bfe480c24
        ------------------------------------------------------------
        revno: 3693.2.3
        revision-id: mhammond at skippinet.com.au-20080919002858-lj7fjayefxp9grdm
        parent: mhammond at skippinet.com.au-20080909120350-b2ntvttvqzfsx38t
        committer: Mark Hammond <mhammond at skippinet.com.au>
        branch nick: bzr.work.transport_abspath
        timestamp: Fri 2008-09-19 10:28:58 +1000
        message:
           Back to skipping the tests on non-windows platforms.
        modified:
          bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
        ------------------------------------------------------------
        revno: 3693.2.2
        revision-id: mhammond at skippinet.com.au-20080909120350-b2ntvttvqzfsx38t
        parent: mhammond at skippinet.com.au-20080906073334-7jklokha0uco0tnk
        committer: Mark Hammond <mhammond at skippinet.com.au>
        branch nick: bzr.work.transport_abspath
        timestamp: Tue 2008-09-09 22:03:50 +1000
        message:
          add a test for win32 abspath sematics, which as requested by lifeless,
          monkey-patches sys.platform for the duration of the test.
        modified:
          bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
        ------------------------------------------------------------
        revno: 3693.2.1
        revision-id: mhammond at skippinet.com.au-20080906073334-7jklokha0uco0tnk
        parent: pqm at pqm.ubuntu.com-20080905212548-ig8wqqpv4vb8b2v4
        committer: Mark Hammond <mhammond at skippinet.com.au>
        branch nick: bzr.work
        timestamp: Sat 2008-09-06 17:33:34 +1000
        message:
          ensure LocalTransport.abspath() returns an absolute URL with the same 
          drive letter (or lack of drive letter) that our _local_base has.
        modified:
          bzrlib/transport/local.py      local_transport.py-20050711165921-9b1f142bfe480c24
    ------------------------------------------------------------
    revno: 3711.2.1
    revision-id: pqm at pqm.ubuntu.com-20080919010941-eu2yokwzyw7ezvh9
    parent: pqm at pqm.ubuntu.com-20080917230446-p0wippqwikt511sp
    parent: ian.clatworthy at canonical.com-20080919003845-1tghuryxnx5mtaro
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2008-09-19 02:09:41 +0100
    message:
      Explain revision/range identifiers (Daniel Clemente)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
      bzrlib/revisionspec.py         revisionspec.py-20050907152633-17567659fd5c0ddb
    ------------------------------------------------------------
    revno: 3711.1.1
    revision-id: ian.clatworthy at canonical.com-20080919003845-1tghuryxnx5mtaro
    parent: pqm at pqm.ubuntu.com-20080917230446-p0wippqwikt511sp
    parent: dcl441-bugs at yahoo.com-20080904190758-711mlwsiss43csmu
    committer: Ian Clatworthy <ian.clatworthy at canonical.com>
    branch nick: ianc-integration
    timestamp: Fri 2008-09-19 10:38:45 +1000
    message:
      Explain revision/range identifiers (Daniel Clemente)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
      bzrlib/revisionspec.py         revisionspec.py-20050907152633-17567659fd5c0ddb
    ------------------------------------------------------------
    revno: 3651.2.5
    revision-id: dcl441-bugs at yahoo.com-20080904190758-711mlwsiss43csmu
    parent: dcl441-bugs at yahoo.com-20080904185304-emtumbgna7m9lpvw
    committer: Daniel Clemente <dcl441-bugs at yahoo.com>
    branch nick: docu
    timestamp: Thu 2008-09-04 21:07:58 +0200
    message:
      Wrote specifical and simpler example for 'before:', and referred to 'bzr diff -c'
    modified:
      bzrlib/revisionspec.py         revisionspec.py-20050907152633-17567659fd5c0ddb
    ------------------------------------------------------------
    revno: 3651.2.4
    revision-id: dcl441-bugs at yahoo.com-20080904185304-emtumbgna7m9lpvw
    parent: dcl441-bugs at yahoo.com-20080904183759-7t40gau1nvpg7ki3
    committer: Daniel Clemente <dcl441-bugs at yahoo.com>
    branch nick: docu
    timestamp: Thu 2008-09-04 20:53:04 +0200
    message:
      Reordered to put explanation first and exceptions after
    modified:
      bzrlib/revisionspec.py         revisionspec.py-20050907152633-17567659fd5c0ddb
    ------------------------------------------------------------
    revno: 3651.2.3
    revision-id: dcl441-bugs at yahoo.com-20080904183759-7t40gau1nvpg7ki3
    parent: dcl441-bugs at yahoo.com-20080828170323-mtdbdqg5tvzn4a5s
    committer: Daniel Clemente <dcl441-bugs at yahoo.com>
    branch nick: docu
    timestamp: Thu 2008-09-04 20:37:59 +0200
    message:
      Explained more about range interpretations. Removed sentence about REV1..REV2..REV3 because it's unimplemented
    modified:
      bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
    ------------------------------------------------------------
    revno: 3651.2.2
    revision-id: dcl441-bugs at yahoo.com-20080828170323-mtdbdqg5tvzn4a5s
    parent: dcl441-bugs at yahoo.com-20080828151138-2b06hh7tvcgvofz5
    committer: Daniel Clemente <dcl441-bugs at yahoo.com>
    branch nick: docu
    timestamp: Thu 2008-08-28 19:03:23 +0200
    message:
      Explained the syntax for revision and range identifiers
    modified:
      bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
    ------------------------------------------------------------
    revno: 3651.2.1
    revision-id: dcl441-bugs at yahoo.com-20080828151138-2b06hh7tvcgvofz5
    parent: pqm at pqm.ubuntu.com-20080827044137-4ox67ehr4bxtj7b0
    committer: Daniel Clemente <dcl441-bugs at yahoo.com>
    branch nick: docu
    timestamp: Thu 2008-08-28 17:11:38 +0200
    message:
      Clarify that you don't have to write a path if you mean the current branch
    modified:
      bzrlib/revisionspec.py         revisionspec.py-20050907152633-17567659fd5c0ddb
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2008-09-21 13:58:43 +0000
+++ b/NEWS	2008-09-21 14:15:55 +0000
@@ -13,6 +13,10 @@
 
   IMPROVEMENTS:
 
+    * ``bzr branch`` now accepts a ``--standalone`` option, which creates a
+      standalone branch regardless of the presence of shared repositories.
+      (Daniel Watkins)
+
     * ``bzr log file`` has been changed. It now uses a different method
       for determining which revisions to show as merging the changes to
       the file. It now only shows revisions which merged the change
@@ -21,6 +25,11 @@
       simplifies the output, makes it faster, and reduces memory
       consumption.  (John Arbash Meinel)
 
+    * Location aliases can now accept a trailing path.  (Micheal Hudson)
+
+    * Switching in heavyweight checkouts uses the master branch's context, not
+      the checkout's context.  (Adrian Wilkins)
+
   BUG FIXES:
 
     * Branching from a shared repository on a smart server into a new
@@ -42,6 +51,8 @@
 
   DOCUMENTATION:
 
+    * Explain revision/range identifiers. (Daniel Clemente)
+
   API CHANGES:
 
   TESTING:
@@ -50,6 +61,10 @@
       ``bzrlib.tests.per_repository`` so that we have a common structure
       (and it is shorter). (John Arbash Meinel, #239343)
 
+    * ``LocalTransport.abspath()`` now returns a drive letter if the
+      transport has one, fixing numerous tests on Windows.
+      (Mark Hammond)
+
     * The full test suite is passing again on OSX.
       (Guillermo Gonzalez, Vincent Ladeuil)
 
@@ -88,6 +103,10 @@
     * ``bzr export`` can now export a subdirectory of a project.
       (Robert Collins)
 
+    * ``bzr remove-tree`` will now refuse to remove a tree with uncommitted
+      changes, unless the ``--force`` option is specified.
+      (Luk???? Lalinsk??, #74101)
+
     * ``bzr rm`` will now scan for files that are missing and remove just
       them automatically, much as ``bzr add`` scans for new files that
       are not ignored and adds them automatically. (Robert Collins)
@@ -97,6 +116,8 @@
     * Support for GSSAPI authentication when using FTP as documented in 
       RFC2228. (Jelmer Vernooij, #49623)
 
+    * Add support for IPv6 in the smart server. (Jelmer Vernooij, #165014)
+
   IMPROVEMENTS:
 
     * A url like ``log+file:///tmp`` will log all access to that Transport 

=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2008-09-17 07:18:20 +0000
+++ b/bzrlib/builtins.py	2008-09-21 01:21:05 +0000
@@ -250,10 +250,14 @@
     To re-create the working tree, use "bzr checkout".
     """
     _see_also = ['checkout', 'working-trees']
-
     takes_args = ['location?']
+    takes_options = [
+        Option('force',
+               help='Remove the working tree even if it has '
+                    'uncommitted changes.'),
+        ]
 
-    def run(self, location='.'):
+    def run(self, location='.', force=False):
         d = bzrdir.BzrDir.open(location)
         
         try:
@@ -263,7 +267,11 @@
         except errors.NotLocalUrl:
             raise errors.BzrCommandError("You cannot remove the working tree of a "
                                          "remote path")
-        
+        if not force:
+            changes = working.changes_from(working.basis_tree())
+            if changes.has_changed():
+                raise errors.UncommittedChanges(working)
+
         working_path = working.bzrdir.root_transport.base
         branch_path = working.branch.bzrdir.root_transport.base
         if working_path != branch_path:
@@ -837,11 +845,13 @@
             help='Create a stacked branch referring to the source branch. '
                 'The new branch will depend on the availability of the source '
                 'branch for all operations.'),
+        Option('standalone',
+               help='Do not use a shared repository, even if available.'),
         ]
     aliases = ['get', 'clone']
 
     def run(self, from_location, to_location=None, revision=None,
-            hardlink=False, stacked=False):
+            hardlink=False, stacked=False, standalone=False):
         from bzrlib.tag import _merge_tags_if_possible
         if revision is None:
             revision = [None]
@@ -876,7 +886,8 @@
                 dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
                                             possible_transports=[to_transport],
                                             accelerator_tree=accelerator_tree,
-                                            hardlink=hardlink, stacked=stacked)
+                                            hardlink=hardlink, stacked=stacked,
+                                            force_new_repo=standalone)
                 branch = dir.open_branch()
             except errors.NoSuchRevision:
                 to_transport.delete_tree('.')
@@ -4559,8 +4570,14 @@
         try:
             to_branch = Branch.open(to_location)
         except errors.NotBranchError:
+            this_branch = control_dir.open_branch()
+            # This may be a heavy checkout, where we want the master branch
+            this_url = this_branch.get_bound_location()
+            # If not, use a local sibling
+            if this_url is None:
+                this_url = this_branch.base
             to_branch = Branch.open(
-                control_dir.open_branch().base + '../' + to_location)
+                urlutils.join(this_url, '..', to_location))
         switch.switch(control_dir, to_branch, force)
         note('Switched to branch: %s',
             urlutils.unescape_for_display(to_branch.base, 'utf-8'))

=== modified file 'bzrlib/directory_service.py'
--- a/bzrlib/directory_service.py	2008-06-30 05:27:47 +0000
+++ b/bzrlib/directory_service.py	2008-09-20 18:16:22 +0000
@@ -22,6 +22,8 @@
 
 from bzrlib import errors, registry
 from bzrlib.branch import Branch
+from bzrlib import urlutils
+
 
 class DirectoryServiceRegistry(registry.Registry):
     """This object maintains and uses a list of directory services.
@@ -72,14 +74,22 @@
             'push': branch.get_push_location,
             'this': lambda: branch.base
         }
+        parts = url.split('/', 1)
+        if len(parts) == 2:
+            name, extra = parts
+        else:
+            (name,) = parts
+            extra = None
         try:
-            method = lookups[url[1:]]
+            method = lookups[name[1:]]
         except KeyError:
             raise errors.InvalidLocationAlias(url)
         else:
             result = method()
         if result is None:
             raise errors.UnsetLocationAlias(url)
+        if extra is not None:
+            result = urlutils.join(result, extra)
         return result
 
 directories.register(':', AliasDirectory,

=== modified file 'bzrlib/help_topics/__init__.py'
--- a/bzrlib/help_topics/__init__.py	2008-07-13 07:29:40 +0000
+++ b/bzrlib/help_topics/__init__.py	2008-09-04 18:37:59 +0000
@@ -149,10 +149,33 @@
     import bzrlib.revisionspec
 
     out = []
-    out.append("Revision Identifiers\n")
-    out.append("A revision, or a range bound, can be one of the following.\n")
+    out.append(
+"""Revision Identifiers
+
+A revision identifier refers to a specific state of a branch's history. It can
+be a revision number, or a keyword followed by ':' and often other
+parameters. Some examples of identifiers are '3', 'last:1', 'before:yesterday'
+and 'submit:'.
+
+If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a
+revision range. Examples: '3647..3649', 'date:yesterday..-1' and
+'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes or
+spaces around the '..').
+
+Ranges are interpreted differently by different commands. To the "log" command,
+a range is a sequence of log messages, but to the "diff" command, the range
+denotes a change between revisions (and not a sequence of changes).  In
+addition, "log" considers a closed range whereas "diff" and "merge" consider it
+to be open-ended, that is, they include one end but not the other.  For example:
+"bzr log -r 3647..3649" shows the messages of revisions 3647, 3648 and 3649,
+while "bzr diff -r 3647..3649" includes the changes done in revisions 3647 and
+3648, but not 3649.
+
+The keywords used as revision selection methods are the following:
+""")
     details = []
-    details.append("\nFurther details are given below.\n")
+    details.append("\nIn addition, plugins can provide other keywords.")
+    details.append("\nA detailed description of each keyword is given below.\n")
 
     # The help text is indented 4 spaces - this re cleans that up below
     indent_re = re.compile(r'^    ', re.MULTILINE)

=== modified file 'bzrlib/revisionspec.py'
--- a/bzrlib/revisionspec.py	2008-07-19 15:00:27 +0000
+++ b/bzrlib/revisionspec.py	2008-09-04 19:07:58 +0000
@@ -286,7 +286,7 @@
     than the branch's history, the first revision is returned.
     Examples::
 
-      revno:1                   -> return the first revision
+      revno:1                   -> return the first revision of this branch
       revno:3:/path/to/branch   -> return the 3rd revision of
                                    the branch '/path/to/branch'
       revno:-1                  -> The last revision in a branch.
@@ -475,19 +475,21 @@
 
     help_txt = """Selects the parent of the revision specified.
 
-    Supply any revision spec to return the parent of that revision.
+    Supply any revision spec to return the parent of that revision.  This is
+    mostly useful when inspecting revisions that are not in the revision history
+    of a branch.
+
     It is an error to request the parent of the null revision (before:0).
-    This is mostly useful when inspecting revisions that are not in the
-    revision history of a branch.
 
     Examples::
 
       before:1913    -> Return the parent of revno 1913 (revno 1912)
       before:revid:aaaa at bbbb-1234567890  -> return the parent of revision
                                             aaaa at bbbb-1234567890
-      bzr diff -r before:revid:aaaa..revid:aaaa
-            -> Find the changes between revision 'aaaa' and its parent.
-               (what changes did 'aaaa' introduce)
+      bzr diff -r before:1913..1913
+            -> Find the changes between revision 1913 and its parent (1912).
+               (What changes did revision 1913 introduce).
+               This is equivalent to:  bzr diff -c 1913
     """
 
     prefix = 'before:'

=== modified file 'bzrlib/smart/medium.py'
--- a/bzrlib/smart/medium.py	2008-08-14 02:15:31 +0000
+++ b/bzrlib/smart/medium.py	2008-09-19 10:12:18 +0000
@@ -704,7 +704,7 @@
 
 
 # Port 4155 is the default port for bzr://, registered with IANA.
-BZR_DEFAULT_INTERFACE = '0.0.0.0'
+BZR_DEFAULT_INTERFACE = None
 BZR_DEFAULT_PORT = 4155
 
 
@@ -736,15 +736,31 @@
         """Connect this medium if not already connected."""
         if self._connected:
             return
-        self._socket = socket.socket()
-        self._socket.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
         if self._port is None:
             port = BZR_DEFAULT_PORT
         else:
             port = int(self._port)
         try:
-            self._socket.connect((self._host, port))
-        except socket.error, err:
+            sockaddrs = socket.getaddrinfo(self._host, port, socket.AF_UNSPEC, 
+                socket.SOCK_STREAM, 0, 0)
+        except socket.gaierror, (err_num, err_msg):
+            raise errors.ConnectionError("failed to lookup %s:%d: %s" %
+                    (self._host, port, err_msg))
+        # Initialize err in case there are no addresses returned:
+        err = socket.error("no address found for %s" % self._host)
+        for (family, socktype, proto, canonname, sockaddr) in sockaddrs:
+            try:
+                self._socket = socket.socket(family, socktype, proto)
+                self._socket.setsockopt(socket.IPPROTO_TCP, 
+                                        socket.TCP_NODELAY, 1)
+                self._socket.connect(sockaddr)
+            except socket.error, err:
+                if self._socket is not None:
+                    self._socket.close()
+                self._socket = None
+                continue
+            break
+        if self._socket is None:
             # socket errors either have a (string) or (errno, string) as their
             # args.
             if type(err.args) is str:

=== modified file 'bzrlib/smart/server.py'
--- a/bzrlib/smart/server.py	2008-06-05 22:56:42 +0000
+++ b/bzrlib/smart/server.py	2008-09-19 00:57:26 +0000
@@ -59,13 +59,18 @@
         from socket import error as socket_error
         self._socket_error = socket_error
         self._socket_timeout = socket_timeout
-        self._server_socket = socket.socket()
+        addrs = socket.getaddrinfo(host, port, socket.AF_UNSPEC, 
+            socket.SOCK_STREAM, 0, socket.AI_PASSIVE)[0]
+
+        (family, socktype, proto, canonname, sockaddr) = addrs
+
+        self._server_socket = socket.socket(family, socktype, proto)
         # SO_REUSERADDR has a different meaning on Windows
         if sys.platform != 'win32':
             self._server_socket.setsockopt(socket.SOL_SOCKET,
                 socket.SO_REUSEADDR, 1)
         try:
-            self._server_socket.bind((host, port))
+            self._server_socket.bind(sockaddr)
         except self._socket_error, message:
             raise errors.CannotBindAddress(host, port, message)
         self._sockname = self._server_socket.getsockname()

=== modified file 'bzrlib/tests/blackbox/test_branch.py'
--- a/bzrlib/tests/blackbox/test_branch.py	2008-09-02 21:38:04 +0000
+++ b/bzrlib/tests/blackbox/test_branch.py	2008-09-13 11:17:00 +0000
@@ -24,6 +24,7 @@
 from bzrlib.tests.blackbox import ExternalBase
 from bzrlib.tests import HardlinkFeature
 from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer
+from bzrlib.urlutils import local_path_to_url, strip_trailing_slash
 from bzrlib.workingtree import WorkingTree
 
 
@@ -97,6 +98,15 @@
         target_stat = os.stat('target/file1')
         self.assertEqual(source_stat, target_stat)
 
+    def test_branch_standalone(self):
+        shared_repo = self.make_repository('repo', shared=True)
+        self.example_branch('source')
+        self.run_bzr('branch --standalone source repo/target')
+        b = branch.Branch.open('repo/target')
+        expected_repo_path = os.path.abspath('repo/target/.bzr/repository')
+        self.assertEqual(strip_trailing_slash(b.repository.base),
+            strip_trailing_slash(local_path_to_url(expected_repo_path)))
+
 
 class TestBranchStacked(ExternalBase):
     """Tests for branch --stacked"""

=== modified file 'bzrlib/tests/blackbox/test_remove_tree.py'
--- a/bzrlib/tests/blackbox/test_remove_tree.py	2007-06-26 20:32:49 +0000
+++ b/bzrlib/tests/blackbox/test_remove_tree.py	2008-08-31 06:51:42 +0000
@@ -109,3 +109,16 @@
     def test_remove_tree_remote_path(self):
         # TODO: I can't think of a way to implement this...
         pass
+
+    def test_remove_tree_uncommitted_changes(self):
+        self.build_tree(['branch1/bar'])
+        self.tree.add('bar')
+        output = self.run_bzr_error(["Working tree .* has uncommitted changes"],
+                                    'remove-tree branch1', retcode=3)
+
+    def test_remove_tree_uncommitted_changes_force(self):
+        self.build_tree(['branch1/bar'])
+        self.tree.add('bar')
+        self.run_bzr('remove-tree branch1 --force')
+        self.failIfExists('branch1/foo')
+        self.failUnlessExists('branch1/bar')

=== modified file 'bzrlib/tests/blackbox/test_switch.py'
--- a/bzrlib/tests/blackbox/test_switch.py	2008-03-03 11:35:47 +0000
+++ b/bzrlib/tests/blackbox/test_switch.py	2008-08-07 09:12:47 +0000
@@ -62,4 +62,23 @@
         self.assertEqual(branchb_id, checkout.last_revision())
         checkout = checkout.bzrdir.open_workingtree()
         self.assertEqual(tree2.branch.base, checkout.branch.base)
-        
+
+    def test_switch_finds_relative_bound_branch(self):
+        """Using switch on a heavy checkout should find master sibling
+
+        The behaviour of lighweight and heavy checkouts should be 
+        consistentwhen using the convenient "switch to sibling" feature
+        Both should switch to a sibling of the branch
+        they are bound to, and not a sibling of themself"""
+
+        self.build_tree(['repo/',
+                         'heavyco/'])
+        tree1 = self.make_branch_and_tree('repo/brancha')
+        tree1.commit('foo')
+        tree2 = self.make_branch_and_tree('repo/branchb')
+        tree2.pull(tree1.branch)
+        branchb_id = tree2.commit('bar')
+        checkout = tree1.branch.create_checkout('heavyco/a', lightweight=False)
+        self.run_bzr(['switch', 'branchb'], working_dir='heavyco/a')
+        self.assertEqual(branchb_id, checkout.last_revision())
+        self.assertEqual(tree2.branch.base, checkout.branch.get_bound_location())

=== modified file 'bzrlib/tests/test_directory_service.py'
--- a/bzrlib/tests/test_directory_service.py	2008-06-26 06:03:36 +0000
+++ b/bzrlib/tests/test_directory_service.py	2008-08-14 03:13:55 +0000
@@ -20,6 +20,7 @@
 from bzrlib.directory_service import DirectoryServiceRegistry, directories
 from bzrlib.tests import TestCase, TestCaseWithTransport
 from bzrlib.transport import get_transport
+from bzrlib import urlutils
 
 
 class FooService(object):
@@ -83,6 +84,11 @@
         branch = self.make_branch('.')
         self.assertEqual(branch.base, directories.dereference(':this'))
 
+    def test_extra_path(self):
+        branch = self.make_branch('.')
+        self.assertEqual(urlutils.join(branch.base, 'arg'),
+                         directories.dereference(':this/arg'))
+
     def test_lookup_badname(self):
         branch = self.make_branch('.')
         e = self.assertRaises(errors.InvalidLocationAlias,

=== modified file 'bzrlib/tests/test_transport_implementations.py'
--- a/bzrlib/tests/test_transport_implementations.py	2008-09-10 19:52:36 +0000
+++ b/bzrlib/tests/test_transport_implementations.py	2008-09-19 03:17:09 +0000
@@ -1338,6 +1338,23 @@
         self.assertEqual(transport.clone("/").abspath('foo'),
                          transport.abspath("/foo"))
 
+    def test_win32_abspath(self):
+        # Note: we tried to set sys.platform='win32' so we could test on
+        # other platforms too, but then osutils does platform specific
+        # things at import time which defeated us...
+        if sys.platform != 'win32':
+            raise TestSkipped(
+                'Testing drive letters in abspath implemented only for win32')
+
+        # smoke test for abspath on win32.
+        # a transport based on 'file:///' never fully qualifies the drive.
+        transport = get_transport("file:///")
+        self.failUnlessEqual(transport.abspath("/"), "file:///")
+
+        # but a transport that starts with a drive spec must keep it.
+        transport = get_transport("file:///C:/")
+        self.failUnlessEqual(transport.abspath("/"), "file:///C:/")
+
     def test_local_abspath(self):
         transport = self.get_transport()
         try:

=== modified file 'bzrlib/tests/tree_implementations/test_inv.py'
--- a/bzrlib/tests/tree_implementations/test_inv.py	2008-06-11 04:20:16 +0000
+++ b/bzrlib/tests/tree_implementations/test_inv.py	2008-07-24 16:08:28 +0000
@@ -103,3 +103,24 @@
         entry = get_entry(self.tree, self.tree.path2id('symlink'))
         self.assertEqual(entry.kind, 'symlink')
         self.assertEqual(None, entry.text_size)
+
+    def test_paths2ids_recursive(self):
+        work_tree = self.make_branch_and_tree('tree')
+        self.build_tree(['tree/dir/', 'tree/dir/file'])
+        work_tree.add(['dir', 'dir/file'], ['dir-id', 'file-id'])
+        tree = self._convert_tree(work_tree)
+        tree.lock_read()
+        self.addCleanup(tree.unlock)
+        self.assertEqual(set(['dir-id', 'file-id']), tree.paths2ids(['dir']))
+
+    def test_paths2ids_forget_old(self):
+        work_tree = self.make_branch_and_tree('tree')
+        self.build_tree(['tree/file'])
+        work_tree.add('file', 'first-id')
+        work_tree.commit('commit old state')
+        work_tree.remove('file')
+        tree = self._convert_tree(work_tree)
+        tree.lock_read()
+        self.addCleanup(tree.unlock)
+        self.assertEqual(set([]), tree.paths2ids(['file'],
+                         require_versioned=False))

=== modified file 'bzrlib/tests/tree_implementations/test_tree.py'
--- a/bzrlib/tests/tree_implementations/test_tree.py	2008-07-16 18:14:23 +0000
+++ b/bzrlib/tests/tree_implementations/test_tree.py	2008-09-08 20:33:27 +0000
@@ -203,3 +203,16 @@
         output_order = [p for p, e in tree.iter_entries_by_dir()]
         self.assertEqual(['', 'a', 'f', 'a/b', 'a/d', 'a/b/c', 'a/d/e', 'f/g'],
                          output_order)
+
+
+class TestHasId(TestCaseWithTree):
+
+    def test_has_id(self):
+        work_tree = self.make_branch_and_tree('tree')
+        self.build_tree(['tree/file'])
+        work_tree.add('file', 'file-id')
+        tree = self._convert_tree(work_tree)
+        tree.lock_read()
+        self.addCleanup(tree.unlock)
+        self.assertTrue(tree.has_id('file-id'))
+        self.assertFalse(tree.has_id('dir-id'))

=== modified file 'bzrlib/transform.py'
--- a/bzrlib/transform.py	2008-09-01 06:19:29 +0000
+++ b/bzrlib/transform.py	2008-09-08 20:26:41 +0000
@@ -1525,18 +1525,13 @@
     def __iter__(self):
         return iter(self.all_file_ids())
 
-    def paths2ids(self, specific_files, trees=None, require_versioned=False):
-        """See Tree.paths2ids"""
-        to_find = set(specific_files)
-        result = set()
-        for (file_id, paths, changed, versioned, parent, name, kind,
-             executable) in self._transform.iter_changes():
-            if paths[1] in to_find:
-                result.add(file_id)
-                to_find.remove(paths[1])
-        result.update(self._transform._tree.paths2ids(to_find,
-                      trees=[], require_versioned=require_versioned))
-        return result
+    def has_id(self, file_id):
+        if file_id in self._transform._r_new_id:
+            return True
+        elif file_id in self._transform._removed_id:
+            return False
+        else:
+            return self._transform._tree.has_id(file_id)
 
     def _path2trans_id(self, path):
         segments = splitpath(path)
@@ -1567,6 +1562,11 @@
         children.update(self._by_parent.get(trans_id, []))
         return children
 
+    def iter_children(self, file_id):
+        trans_id = self._transform.trans_id_file_id(file_id)
+        for child_trans_id in self._all_children(trans_id):
+            yield self._transform.final_file_id(child_trans_id)
+
     def _make_inv_entries(self, ordered_entries, specific_file_ids):
         for trans_id, parent_file_id in ordered_entries:
             file_id = self._transform.final_file_id(trans_id)

=== modified file 'bzrlib/transport/local.py'
--- a/bzrlib/transport/local.py	2008-08-11 02:32:44 +0000
+++ b/bzrlib/transport/local.py	2008-09-06 07:33:34 +0000
@@ -109,6 +109,16 @@
         #       proper handling of stuff like
         path = osutils.normpath(osutils.pathjoin(
                     self._local_base, urlutils.unescape(relpath)))
+        # on windows, our _local_base may or may not have a drive specified
+        # (ie, it may be "/" or "c:/foo").
+        # If 'relpath' is '/' we *always* get back an abspath without
+        # the drive letter - but if our transport already has a drive letter,
+        # we want our abspaths to have a drive letter too - so handle that
+        # here.
+        if (sys.platform == "win32" and self._local_base[1:2] == ":"
+            and path == '/'):
+            path = self._local_base[:3]
+
         return urlutils.local_path_to_url(path)
 
     def local_abspath(self, relpath):

=== modified file 'bzrlib/tree.py'
--- a/bzrlib/tree.py	2008-08-14 17:25:43 +0000
+++ b/bzrlib/tree.py	2008-09-20 16:40:41 +0000
@@ -455,6 +455,11 @@
         """
         return find_ids_across_trees(paths, [self] + list(trees), require_versioned)
 
+    def iter_children(self, file_id):
+        entry = self.iter_entries_by_dir([file_id]).next()[1]
+        for child in getattr(entry, 'children', {}).itervalues():
+            yield child.file_id
+
     @symbol_versioning.deprecated_method(symbol_versioning.one_six)
     def print_file(self, file_id):
         """Print file with id `file_id` to stdout."""
@@ -719,10 +724,9 @@
             for tree in trees:
                 if not tree.has_id(file_id):
                     continue
-                entry = tree.inventory[file_id]
-                for child in getattr(entry, 'children', {}).itervalues():
-                    if child.file_id not in interesting_ids:
-                        new_pending.add(child.file_id)
+                for child_id in tree.iter_children(file_id):
+                    if child_id not in interesting_ids:
+                        new_pending.add(child_id)
         interesting_ids.update(new_pending)
         pending = new_pending
     return interesting_ids



More information about the bazaar-commits mailing list