Merge lp:~jelmer/brz/support-backslash into lp:brz

[Jelmer Vernooij]

Support backslashes in filenames.

[Martin Packman (gz)]

Am a little leery of landing this without a better mechanism for dealing with uncheckaboutable files on Windows, but really this doesn't make things much worse than already exists with special filenames. See one inline comment to change.

review: Approve

=== modified file 'breezy/bzr/inventory.py'
--- breezy/bzr/inventory.py	2017-11-13 22:52:33 +0000
+++ breezy/bzr/inventory.py	2018-01-14 05:56:18 +0000
@@ -222,7 +222,7 @@
         Traceback (most recent call last):
         InvalidEntryName: Invalid entry name: src/hello.c
         """
-        if u'/' in name or u'\\' in name:
+        if u'/' in name:
             raise errors.InvalidEntryName(name=name)
         self.file_id = file_id
         self.revision = None

=== modified file 'breezy/tests/features.py'
--- breezy/tests/features.py	2017-11-11 18:13:55 +0000
+++ breezy/tests/features.py	2018-01-14 05:56:18 +0000
@@ -533,6 +533,29 @@
 win32_feature = Win32Feature()
 
 
+class _BackslashFilenameFeature(Feature):
+    """Does the filesystem support backslashes in filenames?"""
+
+    def _probe(self):
+
+        try:
+            fileno, name = tempfile.mkstemp(prefix='bzr\\prefix')
+        except (IOError, OSError):
+            return False
+        else:
+            try:
+                os.stat(name)
+            except (IOError, OSError):
+                # mkstemp succeeded but the file wasn't actually created
+                return False
+            os.close(fileno)
+            os.remove(name)
+            return True
+
+
+BackslashFilenameFeature = _BackslashFilenameFeature()
+
+
 class _ColorFeature(Feature):
 
     def _probe(self):

=== modified file 'breezy/tests/test_features.py'
--- breezy/tests/test_features.py	2017-08-26 19:31:51 +0000
+++ breezy/tests/test_features.py	2018-01-14 05:56:18 +0000
@@ -155,3 +155,12 @@
         # We can't test much more than that because the behaviour depends
         # on the platform.
         features.UnicodeFilenameFeature._probe()
+
+
+class TestBackslashFilenameFeature(tests.TestCase):
+
+    def test_probe_passes(self):
+        """BackslashFilenameFeature._probe passes."""
+        # We can't test much more than that because the behaviour depends
+        # on the platform.
+        features.BackslashFilenameFeature._probe()

=== modified file 'breezy/tests/test_inv.py'
--- breezy/tests/test_inv.py	2017-08-05 01:03:53 +0000
+++ breezy/tests/test_inv.py	2018-01-14 05:56:18 +0000
@@ -700,6 +700,14 @@
 
 class TestInventoryEntry(TestCase):
 
+    def test_file_invalid_entry_name(self):
+        self.assertRaises(errors.InvalidEntryName, inventory.InventoryFile,
+            '123', 'a/hello.c', ROOT_ID)
+
+    def test_file_backslash(self):
+        file = inventory.InventoryFile('123', 'h\\ello.c', ROOT_ID)
+        self.assertEquals(file.name, 'h\\ello.c')
+
     def test_file_kind_character(self):
         file = inventory.InventoryFile('123', 'hello.c', ROOT_ID)
         self.assertEqual(file.kind_character(), '')

=== modified file 'doc/en/release-notes/brz-3.0.txt'
--- doc/en/release-notes/brz-3.0.txt	2017-12-19 22:38:08 +0000
+++ doc/en/release-notes/brz-3.0.txt	2018-01-14 05:56:18 +0000
@@ -152,6 +152,9 @@
 * Avoid writing directly to sys.stdout, but use self.outf in
   Command implementations instead. (#268573, B. Clausius)
 
+* It is now possible to version files with backslashes in their name
+  on platforms that support it. (Jelmer Vernooij, #81844)
+
 Documentation
 *************
 

=== modified file 'doc/en/release-notes/bzr-2.6.txt'
--- doc/en/release-notes/bzr-2.6.txt	2013-08-04 11:45:53 +0000
+++ doc/en/release-notes/bzr-2.6.txt	2018-01-14 05:56:18 +0000
@@ -279,6 +279,9 @@
 Bug Fixes
 *********
 
+.. Fixes for situations where bzr would previously crash or give incorrect
+   or undesirable results.
+
 * Fix ``bzr config`` display for ``RegistryOption`` values.
   (Vincent Ladeuil, #930182)