Submitter | phabricator |
---|---|
Date | Feb. 13, 2018, 4:13 p.m. |
Message ID | <differential-rev-PHID-DREV-nvx2x2qupwnysqr4hea2-req@phab.mercurial-scm.org> |
Download | mbox | patch |
Permalink | /patch/27822/ |
State | Superseded |
Headers | show |
Comments
indygreg accepted this revision. indygreg added a comment. This revision is now accepted and ready to land. Ugh. Maybe `.format()` would be better here. We can use that in 3.5 for bytes, right? REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2226 To: durin42, #hg-reviewers, indygreg Cc: indygreg, mercurial-devel
durin42 added a comment. In https://phab.mercurial-scm.org/D2226#36921, @indygreg wrote: > Ugh. Maybe `.format()` would be better here. We can use that in 3.5 for bytes, right? Python 3.6.2 (default, Jul 17 2017, 17:35:42) [GCC 4.2.1 Compatible Apple LLVM 8.1.0 (clang-802.0.42)] on darwin Type "help", "copyright", "credits" or "license" for more information. >>> b''.format Traceback (most recent call last): File "<stdin>", line 1, in <module> AttributeError: 'bytes' object has no attribute 'format' Sigh. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2226 To: durin42, #hg-reviewers, indygreg Cc: indygreg, mercurial-devel
yuja added a comment. Maybe we want `'%d'`, not `'% d'`? The latter means to use `' '` in place of `'+'` sign. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2226 To: durin42, #hg-reviewers, indygreg Cc: yuja, indygreg, mercurial-devel
Patch
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: