Mercurial > public > mercurial-scm > hg-stable

diff mercurial/subrepo.py @ 20868:5db105f216c3 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
i18n: fix "% inside _()" problems Before this patch, "contrib/check-code.py" can't detect these problems, because the regexp pattern to detect "% inside _()" doesn't suppose the case that the format string and "%" aren't placed in the same line. This patch replaces "\s" in that regexp pattern with "[ \t\n]" to detect "% inside _()" problems in such case. "[\s\n]" can't be used in this purpose, because "\s" is automatically replaced with "[ \t]" by "_preparepats()" and "\s" in "[]" causes nested "[]" unexpectedly.
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Tue, 01 Apr 2014 02:46:03 +0900
parents e5641536e4d5
children 9658a79968c6
line wrap: on
line diff
--- a/mercurial/subrepo.py	Tue Apr 01 02:46:03 2014 +0900
+++ b/mercurial/subrepo.py	Tue Apr 01 02:46:03 2014 +0900
@@ -321,8 +321,8 @@
         for f in names:
             if f.lower() == 'hgrc':
                 ui.warn(
-                    _("warning: removing potentially hostile .hg/hgrc in '%s'"
-                      % path))
+                    _("warning: removing potentially hostile .hg/hgrc in '%s'")
+                      % path)
                 os.unlink(os.path.join(dirname, f))
     os.walk(path, v, None)