Mercurial > public > mercurial-scm > hg-stable

diff mercurial/hg.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 bc56ec9e64df
children 6500a2eebee8
line wrap: on
line diff
--- a/mercurial/hg.py	Tue Apr 01 02:46:03 2014 +0900
+++ b/mercurial/hg.py	Tue Apr 01 02:46:03 2014 +0900
@@ -433,7 +433,7 @@
                         if bn == 'default':
                             status = _("updating to bookmark @\n")
                         else:
-                            status = _("updating to bookmark @ on branch %s\n"
+                            status = (_("updating to bookmark @ on branch %s\n")
                                        % bn)
                     except KeyError:
                         try: