This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4688

py3: use '%d' instead of '%s' for integers
ClosedPublic

Authored by pulkit on Sep 20 2018, 6:00 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG7303ab86431a: py3: use '%d' instead of '%s' for integers
Summary

Python 3 does not allow to use '%s' for integers.

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

pulkit created this revision.Sep 20 2018, 6:00 PM
indygreg added a subscriber: indygreg.Sep 20 2018, 6:32 PM
indygreg added inline comments.
mercurial/commands.py
4881–4884

IMO we should be using hex nodes here instead of revision numbers. But that was a preexisting condition. Meh.

Closed by commit rHG7303ab86431a: py3: use '%d' instead of '%s' for integers (authored by pulkit). · Explain WhySep 20 2018, 6:33 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (4 lines)

Diff 11252

mercurial/commands.py

hint = _("uncommitted merge, use --all to discard all changes," hint = _("uncommitted merge, use --all to discard all changes,"
" or 'hg update -C .' to abort the merge") " or 'hg update -C .' to abort the merge")
raise error.Abort(msg, hint=hint) raise error.Abort(msg, hint=hint)
dirty = any(repo.status()) dirty = any(repo.status())
node = ctx.node() node = ctx.node()
if node != parent: if node != parent:
if dirty: if dirty:
hint = _("uncommitted changes, use --all to discard all" hint = _("uncommitted changes, use --all to discard all"
" changes, or 'hg update %s' to update") % ctx.rev() " changes, or 'hg update %d' to update") % ctx.rev()
else: else:
hint = _("use --all to revert all files," hint = _("use --all to revert all files,"
" or 'hg update %s' to update") % ctx.rev() " or 'hg update %d' to update") % ctx.rev()
indygregUnsubmitted
Not Done

IMO we should be using hex nodes here instead of revision numbers. But that was a preexisting condition. Meh.

indygreg: IMO we should be using hex nodes here instead of revision numbers. But that was a preexisting…
elif dirty: elif dirty:
hint = _("uncommitted changes, use --all to discard all changes") hint = _("uncommitted changes, use --all to discard all changes")
else: else:
hint = _("use --all to revert all files") hint = _("use --all to revert all files")
raise error.Abort(msg, hint=hint) raise error.Abort(msg, hint=hint)
return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats,
**pycompat.strkwargs(opts)) **pycompat.strkwargs(opts))