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

remote-hg: make sure the encoding is correct

Browse Source 
Independently of the environment.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Jeff King <peff@peff.net>
This commit is contained in:
Felipe Contreras 2012-11-04 03:13:27 +01:00 committed by Jeff King
parent ffaf84c663
commit ff247d9e56
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,7 +9,7 @@
# Then you can clone with: # Then you can clone with:
# git clone hg::/path/to/mercurial/repo/ # git clone hg::/path/to/mercurial/repo/
from mercurial import hg, ui, bookmarks, context, util from mercurial import hg, ui, bookmarks, context, util, encoding
import re import re
import sys import sys
@ -391,6 +391,9 @@ def do_import(parser):
print "feature export-marks=%s" % path print "feature export-marks=%s" % path
sys.stdout.flush() sys.stdout.flush()
tmp = encoding.encoding
encoding.encoding = 'utf-8'
# lets get all the import lines # lets get all the import lines
while parser.check('import'): while parser.check('import'):
ref = parser[1] ref = parser[1]
@ -409,6 +412,8 @@ def do_import(parser):
parser.next() parser.next()
encoding.encoding = tmp
print 'done' print 'done'
def parse_blob(parser): def parse_blob(parser):
@ -491,8 +496,13 @@ def parse_commit(parser):
files.keys(), getfilectx, files.keys(), getfilectx,
user, (date, tz), extra) user, (date, tz), extra)
tmp = encoding.encoding
encoding.encoding = 'utf-8'
node = repo.commitctx(ctx) node = repo.commitctx(ctx)
encoding.encoding = tmp
rev = repo[node].rev() rev = repo[node].rev()
parsed_refs[ref] = node parsed_refs[ref] = node