This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11559

phase: avoid a no-op resolution of revset from revnums
ClosedPublic

Authored by martinvonz on Oct 1 2021, 3:51 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGb067d22dc6ad: phase: avoid a no-op resolution of revset from revnums
Summary

I was surprised that scmutil.revrange() supports integers in the
list of revsets. I think it's clearer to not pass a list that's known
to contain only integers into the function.

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.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (6 lines)

Diff 30545

mercurial/commands.py

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
if opts[name]: if opts[name]:
if targetphase is not None: if targetphase is not None:
raise error.InputError(_(b'only one phase can be specified')) raise error.InputError(_(b'only one phase can be specified'))
targetphase = idx targetphase = idx
# look for specified revision # look for specified revision
revs = list(revs) revs = list(revs)
revs.extend(opts[b'rev']) revs.extend(opts[b'rev'])
if not revs: if revs:
revs = scmutil.revrange(repo, revs)
else:
# display both parents as the second parent phase can influence # display both parents as the second parent phase can influence
# the phase of a merge commit # the phase of a merge commit
revs = [c.rev() for c in repo[None].parents()] revs = [c.rev() for c in repo[None].parents()]
revs = scmutil.revrange(repo, revs)
ret = 0 ret = 0
if targetphase is None: if targetphase is None:
# display # display
for r in revs: for r in revs:
ctx = repo[r] ctx = repo[r]
ui.write(b'%i: %s\n' % (ctx.rev(), ctx.phasestr())) ui.write(b'%i: %s\n' % (ctx.rev(), ctx.phasestr()))
else: else:
with repo.lock(), repo.transaction(b"phase") as tr: with repo.lock(), repo.transaction(b"phase") as tr: