--- a/hgext/relink.py Thu Oct 15 20:36:12 2015 -0400
+++ b/hgext/relink.py Wed Oct 14 22:29:03 2015 -0400
@@ -84,7 +84,7 @@
total = live * 3 // 2
src = src.store.path
pos = 0
- ui.status(_("tip has %d files, estimated total number of files: %s\n")
+ ui.status(_("tip has %d files, estimated total number of files: %d\n")
% (live, total))
for dirpath, dirnames, filenames in os.walk(src):
dirnames.sort()
--- a/mercurial/mail.py Thu Oct 15 20:36:12 2015 -0400
+++ b/mercurial/mail.py Wed Oct 14 22:29:03 2015 -0400
@@ -127,7 +127,7 @@
else:
defaultport = 25
mailport = util.getport(ui.config('smtp', 'port', defaultport))
- ui.note(_('sending mail: smtp host %s, port %s\n') %
+ ui.note(_('sending mail: smtp host %s, port %d\n') %
(mailhost, mailport))
s.connect(host=mailhost, port=mailport)
if starttls:
--- a/mercurial/revset.py Thu Oct 15 20:36:12 2015 -0400
+++ b/mercurial/revset.py Wed Oct 14 22:29:03 2015 -0400
@@ -2643,7 +2643,7 @@
l = getlist(tree[2])
if len(l) != len(alias.args):
raise error.ParseError(
- _('invalid number of arguments: %s') % len(l))
+ _('invalid number of arguments: %d') % len(l))
l = [_expandaliases(aliases, a, [], cache) for a in l]
result = _expandargs(result, dict(zip(alias.args, l)))
else:
--- a/mercurial/store.py Thu Oct 15 20:36:12 2015 -0400
+++ b/mercurial/store.py Wed Oct 14 22:29:03 2015 -0400
@@ -404,7 +404,7 @@
fp.seek(0)
for n, line in enumerate(fp):
if not line.rstrip('\n'):
- t = _('invalid entry in fncache, line %s') % (n + 1)
+ t = _('invalid entry in fncache, line %d') % (n + 1)
raise error.Abort(t)
fp.close()