mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-01 23:07:55 +01:00
Code Activity

remote-bzr: add utf-8 support for fetching

Browse source 
[fc: added tests]

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Timotheus Pokorra 2013-04-05 21:49:22 -06:00 committed by Junio C Hamano
parent 8954441ac7
commit 5445b24e22
2 changed files with 27 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
contrib/remote-helpers/git-remote-bzr
View file

@ -223,7 +223,7 @@ def export_files(tree, files):
# is the blog already exported? # is the blog already exported?
if h in filenodes: if h in filenodes:
mark = filenodes[h] mark = filenodes[h]
final.append((mode, mark, path)) final.append((mode, mark, path.encode('utf-8')))
continue continue
d = tree.get_file_text(fid) d = tree.get_file_text(fid)
@ -240,7 +240,7 @@ def export_files(tree, files):
print "data %d" % len(d) print "data %d" % len(d)
print d print d
final.append((mode, mark, path)) final.append((mode, mark, path.encode('utf-8')))
return final return final

25
contrib/remote-helpers/test-bzr.sh
View file

@ -179,4 +179,29 @@ test_expect_success 'different authors' '
test_cmp expected actual test_cmp expected actual
' '
test_expect_success 'fetch 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 test >> "áéíóú" &&
bzr add "áéíóú" &&
bzr commit -m utf-8
) &&
(
git clone "bzr::$PWD/bzrrepo" gitrepo &&
cd gitrepo &&
git ls-files > ../actual
) &&
echo "\"\\303\\241\\303\\251\\303\\255\\303\\263\\303\\272\"" > expected &&
test_cmp expected actual
'
test_done test_done