Rev 3728: add win32utils.get_local_appdata_location() (mhammond) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Tue Sep 23 19:15:16 BST 2008
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3728
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 05:15:23 +0000
+++ b/NEWS 2008-09-23 17:46:27 +0000
@@ -81,6 +81,9 @@
* A new hook, ``Branch.open``, has been added, which is called when
branch objects are opened. (Robert Collins)
+ * New win32utils.get_local_appdata_location() provides access to a local
+ directory for storing data. (Mark Hammond)
+
bzr 1.7rc2 IN DEVELOPMENT
-------------------------
=== 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_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 != '~':
More information about the bazaar-commits
mailing list