[PATCH stable v2] convert: use original local encoding when converting from Perforce
Eugene Baranov
eug.baranov at gmail.com
Wed Jul 22 10:59:48 CDT 2015
# HG changeset patch
# User Eugene Baranov <eug.baranov at gmail.com>
# Date 1437580631 -3600
# Wed Jul 22 16:57:11 2015 +0100
# Node ID 67e43f16613874f2c5782ddf11e6f3ee17f1b586
# Parent bcb96f98d9cfade5098a9a12b49714d218441f83
convert: use original local encoding when converting from Perforce
diff -r bcb96f98d9cf -r 67e43f166138 hgext/convert/p4.py
--- a/hgext/convert/p4.py Thu Jul 16 17:57:38 2015 +0100
+++ b/hgext/convert/p4.py Wed Jul 22 16:57:11 2015 +0100
@@ -9,6 +9,7 @@
from mercurial.i18n import _
from common import commit, converter_source, checktool, NoRepo
+import convcmd
import marshal
import re
@@ -139,7 +140,7 @@
self.tags = {}
self.lastbranch = {}
self.parent = {}
- self.encoding = "latin_1"
+ self.encoding = convcmd.orig_encoding
self.depotname = {} # mapping from local name to depot name
self.localname = {} # mapping from depot name to local name
self.re_type = re.compile(
More information about the Mercurial-devel
mailing list