This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2146

py3: port string formatting
ClosedPublic

Authored by indygreg on Feb 11 2018, 5:57 PM.

Details

Reviewers
yuja
pulkit
Group Reviewers
hg-reviewers
Commits
rHG6eb7d95f8970: py3: port string formatting
Summary

skipped is a set of integer revs here. So cast integers to
strings using %d.

None doesn't cast to an empty string on Python 3. So use '' explicitly.

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

indygreg created this revision.Feb 11 2018, 5:57 PM
yuja requested changes to this revision.Feb 11 2018, 8:43 PM
yuja added a subscriber: yuja.

r looks like an integer, and bytes(int) is '\0' * int.

This revision now requires changes to proceed.Feb 11 2018, 8:43 PM
indygreg edited the summary of this revision. (Show Details)Feb 11 2018, 9:35 PM
indygreg added a child revision: D2152: py3: compare against bytes instead of str.
indygreg updated this revision to Diff 5452.
pulkit accepted this revision.Feb 12 2018, 2:14 AM
yuja accepted this revision.Feb 13 2018, 7:11 AM
This revision is now accepted and ready to land.Feb 13 2018, 7:11 AM
Closed by commit rHG6eb7d95f8970: py3: port string formatting (authored by indygreg). · Explain WhyFeb 13 2018, 7:24 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (2 lines)

Diff 5628

hgext/rebase.py

# recompute the set of skipped revs # recompute the set of skipped revs
if not collapse: if not collapse:
seen = set(destmap.values()) seen = set(destmap.values())
for old, new in sorted(state.items()): for old, new in sorted(state.items()):
if new != revtodo and new in seen: if new != revtodo and new in seen:
skipped.add(old) skipped.add(old)
seen.add(new) seen.add(new)
repo.ui.debug('computed skipped revs: %s\n' % repo.ui.debug('computed skipped revs: %s\n' %
(' '.join(str(r) for r in sorted(skipped)) or None)) (' '.join('%d' % r for r in sorted(skipped)) or ''))
repo.ui.debug('rebase status resumed\n') repo.ui.debug('rebase status resumed\n')
self.originalwd = originalwd self.originalwd = originalwd
self.destmap = destmap self.destmap = destmap
self.state = state self.state = state
self.skipped = skipped self.skipped = skipped
self.collapsef = collapse self.collapsef = collapse
self.keepf = keep self.keepf = keep