changeset 35206:278f1feee73a

scmutil: improve format pattern used in nodesummaries As spotted by Yuya Nishihara, that value is an integer.
author Boris Feld <boris.feld@octobus.net>
date Mon, 04 Dec 2017 09:39:37 +0100
parents 8feef8ef8389
children d210723b73e5
files mercurial/scmutil.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/scmutil.py	Sat Dec 02 17:52:53 2017 -0500
+++ b/mercurial/scmutil.py	Mon Dec 04 09:39:37 2017 +0100
@@ -1284,7 +1284,7 @@
     if len(nodes) <= maxnumnodes or repo.ui.verbose:
         return ' '.join(short(h) for h in nodes)
     first = ' '.join(short(h) for h in nodes[:maxnumnodes])
-    return _("%s and %s others") % (first, len(nodes) - maxnumnodes)
+    return _("%s and %d others") % (first, len(nodes) - maxnumnodes)
 
 def enforcesinglehead(repo, tr, desc):
     """check that no named branch has multiple heads"""