Merge lp:~bialix/bzr/hidden_attr_on_unicode into lp:~bzr/bzr/trunk-old

[Alexander Belchenko]

[Alexander Belchenko (bialix)]

Bzr has one latent bug related to create new .bzr directory inside unicode directory. The problem occurs when unicode path cannot be encoded in current user encoding, as pointed by INADA Naoki, see
https://bugs.launchpad.net/tortoisebzr/+bug/335362/comments/41

This is rare condition, but bug itself is very serious.
Please, merge for 1.17.

(This is 3rd version of my patch, started from merge directive in ML, and now I send it to LP as jml and vila suggested).

[John A Meinel (jameinel)]

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

Alexander Belchenko wrote:
> You have been requested to review the proposed merge of lp:~bialix/bzr/hidden_attr_on_unicode into lp:bzr.
>
> Bzr has one latent bug related to create new .bzr directory inside unicode directory. The problem occurs when unicode path cannot be encoded in current user encoding, as pointed by INADA Naoki, see
> https://bugs.launchpad.net/tortoisebzr/+bug/335362/comments/41
>
> This is rare condition, but bug itself is very serious.
> Please, merge for 1.17.
>
> (This is 3rd version of my patch, started from merge directive in ML, and now I send it to LP as jml and vila suggested).
>
> --
> https://code.launchpad.net/~bialix/bzr/hidden_attr_on_unicode/+merge/8181
> You are requested to review the proposed merge of lp:~bialix/bzr/hidden_attr_on_unicode into lp:bzr.
>

As mentioned on Bundle Buggy, you need to add
"requireFeature(Unicode...)" for the tests, otherwise:

 vote approve

John
=:->

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

iEYEARECAAYFAkpODmcACgkQJdeBCYSNAAMPSQCaA8V9Jw0JCqAfbG1tKbL52tXT
xAcAoI+o5mhlJxLqlw8gKioaCXTEaBzL
=ZGcT
-----END PGP SIGNATURE-----

review: Approve

[Alexander Belchenko (bialix)]

John A Meinel пишет:
> As mentioned on Bundle Buggy, you need to add
> "requireFeature(Unicode...)" for the tests, otherwise:

As I said in ML it's all about windows behavior. Can I just skip tests
when running not on Windows? They have no sense for Linux.

[Vincent Ladeuil (vila)]

Review: approve

>>>>> "bialix" == Alexander Belchenko <email address hidden> writes:

    bialix> John A Meinel пишет:
    >> As mentioned on Bundle Buggy, you need to add
    >> "requireFeature(Unicode...)" for the tests, otherwise:

    bialix> As I said in ML it's all about windows behavior. Can
    bialix> I just skip tests when running not on Windows? They
    bialix> have no sense for Linux.

Sorted out on IRC, I'll merge.

       Vincent

=== modified file 'NEWS'
--- NEWS	2009-07-03 09:16:56 +0000
+++ NEWS	2009-07-03 14:35:11 +0000
@@ -92,6 +92,10 @@
   content plus the size of the compressed text.  Related to bug #109114.
   (John Arbash Meinel)
 
+* Set hidden attribute on .bzr directory below unicode path should never
+  fail with error. The operation should succeed even if bzr unable to set 
+  the attribute.  (Alexander Belchenko, related to bug #335362).
+  
 * Stacking will no longer accept requests to stack on the same
   branch/repository. Existing branches that incorrectly reference the same
   repository in a stacking configuration will now raise

=== modified file 'bzrlib/tests/test_win32utils.py'
--- bzrlib/tests/test_win32utils.py	2009-06-25 10:05:17 +0000
+++ bzrlib/tests/test_win32utils.py	2009-07-03 14:35:11 +0000
@@ -18,7 +18,13 @@
 import sys
 
 from bzrlib import osutils
-from bzrlib.tests import TestCase, TestCaseInTempDir, TestSkipped, Feature
+from bzrlib.tests import (
+    Feature,
+    TestCase,
+    TestCaseInTempDir,
+    TestSkipped,
+    UnicodeFilenameFeature,
+    )
 from bzrlib.win32utils import glob_expand, get_app_path
 from bzrlib import win32utils
 
@@ -238,3 +244,20 @@
 
     def restoreCtypes(self):
         win32utils.has_ctypes = self.old_ctypes
+
+
+class TestSetHidden(TestCaseInTempDir):
+
+    def test_unicode_dir(self):
+        # we should handle unicode paths without errors
+        self.requireFeature(UnicodeFilenameFeature)
+        os.mkdir(u'\u1234')
+        win32utils.set_file_attr_hidden(u'\u1234')
+
+    def test_dot_bzr_in_unicode_dir(self):
+        # we should not raise traceback if we try to set hidden attribute
+        # on .bzr directory below unicode path
+        self.requireFeature(UnicodeFilenameFeature)
+        os.makedirs(u'\u1234\\.bzr')
+        path = osutils.abspath(u'\u1234\\.bzr')
+        win32utils.set_file_attr_hidden(path)

=== modified file 'bzrlib/win32utils.py'
--- bzrlib/win32utils.py	2009-06-26 07:15:24 +0000
+++ bzrlib/win32utils.py	2009-07-03 14:35:11 +0000
@@ -66,6 +66,7 @@
         suffix = 'W'
 try:
     import win32file
+    import pywintypes
     has_win32file = True
 except ImportError:
     has_win32file = False
@@ -499,7 +500,15 @@
 def set_file_attr_hidden(path):
     """Set file attributes to hidden if possible"""
     if has_win32file:
-        win32file.SetFileAttributes(path, win32file.FILE_ATTRIBUTE_HIDDEN)
+        if winver != 'Windows 98':
+            SetFileAttributes = win32file.SetFileAttributesW
+        else:
+            SetFileAttributes = win32file.SetFileAttributes
+        try:
+            SetFileAttributes(path, win32file.FILE_ATTRIBUTE_HIDDEN)
+        except pywintypes.error, e:
+            from bzrlib import trace
+            trace.mutter('Unable to set hidden attribute on %r: %s', path, e)
 
 
 if has_ctypes and winver != 'Windows 98':