[merge] win32- more test suite fixes

[John Arbash Meinel]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

In merge.py we were using an try/except clause that was hiding real
errors. Aaron agreed that we should remove it.

In other parts of the code, we were expecting to get ENOENT if we tried
to rename the current working directory. fancy_rename() gets EPERM,
because it tries to rename the target out of the way, before trying to
rename the from into position.
So I change _win32_rename() so that it stats the from first, forcing ENOENT.

the test test_fileids_affected_by was expecting os.chmod() to work.
So I switched it to use TreeTransform.set_executability() which does
work on all platforms.

Also, the same test thought it was handling when certain characters were
invalid on the filesystem, but it really wasn't. So I fixed that.
(It wasn't setting self.branch but never actually checked that it wasn't
properly set up)

TreeTransform wasn't properly closing a file descriptor, so I put it in
 a try/finally.

All of these patches are in my win32 branch.

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFEpEn3JdeBCYSNAAMRAi+cAKCcOs4ohLsQ/93BUwxnszyEbtNDLwCbB8JB
ISHGIp5QUtpb5NxgHSsEZu0=
=LhKU
-----END PGP SIGNATURE-----
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: win32-test-suite-cleanups.diff
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20060629/d72ad095/attachment.diff