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>

diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg
index a5023c92fa834addabf29ee9d533f2dcfb58365c..503a9fc324296c640c4a43c98ad41f5f0dd385e3 100755 (executable)
--- a/contrib/remote-helpers/git-remote-hg
+++ b/contrib/remote-helpers/git-remote-hg
@@ -9,7 +9,7 @@
 # Then you can clone with:
 # git clone hg::/path/to/mercurial/repo/
 
 # 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
 
 import re
 import sys


@@ -391,6 +391,9 @@ def do_import(parser):
     print "feature export-marks=%s" % path
     sys.stdout.flush()
 
     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]
     # lets get all the import lines
     while parser.check('import'):
         ref = parser[1]


@@ -409,6 +412,8 @@ def do_import(parser):
 
         parser.next()
 
 
         parser.next()
 

+    encoding.encoding = tmp
+

     print 'done'
 
 def parse_blob(parser):
     print 'done'
 
 def parse_blob(parser):


@@ -491,8 +496,13 @@ def parse_commit(parser):
             files.keys(), getfilectx,
             user, (date, tz), extra)
 
             files.keys(), getfilectx,
             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()
 
     parsed_refs[ref] = node
     rev = repo[node].rev()
 
     parsed_refs[ref] = node