mirror of
https://github.com/git/git
synced 2024-11-05 18:59:29 +00:00
remote-hg: make sure the encoding is correct
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:
parent
ffaf84c663
commit
ff247d9e56
1 changed files with 11 additions and 1 deletions
|
@ -9,7 +9,7 @@
|
|||
# Then you can clone with:
|
||||
# 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 sys
|
||||
|
@ -391,6 +391,9 @@ def do_import(parser):
|
|||
print "feature export-marks=%s" % path
|
||||
sys.stdout.flush()
|
||||
|
||||
tmp = encoding.encoding
|
||||
encoding.encoding = 'utf-8'
|
||||
|
||||
# lets get all the import lines
|
||||
while parser.check('import'):
|
||||
ref = parser[1]
|
||||
|
@ -409,6 +412,8 @@ def do_import(parser):
|
|||
|
||||
parser.next()
|
||||
|
||||
encoding.encoding = tmp
|
||||
|
||||
print 'done'
|
||||
|
||||
def parse_blob(parser):
|
||||
|
@ -491,8 +496,13 @@ def parse_commit(parser):
|
|||
files.keys(), getfilectx,
|
||||
user, (date, tz), extra)
|
||||
|
||||
tmp = encoding.encoding
|
||||
encoding.encoding = 'utf-8'
|
||||
|
||||
node = repo.commitctx(ctx)
|
||||
|
||||
encoding.encoding = tmp
|
||||
|
||||
rev = repo[node].rev()
|
||||
|
||||
parsed_refs[ref] = node
|
||||
|
|
Loading…
Reference in a new issue