# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1518611775 -32400
# Node ID 707aba4d48b5bdf7a51e4e23b5fcc399c65c2aa2
# Parent  46260fac556348f3600bae2d41af058f131a3460
progress: use '%*d' to pad progress value

Follows up 7f5108e58083. The problem of '% Nd' is that ' ' means we want
{' ' or '-'} as a sign character. We should instead write '%Nd' to pad up
to N characters with space, and N can be '*'.

diff -r 46260fac5563 -r 707aba4d48b5 mercurial/progress.py
--- a/mercurial/progress.py	Wed Feb 14 21:29:27 2018 +0900
+++ b/mercurial/progress.py	Wed Feb 14 21:36:15 2018 +0900
@@ -119,12 +119,7 @@
                 add = topic
             elif indicator == 'number':
                 if total:
-                    padamount = '%d' % len(str(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)
+                    add = b'%*d/%d' % (len(str(total)), pos, total)
                 else:
                     add = str(pos)
             elif indicator.startswith('item') and item: