This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5687

revpair: simplify revpair by always relying on smartset.first/last
ClosedPublic

Authored by martinvonz on Jan 24 2019, 3:51 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG5079242abef9: revpair: simplify revpair by always relying on smartset.first/last
rHG90636f6a2022: revpair: simplify revpair by always relying on smartset.first/last
Summary

I thinkt the code was written the way it was because it comes from
97b2f26dfc43 (revpair: smartset compatibility, 2014-03-20) and the
first/last methods came only later, in 228b0aafb1ce (smartset: add
first and last methods, 2014-10-06).

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

martinvonz created this revision.Jan 24 2019, 3:51 PM
Closed by commit rHG90636f6a2022: revpair: simplify revpair by always relying on smartset.first/last (authored by martinvonz). · Explain WhyJan 25 2019, 3:03 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/scmutil.py (13 lines)

Diff 13457

mercurial/scmutil.py

return tree and tree[0] in ('range', 'rangepre', 'rangepost', 'rangeall') return tree and tree[0] in ('range', 'rangepre', 'rangepost', 'rangeall')
def revpair(repo, revs): def revpair(repo, revs):
if not revs: if not revs:
return repo['.'], repo[None] return repo['.'], repo[None]
l = revrange(repo, revs) l = revrange(repo, revs)
if not l:
first = second = None
elif l.isascending():
first = l.min()
second = l.max()
elif l.isdescending():
first = l.max()
second = l.min()
else:
first = l.first() first = l.first()
second = l.last() second = l.last()
if first is None: if first is None:
raise error.Abort(_('empty revision range')) raise error.Abort(_('empty revision range'))
if (first == second and len(revs) >= 2 if (first == second and len(revs) >= 2
and not all(revrange(repo, [r]) for r in revs)): and not all(revrange(repo, [r]) for r in revs)):
raise error.Abort(_('empty revision on one side of range')) raise error.Abort(_('empty revision on one side of range'))
# if top-level is range expression, the result must always be a pair # if top-level is range expression, the result must always be a pair