Rev 3707: NEWS conflicts FTW. in http://people.ubuntu.com/~robertc/baz2.0/integration

Robert Collins robertc at robertcollins.net
Wed Sep 24 01:10:00 BST 2008


At http://people.ubuntu.com/~robertc/baz2.0/integration

------------------------------------------------------------
revno: 3707
revision-id: robertc at robertcollins.net-20080924000949-vigmjnpor0w5kpxz
parent: robertc at robertcollins.net-20080923232827-vpd4xsif8x8op6i3
parent: pqm at pqm.ubuntu.com-20080923234504-js54vdh7ejw0f45i
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2008-09-24 10:09:49 +1000
message:
  NEWS conflicts FTW.
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/help_topics/en/hooks.txt hooks.txt-20070830033044-xxu2rced13f72dka-1
  bzrlib/hooks.py                hooks.py-20070325015548-ix4np2q0kd8452au-1
  bzrlib/lock.py                 lock.py-20050527050856-ec090bb51bc03349
  bzrlib/lockdir.py              lockdir.py-20060220222025-98258adf27fbdda3
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/test_lockdir.py   test_lockdir.py-20060220222025-33d4221569a3d600
  bzrlib/tests/test_win32utils.py test_win32utils.py-20070713181630-8xsrjymd3e8mgw23-108
  bzrlib/win32utils.py           win32console.py-20051021033308-123c6c929d04973d
  setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
    ------------------------------------------------------------
    revno: 3696.1.34
    revision-id: pqm at pqm.ubuntu.com-20080923234504-js54vdh7ejw0f45i
    parent: pqm at pqm.ubuntu.com-20080923191842-0hfq8zykwwm1oo9k
    parent: mbp at sourcefrog.net-20080923053753-yusi3tdaemoflcya
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2008-09-24 00:45:04 +0100
    message:
      (mbp) add lock hooks
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/help_topics/en/hooks.txt hooks.txt-20070830033044-xxu2rced13f72dka-1
      bzrlib/hooks.py                hooks.py-20070325015548-ix4np2q0kd8452au-1
      bzrlib/lock.py                 lock.py-20050527050856-ec090bb51bc03349
      bzrlib/lockdir.py              lockdir.py-20060220222025-98258adf27fbdda3
      bzrlib/tests/test_lockdir.py   test_lockdir.py-20060220222025-33d4221569a3d600
        ------------------------------------------------------------
        revno: 3696.34.1
        revision-id: mbp at sourcefrog.net-20080923053753-yusi3tdaemoflcya
        parent: pqm at pqm.ubuntu.com-20080923015500-7nb0mp3c7o2wh1zu
        parent: mbp at sourcefrog.net-20080527032549-khxlcrlp95us6rkj
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: lock-hooks
        timestamp: Tue 2008-09-23 15:37:53 +1000
        message:
          Move Lock hooks onto a base Lock class and make them more consistent with other lock classes
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/help_topics/en/hooks.txt hooks.txt-20070830033044-xxu2rced13f72dka-1
          bzrlib/hooks.py                hooks.py-20070325015548-ix4np2q0kd8452au-1
          bzrlib/lock.py                 lock.py-20050527050856-ec090bb51bc03349
          bzrlib/lockdir.py              lockdir.py-20060220222025-98258adf27fbdda3
          bzrlib/tests/test_lockdir.py   test_lockdir.py-20060220222025-33d4221569a3d600
        ------------------------------------------------------------
        revno: 3331.3.13
        revision-id: mbp at sourcefrog.net-20080527032549-khxlcrlp95us6rkj
        parent: mbp at sourcefrog.net-20080527032431-3bjagu9x4vquh1y0
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: lock_hooks
        timestamp: Tue 2008-05-27 13:25:49 +1000
        message:
          Fix up imports
        modified:
          bzrlib/lockdir.py              lockdir.py-20060220222025-98258adf27fbdda3
          bzrlib/tests/test_lockdir.py   test_lockdir.py-20060220222025-33d4221569a3d600
        ------------------------------------------------------------
        revno: 3331.3.12
        revision-id: mbp at sourcefrog.net-20080527032431-3bjagu9x4vquh1y0
        parent: mbp at sourcefrog.net-20080527032312-mh6gtuu8hwfx01xl
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: lock_hooks
        timestamp: Tue 2008-05-27 13:24:31 +1000
        message:
          Remove PhysicalLock class
        modified:
          bzrlib/lockdir.py              lockdir.py-20060220222025-98258adf27fbdda3
          bzrlib/tests/test_lockdir.py   test_lockdir.py-20060220222025-33d4221569a3d600
        ------------------------------------------------------------
        revno: 3331.3.11
        revision-id: mbp at sourcefrog.net-20080527032312-mh6gtuu8hwfx01xl
        parent: mbp at sourcefrog.net-20080527031219-whr998jr17x233qh
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: lock_hooks
        timestamp: Tue 2008-05-27 13:23:12 +1000
        message:
          Move LockDir hooks onto LockDir
        modified:
          bzrlib/help_topics/en/hooks.txt hooks.txt-20070830033044-xxu2rced13f72dka-1
          bzrlib/lock.py                 lock.py-20050527050856-ec090bb51bc03349
          bzrlib/lockdir.py              lockdir.py-20060220222025-98258adf27fbdda3
          bzrlib/tests/test_lockdir.py   test_lockdir.py-20060220222025-33d4221569a3d600
        ------------------------------------------------------------
        revno: 3331.3.10
        revision-id: mbp at sourcefrog.net-20080527031219-whr998jr17x233qh
        parent: mbp at sourcefrog.net-20080527030636-a62cu3v4q6857jrn
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: lock_hooks
        timestamp: Tue 2008-05-27 13:12:19 +1000
        message:
          Update test_help for hooks doc
        modified:
          bzrlib/tests/test_help.py      test_help.py-20070419045354-6q6rq15j9e2n5fna-1
        ------------------------------------------------------------
        revno: 3331.3.9
        revision-id: mbp at sourcefrog.net-20080527030636-a62cu3v4q6857jrn
        parent: mbp at sourcefrog.net-20080527030541-2sgzqkikiy1arh0d
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: lock_hooks
        timestamp: Tue 2008-05-27 13:06:36 +1000
        message:
          Change one more case from using install_hook to install_named_hook
        modified:
          bzrlib/tests/test_lockdir.py   test_lockdir.py-20060220222025-33d4221569a3d600
        ------------------------------------------------------------
        revno: 3331.3.8
        revision-id: mbp at sourcefrog.net-20080527030541-2sgzqkikiy1arh0d
        parent: mbp at sourcefrog.net-20080527030519-aecbzatpy4xgt2wd
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: lock_hooks
        timestamp: Tue 2008-05-27 13:05:41 +1000
        message:
          Change from using install_hook to install_named_hook
        modified:
          bzrlib/tests/test_hooks.py     test_hooks.py-20070628030849-89rtsbe5dmer5npz-1
          bzrlib/tests/test_lockdir.py   test_lockdir.py-20060220222025-33d4221569a3d600
        ------------------------------------------------------------
        revno: 3331.3.7
        revision-id: mbp at sourcefrog.net-20080527030519-aecbzatpy4xgt2wd
        parent: mbp at sourcefrog.net-20080527030053-0mct6dypek0ysjc3
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: lock_hooks
        timestamp: Tue 2008-05-27 13:05:19 +1000
        message:
          Add note about lock hook limitations
        modified:
          bzrlib/help_topics/en/hooks.txt hooks.txt-20070830033044-xxu2rced13f72dka-1
        ------------------------------------------------------------
        revno: 3331.3.6
        revision-id: mbp at sourcefrog.net-20080527030053-0mct6dypek0ysjc3
        parent: mbp at sourcefrog.net-20080527025453-g92mkdb1u2aterqe
        parent: pqm at pqm.ubuntu.com-20080524120232-22xdromy706t0x16
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: lock_hooks
        timestamp: Tue 2008-05-27 13:00:53 +1000
        message:
          merge trunk
        removed:
          bzrlib/xml6.py                 xml6.py-20060823042456-dbaaq4atrche7xy5-1
        added:
          bzrlib/smart/message.py        message.py-20080222013625-ncqmh3nrxjkxab87-1
          bzrlib/tests/branch_implementations/test_check.py test_check.py-20080429151303-1sbfclxhddpz0tnj-1
          bzrlib/tests/branch_implementations/test_reconcile.py test_reconcile.py-20080429161555-qlmccuyeyt6pvho7-1
          bzrlib/tests/file_utils.py     file_utils.py-20080506145406-a1h3ydg2lsh2iriy-1
          bzrlib/tests/interrepository_implementations/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
          bzrlib/tests/repository_implementations/test_get_parent_map.py test_get_parent_map.-20080421172708-x1z6ot341osr0jq1-1
          bzrlib/tests/test_mutabletree.py test_mutabletree.py-20080405014429-2v0cdi3re320p8db-1
          bzrlib/xml5.py                 xml5.py-20080328030717-t9guwinq8hom0ar3-1
          bzrlib/xml6.py                 xml6.py-20080327235607-1skmbg4o9cd1o636-1
          doc/developers/integration.txt integration.txt-20080404022341-2lorxocp1in07zij-1
          doc/developers/plugin-api.txt  pluginapi.txt-20080229110225-q2j5y4agqhlkjn0s-1
          doc/developers/releasing.txt   releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
          doc/developers/repository-stream.txt repositorystream.txt-20080410222511-nh6b9bvscvcerh48-1
          doc/developers/tortoise-strategy.txt tortoisestrategy.txt-20080403024510-2ahdqrvnwqrb5p5t-1
          doc/en/user-guide/bzrtools_plugin.txt bzrtools_plugin.txt-20080509065016-cjc90f46407vi9a0-1
          doc/en/user-guide/svn_plugin.txt svn_plugin.txt-20080509065016-cjc90f46407vi9a0-2
          doc/en/user-guide/web_browsing.txt web_browsing.txt-20080509065016-cjc90f46407vi9a0-3
          doc/es/                        es-20080504181154-x2fm3oprvjohiz7n-1
          doc/es/guia-desarrollador/     guiadesarrollador-20080504181514-qlh50dq1mj769bic-1
          doc/es/guia-usuario/           guiausuario-20080504181514-qlh50dq1mj769bic-2
          doc/es/guia-usuario/index.txt  index.txt-20080512005856-hgdxkh9xo58n7zdp-2
          doc/es/guia-usuario/resolving_conflicts.txt conflicts.txt-20080504181626-aqnzjwfhpju5ypfe-1
          doc/es/guia-usuario/version_info.txt version_info.txt-20080504181730-u24nugzokrcrk1bf-1
          doc/es/mini-tutorial/          minitutorial-20080504181514-qlh50dq1mj769bic-3
          doc/es/mini-tutorial/index.txt index.txt-20080504182136-wmoc35u2t6kom8ca-1
          doc/es/notas-version/          notasversion-20080504181514-qlh50dq1mj769bic-4
          doc/es/referencia/             referencia-20080504181514-qlh50dq1mj769bic-5
          doc/es/referencia-rapida/      referenciarapida-20080504181514-qlh50dq1mj769bic-6
          doc/es/referencia-rapida/Makefile makefile-20080506002609-y60mr4avuqwzlf4s-1
          doc/es/referencia-rapida/referencia-rapida.svg referenciarapida.svg-20080506002609-y60mr4avuqwzlf4s-2
          doc/index.es.txt               index.es.txt-20080506002113-aunzdhptcoc0h6hm-1
        renamed:
          bzrlib/xml5.py => bzrlib/xml8.py xml5.py-20050907032657-aac8f960815b66b1
          doc/en/user-guide/best_practice_intro.txt => doc/en/user-guide/part2_intro.txt best_practice_intro.-20071123154453-dk2mjhrg1vpjm5w2-1
        modified:
          Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzr                            bzr.py-20050313053754-5485f144c7006fa6
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
          bzrlib/_dirstate_helpers_py.py _dirstate_helpers_py-20070710145033-90nz6cqglsk150jy-1
          bzrlib/_patiencediff_py.py     cdvdifflib.py-20051106064558-f8f8097fbf0db4e4
          bzrlib/add.py                  add.py-20050323030017-3a77d63feda58e33
          bzrlib/annotate.py             annotate.py-20050922133147-7c60541d2614f022
          bzrlib/atomicfile.py           atomicfile.py-20050509044450-dbd24e6c564f7c66
          bzrlib/benchmarks/bench_bundle.py bench_bundle.py-20060719055338-o1c6ieybbwt6c3zv-1
          bzrlib/benchmarks/tree_creator/kernel_like.py kernel_like.py-20060815024128-b16a7pn542u6b13k-1
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/bundle/bundle_data.py   read_changeset.py-20050619171944-c0d95aa685537640
          bzrlib/bundle/serializer/v08.py v06.py-20051119041339-ee43f97270b01823
          bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
          bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
          bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
          bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
          bzrlib/counted_lock.py         counted_lock.py-20070502135927-7dk86io3ok7ctx6k-1
          bzrlib/debug.py                debug.py-20061102062349-vdhrw9qdpck8cl35-1
          bzrlib/delta.py                delta.py-20050729221636-54cf14ef94783d0a
          bzrlib/deprecated_graph.py     graph.py-20050905070950-b47dce53236c5e48
          bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
          bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
          bzrlib/doc/__init__.py         __init__.py-20051224020731-eb3eb3ef5b4570df
          bzrlib/doc/api/__init__.py     __init__.py-20051224020744-7b87d590843855bc
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
          bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
          bzrlib/hashcache.py            hashcache.py-20050706091756-fe3a8cc1143ff24f
          bzrlib/help.py                 help.py-20050505025907-4dd7a6d63912f894
          bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
          bzrlib/help_topics/en/authentication.txt authentication_conf.-20071104135035-glfv0ri355tyg1nf-1
          bzrlib/help_topics/en/configuration.txt configuration.txt-20060314161707-868350809502af01
          bzrlib/help_topics/en/hooks.txt hooks.txt-20070830033044-xxu2rced13f72dka-1
          bzrlib/hooks.py                hooks.py-20070325015548-ix4np2q0kd8452au-1
          bzrlib/index.py                index.py-20070712131115-lolkarso50vjr64s-1
          bzrlib/info.py                 info.py-20050323235939-6bbfe7d9700b0b9b
          bzrlib/intset.py               intset.py-20050717175247-81cd658f9aaa2731
          bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/lazy_import.py          lazy_import.py-20060910203832-f77c54gf3n232za0-1
          bzrlib/lazy_regex.py           lazy_regex.py-20061009091222-fyettq6z5qomdl9e-1
          bzrlib/lock.py                 lock.py-20050527050856-ec090bb51bc03349
          bzrlib/lockable_files.py       control_files.py-20051111201905-bb88546e799d669f
          bzrlib/lockdir.py              lockdir.py-20060220222025-98258adf27fbdda3
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/lru_cache.py            lru_cache.py-20070119165515-tlw203kuwh0id5gv-1
          bzrlib/mail_client.py          mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
          bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
          bzrlib/merge3.py               merge3.py-20050704130834-bf0597094828a2e1
          bzrlib/merge_directive.py      merge_directive.py-20070228184838-ja62280spt1g7f4x-1
          bzrlib/missing.py              missing.py-20050812153334-097f7097e2a8bcd1
          bzrlib/msgeditor.py            msgeditor.py-20050901111708-ef6d8de98f5d8f2f
          bzrlib/multiparent.py          __init__.py-20070410133617-n1jdhcc1n1mibarp-1
          bzrlib/mutabletree.py          mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
          bzrlib/option.py               option.py-20051014052914-661fb36e76e7362f
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
          bzrlib/patches.py              patches.py-20050727183609-378c1cc5972ce908
          bzrlib/plugin.py               plugin.py-20050622060424-829b654519533d69
          bzrlib/plugins/launchpad/lp_directory.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
          bzrlib/plugins/launchpad/lp_registration.py lp_registration.py-20060315190948-daa617eafe3a8d48
          bzrlib/plugins/launchpad/test_register.py test_register.py-20060315182712-40f5dda945c829a8
          bzrlib/progress.py             progress.py-20050610070202-df9faaab791964c0
          bzrlib/reconcile.py            reweave_inventory.py-20051108164726-1e5e0934febac06e
          bzrlib/reconfigure.py          reconfigure.py-20070908040425-6ykgo7escxhyrg9p-1
          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/revision.py             revision.py-20050309040759-e77802c08f3999d5
          bzrlib/revisionspec.py         revisionspec.py-20050907152633-17567659fd5c0ddb
          bzrlib/revisiontree.py         revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
          bzrlib/rio.py                  rio.py-20051128032247-770b120b34dfff60
          bzrlib/smart/branch.py         branch.py-20061124031907-mzh3pla28r83r97f-1
          bzrlib/smart/client.py         client.py-20061116014825-2k6ada6xgulslami-1
          bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-1
          bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
          bzrlib/smart/repository.py     repository.py-20061128022038-vr5wy5bubyb8xttk-1
          bzrlib/smart/request.py        request.py-20061108095550-gunadhxmzkdjfeek-1
          bzrlib/smart/server.py         server.py-20061110062051-chzu10y32vx8gvur-1
          bzrlib/status.py               status.py-20050505062338-431bfa63ec9b19e6
          bzrlib/store/__init__.py       store.py-20050309040759-164dc5173d6406c2
          bzrlib/store/revision/knit.py  knit.py-20060303020652-de5fa299e941a3c7
          bzrlib/store/revision/text.py  text.py-20060303020652-e49155f0da4d14ab
          bzrlib/store/versioned/__init__.py weavestore.py-20050907094258-88262e0434babab9
          bzrlib/symbol_versioning.py    symbol_versioning.py-20060105104851-9ecf8af605d15a80
          bzrlib/testament.py            testament.py-20051011100429-6d319a18183b13c8
          bzrlib/tests/TestUtil.py       TestUtil.py-20050824080200-5f70140a2d938694
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
          bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
          bzrlib/tests/blackbox/test_hooks.py test_hooks.py-20080308163236-xljgf9j41hik1x21-1
          bzrlib/tests/blackbox/test_ls.py test_ls.py-20060712232047-0jraqpecwngee12y-1
          bzrlib/tests/blackbox/test_missing.py test_missing.py-20051211212735-a2cf4c1840bb84c4
          bzrlib/tests/blackbox/test_reconcile.py test_fix.py-20060223013051-9a188e15a5ee9451
          bzrlib/tests/blackbox/test_reconfigure.py test_reconfigure.py-20070908173426-khfo5fi2rgzgtwj3-1
          bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
          bzrlib/tests/blackbox/test_serve.py test_serve.py-20060913064329-8t2pvmsikl4s3xhl-1
          bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
          bzrlib/tests/blackbox/test_switch.py test_switch.py-20071122111948-0c5en6uz92bwl76h-1
          bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
          bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
          bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
          bzrlib/tests/branch_implementations/test_commit.py test_commit.py-20070206022134-117z1i5b644p63r0-1
          bzrlib/tests/branch_implementations/test_hooks.py test_hooks.py-20070129154855-blhpwxmvjs07waei-1
          bzrlib/tests/branch_implementations/test_permissions.py test_permissions.py-20060210110243-245c01403bf0fde6
          bzrlib/tests/branch_implementations/test_pull.py test_pull.py-20060410103942-83c35b26657414fc
          bzrlib/tests/branch_implementations/test_push.py test_push.py-20070130153159-fhfap8uoifevg30j-1
          bzrlib/tests/branch_implementations/test_uncommit.py test_uncommit.py-20070205180410-ge7058d9138mvq3x-1
          bzrlib/tests/bzrdir_implementations/__init__.py __init__.py-20060131065642-34c39b54f42dd048
          bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
          bzrlib/tests/commands/__init__.py __init__.py-20070520095518-ecfl8531fxgjeycj-1
          bzrlib/tests/ftp_server.py     ftpserver.py-20071019102346-61jbvdkrr70igauv-1
          bzrlib/tests/http_server.py    httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
          bzrlib/tests/http_utils.py     HTTPTestUtil.py-20050914180604-247d3aafb7a43343
          bzrlib/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
          bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
          bzrlib/tests/intertree_implementations/__init__.py __init__.py-20060724101752-09ysswo1a92uqyoz-3
          bzrlib/tests/interversionedfile_implementations/__init__.py __init__.py-20060302012326-981af525594d02ed
          bzrlib/tests/interversionedfile_implementations/test_join.py test_join.py-20060302012326-9b5e9b0f0a03fedc
          bzrlib/tests/inventory_implementations/__init__.py __init__.py-20070821044532-olbadbokgv3qv1yd-1
          bzrlib/tests/per_lock/__init__.py __init__.py-20070314201444-u92yjsqrkh2m3qcb-1
          bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
          bzrlib/tests/repository_implementations/test_check_reconcile.py test_broken.py-20070928125406-62236394w0jpbpd6-2
          bzrlib/tests/repository_implementations/test_fetch.py test_fetch.py-20070814052151-5cxha9slx4c93uog-1
          bzrlib/tests/repository_implementations/test_has_same_location.py test_has_same_locati-20070807074648-2i2ah82fbe83iys7-1
          bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
          bzrlib/tests/repository_implementations/test_revision.py testrevprops.py-20051013073044-92bc3c68302ce1bf
          bzrlib/tests/revisionstore_implementations/__init__.py __init__.py-20060303020702-976c4186a0f99edb
          bzrlib/tests/revisionstore_implementations/test_all.py test_all.py-20060303020702-9b2d4c1d75407f31
          bzrlib/tests/stub_sftp.py      stub_sftp.py-20051027032739-0e7ef4f7bab0e174
          bzrlib/tests/test_ancestry.py  test_ancestry.py-20050913023709-69768e94848312c6
          bzrlib/tests/test_branch.py    test_branch.py-20060116013032-97819aa07b8ab3b5
          bzrlib/tests/test_bundle.py    test.py-20050630184834-092aa401ab9f039c
          bzrlib/tests/test_bzrdir.py    test_bzrdir.py-20060131065654-deba40eef51cf220
          bzrlib/tests/test_commit.py    test_commit.py-20050914060732-279f057f8c295434
          bzrlib/tests/test_config.py    testconfig.py-20051011041908-742d0c15d8d8c8eb
          bzrlib/tests/test_conflicts.py test_conflicts.py-20051006031059-e2dad9bbeaa5891f
          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_graph.py     test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
          bzrlib/tests/test_hooks.py     test_hooks.py-20070628030849-89rtsbe5dmer5npz-1
          bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
          bzrlib/tests/test_http_response.py test_http_response.py-20060628233143-950b2a482a32505d
          bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
          bzrlib/tests/test_lockable_files.py test_lockable_files.py-20051225183927-365c7fd99591caf1
          bzrlib/tests/test_lockdir.py   test_lockdir.py-20060220222025-33d4221569a3d600
          bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
          bzrlib/tests/test_mail_client.py test_mail_client.py-20070809192806-vuxt3t19srtpjpdn-2
          bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
          bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
          bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
          bzrlib/tests/test_missing.py   test_missing.py-20051212000028-694fa4f658a81f48
          bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
          bzrlib/tests/test_osutils_encodings.py test_osutils_encodin-20061226013130-kkp732tpt3lm91vv-1
          bzrlib/tests/test_patches.py   test_patches.py-20051231203844-f4974d20f6aea09c
          bzrlib/tests/test_permissions.py test_permissions.py-20051215004520-ccf475789c80e80c
          bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
          bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
          bzrlib/tests/test_reconcile.py test_reconcile.py-20060225054842-50aa618584a86f26
          bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
          bzrlib/tests/test_registry.py  test_lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-2
          bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
          bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
          bzrlib/tests/test_revision.py  testrevision.py-20050804210559-46f5e1eb67b01289
          bzrlib/tests/test_revisiontree.py test_revisiontree.py-20060615095324-aij44ndxbv1h4c9f-1
          bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
          bzrlib/tests/test_smart.py     test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
          bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
          bzrlib/tests/test_source.py    test_source.py-20051207061333-a58dea6abecc030d
          bzrlib/tests/test_status.py    test_status.py-20060516190614-fbf6432e4a6e8aa5
          bzrlib/tests/test_store.py     teststore.py-20050826022702-f6caadb647395769
          bzrlib/tests/test_strace.py    test_strace.py-20070323001526-6zquhhw8leb9m6j8-2
          bzrlib/tests/test_subsume.py   test_subsume.py-20060927040024-tsvh4pchajoayymg-1
          bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
          bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
          bzrlib/tests/test_upgrade.py   test_upgrade.py-20051004040251-555fe1d2bae1bc71
          bzrlib/tests/test_version_info.py test_version_info.py-20051228204928-2c364e30b702b41b
          bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
          bzrlib/tests/test_weave.py     testknit.py-20050627023648-9833cc5562ffb785
          bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
          bzrlib/tests/test_xml.py       test_xml.py-20050905091053-80b45588931a9b35
          bzrlib/tests/transport_util.py transportutil.py-20070525113600-5v2igk89s8fensom-1
          bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
          bzrlib/tests/tree_implementations/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
          bzrlib/tests/tree_implementations/test_test_trees.py test_tree_trees.py-20060720091921-3nwi5h21lf06vf5p-1
          bzrlib/tests/treeshape.py      treeshape.py-20051004094628-312a98f0194306a8
          bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
          bzrlib/tests/workingtree_implementations/test_add_reference.py test_add_reference.p-20061211024451-yo9i1691dgbv1eyn-1
          bzrlib/tests/workingtree_implementations/test_basis_inventory.py test_basis_inventory.py-20051218151655-3650468941091309
          bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
          bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
          bzrlib/tests/workingtree_implementations/test_set_root_id.py test_set_root_id.py-20061004073850-0r1c7qikmnkb8m9k-1
          bzrlib/tests/workingtree_implementations/test_walkdirs.py test_walkdirs.py-20060731045042-ch366w6dve2m7ro9-1
          bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
          bzrlib/textinv.py              textinv.py-20050411024435-e3898231b7d1897b26c38878
          bzrlib/textui.py               textui.py-20050309040759-5d0cebe09c528e7d
          bzrlib/timestamp.py            timestamp.py-20070306142322-ttbb9oulf3jotljd-1
          bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
          bzrlib/transactions.py         transactions.py-20051007010900-f1313d53cf58e223
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
          bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
          bzrlib/transport/chroot.py     chroot.py-20061011104729-0us9mgm97z378vnt-1
          bzrlib/transport/decorator.py  decorator.py-20060402223305-e913a0f25319ab42
          bzrlib/transport/ftp.py        ftp.py-20051116161804-58dc9506548c2a53
          bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
          bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
          bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
          bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
          bzrlib/transport/http/response.py _response.py-20060613154423-a2ci7hd4iw5c7fnt-1
          bzrlib/transport/http/wsgi.py  wsgi.py-20061005091552-rz8pva0olkxv0sd8-2
          bzrlib/transport/local.py      local_transport.py-20050711165921-9b1f142bfe480c24
          bzrlib/transport/memory.py     memory.py-20051016101338-cd008dbdf69f04fc
          bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
          bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
          bzrlib/transport/ssh.py        ssh.py-20060824042150-0s9787kng6zv1nwq-1
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
          bzrlib/treebuilder.py          treebuilder.py-20060907214856-4omn6hf1u7fvrart-1
          bzrlib/tuned_gzip.py           tuned_gzip.py-20060407014720-5aadc518e928e8d2
          bzrlib/urlutils.py             urlutils.py-20060502195429-e8a161ecf8fac004
          bzrlib/version_info_formats/__init__.py generate_version_info.py-20051228204928-8358edabcddcd97e
          bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
          bzrlib/weave.py                knit.py-20050627021749-759c29984154256b
          bzrlib/weavefile.py            weavefile.py-20050629135233-2ffe0200f103f6c2
          bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
          bzrlib/xml4.py                 xml4.py-20050916091259-db5ab55e7e6ca324
          bzrlib/xml_serializer.py       xml.py-20050309040759-57d51586fdec365d
          doc/default.css                default.css-20060622101119-tgwtdci8z769bjb9-1
          doc/developers/HACKING.txt     HACKING-20050805200004-2a5dc975d870f78c
          doc/developers/authentication-ring.txt authring.txt-20070718200437-q5tdik0ne6lor86d-1
          doc/developers/index.txt       index.txt-20070508041241-qznziunkg0nffhiw-1
          doc/developers/network-protocol.txt networkprotocol.txt-20070903044232-woustorrjbmg5zol-1
          doc/en/user-guide/bug_trackers.txt bug_trackers.txt-20070713223459-khxdlcudraii95uv-1
          doc/en/user-guide/configuring_bazaar.txt configuring_bazaar.t-20071128000722-ncxiua259xwbdbg7-1
          doc/en/user-guide/controlling_registration.txt controlling_registra-20071121073725-0corxykv5irjal00-3
          doc/en/user-guide/core_concepts.txt core_concepts.txt-20071114035000-q36a9h57ps06uvnl-2
          doc/en/user-guide/distributed_intro.txt distributed_intro.tx-20071123154453-dk2mjhrg1vpjm5w2-2
          doc/en/user-guide/hooks.txt    hooks.txt-20070829200551-7nr6e5a1io6x78uf-1
          doc/en/user-guide/index.txt    index.txt-20060622101119-tgwtdci8z769bjb9-2
          doc/en/user-guide/introducing_bazaar.txt introducing_bazaar.t-20071114035000-q36a9h57ps06uvnl-5
          doc/en/user-guide/sending_changes.txt sending_changes.txt-20071123154453-dk2mjhrg1vpjm5w2-4
          doc/index.txt                  index.txt-20070813101924-07gd9i9d2jt124bf-1
          bzrlib/xml8.py                 xml5.py-20050907032657-aac8f960815b66b1
          doc/en/user-guide/part2_intro.txt best_practice_intro.-20071123154453-dk2mjhrg1vpjm5w2-1
        ------------------------------------------------------------
        revno: 3331.3.5
        revision-id: mbp at sourcefrog.net-20080527025453-g92mkdb1u2aterqe
        parent: mbp at sourcefrog.net-20080527025425-sz49e3x4nrifmc3u
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: lock_hooks
        timestamp: Tue 2008-05-27 12:54:53 +1000
        message:
          Move physical lock hooks onto new PhysicalLock class variable
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/help_topics/en/hooks.txt hooks.txt-20070830033044-xxu2rced13f72dka-1
          bzrlib/lock.py                 lock.py-20050527050856-ec090bb51bc03349
          bzrlib/lockdir.py              lockdir.py-20060220222025-98258adf27fbdda3
          bzrlib/tests/test_lockdir.py   test_lockdir.py-20060220222025-33d4221569a3d600
        ------------------------------------------------------------
        revno: 3331.3.4
        revision-id: mbp at sourcefrog.net-20080527025425-sz49e3x4nrifmc3u
        parent: mbp at sourcefrog.net-20080527025048-lzx8vehacfxbmvzz
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: lock_hooks
        timestamp: Tue 2008-05-27 12:54:25 +1000
        message:
          Add Hooks.clear_hooks method
        modified:
          bzrlib/hooks.py                hooks.py-20070325015548-ix4np2q0kd8452au-1
          bzrlib/tests/test_hooks.py     test_hooks.py-20070628030849-89rtsbe5dmer5npz-1
        ------------------------------------------------------------
        revno: 3331.3.3
        revision-id: mbp at sourcefrog.net-20080527025048-lzx8vehacfxbmvzz
        parent: robertc at robertcollins.net-20080404035337-ldligjwfp2bzqi47
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: lock_hooks
        timestamp: Tue 2008-05-27 12:50:48 +1000
        message:
          Add Hooks.clone method
        modified:
          bzrlib/hooks.py                hooks.py-20070325015548-ix4np2q0kd8452au-1
          bzrlib/tests/test_hooks.py     test_hooks.py-20070628030849-89rtsbe5dmer5npz-1
        ------------------------------------------------------------
        revno: 3331.3.2
        revision-id: robertc at robertcollins.net-20080404035337-ldligjwfp2bzqi47
        parent: robertc at robertcollins.net-20080404021333-13wfvylrgmvcp3gz
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: PhysicalLock.hooks
        timestamp: Fri 2008-04-04 14:53:37 +1100
        message:
          Polish on lock hooks to be easier to use.
        modified:
          bzrlib/lock.py                 lock.py-20050527050856-ec090bb51bc03349
          bzrlib/lockdir.py              lockdir.py-20060220222025-98258adf27fbdda3
          bzrlib/tests/test_help.py      test_help.py-20070419045354-6q6rq15j9e2n5fna-1
          bzrlib/tests/test_lockdir.py   test_lockdir.py-20060220222025-33d4221569a3d600
        ------------------------------------------------------------
        revno: 3331.3.1
        revision-id: robertc at robertcollins.net-20080404021333-13wfvylrgmvcp3gz
        parent: pqm at pqm.ubuntu.com-20080403080121-tbx3clqp8wqe776c
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: PhysicalLock.hooks
        timestamp: Fri 2008-04-04 13:13:33 +1100
        message:
           * ``LockDir`` lock acquisition and release now trigger hooks allowing
             introspection of locking activity. (Robert Collins)
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/help_topics/en/hooks.txt hooks.txt-20070830033044-xxu2rced13f72dka-1
          bzrlib/lock.py                 lock.py-20050527050856-ec090bb51bc03349
          bzrlib/lockdir.py              lockdir.py-20060220222025-98258adf27fbdda3
          bzrlib/tests/test_lockdir.py   test_lockdir.py-20060220222025-33d4221569a3d600
    ------------------------------------------------------------
    revno: 3696.1.33
    revision-id: pqm at pqm.ubuntu.com-20080923191842-0hfq8zykwwm1oo9k
    parent: pqm at pqm.ubuntu.com-20080923181512-j5mqkendfi4ih075
    parent: john at arbash-meinel.com-20080923182832-gcuz5seo3xv2algc
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2008-09-23 20:18:42 +0100
    message:
      (jam) Merge bzr 1.7-final into bzr.dev
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
        ------------------------------------------------------------
        revno: 3696.33.1
        revision-id: john at arbash-meinel.com-20080923182832-gcuz5seo3xv2algc
        parent: pqm at pqm.ubuntu.com-20080922180718-n946121e40ql2bb3
        parent: pqm at pqm.ubuntu.com-20080923164635-it2hzrn39wpbhh9e
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Tue 2008-09-23 13:28:32 -0500
        message:
          Merge bzr 1.7-final into bzr.dev
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
        ------------------------------------------------------------
        revno: 3696.29.3
        revision-id: pqm at pqm.ubuntu.com-20080923164635-it2hzrn39wpbhh9e
        parent: pqm at pqm.ubuntu.com-20080917234114-mx3kwcbibtdfzc02
        parent: john at arbash-meinel.com-20080923161454-eoft8u1jcqqji9cg
        committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
        branch nick: 1.7
        timestamp: Tue 2008-09-23 17:46:35 +0100
        message:
          (jam) bring in Mark Hammonds setup tweaks, release bzr 1.7 final
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
            ------------------------------------------------------------
            revno: 3696.32.3
            revision-id: john at arbash-meinel.com-20080923161454-eoft8u1jcqqji9cg
            parent: john at arbash-meinel.com-20080923161207-5cvoirch1q0zm81t
            committer: John Arbash Meinel <john at arbash-meinel.com>
            branch nick: 1.7rc2
            timestamp: Tue 2008-09-23 11:14:54 -0500
            message:
              Update NEWS, release 1.7 final
            modified:
              NEWS                           NEWS-20050323055033-4e00b5db738777ff
              bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
            ------------------------------------------------------------
            revno: 3696.32.2
            revision-id: john at arbash-meinel.com-20080923161207-5cvoirch1q0zm81t
            parent: john at arbash-meinel.com-20080923161049-zqvuu0wzew3ilrk5
            parent: mhammond at skippinet.com.au-20080903131033-77635gwnys1nr877
            committer: John Arbash Meinel <john at arbash-meinel.com>
            branch nick: 1.7rc2
            timestamp: Tue 2008-09-23 11:12:07 -0500
            message:
              Include localization files that are found in plugins we are installing.
            modified:
              setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
                ------------------------------------------------------------
                revno: 3684.3.1
                revision-id: mhammond at skippinet.com.au-20080903131033-77635gwnys1nr877
                parent: pqm at pqm.ubuntu.com-20080903094659-lkj3i4hd83d35fov
                committer: Mark Hammond <mhammond at skippinet.com.au>
                branch nick: bzr.binaries.17
                timestamp: Wed 2008-09-03 23:10:33 +1000
                message:
                  pickup l10n files from plugins.
                modified:
                  setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
            ------------------------------------------------------------
            revno: 3696.32.1
            revision-id: john at arbash-meinel.com-20080923161049-zqvuu0wzew3ilrk5
            parent: pqm at pqm.ubuntu.com-20080917234114-mx3kwcbibtdfzc02
            parent: mhammond at skippinet.com.au-20080919040809-6uyf76hisqk38civ
            committer: John Arbash Meinel <john at arbash-meinel.com>
            branch nick: 1.7rc2
            timestamp: Tue 2008-09-23 11:10:49 -0500
            message:
              Include docutils as part of the qbzr setup
            modified:
              setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
            ------------------------------------------------------------
            revno: 3696.31.1
            revision-id: mhammond at skippinet.com.au-20080919040809-6uyf76hisqk38civ
            parent: pqm at pqm.ubuntu.com-20080917234114-mx3kwcbibtdfzc02
            committer: Mark Hammond <mhammond at skippinet.com.au>
            branch nick: bzr.binaries.17
            timestamp: Fri 2008-09-19 14:08:09 +1000
            message:
               include docutils for tbzr to use formatting bzr help topics as HTML
            modified:
              setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
        ------------------------------------------------------------
        revno: 3696.29.2
        revision-id: pqm at pqm.ubuntu.com-20080917234114-mx3kwcbibtdfzc02
        parent: pqm at pqm.ubuntu.com-20080917051135-akewztrabntc2sec
        parent: john at arbash-meinel.com-20080917230918-l3hozsoph343oj87
        committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
        branch nick: 1.7
        timestamp: Thu 2008-09-18 00:41:14 +0100
        message:
          (jam) Prepare 1.7rc2
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
            ------------------------------------------------------------
            revno: 3696.30.2
            revision-id: john at arbash-meinel.com-20080917230918-l3hozsoph343oj87
            parent: john at arbash-meinel.com-20080917230733-rg4y53rt8hmbok8f
            committer: John Arbash Meinel <john at arbash-meinel.com>
            branch nick: 1.7rc2
            timestamp: Wed 2008-09-17 18:09:18 -0500
            message:
              NEWS summary for 1.7rc2
            modified:
              NEWS                           NEWS-20050323055033-4e00b5db738777ff
            ------------------------------------------------------------
            revno: 3696.30.1
            revision-id: john at arbash-meinel.com-20080917230733-rg4y53rt8hmbok8f
            parent: pqm at pqm.ubuntu.com-20080917051135-akewztrabntc2sec
            committer: John Arbash Meinel <john at arbash-meinel.com>
            branch nick: 1.7rc2
            timestamp: Wed 2008-09-17 18:07:33 -0500
            message:
              NEWS entry for #261315
            modified:
              NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 3696.29.1
        revision-id: pqm at pqm.ubuntu.com-20080917051135-akewztrabntc2sec
        parent: pqm at pqm.ubuntu.com-20080916224734-ggoasnd8egrezi9t
        parent: mbp at sourcefrog.net-20080917043324-gpo0wyot7r43hgkp
        committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
        branch nick: 1.7
        timestamp: Wed 2008-09-17 06:11:35 +0100
        message:
          (mbp) #261315 add Branch.get_stacked_on_url rpc and fallback
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/smart/branch.py         branch.py-20061124031907-mzh3pla28r83r97f-1
          bzrlib/smart/request.py        request.py-20061108095550-gunadhxmzkdjfeek-1
          bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
          bzrlib/tests/test_smart.py     test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
    ------------------------------------------------------------
    revno: 3696.1.32
    revision-id: pqm at pqm.ubuntu.com-20080923181512-j5mqkendfi4ih075
    parent: pqm at pqm.ubuntu.com-20080923070920-h74n26u7ipd72c46
    parent: aaron at aaronbentley.com-20080923174627-y4qu12hn8t77kvv9
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2008-09-23 19:15:12 +0100
    message:
      add win32utils.get_local_appdata_location() (mhammond)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
      bzrlib/tests/test_win32utils.py test_win32utils.py-20070713181630-8xsrjymd3e8mgw23-108
      bzrlib/win32utils.py           win32console.py-20051021033308-123c6c929d04973d
    ------------------------------------------------------------
    revno: 3638.4.11
    revision-id: aaron at aaronbentley.com-20080923174627-y4qu12hn8t77kvv9
    parent: aaron at aaronbentley.com-20080923170003-8vh06dg6jewct4ta
    parent: pqm at pqm.ubuntu.com-20080923070920-h74n26u7ipd72c46
    committer: Aaron Bentley <aaron at aaronbentley.com>
    branch nick: bzr.ab.integration
    timestamp: Tue 2008-09-23 13:46:27 -0400
    message:
      Merge with bzr.dev
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
      bzrlib/annotate.py             annotate.py-20050922133147-7c60541d2614f022
      bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/help_topics/en/hooks.txt hooks.txt-20070830033044-xxu2rced13f72dka-1
      bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
      bzrlib/tests/blackbox/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
      bzrlib/tests/branch_implementations/test_hooks.py test_hooks.py-20070129154855-blhpwxmvjs07waei-1
      bzrlib/tests/intertree_implementations/__init__.py __init__.py-20060724101752-09ysswo1a92uqyoz-3
      bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
      bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
      bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
      bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
      bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
    ------------------------------------------------------------
    revno: 3638.4.10
    revision-id: aaron at aaronbentley.com-20080923170003-8vh06dg6jewct4ta
    parent: aaron at aaronbentley.com-20080923165858-05bepfv3ev4g6jpk
    committer: Aaron Bentley <aaron at aaronbentley.com>
    branch nick: bzr.ab.integration
    timestamp: Tue 2008-09-23 13:00:03 -0400
    message:
      Correct spelling of 'Application Data'
    modified:
      bzrlib/win32utils.py           win32console.py-20051021033308-123c6c929d04973d
    ------------------------------------------------------------
    revno: 3638.4.9
    revision-id: aaron at aaronbentley.com-20080923165858-05bepfv3ev4g6jpk
    parent: aaron at aaronbentley.com-20080923165638-mb0kgbre4o3vchyi
    committer: Aaron Bentley <aaron at aaronbentley.com>
    branch nick: bzr.ab.integration
    timestamp: Tue 2008-09-23 12:58:58 -0400
    message:
      Update NEWS
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
    ------------------------------------------------------------
    revno: 3638.4.8
    revision-id: aaron at aaronbentley.com-20080923165638-mb0kgbre4o3vchyi
    parent: mhammond at skippinet.com.au-20080919005024-vg2hcgeaub9rjwpq
    parent: pqm at pqm.ubuntu.com-20080922180718-n946121e40ql2bb3
    committer: Aaron Bentley <aaron at aaronbentley.com>
    branch nick: bzr.ab.integration
    timestamp: Tue 2008-09-23 12:56:38 -0400
    message:
      Merge with bzr.dev
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
      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/client.py         client.py-20061116014825-2k6ada6xgulslami-1
      bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-1
      bzrlib/smart/server.py         server.py-20061110062051-chzu10y32vx8gvur-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_remove_tree.py test_remove_tree.py-20061110192919-5j3xjciiaqbs2dvo-1
      bzrlib/tests/blackbox/test_switch.py test_switch.py-20071122111948-0c5en6uz92bwl76h-1
      bzrlib/tests/branch_implementations/test_break_lock.py test_break_lock.py-20060504111902-9aae411dbe9aadd2
      bzrlib/tests/branch_implementations/test_push.py test_push.py-20070130153159-fhfap8uoifevg30j-1
      bzrlib/tests/test_directory_service.py test_directory_servi-20080305221044-vr2mkvlsk8jypa2y-2
      bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
      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/tests/workingtree_implementations/test_remove.py test_remove.py-20070413183901-rvnp85rtc0q0sclp-1
      bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
      bzrlib/transport/local.py      local_transport.py-20050711165921-9b1f142bfe480c24
      bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
      bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
    ------------------------------------------------------------
    revno: 3638.4.7
    revision-id: mhammond at skippinet.com.au-20080919005024-vg2hcgeaub9rjwpq
    parent: mhammond at skippinet.com.au-20080919004724-bfkrvt4pp8zpf7cm
    parent: pqm at pqm.ubuntu.com-20080917230446-p0wippqwikt511sp
    committer: Mark Hammond <mhammond at skippinet.com.au>
    branch nick: bzr.dev.local_appdata
    timestamp: Fri 2008-09-19 10:50:24 +1000
    message:
      merge tip
    added:
      doc/developers/overview.txt    overview.txt-20080904022501-ww2ggomrs5elxfm0-1
    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/bundle/bundle_data.py   read_changeset.py-20050619171944-c0d95aa685537640
      bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
      bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
      bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
      bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
      bzrlib/memorytree.py           memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
      bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
      bzrlib/missing.py              missing.py-20050812153334-097f7097e2a8bcd1
      bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
      bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
      bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
      bzrlib/smart/branch.py         branch.py-20061124031907-mzh3pla28r83r97f-1
      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/smart/request.py        request.py-20061108095550-gunadhxmzkdjfeek-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/blackbox/test_outside_wt.py test_outside_wt.py-20060116200058-98edd33e7db8bdde
      bzrlib/tests/branch_implementations/test_locking.py test_locking.py-20060707151933-tav3o2hpibwi53u4-4
      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_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_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_revisiontree.py test_revisiontree.py-20060615095324-aij44ndxbv1h4c9f-1
      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_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-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
      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/index.txt       index.txt-20070508041241-qznziunkg0nffhiw-1
      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: 3638.4.6
    revision-id: mhammond at skippinet.com.au-20080919004724-bfkrvt4pp8zpf7cm
    parent: mhammond at skippinet.com.au-20080904113930-9hux8vci0ym1x9kp
    committer: Mark Hammond <mhammond at skippinet.com.au>
    branch nick: bzr.dev.local_appdata
    timestamp: Fri 2008-09-19 10:47:24 +1000
    message:
       Skip the environment checks when APPDATA isn't in the environment.
    modified:
      bzrlib/tests/test_win32utils.py test_win32utils.py-20070713181630-8xsrjymd3e8mgw23-108
    ------------------------------------------------------------
    revno: 3638.4.5
    revision-id: mhammond at skippinet.com.au-20080904113930-9hux8vci0ym1x9kp
    parent: mhammond at skippinet.com.au-20080904113804-qzs005pjze7rvqih
    parent: pqm at pqm.ubuntu.com-20080903223056-b108iytb38xkznci
    committer: Mark Hammond <mhammond at skippinet.com.au>
    branch nick: bzr.dev.local_appdata
    timestamp: Thu 2008-09-04 21:39:30 +1000
    message:
      merge
    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/_readdir_py.py          readdir.py-20060609152855-rm6v321vuaqyh9tu-3
      bzrlib/_readdir_pyx.pyx        readdir.pyx-20060609152855-rm6v321vuaqyh9tu-1
      bzrlib/btree_index.py          index.py-20080624222253-p0x5f92uyh5hw734-7
      bzrlib/chunk_writer.py         chunk_writer.py-20080630234519-6ggn4id17nipovny-1
      bzrlib/readdir.h               readdir.h-20060609152855-rm6v321vuaqyh9tu-2
      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_transport_log.py test_transport_log.p-20080902041816-vh8x5yt5nvdzvew3-3
      bzrlib/transport/ftp/          ftp-20080611185801-3vm145h8dmnfgh25-1
      bzrlib/transport/ftp/_gssapi.py _gssapi.py-20080611190840-7ejrtp884bk5eu72-2
      bzrlib/transport/log.py        log.py-20080902041816-vh8x5yt5nvdzvew3-5
      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
      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/_patiencediff_c.c       _patiencediff_c.c-20070721205602-q3imkipwlgagp3cy-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/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
      bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
      bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
      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/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
      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/merge.py                merge.py-20050513021216-953b65a438527106
      bzrlib/option.py               option.py-20051014052914-661fb36e76e7362f
      bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
      bzrlib/plugin.py               plugin.py-20050622060424-829b654519533d69
      bzrlib/push.py                 push.py-20080606021927-5fe39050e8xne9un-1
      bzrlib/reconcile.py            reweave_inventory.py-20051108164726-1e5e0934febac06e
      bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
      bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
      bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
      bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
      bzrlib/smart/repository.py     repository.py-20061128022038-vr5wy5bubyb8xttk-1
      bzrlib/status.py               status.py-20050505062338-431bfa63ec9b19e6
      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_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_outside_wt.py test_outside_wt.py-20060116200058-98edd33e7db8bdde
      bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
      bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
      bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
      bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
      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_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
      bzrlib/tests/test__dirstate_helpers.py test_dirstate_helper-20070504035751-jsbn00xodv0y1eve-2
      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_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_log.py       testlog.py-20050728115707-1a514809d7d49309
      bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
      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_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_status.py    test_status.py-20060516190614-fbf6432e4a6e8aa5
      bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
      bzrlib/tests/test_upgrade_stacked.py test_upgrade_stacked-20080804072225-jd13yami19nskns5-1
      bzrlib/tests/test_whitebox.py  whitebox.py-20050530064534-a063aafb4a0a3a04
      bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
      bzrlib/tests/tree_implementations/test_walkdirs.py test_walkdirs.py-20060729160421-gmjnkotqgxdh98ce-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/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
      bzrlib/transport/trace.py      trace.py-20070828055009-7kt0bbc4t4b92apz-1
      bzrlib/win32utils.py           win32console.py-20051021033308-123c6c929d04973d
      bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
      doc/developers/development-repo.txt developmentrepo.txt-20080102200205-raj42k61dch8pjmj-1
      doc/developers/index.txt       index.txt-20070508041241-qznziunkg0nffhiw-1
      doc/developers/ppa.txt         ppa.txt-20080722055539-606u7t2z32t3ae4w-1
      doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
      doc/en/user-guide/undoing_mistakes.txt undoing_mistakes.txt-20071121092300-8fyacngt1w98e5mp-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: 3638.4.4
    revision-id: mhammond at skippinet.com.au-20080904113804-qzs005pjze7rvqih
    parent: mhammond at skippinet.com.au-20080830034203-kmrvo56dzeiepw2h
    committer: Mark Hammond <mhammond at skippinet.com.au>
    branch nick: bzr.dev.local_appdata
    timestamp: Thu 2008-09-04 21:38:04 +1000
    message:
      fix typo in comments
    modified:
      bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
    ------------------------------------------------------------
    revno: 3638.4.3
    revision-id: mhammond at skippinet.com.au-20080830034203-kmrvo56dzeiepw2h
    parent: mhammond at skippinet.com.au-20080830034112-iaw9p773yu6jnj2n
    committer: Mark Hammond <mhammond at skippinet.com.au>
    branch nick: bzr.dev.local_appdata
    timestamp: Sat 2008-08-30 13:42:03 +1000
    message:
      cleanup tests, rationalize path checking etc.
    modified:
      bzrlib/tests/test_win32utils.py test_win32utils.py-20070713181630-8xsrjymd3e8mgw23-108
    ------------------------------------------------------------
    revno: 3638.4.2
    revision-id: mhammond at skippinet.com.au-20080830034112-iaw9p773yu6jnj2n
    parent: mhammond at skippinet.com.au-20080823035823-1anntol029n0il6r
    committer: Mark Hammond <mhammond at skippinet.com.au>
    branch nick: bzr.dev.local_appdata
    timestamp: Sat 2008-08-30 13:41:12 +1000
    message:
      Add a reference to bug 262874 noting 'mbcs' may be the correct encoding.
    modified:
      bzrlib/win32utils.py           win32console.py-20051021033308-123c6c929d04973d
    ------------------------------------------------------------
    revno: 3638.4.1
    revision-id: mhammond at skippinet.com.au-20080823035823-1anntol029n0il6r
    parent: pqm at pqm.ubuntu.com-20080816000954-t0401ff8s3ydnkr6
    committer: Mark Hammond <mhammond at skippinet.com.au>
    branch nick: bzr.dev.local_appdata
    timestamp: Sat 2008-08-23 13:58:23 +1000
    message:
      Add win32utils.get_local_appdata_location() so bzr and plugins can 
      differentiate between the 'local' and 'roaming' locations offered by
      windows.  Includes support for falling back to pywin32 if ctypes isn't
      available and introduces new tests.
    modified:
      bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
      bzrlib/tests/test_win32utils.py test_win32utils.py-20070713181630-8xsrjymd3e8mgw23-108
      bzrlib/win32utils.py           win32console.py-20051021033308-123c6c929d04973d
=== modified file 'NEWS'
--- a/NEWS	2008-09-23 23:02:53 +0000
+++ b/NEWS	2008-09-24 00:09:49 +0000
@@ -28,6 +28,9 @@
 
     * Location aliases can now accept a trailing path.  (Micheal Hudson)
 
+    * New hooks ``Lock.hooks`` when LockDirs are acquired and released. 
+      (Robert Collins, MartinPool)
+
     * Switching in heavyweight checkouts uses the master branch's context, not
       the checkout's context.  (Adrian Wilkins)
 
@@ -94,9 +97,34 @@
       tree walking, and modular directory listing code to aid future
       performance optimisations and refactoring. (Robert Collins)
 
-
-bzr 1.7rc2 IN DEVELOPMENT
--------------------------
+    * New win32utils.get_local_appdata_location() provides access to a local
+      directory for storing data.  (Mark Hammond)
+
+
+bzr 1.7 2008-09-23
+------------------
+
+This release includes many bug fixes and a few performance and feature
+improvements.  ``bzr rm`` will now scan for missing files and remove them,
+like how ``bzr add`` scans for unknown files and adds them. A bit more
+polish has been applied to the stacking code. The b-tree indexing code has
+been brought in, with an eye on using it in a future repository format.
+There are only minor installer changes since bzr-1.7rc2.
+
+  FEATURES
+
+    * Some small updates to the win32 installer. Include localization
+      files found in plugins, and include the builtin distutils as part of
+      packaging qbzr. (Mark Hammond)
+
+
+bzr 1.7rc2 2008-09-17
+---------------------
+
+A few bug fixes from 1.7rc1. The biggest change is a new
+``RemoteBranch.get_stacked_on_url`` rpc. This allows clients that are
+trying to access a Stacked branch over the smart protocol, to properly
+connect to the stacked-on location.
 
   BUG FIXES:
 
@@ -104,12 +132,15 @@
       repository now preserves the repository format.
       (Andrew Bennetts, #269214)
 
-    * Fix '_in_buffer' AttributeError when using the -Dhpss debug flag.
-      (Andrew Bennetts)
+   * Branching from a stacked branch via ``bzr+ssh`` can properly connect
+     to the stacked-on branch.  (Martin Pool, #261315)
 
     * ``bzr init`` no longer re-opens the BzrDir multiple times.
       (Vincent Ladeuil)
 
+    * Fix '_in_buffer' AttributeError when using the -Dhpss debug flag.
+      (Andrew Bennetts)
+
 
 bzr 1.7rc1 2008-09-09
 ---------------------

=== modified file 'bzrlib/help_topics/en/hooks.txt'
--- a/bzrlib/help_topics/en/hooks.txt	2008-09-04 05:23:39 +0000
+++ b/bzrlib/help_topics/en/hooks.txt	2008-09-23 23:45:04 +0000
@@ -192,3 +192,16 @@
 
 Invoked whenever the server stops serving a directory.
 The hook signature is the same as ``server_started``.
+
+
+lock_acquired (LockDir)
+----------------------------
+
+Called with a LockResult object when a lock has been successfully acquired.
+(New in 1.8.)
+
+lock_released (LockDir)
+----------------------------
+
+Called with a LockResult object when a lock has been successfully released.
+(New in 1.8.)

=== modified file 'bzrlib/hooks.py'
--- a/bzrlib/hooks.py	2008-04-30 13:21:37 +0000
+++ b/bzrlib/hooks.py	2008-09-23 05:37:53 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2007 Canonical Ltd
+# Copyright (C) 2007, 2008 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/lock.py'
--- a/bzrlib/lock.py	2008-04-24 07:22:53 +0000
+++ b/bzrlib/lock.py	2008-09-23 05:37:53 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2006, 2007 Canonical Ltd
+# Copyright (C) 2005, 2006, 2007, 2008 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -42,6 +42,42 @@
     osutils,
     trace,
     )
+from bzrlib.hooks import Hooks
+
+
+class LockHooks(Hooks):
+
+    def __init__(self):
+        Hooks.__init__(self)
+
+        # added in 1.8; called with a LockResult when a physical lock is
+        # acquired
+        self['lock_acquired'] = []
+
+        # added in 1.8; called with a LockResult when a physical lock is
+        # acquired
+        self['lock_released'] = []
+
+
+class Lock(object):
+    """Base class for locks.
+
+    :cvar hooks: Hook dictionary for operations on locks.
+    """
+
+    hooks = LockHooks()
+
+
+class LockResult(object):
+    """Result of an operation on a lock; passed to a hook"""
+
+    def __init__(self, lock_url, details=None):
+        """Create a lock result for lock with optional details about the lock."""
+        self.lock_url = lock_url
+        self.details = details
+
+    def __eq__(self, other):
+        return self.lock_url == other.lock_url and self.details == other.details
 
 
 class _OSLock(object):

=== modified file 'bzrlib/lockdir.py'
--- a/bzrlib/lockdir.py	2008-08-16 04:00:54 +0000
+++ b/bzrlib/lockdir.py	2008-09-23 05:37:53 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006, 2007 Canonical Ltd
+# Copyright (C) 2006, 2007, 2008 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -110,6 +110,7 @@
 from bzrlib import (
     debug,
     errors,
+    lock,
     )
 import bzrlib.config
 from bzrlib.errors import (
@@ -126,6 +127,7 @@
         TransportError,
         UnlockableTransport,
         )
+from bzrlib.hooks import Hooks
 from bzrlib.trace import mutter, note
 from bzrlib.transport import Transport
 from bzrlib.osutils import rand_chars, format_delta, get_host_name
@@ -152,8 +154,9 @@
 _DEFAULT_POLL_SECONDS = 1.0
 
 
-class LockDir(object):
-    """Write-lock guarding access to data."""
+class LockDir(lock.Lock):
+    """Write-lock guarding access to data.
+    """
 
     __INFO_NAME = '/info'
 
@@ -296,6 +299,7 @@
             self._locked_via_token = False
             self._lock_held = False
         else:
+            old_nonce = self.nonce
             # rename before deleting, because we can't atomically remove the
             # whole tree
             start_time = time.time()
@@ -321,6 +325,10 @@
                 self.transport.delete_tree(tmpname)
             self._trace("... unlock succeeded after %dms",
                     (time.time() - start_time) * 1000)
+            result = lock.LockResult(self.transport.abspath(self.path),
+                old_nonce)
+            for hook in self.hooks['lock_released']:
+                hook(result)
 
     def break_lock(self):
         """Break a lock not held by this instance of LockDir.
@@ -450,7 +458,12 @@
         """
         if self._fake_read_lock:
             raise LockContention(self)
-        return self._attempt_lock()
+        result = self._attempt_lock()
+        hook_result = lock.LockResult(self.transport.abspath(self.path),
+                self.nonce)
+        for hook in self.hooks['lock_acquired']:
+            hook(hook_result)
+        return result
 
     def wait_lock(self, timeout=None, poll=None, max_attempts=None):
         """Wait a certain period for a lock.

=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2008-09-22 06:16:40 +0000
+++ b/bzrlib/tests/__init__.py	2008-09-23 16:56:38 +0000
@@ -1212,7 +1212,8 @@
         new_env = {
             'BZR_HOME': None, # Don't inherit BZR_HOME to all the tests.
             'HOME': os.getcwd(),
-            'APPDATA': None,  # bzr now use Win32 API and don't rely on APPDATA
+            # bzr now uses the Win32 API and doesn't rely on APPDATA, but the
+            # tests do check our impls match APPDATA
             'BZR_EDITOR': None, # test_msgeditor manipulates this variable
             'BZR_EMAIL': None,
             'BZREMAIL': None, # may still be present in the environment

=== modified file 'bzrlib/tests/test_lockdir.py'
--- a/bzrlib/tests/test_lockdir.py	2008-06-17 04:07:49 +0000
+++ b/bzrlib/tests/test_lockdir.py	2008-09-23 05:37:53 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006, 2007 Canonical Ltd
+# Copyright (C) 2006, 2007, 2008 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -25,6 +25,7 @@
 from bzrlib import (
     config,
     errors,
+    lock,
     osutils,
     tests,
     transport,
@@ -658,3 +659,74 @@
         self.assertRaises(errors.LockContention, ld2.attempt_lock)
         # no kibble
         check_dir(['held'])
+
+    def record_hook(self, result):
+        self._calls.append(result)
+
+    def reset_hooks(self):
+        self._old_hooks = lock.Lock.hooks
+        self.addCleanup(self.restore_hooks)
+        lock.Lock.hooks = lock.LockHooks()
+
+    def restore_hooks(self):
+        lock.Lock.hooks = self._old_hooks
+
+    def test_LockDir_acquired_success(self):
+        # the LockDir.lock_acquired hook fires when a lock is acquired.
+        self._calls = []
+        self.reset_hooks()
+        LockDir.hooks.install_named_hook('lock_acquired',
+            self.record_hook, 'record_hook')
+        ld = self.get_lock()
+        ld.create()
+        self.assertEqual([], self._calls)
+        result = ld.attempt_lock()
+        lock_path = ld.transport.abspath(ld.path)
+        self.assertEqual([lock.LockResult(lock_path, result)], self._calls)
+        ld.unlock()
+        self.assertEqual([lock.LockResult(lock_path, result)], self._calls)
+
+    def test_LockDir_acquired_fail(self):
+        # the LockDir.lock_acquired hook does not fire on failure.
+        self._calls = []
+        self.reset_hooks()
+        ld = self.get_lock()
+        ld.create()
+        ld2 = self.get_lock()
+        ld2.attempt_lock()
+        # install a lock hook now, when the disk lock is locked
+        LockDir.hooks.install_named_hook('lock_acquired',
+            self.record_hook, 'record_hook')
+        self.assertRaises(errors.LockContention, ld.attempt_lock)
+        self.assertEqual([], self._calls)
+        ld2.unlock()
+        self.assertEqual([], self._calls)
+
+    def test_LockDir_released_success(self):
+        # the LockDir.lock_released hook fires when a lock is acquired.
+        self._calls = []
+        self.reset_hooks()
+        LockDir.hooks.install_named_hook('lock_released',
+            self.record_hook, 'record_hook')
+        ld = self.get_lock()
+        ld.create()
+        self.assertEqual([], self._calls)
+        result = ld.attempt_lock()
+        self.assertEqual([], self._calls)
+        ld.unlock()
+        lock_path = ld.transport.abspath(ld.path)
+        self.assertEqual([lock.LockResult(lock_path, result)], self._calls)
+
+    def test_LockDir_released_fail(self):
+        # the LockDir.lock_released hook does not fire on failure.
+        self._calls = []
+        self.reset_hooks()
+        ld = self.get_lock()
+        ld.create()
+        ld2 = self.get_lock()
+        ld.attempt_lock()
+        ld2.force_break(ld2.peek())
+        LockDir.hooks.install_named_hook('lock_released',
+            self.record_hook, 'record_hook')
+        self.assertRaises(LockBroken, ld.unlock)
+        self.assertEqual([], self._calls)

=== modified file 'bzrlib/tests/test_win32utils.py'
--- a/bzrlib/tests/test_win32utils.py	2007-12-29 22:05:47 +0000
+++ b/bzrlib/tests/test_win32utils.py	2008-09-19 00:47:24 +0000
@@ -18,8 +18,9 @@
 import sys
 
 from bzrlib import osutils
-from bzrlib.tests import TestCase, TestCaseInTempDir, Feature
+from bzrlib.tests import TestCase, TestCaseInTempDir, TestSkipped, Feature
 from bzrlib.win32utils import glob_expand, get_app_path
+from bzrlib import win32utils
 
 
 # Features
@@ -36,19 +37,25 @@
 NeedsGlobExpansionFeature = _NeedsGlobExpansionFeature()
 
 
-class _Win32RegistryFeature(Feature):
+class _RequiredModuleFeature(Feature):
+
+    def __init__(self, mod_name):
+        self.mod_name = mod_name
+        super(_RequiredModuleFeature, self).__init__()
 
     def _probe(self):
         try:
-            import _winreg
+            __import__(self.mod_name)
             return True
         except ImportError:
             return False
 
     def feature_name(self):
-        return '_winreg'
+        return self.mod_name
 
-Win32RegistryFeature = _Win32RegistryFeature()
+Win32RegistryFeature = _RequiredModuleFeature('_winreg')
+CtypesFeature = _RequiredModuleFeature('ctypes')
+Win32comShellFeature = _RequiredModuleFeature('win32com.shell')
 
 
 # Tests
@@ -160,3 +167,64 @@
     def test_not_existing(self):
         p = get_app_path('not-existing')
         self.assertEquals('not-existing', p)
+
+
+class TestLocationsCtypes(TestCase):
+
+    _test_needs_features = [CtypesFeature]
+
+    def assertPathsEqual(self, p1, p2):
+        # TODO: The env var values in particular might return the "short"
+        # version (ie, "C:\DOCUME~1\...").  Its even possible the returned
+        # values will differ only by case - handle these situations as we
+        # come across them.
+        self.assertEquals(p1, p2)
+
+    def test_appdata_not_using_environment(self):
+        # Test that we aren't falling back to the environment
+        first = win32utils.get_appdata_location()
+        self._captureVar("APPDATA", None)
+        self.assertPathsEqual(first, win32utils.get_appdata_location())
+ 
+    def test_appdata_matches_environment(self):
+        # Typically the APPDATA environment variable will match
+        # get_appdata_location
+        # XXX - See bug 262874, which asserts the correct encoding is 'mbcs',
+        encoding = osutils.get_user_encoding()
+        env_val = os.environ.get("APPDATA", None)
+        if not env_val:
+            raise TestSkipped("No APPDATA environment variable exists")
+        self.assertPathsEqual(win32utils.get_appdata_location(),
+                              env_val.decode(encoding))
+
+    def test_local_appdata_not_using_environment(self):
+        # Test that we aren't falling back to the environment
+        first = win32utils.get_local_appdata_location()
+        self._captureVar("LOCALAPPDATA", None)
+        self.assertPathsEqual(first, win32utils.get_local_appdata_location())
+
+    def test_local_appdata_matches_environment(self):
+        # LOCALAPPDATA typically only exists on Vista, so we only attempt to
+        # compare when it exists.
+        lad = win32utils.get_local_appdata_location()
+        env = os.environ.get("LOCALAPPDATA")
+        if env:
+            # XXX - See bug 262874, which asserts the correct encoding is 'mbcs'
+            encoding = osutils.get_user_encoding()
+            self.assertPathsEqual(lad, env.decode(encoding))
+
+
+class TestLocationsPywin32(TestLocationsCtypes):
+
+    _test_needs_features = [Win32comShellFeature]
+
+    def setUp(self):
+        super(TestLocationsPywin32, self).setUp()
+        # We perform the exact same tests after disabling the use of ctypes.
+        # This causes the implementation to fall back to pywin32.
+        self.old_ctypes = win32utils.has_ctypes
+        win32utils.has_ctypes = False
+        self.addCleanup(self.restoreCtypes)
+
+    def restoreCtypes(self):
+        win32utils.has_ctypes = self.old_ctypes

=== modified file 'bzrlib/win32utils.py'
--- a/bzrlib/win32utils.py	2008-08-19 19:44:10 +0000
+++ b/bzrlib/win32utils.py	2008-09-23 17:00:03 +0000
@@ -75,6 +75,10 @@
 except ImportError:
     has_win32api = False
 
+# pulling in win32com.shell is a bit of overhead, and normally we don't need
+# it as ctypes is preferred and common.  lazy_imports and "optional"
+# modules don't work well, so we do our own lazy thing...
+has_win32com_shell = None # Set to True or False once we know for sure...
 
 # Special Win32 API constants
 # Handles of std streams
@@ -84,6 +88,7 @@
 
 # CSIDL constants (from MSDN 2003)
 CSIDL_APPDATA = 0x001A      # Application Data folder
+CSIDL_LOCAL_APPDATA = 0x001c# <user name>\Local Settings\Application Data (non roaming)
 CSIDL_PERSONAL = 0x0005     # My Documents folder
 
 # from winapi C headers
@@ -119,24 +124,58 @@
         return (defaultx, defaulty)
 
 
+def _get_sh_special_folder_path(csidl):
+    """Call SHGetSpecialFolderPathW if available, or return None.
+    
+    Result is always unicode (or None).
+    """
+    if has_ctypes:
+        try:
+            SHGetSpecialFolderPath = \
+                ctypes.windll.shell32.SHGetSpecialFolderPathW
+        except AttributeError:
+            pass
+        else:
+            buf = ctypes.create_unicode_buffer(MAX_PATH)
+            if SHGetSpecialFolderPath(None,buf,csidl,0):
+                return buf.value
+
+    global has_win32com_shell
+    if has_win32com_shell is None:
+        try:
+            from win32com.shell import shell
+            has_win32com_shell = True
+        except ImportError:
+            has_win32com_shell = False
+    if has_win32com_shell:
+        # still need to bind the name locally, but this is fast.
+        from win32com.shell import shell
+        try:
+            return shell.SHGetSpecialFolderPath(0, csidl, 0)
+        except shell.error:
+            # possibly E_NOTIMPL meaning we can't load the function pointer,
+            # or E_FAIL meaning the function failed - regardless, just ignore it
+            pass
+    return None
+
+
 def get_appdata_location():
     """Return Application Data location.
     Return None if we cannot obtain location.
 
-    Returned value can be unicode or plain sring.
+    Windows defines two 'Application Data' folders per user - a 'roaming'
+    one that moves with the user as they logon to different machines, and
+    a 'local' one that stays local to the machine.  This returns the 'roaming'
+    directory, and thus is suitable for storing user-preferences, etc.
+
+    Returned value can be unicode or plain string.
     To convert plain string to unicode use
     s.decode(bzrlib.user_encoding)
+    (XXX - but see bug 262874, which asserts the correct encoding is 'mbcs')
     """
-    if has_ctypes:
-        try:
-            SHGetSpecialFolderPath = \
-                ctypes.windll.shell32.SHGetSpecialFolderPathW
-        except AttributeError:
-            pass
-        else:
-            buf = ctypes.create_unicode_buffer(MAX_PATH)
-            if SHGetSpecialFolderPath(None,buf,CSIDL_APPDATA,0):
-                return buf.value
+    appdata = _get_sh_special_folder_path(CSIDL_APPDATA)
+    if appdata:
+        return appdata
     # from env variable
     appdata = os.environ.get('APPDATA')
     if appdata:
@@ -152,6 +191,31 @@
     return None
 
 
+def get_local_appdata_location():
+    """Return Local Application Data location.
+    Return the same as get_appdata_location() if we cannot obtain location.
+
+    Windows defines two 'Application Data' folders per user - a 'roaming'
+    one that moves with the user as they logon to different machines, and
+    a 'local' one that stays local to the machine.  This returns the 'local'
+    directory, and thus is suitable for caches, temp files and other things
+    which don't need to move with the user.
+
+    Returned value can be unicode or plain string.
+    To convert plain string to unicode use
+    s.decode(bzrlib.user_encoding)
+    (XXX - but see bug 262874, which asserts the correct encoding is 'mbcs')
+    """
+    local = _get_sh_special_folder_path(CSIDL_LOCAL_APPDATA)
+    if local:
+        return local
+    # Vista supplies LOCALAPPDATA, but XP and earlier do not.
+    local = os.environ.get('LOCALAPPDATA')
+    if local:
+        return local
+    return get_appdata_location()
+
+
 def get_home_location():
     """Return user's home location.
     Assume on win32 it's the <My Documents> folder.
@@ -162,16 +226,9 @@
     To convert plain string to unicode use
     s.decode(bzrlib.user_encoding)
     """
-    if has_ctypes:
-        try:
-            SHGetSpecialFolderPath = \
-                ctypes.windll.shell32.SHGetSpecialFolderPathW
-        except AttributeError:
-            pass
-        else:
-            buf = ctypes.create_unicode_buffer(MAX_PATH)
-            if SHGetSpecialFolderPath(None,buf,CSIDL_PERSONAL,0):
-                return buf.value
+    home = _get_sh_special_folder_path(CSIDL_PERSONAL)
+    if home:
+        return home
     # try for HOME env variable
     home = os.path.expanduser('~')
     if home != '~':

=== modified file 'setup.py'
--- a/setup.py	2008-09-23 23:28:27 +0000
+++ b/setup.py	2008-09-24 00:09:49 +0000
@@ -352,6 +352,7 @@
     excludes.append('PyQt4.elementtree.ElementTree')
     includes.append('sip') # extension module required for Qt.
     packages.append('pygments') # colorizer for qbzr
+    packages.append('docutils') # html formatting
     # but we can avoid many Qt4 Dlls.
     dll_excludes.extend(
         """QtAssistantClient4.dll QtCLucene4.dll QtDesigner4.dll
@@ -510,7 +511,7 @@
             plugins = set(dirs)
         x = []
         for i in files:
-            if os.path.splitext(i)[1] not in [".py", ".pyd", ".dll"]:
+            if os.path.splitext(i)[1] not in [".py", ".pyd", ".dll", ".mo"]:
                 continue
             if i == '__init__.py' and root == 'bzrlib/plugins':
                 continue




More information about the bazaar-commits mailing list