Rev 1836: (jam) cleanup for win32, close open file handles,
tests pass in /home/pqm/archives/thelove/bzr/+trunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Mon Jul 3 14:56:49 BST 2006
------------------------------------------------------------
revno: 1836
revision-id: pqm at pqm.ubuntu.com-20060703135648-b927e5efb9f5b907
parent: pqm at pqm.ubuntu.com-20060703134539-82008abdbc3ba1d4
parent: john at arbash-meinel.com-20060703134852-295eeb195b8e2811
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-07-03 14:56:48 +0100
message:
(jam) cleanup for win32, close open file handles, tests pass
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/doc/api/branch.txt branch.txt-20060130010728-d96c35d50b205aed
bzrlib/doc/api/transport.txt transport.txt-20051224020744-66b4fb564d98a5a5
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/lock.py lock.py-20050527050856-ec090bb51bc03349
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/patch.py patch.py-20050513021216-ad183543f56ee2e5
bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
bzrlib/tests/repository_implementations/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_urlutils.py test_urlutils.py-20060502192900-46b1f9579987cf9c
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/textfile.py textfile.py-20060415001558-9cc2f3652ca99f97
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
------------------------------------------------------------
merged: john at arbash-meinel.com-20060703134852-295eeb195b8e2811
parent: john at arbash-meinel.com-20060703133234-8bd4ed928210ba39
parent: pqm at pqm.ubuntu.com-20060703134539-82008abdbc3ba1d4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32-accepted
timestamp: Mon 2006-07-03 08:48:52 -0500
message:
[merge] bzr.dev 1835
------------------------------------------------------------
merged: john at arbash-meinel.com-20060703133234-8bd4ed928210ba39
parent: john at arbash-meinel.com-20060703133054-308be6e88ef781a9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32-accepted
timestamp: Mon 2006-07-03 08:32:34 -0500
message:
NEWS
------------------------------------------------------------
merged: john at arbash-meinel.com-20060703133054-308be6e88ef781a9
parent: john at arbash-meinel.com-20060630145815-6d4609646dd6a5d6
parent: john at arbash-meinel.com-20060702035858-414b2de9dec7519a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32-accepted
timestamp: Mon 2006-07-03 08:30:54 -0500
message:
[merge] win32: all tests now pass
------------------------------------------------------------
merged: john at arbash-meinel.com-20060702035858-414b2de9dec7519a
parent: john at arbash-meinel.com-20060702033618-8e8d68c805f04abe
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Sat 2006-07-01 22:58:58 -0500
message:
Factor out i18n bundle tests, so we don't always skip.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060702033618-8e8d68c805f04abe
parent: john at arbash-meinel.com-20060702025043-e193b9de3448367e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Sat 2006-07-01 22:36:18 -0500
message:
Include a test to ensure bundles handle trailing whitespace.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060702025043-e193b9de3448367e
parent: john at arbash-meinel.com-20060702014041-e524bbb85dc3c8f8
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Sat 2006-07-01 21:50:43 -0500
message:
Fix order of compare_trees in bundle tests.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060702014041-e524bbb85dc3c8f8
parent: john at arbash-meinel.com-20060701123742-395c3a2e03ea1297
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Sat 2006-07-01 20:40:41 -0500
message:
Switch from a trailing space to a beginning space, which is supported everywhere.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060701123742-395c3a2e03ea1297
parent: john at arbash-meinel.com-20060701123059-4a0d5d179ef3b0ae
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Sat 2006-07-01 07:37:42 -0500
message:
Clean up win32 locks when they fail to lock, so we don't try to unlock them later.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060701123059-4a0d5d179ef3b0ae
parent: john at arbash-meinel.com-20060701121706-ec8d4120552b20c3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Sat 2006-07-01 07:30:59 -0500
message:
Switch to using TestSkipped for old win32 problems
------------------------------------------------------------
merged: john at arbash-meinel.com-20060701121706-ec8d4120552b20c3
parent: john at arbash-meinel.com-20060701120602-4c069d6d929c9544
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Sat 2006-07-01 07:17:06 -0500
message:
Switch to using TestSkipped for fileid_involved tests.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060701120602-4c069d6d929c9544
parent: john at arbash-meinel.com-20060630224322-c8e53eefd1a8b9f6
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Sat 2006-07-01 07:06:02 -0500
message:
clean up the WorkingTree.open_containing tests
------------------------------------------------------------
merged: john at arbash-meinel.com-20060630224322-c8e53eefd1a8b9f6
parent: john at arbash-meinel.com-20060630224239-7c908c96a5e3d3ab
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Fri 2006-06-30 17:43:22 -0500
message:
Investigating why test_bundle fails, something isn't transmitting properly.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060630224239-7c908c96a5e3d3ab
parent: john at arbash-meinel.com-20060630220100-5e348dced9dfd531
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Fri 2006-06-30 17:42:39 -0500
message:
Linux raises EBUSY when renaming current directory
------------------------------------------------------------
merged: john at arbash-meinel.com-20060630220100-5e348dced9dfd531
parent: john at arbash-meinel.com-20060630213852-8a2dd85d080541a1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Fri 2006-06-30 17:01:00 -0500
message:
try/finally to close files, _KnitData was keeping a handle to a file it never used again, and using transport.rename() when it wanted transport.move()
------------------------------------------------------------
merged: john at arbash-meinel.com-20060630213852-8a2dd85d080541a1
parent: john at arbash-meinel.com-20060630212207-88ba561ade589f52
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Fri 2006-06-30 16:38:52 -0500
message:
check_text_file was leaving the file handle open, now it closes.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060630212207-88ba561ade589f52
parent: john at arbash-meinel.com-20060630174220-1c10cc7585f94c07
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Fri 2006-06-30 16:22:07 -0500
message:
The api doc tests were using invalid paths on win32, fix them
------------------------------------------------------------
merged: john at arbash-meinel.com-20060630174220-1c10cc7585f94c07
parent: john at arbash-meinel.com-20060630172730-1e373a1881c2b424
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Fri 2006-06-30 12:42:20 -0500
message:
transform: cleanup the temporary file even if unique_add fails.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060630172730-1e373a1881c2b424
parent: john at arbash-meinel.com-20060630172527-6d36c06a13dc7110
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Fri 2006-06-30 12:27:30 -0500
message:
Run the merge_core tests underneath the current test directory, rather than TEMP
------------------------------------------------------------
merged: john at arbash-meinel.com-20060630172527-6d36c06a13dc7110
parent: john at arbash-meinel.com-20060630165652-c70cb466db18846d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Fri 2006-06-30 12:25:27 -0500
message:
always close files, minor PEP8 cleanup
------------------------------------------------------------
merged: john at arbash-meinel.com-20060630165652-c70cb466db18846d
parent: john at arbash-meinel.com-20060630165336-0711b06bfb42dc37
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Fri 2006-06-30 11:56:52 -0500
message:
file:// urls look slightly different on win32
------------------------------------------------------------
merged: john at arbash-meinel.com-20060630165336-0711b06bfb42dc37
parent: john at arbash-meinel.com-20060630164834-dcf36d722fcecb86
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Fri 2006-06-30 11:53:36 -0500
message:
Old repository formats didn't support double locking on win32, don't raise errors
------------------------------------------------------------
merged: john at arbash-meinel.com-20060630164834-dcf36d722fcecb86
parent: john at arbash-meinel.com-20060630164222-e5bff724acaf456e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Fri 2006-06-30 11:48:34 -0500
message:
Delay the extra syscall in _win32_rename until we get a failure.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060630164222-e5bff724acaf456e
parent: john at arbash-meinel.com-20060630160009-eb1cae48254281f7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Fri 2006-06-30 11:42:22 -0500
message:
remove assertDictsEqual
------------------------------------------------------------
merged: john at arbash-meinel.com-20060630160009-eb1cae48254281f7
parent: john at arbash-meinel.com-20060630154053-5817fd370f6044f7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Fri 2006-06-30 11:00:09 -0500
message:
Properly handle the case when you want to turn off executability.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060630154053-5817fd370f6044f7
parent: john at arbash-meinel.com-20060630153222-86afc1dde3d4867d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Fri 2006-06-30 10:40:53 -0500
message:
diff tests check exact texts, should use binary mode for files.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060630153222-86afc1dde3d4867d
parent: john at arbash-meinel.com-20060630151319-d1447bdf800beb34
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Fri 2006-06-30 10:32:22 -0500
message:
Fix expected value for urlutils tests
------------------------------------------------------------
merged: john at arbash-meinel.com-20060630151319-d1447bdf800beb34
parent: john at arbash-meinel.com-20060630133754-4f8a64140f1cbddb
parent: pqm at pqm.ubuntu.com-20060630150550-7c698ee2cf8678d8
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Fri 2006-06-30 10:13:19 -0500
message:
[merge] bzr.dev 1827
------------------------------------------------------------
merged: john at arbash-meinel.com-20060630133754-4f8a64140f1cbddb
parent: john at arbash-meinel.com-20060629233654-922fe7dba1ed58c8
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Fri 2006-06-30 08:37:54 -0500
message:
Clean up the documentation for run_bzr_error on Martin's suggestion.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060629233654-922fe7dba1ed58c8
parent: john at arbash-meinel.com-20060629212308-49ece3a5d9b1a4f1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Thu 2006-06-29 18:36:54 -0500
message:
Nothing to clean up if self._log_file is None
------------------------------------------------------------
merged: john at arbash-meinel.com-20060629212308-49ece3a5d9b1a4f1
parent: john at arbash-meinel.com-20060629204629-28d58b0591966eea
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Thu 2006-06-29 16:23:08 -0500
message:
call tearDown() when tests are skipped
------------------------------------------------------------
merged: john at arbash-meinel.com-20060629204629-28d58b0591966eea
parent: john at arbash-meinel.com-20060629204440-c611f39cb86767f4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Thu 2006-06-29 15:46:29 -0500
message:
Use try/finally inside create_file for TreeTransform to ensure the file handle gets closed
------------------------------------------------------------
merged: john at arbash-meinel.com-20060629204440-c611f39cb86767f4
parent: john at arbash-meinel.com-20060629202643-db14152615498634
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Thu 2006-06-29 15:44:40 -0500
message:
Don't squelch errors in tt.finalize()
------------------------------------------------------------
merged: john at arbash-meinel.com-20060629202643-db14152615498634
parent: john at arbash-meinel.com-20060629195725-a536f5de2c7c1141
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Thu 2006-06-29 15:26:43 -0500
message:
Change _win32_rename() so that it raises ENOENT *before* it tries any renaming.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060629195725-a536f5de2c7c1141
parent: john at arbash-meinel.com-20060629193805-42b6fe906d106a04
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Thu 2006-06-29 14:57:25 -0500
message:
Call finalize() though it doesn't help to release resources to allow cleanup.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060629193805-42b6fe906d106a04
parent: john at arbash-meinel.com-20060629165841-eb1e32b66f812cbc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Thu 2006-06-29 14:38:05 -0500
message:
Fix test_fileid_involved so it uses TreeTransform to set the executable bits rather than chmod()
------------------------------------------------------------
merged: john at arbash-meinel.com-20060629165841-eb1e32b66f812cbc
parent: john at arbash-meinel.com-20060629152201-73a22eac267ff59d
parent: john at arbash-meinel.com-20060629165235-5dda727d9baa5237
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Thu 2006-06-29 11:58:41 -0500
message:
[merge] jam-integration, get remerge test fixes.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060629152201-73a22eac267ff59d
parent: john at arbash-meinel.com-20060629052505-264154e2fba31efd
parent: john at arbash-meinel.com-20060629144844-cb4d5cd64763c4fa
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Thu 2006-06-29 10:22:01 -0500
message:
refactor test_executable into smaller tests.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060629052505-264154e2fba31efd
parent: john at arbash-meinel.com-20060629052217-8c439d2cd0b243b7
parent: pqm at pqm.ubuntu.com-20060629034618-75fa8c0c1b44421e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Thu 2006-06-29 00:25:05 -0500
message:
[merge] bzr.dev 1821
More information about the bazaar-commits
mailing list