Merge lp:~bialix/bzr/lock-unicode-win32 into lp:~bzr/bzr/trunk-old

[Alexander Belchenko]

[Alexander Belchenko (bialix)]

This is mandatory for 1.17 to avoid regressions re OS locks on unicode paths on Windows. Previously there is landed patch from Martin <gzlist> to use CreateFile API for locking. But that patch does not use unicode API on Windows NT based systems.

Please, merge.

=== modified file 'bzrlib/help_topics/en/debug-flags.txt'
--- bzrlib/help_topics/en/debug-flags.txt	2009-03-18 23:43:51 +0000
+++ bzrlib/help_topics/en/debug-flags.txt	2009-07-07 09:35:11 +0000
@@ -15,6 +15,8 @@
 -Dhashcache       Log every time a working file is read to determine its hash.
 -Dhooks           Trace hook execution.
 -Dhpss            Trace smart protocol requests and responses.
+-Dhpssdetail      More hpss details.
+-Dhpssvfs         Traceback on vfs access to Remote objects.
 -Dhttp            Trace http connections, requests and responses
 -Dindex           Trace major index operations.
 -Dknit            Trace knit operations.

=== modified file 'bzrlib/lock.py'
--- bzrlib/lock.py	2009-06-19 10:04:02 +0000
+++ bzrlib/lock.py	2009-07-07 09:35:10 +0000
@@ -301,13 +301,19 @@
 
 
 if have_pywin32 and sys.platform == 'win32':
+    if os.path.supports_unicode_filenames:
+        # for Windows NT/2K/XP/etc
+        win32file_CreateFile = win32file.CreateFileW
+    else:
+        # for Windows 98
+        win32file_CreateFile = win32file.CreateFile
 
     class _w32c_FileLock(_OSLock):
 
         def _open(self, filename, access, share, cflags, pymode):
             self.filename = osutils.realpath(filename)
             try:
-                self._handle = win32file.CreateFile(filename, access, share,
+                self._handle = win32file_CreateFile(filename, access, share,
                     None, win32file.OPEN_ALWAYS,
                     win32file.FILE_ATTRIBUTE_NORMAL, None)
             except pywintypes.error, e:

=== modified file 'bzrlib/remote.py'
--- bzrlib/remote.py	2009-06-26 09:24:34 +0000
+++ bzrlib/remote.py	2009-07-07 09:35:11 +0000
@@ -723,7 +723,7 @@
         invocation. If in doubt chat to the bzr network team.
         """
         if self._real_repository is None:
-            if 'hpss' in debug.debug_flags:
+            if 'hpssvfs' in debug.debug_flags:
                 import traceback
                 warning('VFS Repository access triggered\n%s',
                     ''.join(traceback.format_stack()))

=== modified file 'bzrlib/smart/medium.py'
--- bzrlib/smart/medium.py	2009-06-10 03:56:49 +0000
+++ bzrlib/smart/medium.py	2009-07-07 09:35:11 +0000
@@ -472,7 +472,8 @@
         if not line.endswith('\n'):
             # end of file encountered reading from server
             raise errors.ConnectionReset(
-                "please check connectivity and permissions")
+                "Unexpected end of message. Please check connectivity "
+                "and permissions, and report a bug if problems persist.")
         return line
 
     def _read_line(self):

=== modified file 'bzrlib/smart/message.py'
--- bzrlib/smart/message.py	2009-04-24 00:45:11 +0000
+++ bzrlib/smart/message.py	2009-07-07 09:35:11 +0000
@@ -283,7 +283,9 @@
                     self._protocol_decoder._get_in_buffer()[:10],
                     self._protocol_decoder.state_accept.__name__)
             raise errors.ConnectionReset(
-                "please check connectivity and permissions")
+                "Unexpected end of message. "
+                "Please check connectivity and permissions, and report a bug "
+                "if problems persist.")
         self._protocol_decoder.accept_bytes(bytes)
 
     def protocol_error(self, exception):

=== modified file 'bzrlib/tests/per_lock/__init__.py'
--- bzrlib/tests/per_lock/__init__.py	2009-03-23 14:59:43 +0000
+++ bzrlib/tests/per_lock/__init__.py	2009-07-07 09:35:11 +0000
@@ -39,7 +39,6 @@
     return result
 
 
-
 def load_tests(standard_tests, module, loader):
     submod_tests = loader.loadTestsFromModuleNames([
         'bzrlib.tests.per_lock.test_lock',

=== modified file 'bzrlib/tests/per_lock/test_lock.py'
--- bzrlib/tests/per_lock/test_lock.py	2009-03-23 14:59:43 +0000
+++ bzrlib/tests/per_lock/test_lock.py	2009-07-07 09:35:11 +0000
@@ -21,6 +21,7 @@
     osutils,
     )
 
+from bzrlib.tests import UnicodeFilenameFeature
 from bzrlib.tests.per_lock import TestCaseWithLock
 
 
@@ -160,3 +161,18 @@
                 b_lock.unlock()
             if c_lock is not None:
                 c_lock.unlock()
+
+
+class TestLockUnicodePath(TestCaseWithLock):
+
+    _test_needs_features = [UnicodeFilenameFeature]
+
+    def test_read_lock(self):
+        self.build_tree([u'\u1234'])
+        u_lock = self.read_lock(u'\u1234')
+        self.addCleanup(u_lock.unlock)
+
+    def test_write_lock(self):
+        self.build_tree([u'\u1234'])
+        u_lock = self.write_lock(u'\u1234')
+        self.addCleanup(u_lock.unlock)

=== modified file 'bzrlib/tests/test_smart_transport.py'
--- bzrlib/tests/test_smart_transport.py	2009-07-04 08:37:34 +0000
+++ bzrlib/tests/test_smart_transport.py	2009-07-07 09:35:11 +0000
@@ -1507,7 +1507,8 @@
         ex = self.assertRaises(errors.ConnectionReset,
             response_handler.read_response_tuple)
         self.assertEqual("Connection closed: "
-            "please check connectivity and permissions ",
+            "Unexpected end of message. Please check connectivity "
+            "and permissions, and report a bug if problems persist. ",
             str(ex))
 
     def test_server_offset_serialisation(self):