##// END OF EJS Templates
revset: use {force,}bytestr to fix some %r formatting issues...
Augie Fackler -
r36598:04e50037 default
parent child Browse files
Show More
@@ -1011,7 +1011,8 b' def grep(repo, subset, x):'
1011 # i18n: "grep" is a keyword
1011 # i18n: "grep" is a keyword
1012 gr = re.compile(getstring(x, _("grep requires a string")))
1012 gr = re.compile(getstring(x, _("grep requires a string")))
1013 except re.error as e:
1013 except re.error as e:
1014 raise error.ParseError(_('invalid match pattern: %s') % e)
1014 raise error.ParseError(
1015 _('invalid match pattern: %s') % util.forcebytestr(e))
1015
1016
1016 def matches(x):
1017 def matches(x):
1017 c = repo[x]
1018 c = repo[x]
@@ -1845,7 +1846,8 b' def _getsortargs(x):'
1845 if reverse:
1846 if reverse:
1846 k = k[1:]
1847 k = k[1:]
1847 if k not in _sortkeyfuncs and k != 'topo':
1848 if k not in _sortkeyfuncs and k != 'topo':
1848 raise error.ParseError(_("unknown sort key %r") % fk)
1849 raise error.ParseError(
1850 _("unknown sort key %r") % pycompat.bytestr(fk))
1849 keyflags.append((k, reverse))
1851 keyflags.append((k, reverse))
1850
1852
1851 if len(keyflags) > 1 and any(k == 'topo' for k, reverse in keyflags):
1853 if len(keyflags) > 1 and any(k == 'topo' for k, reverse in keyflags):
General Comments 0
You need to be logged in to leave comments. Login now