undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ap/remote-hg-unquote-cquote' into maint

Browse Source 
A fast-import stream expresses a pathname with funny characters by
quoting them in C style; remote-hg remote helper (in contrib/)
forgot to unquote such a path.

* ap/remote-hg-unquote-cquote:
  remote-hg: unquote C-style paths when exporting
This commit is contained in:
Junio C Hamano 2013-11-08 12:01:13 -08:00
commit 4bc3d3fca0
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/remote-helpers/git-remote-hg
View File

@ -678,6 +678,11 @@ def get_merge_files(repo, p1, p2, files):
f = { 'ctx' : repo[p1][e] } f = { 'ctx' : repo[p1][e] }
files[e] = f files[e] = f
def c_style_unescape(string):
if string[0] == string[-1] == '"':
return string.decode('string-escape')[1:-1]
return string
def parse_commit(parser): def parse_commit(parser):
global marks, blob_marks, parsed_refs global marks, blob_marks, parsed_refs
global mode global mode
@ -720,6 +725,7 @@ def parse_commit(parser):
f = { 'deleted' : True } f = { 'deleted' : True }
else: else:
die('Unknown file command: %s' % line) die('Unknown file command: %s' % line)
path = c_style_unescape(path).decode('utf-8')
files[path] = f files[path] = f
# only export the commits if we are on an internal proxy repo # only export the commits if we are on an internal proxy repo