Skip to content

Commit

Permalink
Merge branch 'ap/remote-hg-unquote-cquote' into maint
Browse files Browse the repository at this point in the history
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
  • Loading branch information
gitster committed Nov 8, 2013
2 parents 9196a2f + 1136265 commit 4bc3d3f
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions contrib/remote-helpers/git-remote-hg
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 4bc3d3f

Please sign in to comment.