Merge lp:~gz/bzr/merge_2.0_to_2.1 into lp:bzr/2.1

[Martin Packman]

Merge 2.0 into 2.1 to pick up fix for lp:686611

[Vincent Ladeuil (vila)]

review: Approve

[Vincent Ladeuil (vila)]

sent to pqm by email

=== modified file 'NEWS'
--- NEWS	2010-12-02 09:20:16 +0000
+++ NEWS	2010-12-16 15:03:09 +0000
@@ -25,6 +25,9 @@
 Bug Fixes
 *********
 
+* Avoid UnicodeDecodeError in ``bzr add`` with multiple files under a non-ascii
+  path on windows from symlink support addition. (Martin [gz], #686611)
+
 * Skip tests that needs a bzr source tree when there isn't one. This is
   needed to succesfully run the test suite for installed versions.
   (Vincent Ladeuil, #644855).
@@ -154,6 +157,9 @@
 Bug Fixes
 *********
 
+* Avoid UnicodeDecodeError in ``bzr add`` with multiple files under a non-ascii
+  path on windows from symlink support addition. (Martin [gz], #686611)
+
 Improvements
 ************
 

=== modified file 'bzrlib/mutabletree.py'
--- bzrlib/mutabletree.py	2010-08-16 01:50:12 +0000
+++ bzrlib/mutabletree.py	2010-12-16 15:03:09 +0000
@@ -395,7 +395,9 @@
 
         # expand any symlinks in the directory part, while leaving the
         # filename alone
-        file_list = map(osutils.normalizepath, file_list)
+        # only expanding if symlinks are supported avoids windows path bugs
+        if osutils.has_symlinks():
+            file_list = map(osutils.normalizepath, file_list)
 
         # validate user file paths and convert all paths to tree
         # relative : it's cheaper to make a tree relative path an abspath

=== modified file 'bzrlib/tests/blackbox/test_add.py'
--- bzrlib/tests/blackbox/test_add.py	2010-02-17 17:11:16 +0000
+++ bzrlib/tests/blackbox/test_add.py	2010-12-16 15:03:09 +0000
@@ -24,7 +24,8 @@
     condition_isinstance,
     split_suite_by_condition,
     multiply_tests,
-    SymlinkFeature
+    SymlinkFeature,
+    UnicodeFilename,
     )
 from bzrlib.tests.blackbox import ExternalBase
 
@@ -224,3 +225,12 @@
         os.symlink(osutils.abspath('target'), 'tree/link')
         out = self.run_bzr(['add', 'tree/link'])[0]
         self.assertEquals(out, 'adding link\n')
+
+    def test_add_multiple_files_in_unicode_cwd(self):
+        """Adding multiple files in a non-ascii cwd, see lp:686611"""
+        self.requireFeature(UnicodeFilename)
+        self.make_branch_and_tree(u"\xA7")
+        self.build_tree([u"\xA7/a", u"\xA7/b"])
+        out, err = self.run_bzr(["add", "a", "b"], working_dir=u"\xA7")
+        self.assertEquals(out, "adding a\n" "adding b\n")
+        self.assertEquals(err, "")