--- a/contrib/check-code.py Fri Jul 16 13:38:33 2010 +0200
+++ b/contrib/check-code.py Fri Jul 16 14:45:52 2010 +0200
@@ -113,7 +113,7 @@
(r'[^+=*!<>&| -](\s=|=\s)[^= ]',
"wrong whitespace around ="),
(r'raise Exception', "don't raise generic exceptions"),
- (r'ui\.(status|progress|write|note)\([\'\"]x',
+ (r'ui\.(status|progress|write|note|warn)\([\'\"]x',
"warning: unwrapped ui message"),
]
--- a/mercurial/dispatch.py Fri Jul 16 13:38:33 2010 +0200
+++ b/mercurial/dispatch.py Fri Jul 16 14:45:52 2010 +0200
@@ -492,7 +492,7 @@
raise
args.insert(0, repo)
elif rpath:
- ui.warn("warning: --repository ignored\n")
+ ui.warn(_("warning: --repository ignored\n"))
d = lambda: util.checksignature(func)(ui, *args, **cmdoptions)
return runcommand(lui, repo, cmd, fullargs, ui, options, d,
--- a/mercurial/repair.py Fri Jul 16 13:38:33 2010 +0200
+++ b/mercurial/repair.py Fri Jul 16 14:45:52 2010 +0200
@@ -150,9 +150,10 @@
os.unlink(chgrpfile)
except:
if backupfile:
- ui.warn("strip failed, full bundle stored in '%s'\n" % backupfile)
+ ui.warn(_("strip failed, full bundle stored in '%s'\n")
+ % backupfile)
elif saveheads:
- ui.warn("strip failed, partial bundle stored in '%s'\n"
+ ui.warn(_("strip failed, partial bundle stored in '%s'\n")
% chgrpfile)
raise
--- a/mercurial/ui.py Fri Jul 16 13:38:33 2010 +0200
+++ b/mercurial/ui.py Fri Jul 16 14:45:52 2010 +0200
@@ -304,7 +304,7 @@
p = self.config('paths', loc)
if p:
if '%%' in p:
- self.warn("(deprecated '%%' in path %s=%s from %s)\n" %
+ self.warn(_("(deprecated '%%' in path %s=%s from %s)\n") %
(loc, p, self.configsource('paths', loc)))
p = p.replace('%%', '%')
p = util.expandpath(p)