This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2226

progress: use %d to format ints instead of %s
ClosedPublic

Authored by durin42 on Feb 13 2018, 11:13 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG7f5108e58083: progress: use %d to format ints instead of %s
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.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

durin42 created this revision.Feb 13 2018, 11:13 AM
indygreg accepted this revision.Feb 13 2018, 12:12 PM
indygreg added a subscriber: indygreg.

Ugh. Maybe .format() would be better here. We can use that in 3.5 for bytes, right?

This revision is now accepted and ready to land.Feb 13 2018, 12:12 PM
Closed by commit rHG7f5108e58083: progress: use %d to format ints instead of %s (authored by durin42). · Explain WhyFeb 13 2018, 12:14 PM
This revision was automatically updated to reflect the committed changes.
durin42 added a comment.Feb 13 2018, 12:16 PM
In 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.

yuja added a subscriber: yuja.Feb 14 2018, 7:20 AM

Maybe we want '%d', not '% d'? The latter means to use ' ' in place
of '+' sign.

Revision Contents
Changeset List

PathPackages
Mmercurial/progress.py (6 lines)

Diff 5639

mercurial/progress.py

tail = '' tail = ''
for indicator in self.order: for indicator in self.order:
add = '' add = ''
if indicator == 'topic': if indicator == 'topic':
add = topic add = topic
elif indicator == 'number': elif indicator == 'number':
if total: if total:
padamount = '%d' % len(str(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: else:
add = str(pos) add = str(pos)
elif indicator.startswith('item') and item: elif indicator.startswith('item') and item:
slice = 'end' slice = 'end'
if '-' in indicator: if '-' in indicator:
wid = int(indicator.split('-')[1]) wid = int(indicator.split('-')[1])
elif '+' in indicator: elif '+' in indicator:
slice = 'beginning' slice = 'beginning'