D1183: cmdutil: fix status tersing on Python 3
durin42 (Augie Fackler)
phabricator at mercurial-scm.org
Wed Oct 18 22:30:52 UTC 2017
durin42 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D1183
AFFECTED FILES
mercurial/cmdutil.py
CHANGE DETAILS
diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -526,7 +526,7 @@
allst = ('m', 'a', 'r', 'd', 'u', 'i', 'c')
# checking the argument validity
- for s in terseargs:
+ for s in pycompat.bytestr(terseargs):
if s not in allst:
raise error.Abort(_("'%s' not recognized") % s)
@@ -537,9 +537,10 @@
tersedict = {}
for attrname in pstatus:
+ statuschar = attrname[0:1]
for f in getattr(statuslist, attrname):
- rootobj.addfile(f, attrname[0])
- tersedict[attrname[0]] = []
+ rootobj.addfile(f, statuschar)
+ tersedict[statuschar] = []
# we won't be tersing the root dir, so add files in it
for st, fpath in rootobj.iterfilepaths():
To: durin42, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list