D3300: fix: port most of the way to python 3
durin42 (Augie Fackler)
phabricator at mercurial-scm.org
Fri Apr 13 04:22:37 EDT 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG1edf3738e000: fix: port most of the way to python 3 (authored by durin42, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3300?vs=8093&id=8108
REVISION DETAIL
https://phab.mercurial-scm.org/D3300
AFFECTED FILES
hgext/fix.py
CHANGE DETAILS
diff --git a/hgext/fix.py b/hgext/fix.py
--- a/hgext/fix.py
+++ b/hgext/fix.py
@@ -66,6 +66,7 @@
mdiff,
merge,
obsolete,
+ pycompat,
registrar,
scmutil,
util,
@@ -126,6 +127,7 @@
revisions are not forgotten in later ones. The --base flag can be used to
override this default behavior, though it is not usually desirable to do so.
"""
+ opts = pycompat.byteskwargs(opts)
if opts['all']:
if opts['rev']:
raise error.Abort(_('cannot specify both "--rev" and "--all"'))
@@ -513,7 +515,8 @@
result[name] = Fixer()
attrs = ui.configsuboptions('fix', name)[1]
for key in FIXER_ATTRS:
- setattr(result[name], '_' + key, attrs.get(key, ''))
+ setattr(result[name], pycompat.sysstr('_' + key),
+ attrs.get(key, ''))
return result
def fixernames(ui):
To: durin42, #hg-reviewers, pulkit
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list