D2355: py3: use pycompat.byteskwargs in hgext/convert/
pulkit (Pulkit Goyal)
phabricator at mercurial-scm.org
Tue Feb 20 08:34:08 EST 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG93943eef696f: py3: use pycompat.byteskwargs in hgext/convert/ (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D2355?vs=5923&id=5933
REVISION DETAIL
https://phab.mercurial-scm.org/D2355
AFFECTED FILES
hgext/convert/common.py
hgext/convert/convcmd.py
hgext/convert/cvsps.py
hgext/convert/monotone.py
CHANGE DETAILS
diff --git a/hgext/convert/monotone.py b/hgext/convert/monotone.py
--- a/hgext/convert/monotone.py
+++ b/hgext/convert/monotone.py
@@ -13,6 +13,7 @@
from mercurial.i18n import _
from mercurial import (
error,
+ pycompat,
util,
)
@@ -89,6 +90,7 @@
def mtnrunstdio(self, *args, **kwargs):
# Prepare the command in automate stdio format
+ kwargs = pycompat.byteskwargs(kwargs)
command = []
for k, v in kwargs.iteritems():
command.append("%s:%s" % (len(k), k))
diff --git a/hgext/convert/cvsps.py b/hgext/convert/cvsps.py
--- a/hgext/convert/cvsps.py
+++ b/hgext/convert/cvsps.py
@@ -855,6 +855,7 @@
repository, and convert the log to changesets based on matching
commit log entries and dates.
'''
+ opts = pycompat.byteskwargs(opts)
if opts["new_cache"]:
cache = "write"
elif opts["update_cache"]:
diff --git a/hgext/convert/convcmd.py b/hgext/convert/convcmd.py
--- a/hgext/convert/convcmd.py
+++ b/hgext/convert/convcmd.py
@@ -567,6 +567,7 @@
self.map.close()
def convert(ui, src, dest=None, revmapfile=None, **opts):
+ opts = pycompat.byteskwargs(opts)
global orig_encoding
orig_encoding = encoding.encoding
encoding.encoding = 'UTF-8'
diff --git a/hgext/convert/common.py b/hgext/convert/common.py
--- a/hgext/convert/common.py
+++ b/hgext/convert/common.py
@@ -18,6 +18,7 @@
encoding,
error,
phases,
+ pycompat,
util,
)
@@ -322,6 +323,7 @@
pass
def _cmdline(self, cmd, *args, **kwargs):
+ kwargs = pycompat.byteskwargs(kwargs)
cmdline = [self.command, cmd] + list(args)
for k, v in kwargs.iteritems():
if len(k) == 1:
To: pulkit, #hg-reviewers, yuja
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list