Mercurial: mercurial/commands.py comparison

comparison mercurial/commands.py @ 48118:5105a9975407

errors: raise InputError from revsingle() iff revset provided by the user Same reasoning as for `revrange()` in an earlier patch. Differential Revision: https://phab.mercurial-scm.org/D11562

author	Martin von Zweigbergk <martinvonz@google.com>
date	Tue, 28 Sep 2021 15:11:22 -0700
parents	b74e128676d4
children	607e9322fc89

comparison

equal deleted inserted replaced

-:b74e128676d4
+:5105a9975407
 raise error.InputError(_(b'at least one of -n/-c is required for -l'))
 rev = opts.get(b'rev')
 if rev:
 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
-ctx = scmutil.revsingle(repo, rev)
+ctx = logcmdutil.revsingle(repo, rev)
 ui.pager(b'annotate')
 rootfm = ui.formatter(b'annotate', opts)
 if ui.debugflag:
 shorthex = pycompat.identity
 opts = pycompat.byteskwargs(opts)
 rev = opts.get(b'rev')
 if rev:
 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
-ctx = scmutil.revsingle(repo, rev)
+ctx = logcmdutil.revsingle(repo, rev)
 if not ctx:
 raise error.InputError(
 _(b'no working directory: please specify a revision')
 )
 node = ctx.node()
 if date:
 opts[b'date'] = dateutil.parsedate(date)
 cmdutil.checkunfinished(repo)
 cmdutil.bailifchanged(repo)
-ctx = scmutil.revsingle(repo, rev)
+ctx = logcmdutil.revsingle(repo, rev)
 node = ctx.node()
 op1, op2 = repo.dirstate.parents()
 if not repo.changelog.isancestor(node, op1):
 raise error.InputError(
 """
 opts = pycompat.byteskwargs(opts)
 rev = opts.get(b'rev')
 if rev:
 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
-ctx = scmutil.revsingle(repo, rev)
+ctx = logcmdutil.revsingle(repo, rev)
 m = scmutil.match(ctx, (file1,) + pats, opts)
 fntemplate = opts.pop(b'output', b'')
 if cmdutil.isstdiofilename(fntemplate):
 fntemplate = b''
 cmdutil.check_incompatible_arguments(opts, b'from', [b'rev', b'change'])
 cmdutil.check_incompatible_arguments(opts, b'to', [b'rev', b'change'])
 if change:
 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
-ctx2 = scmutil.revsingle(repo, change, None)
+ctx2 = logcmdutil.revsingle(repo, change, None)
 ctx1 = logcmdutil.diff_parent(ctx2)
 elif from_rev or to_rev:
 repo = scmutil.unhidehashlikerevs(
 repo, [from_rev] + [to_rev], b'nowarn'
 )
-ctx1 = scmutil.revsingle(repo, from_rev, None)
+ctx1 = logcmdutil.revsingle(repo, from_rev, None)
-ctx2 = scmutil.revsingle(repo, to_rev, None)
+ctx2 = logcmdutil.revsingle(repo, to_rev, None)
 else:
 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
 ctx1, ctx2 = logcmdutil.revpair(repo, revs)
 if reverse:
 opts = pycompat.byteskwargs(opts)
 rev = opts.get(b'rev')
 if rev:
 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
-ctx = scmutil.revsingle(repo, rev, None)
+ctx = logcmdutil.revsingle(repo, rev, None)
 end = b'\n'
 if opts.get(b'print0'):
 end = b'\0'
 fmt = b'%s' + end
 revs = logcmdutil.revrange(repo, revs)
 skipped = set()
 basectx = None
 if opts.get('base'):
-basectx = scmutil.revsingle(repo, opts['base'], None)
+basectx = logcmdutil.revsingle(repo, opts['base'], None)
 if basectx is None:
 # check for merges
 for rev in repo.revs(b'%ld and merge()', revs):
 ui.warn(_(b'skipping ungraftable merge revision %d\n') % rev)
 skipped.add(rev)
 opts = pycompat.byteskwargs(opts)
 start = None
 rev = opts.get(b'rev')
 if rev:
 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
-start = scmutil.revsingle(repo, rev, None).node()
+start = logcmdutil.revsingle(repo, rev, None).node()
 if opts.get(b'topo'):
 heads = [repo[h] for h in repo.heads(start)]
 else:
 heads = []
 if bookmarks or b'bookmarks' in fm.datahint():
 fm.data(bookmarks=fm.formatlist(getbms(), name=b'bookmark'))
 else:
 if rev:
 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
-ctx = scmutil.revsingle(repo, rev, None)
+ctx = logcmdutil.revsingle(repo, rev, None)
 if ctx.rev() is None:
 ctx = repo[None]
 parents = ctx.parents()
 taglist = []
 opts = pycompat.byteskwargs(opts)
 if opts.get(b'print0'):
 end = b'\0'
 else:
 end = b'\n'
-ctx = scmutil.revsingle(repo, opts.get(b'rev'), None)
+ctx = logcmdutil.revsingle(repo, opts.get(b'rev'), None)
 ret = 1
 m = scmutil.match(
 ctx, pats, opts, default=b'relglob', badfn=lambda x, y: False
 )
 char = {b'l': b'@', b'x': b'*', b'': b'', b't': b'd'}
 mode = {b'l': b'644', b'x': b'755', b'': b'644', b't': b'755'}
 if node:
 repo = scmutil.unhidehashlikerevs(repo, [node], b'nowarn')
-ctx = scmutil.revsingle(repo, node)
+ctx = logcmdutil.revsingle(repo, node)
 mf = ctx.manifest()
 ui.pager(b'manifest')
 for f in ctx:
 fm.startitem()
 fm.context(ctx=ctx)
 raise error.InputError(_(b"please specify just one revision"))
 if not node:
 node = opts.get(b'rev')
 if node:
-ctx = scmutil.revsingle(repo, node)
+ctx = logcmdutil.revsingle(repo, node)
 else:
 if ui.configbool(b'commands', b'merge.require-rev'):
 raise error.InputError(
 _(
 b'configuration requires specifying revision to merge '
 opts = pycompat.byteskwargs(opts)
 rev = opts.get(b'rev')
 if rev:
 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
-ctx = scmutil.revsingle(repo, rev, None)
+ctx = logcmdutil.revsingle(repo, rev, None)
 if file_:
 m = scmutil.match(ctx, (file_,), opts)
 if m.anypats() or len(m.files()) != 1:
 raise error.InputError(_(b'can only specify an explicit filename'))
 )
 rev = opts.get(b'rev')
 if rev:
 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
-ctx = scmutil.revsingle(repo, rev)
+ctx = logcmdutil.revsingle(repo, rev)
 if not (
 pats
 or opts.get(b'include')
 or opts.get(b'exclude')
 if revs and terse:
 msg = _(b'cannot use --terse with --rev')
 raise error.InputError(msg)
 elif change:
 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
-ctx2 = scmutil.revsingle(repo, change, None)
+ctx2 = logcmdutil.revsingle(repo, change, None)
 ctx1 = ctx2.p1()
 else:
 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
 ctx1, ctx2 = logcmdutil.revpair(repo, revs)
 _(
 b'working directory is not at a branch head '
 b'(use -f to force)'
 )
 )
-node = scmutil.revsingle(repo, rev_).node()
+node = logcmdutil.revsingle(repo, rev_).node()
 if not message:
 # we don't translate commit messages
 message = b'Added tag %s for changeset %s' % (
 b', '.join(names),
 )
 # don't allow tagging the null rev
 if (
 not opts.get(b'remove')
-and scmutil.revsingle(repo, rev_).rev() == nullrev
+and logcmdutil.revsingle(repo, rev_).rev() == nullrev
 ):
 raise error.InputError(_(b"cannot tag null revision"))
 tagsmod.tag(
 repo,
 # if we defined a bookmark, we have to remember the original name
 brev = rev
 if rev:
 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
-ctx = scmutil.revsingle(repo, rev, default=None)
+ctx = logcmdutil.revsingle(repo, rev, default=None)
 rev = ctx.rev()
 hidden = ctx.hidden()
 overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')}
 with ui.configoverride(overrides, b'update'):
 ret = hg.updatetotally(

Mercurial > hg

comparison mercurial/commands.py @ 48118:5105a9975407