Merge lp:~bialix/bzr/backslashes-more-tests into lp:bzr

[Alexander Belchenko]

This branches provides merge of latest changes in 2.1 to bzr.dev with resolved conflicts.

[Gordon Tyler (doxxx)]

Looks good to me other than the duplication of BackslashDirSeparatorFeature, which also appears in test_win32utils, and the spurious(?) NEWS entry.

review: Approve

[Robert Collins (lifeless)]

We copy forward NEWS entries from old releases to trunk when merging
old releases to trunk, that way the trunk NEWS is accurate. So it
looks ok to me.

[Robert Collins (lifeless)]

I was merging 2.0 -> 2.1 -> trunk to get the pyrex fix, and ended up including the same change this had. I've moved rather than duplicating the feature though.

[Alexander Belchenko (bialix)]

Why you marked it as Rejected?

[Robert Collins (lifeless)]

because I'm landing the same change from a different branch where I
started from a newer 2.1 - I had conflicts trying to incorporate your
branch.

-Rob

[Alexander Belchenko (bialix)]

So, in the end my work by resolving merge conflicts was useless. Heh.

[Robert Collins (lifeless)]

Not useless at all - I looked at your diff as I did it to understand
how it should be resolved; it was just easier overall to do it
separately - because I had more in 2.1 than you'd resolved, bzr wasn't
picking a great ancestor.

-Rob

=== modified file 'NEWS'
--- NEWS	2010-05-19 02:20:50 +0000
+++ NEWS	2010-05-19 14:37:32 +0000
@@ -639,6 +639,10 @@
 Bug Fixes
 *********
 
+* ``bzr clean-tree`` should not delete nested bzrdirs. Required for proper
+  support of bzr-externals and scmproj plugins.
+  (Alexander Belchenko, bug #572098)
+
 * ``bzr switch`` does not die if a ConfigurableFileMerger is used.
   (Aaron Bentley, #559436)
 
 
=== modified file 'bzrlib/tests/test_cmdline.py'
--- bzrlib/tests/test_cmdline.py	2010-03-01 09:02:18 +0000
+++ bzrlib/tests/test_cmdline.py	2010-05-19 14:37:32 +0000
@@ -14,11 +14,29 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
+import os
 
 from bzrlib import (
     cmdline,
     tests)
 
+
+class _BackslashDirSeparatorFeature(tests.Feature):
+
+    def _probe(self):
+        try:
+            os.lstat(os.getcwd() + '\\')
+        except OSError:
+            return False
+        else:
+            return True
+
+    def feature_name(self):
+        return "Filesystem treats '\\' as a directory separator."
+
+BackslashDirSeparatorFeature = _BackslashDirSeparatorFeature()
+
+
 class TestSplitter(tests.TestCase):
 
     def assertAsTokens(self, expected, line, single_quotes_allowed=False):
@@ -91,3 +109,23 @@
             u'"x x" "y y"')
         self.assertAsTokens([(True, u'x x'), (True, u'y y')],
             u'"x x" \'y y\'', single_quotes_allowed=True)
+
+    def test_n_backslashes_handling(self):
+        # https://bugs.launchpad.net/bzr/+bug/528944
+        # actually we care about the doubled backslashes when they're
+        # represents UNC paths.
+        # But in fact there is too much weird corner cases
+        # (see https://bugs.launchpad.net/tortoisebzr/+bug/569050)
+        # so to reproduce every bit of windows command-line handling
+        # could be not worth of efforts?
+        self.requireFeature(BackslashDirSeparatorFeature)
+        self.assertAsTokens([(True, r'\\host\path')], r'"\\host\path"')
+        self.assertAsTokens([(False, r'\\host\path')], r'\\host\path')
+        # handling of " after the 2n and 2n+1 backslashes
+        # inside and outside the quoted string
+        self.assertAsTokens([(True, r'\\'), (False, r'*.py')], r'"\\\\" *.py')
+        self.assertAsTokens([(True, r'\\" *.py')], r'"\\\\\" *.py"')
+        self.assertAsTokens([(True, r'\\ *.py')], r'\\\\" *.py"')
+        self.assertAsTokens([(False, r'\\"'), (False, r'*.py')],
+                            r'\\\\\" *.py')
+        self.assertAsTokens([(True, u'\\\\')], u'"\\\\')