# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 1518535257 18000
# Node ID 7f5108e58083503ea0b992a8d54c6f61ab2990db
# Parent  d541042f32f6a18ee96c31f2333aca9f601162b2
progress: use %d to format ints instead of %s

Due to behavioral changes between '% Ns' and '% Nd' this has some
unfortunate extra dancing. I'm not sure of a better way to solve this
problem.

Differential Revision: https://phab.mercurial-scm.org/D2226

diff -r d541042f32f6 -r 7f5108e58083 mercurial/progress.py
--- a/mercurial/progress.py	Tue Feb 13 08:43:14 2018 -0500
+++ b/mercurial/progress.py	Tue Feb 13 10:20:57 2018 -0500
@@ -120,7 +120,11 @@
             elif indicator == 'number':
                 if total:
                     padamount = '%d' % len(str(total))
-                    add = ('% '+ padamount + 's/%s') % (pos, total)
+                    # '% 1d' % 1 adds an extra space compared to '% 1s' % 1.
+                    # To avoid this change in output, we convert to a string
+                    # first, then do the padding.
+                    spos = '%d' % pos
+                    add = ('% '+ padamount + 's/%d') % (spos, total)
                 else:
                     add = str(pos)
             elif indicator.startswith('item') and item: