This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3005

scmutil: introduce deprecated alias for revpair()
ClosedPublic

Authored by martinvonz on Apr 1 2018, 3:10 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG7c0f40f4f7bf: scmutil: introduce deprecated alias for revpair()
Summary

revsingle() returns a context object, revpair() returns nodeids,
revrange() returns integer revisions (in a revset). I'm going to
reduce this inconsistency by making revpair() return context
objects. Changing the return type is not nice to extensions, so this
patch introduces a nodeid-returning version of revpair() that they can
detect and use. Update callers to the new function so we can change
revpair() itself and then migrate them back one by one.

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.Apr 1 2018, 3:10 AM
Closed by commit rHG7c0f40f4f7bf: scmutil: introduce deprecated alias for revpair() (authored by martinvonz). · Explain WhyApr 1 2018, 6:36 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/extdiff.py (2 lines)
Mmercurial/commands.py (4 lines)
Mmercurial/fileset.py (2 lines)
Mmercurial/scmutil.py (3 lines)
Mtests/autodiff.py (2 lines)

Diff 7493

hgext/extdiff.py

if revs and change: if revs and change:
msg = _('cannot specify --rev and --change at the same time') msg = _('cannot specify --rev and --change at the same time')
raise error.Abort(msg) raise error.Abort(msg)
elif change: elif change:
node2 = scmutil.revsingle(repo, change, None).node() node2 = scmutil.revsingle(repo, change, None).node()
node1a, node1b = repo.changelog.parents(node2) node1a, node1b = repo.changelog.parents(node2)
else: else:
node1a, node2 = scmutil.revpair(repo, revs) node1a, node2 = scmutil.revpairnodes(repo, revs)
if not revs: if not revs:
node1b = repo.dirstate.p2() node1b = repo.dirstate.p2()
else: else:
node1b = nullid node1b = nullid
# Disable 3-way merge if there is only one parent # Disable 3-way merge if there is only one parent
if do3way: if do3way:
if node1b == nullid: if node1b == nullid:

mercurial/commands.py

msg = _('cannot specify --rev and --change at the same time') msg = _('cannot specify --rev and --change at the same time')
raise error.Abort(msg) raise error.Abort(msg)
elif change: elif change:
repo = scmutil.unhidehashlikerevs(repo, [change], 'nowarn') repo = scmutil.unhidehashlikerevs(repo, [change], 'nowarn')
node2 = scmutil.revsingle(repo, change, None).node() node2 = scmutil.revsingle(repo, change, None).node()
node1 = repo[node2].p1().node() node1 = repo[node2].p1().node()
else: else:
repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn') repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn')
node1, node2 = scmutil.revpair(repo, revs) node1, node2 = scmutil.revpairnodes(repo, revs)
if reverse: if reverse:
node1, node2 = node2, node1 node1, node2 = node2, node1
diffopts = patch.diffallopts(ui, opts) diffopts = patch.diffallopts(ui, opts)
m = scmutil.match(repo[node2], pats, opts) m = scmutil.match(repo[node2], pats, opts)
ui.pager('diff') ui.pager('diff')
logcmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat, logcmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
msg = _('cannot use --terse with --rev') msg = _('cannot use --terse with --rev')
raise error.Abort(msg) raise error.Abort(msg)
elif change: elif change:
repo = scmutil.unhidehashlikerevs(repo, [change], 'nowarn') repo = scmutil.unhidehashlikerevs(repo, [change], 'nowarn')
node2 = scmutil.revsingle(repo, change, None).node() node2 = scmutil.revsingle(repo, change, None).node()
node1 = repo[node2].p1().node() node1 = repo[node2].p1().node()
else: else:
repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn') repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn')
node1, node2 = scmutil.revpair(repo, revs) node1, node2 = scmutil.revpairnodes(repo, revs)
if pats or ui.configbool('commands', 'status.relative'): if pats or ui.configbool('commands', 'status.relative'):
cwd = repo.getcwd() cwd = repo.getcwd()
else: else:
cwd = '' cwd = ''
if opts.get('print0'): if opts.get('print0'):
end = '\0' end = '\0'

mercurial/fileset.py

baseerr = _("first argument to status must be a revision") baseerr = _("first argument to status must be a revision")
baserevspec = getstring(b, baseerr) baserevspec = getstring(b, baseerr)
if not baserevspec: if not baserevspec:
raise error.ParseError(baseerr) raise error.ParseError(baseerr)
reverr = _("second argument to status must be a revision") reverr = _("second argument to status must be a revision")
revspec = getstring(r, reverr) revspec = getstring(r, reverr)
if not revspec: if not revspec:
raise error.ParseError(reverr) raise error.ParseError(reverr)
basenode, node = scmutil.revpair(repo, [baserevspec, revspec]) basenode, node = scmutil.revpairnodes(repo, [baserevspec, revspec])
basectx = repo[basenode] basectx = repo[basenode]
ctx = repo[node] ctx = repo[node]
return getset(mctx.switch(ctx, _buildstatus(ctx, x, basectx=basectx)), x) return getset(mctx.switch(ctx, _buildstatus(ctx, x, basectx=basectx)), x)
@predicate('subrepo([pattern])') @predicate('subrepo([pattern])')
def subrepo(mctx, x): def subrepo(mctx, x):
"""Subrepositories whose paths match the given pattern. """Subrepositories whose paths match the given pattern.
""" """

mercurial/scmutil.py

if not l: if not l:
raise error.Abort(_('empty revision set')) raise error.Abort(_('empty revision set'))
return repo[l.last()] return repo[l.last()]
def _pairspec(revspec): def _pairspec(revspec):
tree = revsetlang.parse(revspec) tree = revsetlang.parse(revspec)
return tree and tree[0] in ('range', 'rangepre', 'rangepost', 'rangeall') return tree and tree[0] in ('range', 'rangepre', 'rangepost', 'rangeall')
def revpairnodes(repo, revs):
return revpair(repo, revs)
def revpair(repo, revs): def revpair(repo, revs):
if not revs: if not revs:
return repo.dirstate.p1(), None return repo.dirstate.p1(), None
l = revrange(repo, revs) l = revrange(repo, revs)
if not l: if not l:
first = second = None first = second = None

tests/autodiff.py

elif git == b'abort': elif git == b'abort':
diffopts.git = False diffopts.git = False
diffopts.upgrade = True diffopts.upgrade = True
def losedatafn(fn=None, **kwargs): def losedatafn(fn=None, **kwargs):
raise error.Abort(b'losing data for %s' % fn) raise error.Abort(b'losing data for %s' % fn)
else: else:
raise error.Abort(b'--git must be yes, no or auto') raise error.Abort(b'--git must be yes, no or auto')
node1, node2 = scmutil.revpair(repo, []) node1, node2 = scmutil.revpairnodes(repo, [])
m = scmutil.match(repo[node2], pats, opts) m = scmutil.match(repo[node2], pats, opts)
it = patch.diff(repo, node1, node2, match=m, opts=diffopts, it = patch.diff(repo, node1, node2, match=m, opts=diffopts,
losedatafn=losedatafn) losedatafn=losedatafn)
for chunk in it: for chunk in it:
ui.write(chunk) ui.write(chunk)
for fn in sorted(brokenfiles): for fn in sorted(brokenfiles):
ui.write((b'data lost for: %s\n' % fn)) ui.write((b'data lost for: %s\n' % fn))