remote-bzr: add utf-8 support for pushing

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/contrib/remote-helpers/git-remote-bzr b/contrib/remote-helpers/git-remote-bzr
index 0bd0759d7ffb9014c1bd12ee4bca69f53e4f8c2b..fad4a48cdc4567cb732ddaed616d6e2365bab620 100755 (executable)
--- a/contrib/remote-helpers/git-remote-bzr
+++ b/contrib/remote-helpers/git-remote-bzr
@@ -512,6 +512,11 @@ class CustomTree():
     def get_symlink_target(self, file_id):
         return self.updates[file_id]['data']
 
     def get_symlink_target(self, file_id):
         return self.updates[file_id]['data']
 

+def c_style_unescape(string):
+    if string[0] == string[-1] == '"':
+        return string.decode('string-escape')[1:-1]
+    return string
+

 def parse_commit(parser):
     global marks, blob_marks, bmarks, parsed_refs
     global mode
 def parse_commit(parser):
     global marks, blob_marks, bmarks, parsed_refs
     global mode


@@ -551,6 +556,7 @@ def parse_commit(parser):
             f = { 'deleted' : True }
         else:
             die('Unknown file command: %s' % line)
             f = { 'deleted' : True }
         else:
             die('Unknown file command: %s' % line)

+        path = c_style_unescape(path).decode('utf-8')

         files[path] = f
 
     repo = parser.repo
         files[path] = f
 
     repo = parser.repo

diff --git a/contrib/remote-helpers/test-bzr.sh b/contrib/remote-helpers/test-bzr.sh
index 6eacf09a9bf5df5c04400bb59d558ab781be3fc2..4d71f711a6d032acfe4c1dc92d1c308ee56b1b80 100755 (executable)
--- a/contrib/remote-helpers/test-bzr.sh
+++ b/contrib/remote-helpers/test-bzr.sh
@@ -204,4 +204,35 @@ test_expect_success 'fetch utf-8 filenames' '
   test_cmp expected actual
 '
 
   test_cmp expected actual
 '
 

+test_expect_success 'push utf-8 filenames' '
+  mkdir -p tmp && cd tmp &&
+  test_when_finished "cd .. && rm -rf tmp && LC_ALL=C" &&
+
+  export LC_ALL=en_US.UTF-8
+
+  (
+  bzr init bzrrepo &&
+  cd bzrrepo &&
+
+  echo one >> content &&
+  bzr add content &&
+  bzr commit -m one
+  ) &&
+
+  (
+  git clone "bzr::$PWD/bzrrepo" gitrepo &&
+  cd gitrepo &&
+
+  echo test >> "áéíóú" &&
+  git add "áéíóú" &&
+  git commit -m utf-8 &&
+
+  git push
+  ) &&
+
+  (cd bzrrepo && bzr ls > ../actual) &&
+  echo -e "content\náéíóú" > expected &&
+  test_cmp expected actual
+'
+

 test_done
 test_done