[PATCH 1 of 7] revset: drop translation markers from error messages of internal _matchfiles
Yuya Nishihara
yuya at tcha.org
Sat Feb 27 14:38:15 UTC 2016
# HG changeset patch
# User Yuya Nishihara <yuya at tcha.org>
# Date 1430790455 -32400
# Tue May 05 10:47:35 2015 +0900
# Node ID 4c869f64c013866cdf49278ffcff981e9074201d
# Parent e8526a30553cde1ec7345cae99b8651ccd72c6c1
revset: drop translation markers from error messages of internal _matchfiles
They are a sort of debug messages, which should never be visible to end users.
diff --git a/mercurial/revset.py b/mercurial/revset.py
--- a/mercurial/revset.py
+++ b/mercurial/revset.py
@@ -1163,13 +1163,11 @@ def _matchfiles(repo, subset, x):
# initialized. Use 'd:' to set the default matching mode, default
# to 'glob'. At most one 'r:' and 'd:' argument can be passed.
- # i18n: "_matchfiles" is a keyword
- l = getargs(x, 1, -1, _("_matchfiles requires at least one argument"))
+ l = getargs(x, 1, -1, "_matchfiles requires at least one argument")
pats, inc, exc = [], [], []
rev, default = None, None
for arg in l:
- # i18n: "_matchfiles" is a keyword
- s = getstring(arg, _("_matchfiles requires string arguments"))
+ s = getstring(arg, "_matchfiles requires string arguments")
prefix, value = s[:2], s[2:]
if prefix == 'p:':
pats.append(value)
@@ -1179,20 +1177,17 @@ def _matchfiles(repo, subset, x):
exc.append(value)
elif prefix == 'r:':
if rev is not None:
- # i18n: "_matchfiles" is a keyword
- raise error.ParseError(_('_matchfiles expected at most one '
- 'revision'))
+ raise error.ParseError('_matchfiles expected at most one '
+ 'revision')
if value != '': # empty means working directory; leave rev as None
rev = value
elif prefix == 'd:':
if default is not None:
- # i18n: "_matchfiles" is a keyword
- raise error.ParseError(_('_matchfiles expected at most one '
- 'default mode'))
+ raise error.ParseError('_matchfiles expected at most one '
+ 'default mode')
default = value
else:
- # i18n: "_matchfiles" is a keyword
- raise error.ParseError(_('invalid _matchfiles prefix: %s') % prefix)
+ raise error.ParseError('invalid _matchfiles prefix: %s' % prefix)
if not default:
default = 'glob'
More information about the Mercurial-devel
mailing list