configitems: register the 'convert.p4.encoding' config

hgext/convert/__init__.py

@@ -97,6 +97,9 b" configitem('convert', 'ignoreancestorche"
 configitem('convert', 'localtimezone',
     default=False,
 )
+configitem('convert', 'p4.encoding',
+    default=lambda: convcmd.orig_encoding,
+)
 configitem('convert', 'p4.startrev',
     default=0,
 )

hgext/convert/p4.py

@@ -44,9 +44,6 b' def decodefilename(filename):'
 
 class p4_source(common.converter_source):
     def __init__(self, ui, path, revs=None):
-        # avoid import cycle
-        from . import convcmd
-
         super(p4_source, self).__init__(ui, path, revs=revs)
 
         if "/" in path and not path.startswith('//'):
@@ -56,8 +53,7 b' class p4_source(common.converter_source)'
         common.checktool('p4', abort=False)
 
         self.revmap = {}
-        self.encoding = self.ui.config('convert', 'p4.encoding',
-                                       default=convcmd.orig_encoding)
+        self.encoding = self.ui.config('convert', 'p4.encoding')
         self.re_type = re.compile(
             "([a-z]+)?(text|binary|symlink|apple|resource|unicode|utf\d+)"
             "(\+\w+)?$")