Rev 1796: (jam) misc win32 fixes (#50155),
fix bundle merging in /home/pqm/archives/thelove/bzr/+trunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Tue Jun 20 02:17:51 BST 2006
------------------------------------------------------------
revno: 1796
revision-id: pqm at pqm.ubuntu.com-20060620011749-a14183c559028aaf
parent: pqm at pqm.ubuntu.com-20060620005432-e393f791e07d2cc8
parent: john at arbash-meinel.com-20060620010414-6046fc4038b56bf0
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-06-20 02:17:49 +0100
message:
(jam) misc win32 fixes (#50155), fix bundle merging
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/read_bundle.py read_changeset.py-20050619171944-c0d95aa685537640
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/msgeditor.py msgeditor.py-20050901111708-ef6d8de98f5d8f2f
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/tests/EncodingAdapter.py EncodingAdapter.py-20060113032051-4d7e1d8c1e38b4a1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_non_ascii.py test_non_ascii.py-20060105214030-68010be784a5d854
bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/test_urlutils.py test_urlutils.py-20060502192900-46b1f9579987cf9c
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/urlutils.py urlutils.py-20060502195429-e8a161ecf8fac004
------------------------------------------------------------
merged: john at arbash-meinel.com-20060620010414-6046fc4038b56bf0
parent: john at arbash-meinel.com-20060619002441-1a4c4d05883a2169
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Mon 2006-06-19 20:04:14 -0500
message:
Workaround was not needed, already solved by using get_transport() and catching PathError
------------------------------------------------------------
merged: john at arbash-meinel.com-20060619002441-1a4c4d05883a2169
parent: john at arbash-meinel.com-20060618193913-88164e4b8df30cd9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Sun 2006-06-18 19:24:41 -0500
message:
Restore merging from a local directory by handling EACCES properly on win32
------------------------------------------------------------
merged: john at arbash-meinel.com-20060618193913-88164e4b8df30cd9
parent: john at arbash-meinel.com-20060618185840-94e61f576c5d7f99
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Sun 2006-06-18 14:39:13 -0500
message:
Bundles were still using os.path.join to compute paths rather than osutils.pathjoin
------------------------------------------------------------
merged: john at arbash-meinel.com-20060618185840-94e61f576c5d7f99
parent: john at arbash-meinel.com-20060618185623-854bdd0fbc4f230f
parent: pqm at pqm.ubuntu.com-20060618160241-5b3082bb8de0192a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Sun 2006-06-18 13:58:40 -0500
message:
[merge] bzr.dev SFTP fixes.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060618185623-854bdd0fbc4f230f
parent: john at arbash-meinel.com-20060618160959-afd0920eb393cb3c
parent: pqm at pqm.ubuntu.com-20060618053944-9dbfbd1db2c79933
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Sun 2006-06-18 13:56:23 -0500
message:
[merge] bzr.dev 1790
------------------------------------------------------------
merged: john at arbash-meinel.com-20060618160959-afd0920eb393cb3c
parent: john at arbash-meinel.com-20060611034017-d9629b49091e2df6
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Sun 2006-06-18 11:09:59 -0500
message:
Add Aaron's --strict testament patch to help with debugging.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060611034017-d9629b49091e2df6
parent: john at arbash-meinel.com-20060611033742-ee98bd12abd089ae
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Sat 2006-06-10 22:40:17 -0500
message:
Only interpret HTTP paths as utf8 on win32
------------------------------------------------------------
merged: john at arbash-meinel.com-20060611033742-ee98bd12abd089ae
parent: john at arbash-meinel.com-20060611032330-74baa5055e28de6b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Sat 2006-06-10 22:37:42 -0500
message:
Custom HttpRequestHandler which treats all paths as utf8 encoded
------------------------------------------------------------
merged: john at arbash-meinel.com-20060611032330-74baa5055e28de6b
parent: john at arbash-meinel.com-20060611030928-502d4af47bd62fe1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Sat 2006-06-10 22:23:30 -0500
message:
Use line_endings='binary' for win32
------------------------------------------------------------
merged: john at arbash-meinel.com-20060611030928-502d4af47bd62fe1
parent: john at arbash-meinel.com-20060611025743-c6532be451a525be
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Sat 2006-06-10 22:09:28 -0500
message:
Remove cp437 from the set of encodings, it isn't strictly needed
------------------------------------------------------------
merged: john at arbash-meinel.com-20060611025743-c6532be451a525be
parent: john at arbash-meinel.com-20060611024651-720ff62ba21f9690
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Sat 2006-06-10 21:57:43 -0500
message:
Skip non_ascii tests that won't write properly to the screen
------------------------------------------------------------
merged: john at arbash-meinel.com-20060611024651-720ff62ba21f9690
parent: john at arbash-meinel.com-20060611022255-d65cae68762dca6a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Sat 2006-06-10 21:46:51 -0500
message:
Pull out sys.stdout.encoding handling into a separate function so it can be tested, and used elsewhere.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060611022255-d65cae68762dca6a
parent: john at arbash-meinel.com-20060611015903-a8bb9a06144e70d1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Sat 2006-06-10 21:22:55 -0500
message:
In general, python on win32 needs to use the unicode os api, because bytestream stuff just doesn't work.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060611015903-a8bb9a06144e70d1
parent: john at arbash-meinel.com-20060611015702-7313e9016f468377
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Sat 2006-06-10 20:59:03 -0500
message:
switch to prefering lowercase drive letters, since that matches os.getcwd() drive letters
------------------------------------------------------------
merged: john at arbash-meinel.com-20060611015702-7313e9016f468377
parent: john at arbash-meinel.com-20060611013811-1e34025ff9fb98af
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Sat 2006-06-10 20:57:02 -0500
message:
Adding cp437, which is my default encoding on windows
------------------------------------------------------------
merged: john at arbash-meinel.com-20060611013811-1e34025ff9fb98af
parent: john at arbash-meinel.com-20060610145351-9da0c1f8ba8a57e0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Sat 2006-06-10 20:38:11 -0500
message:
Removing hacks for _win32_abspath, on real win32 abspath handles unicode just fine, it doesn't handle encoding into 'mbcs'
------------------------------------------------------------
merged: john at arbash-meinel.com-20060610145351-9da0c1f8ba8a57e0
parent: john at arbash-meinel.com-20060610142745-1f86eec922285e65
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Sat 2006-06-10 09:53:51 -0500
message:
the _posix_* routines should use posixpath not os.path, so tests pass on win32
------------------------------------------------------------
merged: john at arbash-meinel.com-20060610142745-1f86eec922285e65
parent: john at arbash-meinel.com-20060610141001-c9fe064ba2f03b34
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Sat 2006-06-10 09:27:45 -0500
message:
Fix some broken tests because of stupid ntpath.abspath behavior
------------------------------------------------------------
merged: john at arbash-meinel.com-20060610141001-c9fe064ba2f03b34
parent: jfmeinel at Ghazal-20060610135801-1ed9433a07de5f6c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Sat 2006-06-10 09:10:01 -0500
message:
Alexander recommended a better short russian string.
------------------------------------------------------------
merged: jfmeinel at Ghazal-20060610135801-1ed9433a07de5f6c
parent: john at arbash-meinel.com-20060610134238-b5f70141bc325f26
committer: jfmeinel <jfmeinel at Ghazal>
branch nick: win32
timestamp: Sat 2006-06-10 08:58:01 -0500
message:
current python may be running in a path that has a space, so properly quote the python exe name. for test_msgeditor
------------------------------------------------------------
merged: john at arbash-meinel.com-20060610134238-b5f70141bc325f26
parent: john at arbash-meinel.com-20060610132724-01a44fdb1f0097b5
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Sat 2006-06-10 08:42:38 -0500
message:
del is not an executable program on win32, you must use cmd /c del
More information about the bazaar-commits
mailing list