( )⚙ D11561 errors: raise InputError from revpair() iff revset provided by the user

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11561

errors: raise InputError from revpair() iff revset provided by the user
ClosedPublic

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

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGb74e128676d4: errors: raise InputError from revpair() iff revset provided by the user
Summary

Same reasoning as for revrange() in an earlier patch.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Revision Contents
Changeset List

PathPackages
Mhgext/extdiff.py (3 lines)
Mmercurial/commands.py (4 lines)
Mmercurial/logcmdutil.py (12 lines)
Mtests/autodiff.py (3 lines)

Diff 30518

hgext/extdiff.py

) )
from mercurial import ( from mercurial import (
archival, archival,
cmdutil, cmdutil,
encoding, encoding,
error, error,
filemerge, filemerge,
formatter, formatter,
logcmdutil,
pycompat, pycompat,
registrar, registrar,
scmutil, scmutil,
util, util,
) )
from mercurial.utils import ( from mercurial.utils import (
procutil, procutil,
stringutil, stringutil,
elif from_rev or to_rev: elif from_rev or to_rev:
repo = scmutil.unhidehashlikerevs( repo = scmutil.unhidehashlikerevs(
repo, [from_rev] + [to_rev], b'nowarn' repo, [from_rev] + [to_rev], b'nowarn'
) )
ctx1a = scmutil.revsingle(repo, from_rev, None) ctx1a = scmutil.revsingle(repo, from_rev, None)
ctx1b = repo[nullrev] ctx1b = repo[nullrev]
ctx2 = scmutil.revsingle(repo, to_rev, None) ctx2 = scmutil.revsingle(repo, to_rev, None)
else: else:
ctx1a, ctx2 = scmutil.revpair(repo, revs) ctx1a, ctx2 = logcmdutil.revpair(repo, revs)
if not revs: if not revs:
ctx1b = repo[None].p2() ctx1b = repo[None].p2()
else: else:
ctx1b = repo[nullrev] ctx1b = repo[nullrev]
# 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 ctx1b.rev() == nullrev: if ctx1b.rev() == nullrev:

mercurial/commands.py

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
elif from_rev or to_rev: elif from_rev or to_rev:
repo = scmutil.unhidehashlikerevs( repo = scmutil.unhidehashlikerevs(
repo, [from_rev] + [to_rev], b'nowarn' repo, [from_rev] + [to_rev], b'nowarn'
) )
ctx1 = scmutil.revsingle(repo, from_rev, None) ctx1 = scmutil.revsingle(repo, from_rev, None)
ctx2 = scmutil.revsingle(repo, to_rev, None) ctx2 = scmutil.revsingle(repo, to_rev, None)
else: else:
repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn') repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
ctx1, ctx2 = scmutil.revpair(repo, revs) ctx1, ctx2 = logcmdutil.revpair(repo, revs)
if reverse: if reverse:
ctxleft = ctx2 ctxleft = ctx2
ctxright = ctx1 ctxright = ctx1
else: else:
ctxleft = ctx1 ctxleft = ctx1
ctxright = ctx2 ctxright = ctx2
msg = _(b'cannot use --terse with --rev') msg = _(b'cannot use --terse with --rev')
raise error.InputError(msg) raise error.InputError(msg)
elif change: elif change:
repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn') repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
ctx2 = scmutil.revsingle(repo, change, None) ctx2 = scmutil.revsingle(repo, change, None)
ctx1 = ctx2.p1() ctx1 = ctx2.p1()
else: else:
repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn') repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
ctx1, ctx2 = scmutil.revpair(repo, revs) ctx1, ctx2 = logcmdutil.revpair(repo, revs)
forcerelativevalue = None forcerelativevalue = None
if ui.hasconfig(b'commands', b'status.relative'): if ui.hasconfig(b'commands', b'status.relative'):
forcerelativevalue = ui.configbool(b'commands', b'status.relative') forcerelativevalue = ui.configbool(b'commands', b'status.relative')
uipathfn = scmutil.getuipathfn( uipathfn = scmutil.getuipathfn(
repo, repo,
legacyrelativevalue=bool(pats), legacyrelativevalue=bool(pats),
forcerelativevalue=forcerelativevalue, forcerelativevalue=forcerelativevalue,

mercurial/logcmdutil.py

return smartset.generatorset(revgen(), iterasc=False), filematcher return smartset.generatorset(revgen(), iterasc=False), filematcher
def _makenofollowfilematcher(repo, pats, opts): def _makenofollowfilematcher(repo, pats, opts):
'''hook for extensions to override the filematcher for non-follow cases''' '''hook for extensions to override the filematcher for non-follow cases'''
return None return None
def revpair(repo, revs):
"""Resolves user-provided revset(s) into two revisions.
This just wraps the lower-level scmutil.revpair() in order to raise an
exception indicating user error.
"""
try:
return scmutil.revpair(repo, revs)
except error.RepoLookupError as e:
raise error.InputError(e.args[0], hint=e.hint)
def revrange(repo, specs, localalias=None): def revrange(repo, specs, localalias=None):
"""Resolves user-provided revset(s). """Resolves user-provided revset(s).
This just wraps the lower-level scmutil.revrange() in order to raise an This just wraps the lower-level scmutil.revrange() in order to raise an
exception indicating user error. exception indicating user error.
""" """
try: try:
return scmutil.revrange(repo, specs, localalias) return scmutil.revrange(repo, specs, localalias)

tests/autodiff.py

# Extension dedicated to test patch.diff() upgrade modes # Extension dedicated to test patch.diff() upgrade modes
from __future__ import absolute_import from __future__ import absolute_import
from mercurial import ( from mercurial import (
error, error,
logcmdutil,
patch, patch,
pycompat, pycompat,
registrar, registrar,
scmutil, scmutil,
) )
cmdtable = {} cmdtable = {}
command = registrar.command(cmdtable) command = registrar.command(cmdtable)
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')
ctx1, ctx2 = scmutil.revpair(repo, []) ctx1, ctx2 = logcmdutil.revpair(repo, [])
m = scmutil.match(ctx2, pats, opts) m = scmutil.match(ctx2, pats, opts)
it = patch.diff( it = patch.diff(
repo, repo,
ctx1.node(), ctx1.node(),
ctx2.node(), ctx2.node(),
match=m, match=m,
opts=diffopts, 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))