D2226: progress: use %d to format ints instead of %s
durin42 (Augie Fackler)
phabricator at mercurial-scm.org
Tue Feb 13 16:13:33 UTC 2018
durin42 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
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.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D2226
AFFECTED FILES
mercurial/progress.py
CHANGE DETAILS
diff --git a/mercurial/progress.py b/mercurial/progress.py
--- a/mercurial/progress.py
+++ b/mercurial/progress.py
@@ -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:
To: durin42, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list