Merge branch 'ap/remote-hg-unquote-cquote' into maint
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:
commit
4bc3d3fca0
@ -678,6 +678,11 @@ def get_merge_files(repo, p1, p2, files):
|
||||
f = { 'ctx' : repo[p1][e] }
|
||||
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):
|
||||
global marks, blob_marks, parsed_refs
|
||||
global mode
|
||||
@ -720,6 +725,7 @@ def parse_commit(parser):
|
||||
f = { 'deleted' : True }
|
||||
else:
|
||||
die('Unknown file command: %s' % line)
|
||||
path = c_style_unescape(path).decode('utf-8')
|
||||
files[path] = f
|
||||
|
||||
# only export the commits if we are on an internal proxy repo
|
||||
|
Loading…
Reference in New Issue
Block a user