This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11562

errors: raise InputError from revsingle() 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
rHG5105a9975407: errors: raise InputError from revsingle() iff revset provided by the user
Summary

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

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.Oct 1 2021, 3:51 PM
Alphare accepted this revision.Oct 1 2021, 4:57 PM
This revision is now accepted and ready to land.Oct 1 2021, 4:57 PM

Revision Contents
Changeset List

Diff 30548

hgext/censor.py

from __future__ import absolute_import from __future__ import absolute_import
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial.node import short from mercurial.node import short
from mercurial import ( from mercurial import (
error, error,
logcmdutil,
registrar, registrar,
scmutil, scmutil,
) )
cmdtable = {} cmdtable = {}
command = registrar.command(cmdtable) command = registrar.command(cmdtable)
# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
# extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
m = scmutil.match(wctx, (path,)) m = scmutil.match(wctx, (path,))
if m.anypats() or len(m.files()) != 1: if m.anypats() or len(m.files()) != 1:
raise error.Abort(_(b'can only specify an explicit filename')) raise error.Abort(_(b'can only specify an explicit filename'))
path = m.files()[0] path = m.files()[0]
flog = repo.file(path) flog = repo.file(path)
if not len(flog): if not len(flog):
raise error.Abort(_(b'cannot censor file with no history')) raise error.Abort(_(b'cannot censor file with no history'))
rev = scmutil.revsingle(repo, rev, rev).rev() rev = logcmdutil.revsingle(repo, rev, rev).rev()
try: try:
ctx = repo[rev] ctx = repo[rev]
except KeyError: except KeyError:
raise error.Abort(_(b'invalid revision identifier %s') % rev) raise error.Abort(_(b'invalid revision identifier %s') % rev)
try: try:
fctx = ctx.filectx(path) fctx = ctx.filectx(path)
except error.LookupError: except error.LookupError:

hgext/children.py

from __future__ import absolute_import from __future__ import absolute_import
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial import ( from mercurial import (
cmdutil, cmdutil,
logcmdutil, logcmdutil,
pycompat, pycompat,
registrar, registrar,
scmutil,
) )
templateopts = cmdutil.templateopts templateopts = cmdutil.templateopts
cmdtable = {} cmdtable = {}
command = registrar.command(cmdtable) command = registrar.command(cmdtable)
# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
# extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
hg children => hg log -r "children(.)" hg children => hg log -r "children(.)"
hg children -r REV => hg log -r "children(REV)" hg children -r REV => hg log -r "children(REV)"
See :hg:`help log` and :hg:`help revsets.children`. See :hg:`help log` and :hg:`help revsets.children`.
""" """
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
rev = opts.get(b'rev') rev = opts.get(b'rev')
ctx = scmutil.revsingle(repo, rev) ctx = logcmdutil.revsingle(repo, rev)
if file_: if file_:
fctx = repo.filectx(file_, changeid=ctx.rev()) fctx = repo.filectx(file_, changeid=ctx.rev())
childctxs = [fcctx.changectx() for fcctx in fctx.children()] childctxs = [fcctx.changectx() for fcctx in fctx.children()]
else: else:
childctxs = ctx.children() childctxs = ctx.children()
displayer = logcmdutil.changesetdisplayer(ui, repo, opts) displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
for cctx in childctxs: for cctx in childctxs:
displayer.show(cctx) displayer.show(cctx)
displayer.close() displayer.close()

hgext/closehead.py

# closehead.py - Close arbitrary heads without checking them out first # closehead.py - Close arbitrary heads without checking them out first
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
'''close arbitrary heads without checking them out first''' '''close arbitrary heads without checking them out first'''
from __future__ import absolute_import from __future__ import absolute_import
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial import ( from mercurial import (
bookmarks, bookmarks,
cmdutil, cmdutil,
context, context,
error, error,
logcmdutil,
pycompat, pycompat,
registrar, registrar,
logcmdutil,
) )
cmdtable = {} cmdtable = {}
command = registrar.command(cmdtable) command = registrar.command(cmdtable)
# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
# extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
# be specifying the version(s) of Mercurial they are tested with, or # be specifying the version(s) of Mercurial they are tested with, or
# leave the attribute unspecified. # leave the attribute unspecified.

hgext/extdiff.py

cmdutil.check_at_most_one_arg(opts, b'rev', b'change') cmdutil.check_at_most_one_arg(opts, b'rev', b'change')
revs = opts.get(b'rev') revs = opts.get(b'rev')
from_rev = opts.get(b'from') from_rev = opts.get(b'from')
to_rev = opts.get(b'to') to_rev = opts.get(b'to')
change = opts.get(b'change') change = opts.get(b'change')
do3way = b'$parent2' in cmdline do3way = b'$parent2' in cmdline
if change: if change:
ctx2 = scmutil.revsingle(repo, change, None) ctx2 = logcmdutil.revsingle(repo, change, None)
ctx1a, ctx1b = ctx2.p1(), ctx2.p2() ctx1a, ctx1b = ctx2.p1(), ctx2.p2()
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 = logcmdutil.revsingle(repo, from_rev, None)
ctx1b = repo[nullrev] ctx1b = repo[nullrev]
ctx2 = scmutil.revsingle(repo, to_rev, None) ctx2 = logcmdutil.revsingle(repo, to_rev, None)
else: else:
ctx1a, ctx2 = logcmdutil.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

hgext/fastannotate/commands.py

import os import os
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial import ( from mercurial import (
commands, commands,
encoding, encoding,
error, error,
extensions, extensions,
logcmdutil,
patch, patch,
pycompat, pycompat,
registrar, registrar,
scmutil, scmutil,
util, util,
) )
from . import ( from . import (
if perfhack: if perfhack:
for p in relpats: for p in relpats:
yield os.path.join(reldir, p) yield os.path.join(reldir, p)
else: else:
def bad(x, y): def bad(x, y):
raise error.Abort(b"%s: %s" % (x, y)) raise error.Abort(b"%s: %s" % (x, y))
ctx = scmutil.revsingle(repo, rev) ctx = logcmdutil.revsingle(repo, rev)
m = scmutil.match(ctx, pats, opts, badfn=bad) m = scmutil.match(ctx, pats, opts, badfn=bad)
for p in ctx.walk(m): for p in ctx.walk(m):
yield p yield p
fastannotatecommandargs = { fastannotatecommandargs = {
'options': [ 'options': [
(b'r', b'rev', b'.', _(b'annotate the specified revision'), _(b'REV')), (b'r', b'rev', b'.', _(b'annotate the specified revision'), _(b'REV')),
rev = opts.get(b'REV') or ui.config(b'fastannotate', b'mainbranch') rev = opts.get(b'REV') or ui.config(b'fastannotate', b'mainbranch')
if not rev: if not rev:
raise error.Abort( raise error.Abort(
_(b'you need to provide a revision'), _(b'you need to provide a revision'),
hint=_(b'set fastannotate.mainbranch or use --rev'), hint=_(b'set fastannotate.mainbranch or use --rev'),
) )
if ui.configbool(b'fastannotate', b'unfilteredrepo'): if ui.configbool(b'fastannotate', b'unfilteredrepo'):
repo = repo.unfiltered() repo = repo.unfiltered()
ctx = scmutil.revsingle(repo, rev) ctx = logcmdutil.revsingle(repo, rev)
m = scmutil.match(ctx, pats, opts) m = scmutil.match(ctx, pats, opts)
paths = list(ctx.walk(m)) paths = list(ctx.walk(m))
if util.safehasattr(repo, 'prefetchfastannotate'): if util.safehasattr(repo, 'prefetchfastannotate'):
# client # client
if opts.get(b'REV'): if opts.get(b'REV'):
raise error.Abort(_(b'--rev cannot be used for client')) raise error.Abort(_(b'--rev cannot be used for client'))
repo.prefetchfastannotate(paths) repo.prefetchfastannotate(paths)
else: else:

hgext/largefiles/overrides.py

repo._lfstatuswriters.pop() repo._lfstatuswriters.pop()
repo._lfcommithooks.pop() repo._lfcommithooks.pop()
return result return result
@eh.wrapcommand(b'cat') @eh.wrapcommand(b'cat')
def overridecat(orig, ui, repo, file1, *pats, **opts): def overridecat(orig, ui, repo, file1, *pats, **opts):
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
ctx = scmutil.revsingle(repo, opts.get(b'rev')) ctx = logcmdutil.revsingle(repo, opts.get(b'rev'))
err = 1 err = 1
notbad = set() notbad = set()
m = scmutil.match(ctx, (file1,) + pats, opts) m = scmutil.match(ctx, (file1,) + pats, opts)
origmatchfn = m.matchfn origmatchfn = m.matchfn
def lfmatchfn(f): def lfmatchfn(f):
if origmatchfn(f): if origmatchfn(f):
return True return True

hgext/rebase.py

base = logcmdutil.revrange(repo, basef or [b'.']) base = logcmdutil.revrange(repo, basef or [b'.'])
if not base: if not base:
ui.status( ui.status(
_(b'empty "base" revision set - ' b"can't compute rebase set\n") _(b'empty "base" revision set - ' b"can't compute rebase set\n")
) )
return None return None
if destf: if destf:
# --base does not support multiple destinations # --base does not support multiple destinations
dest = scmutil.revsingle(repo, destf) dest = logcmdutil.revsingle(repo, destf)
else: else:
dest = repo[_destrebase(repo, base, destspace=destspace)] dest = repo[_destrebase(repo, base, destspace=destspace)]
destf = bytes(dest) destf = bytes(dest)
roots = [] # selected children of branching points roots = [] # selected children of branching points
bpbase = {} # {branchingpoint: [origbase]} bpbase = {} # {branchingpoint: [origbase]}
for b in base: # group bases by branching points for b in base: # group bases by branching points
bp = repo.revs(b'ancestor(%d, %d)', b, dest.rev()).first() bp = repo.revs(b'ancestor(%d, %d)', b, dest.rev()).first()

mercurial/cmdutil.py

after = opts.get(b"after") after = opts.get(b"after")
dryrun = opts.get(b"dry_run") dryrun = opts.get(b"dry_run")
rev = opts.get(b'at_rev') rev = opts.get(b'at_rev')
if rev: if rev:
if not forget and not after: if not forget and not after:
# TODO: Remove this restriction and make it also create the copy # TODO: Remove this restriction and make it also create the copy
# targets (and remove the rename source if rename==True). # targets (and remove the rename source if rename==True).
raise error.InputError(_(b'--at-rev requires --after')) raise error.InputError(_(b'--at-rev requires --after'))
ctx = scmutil.revsingle(repo, rev) ctx = logcmdutil.revsingle(repo, rev)
if len(ctx.parents()) > 1: if len(ctx.parents()) > 1:
raise error.InputError( raise error.InputError(
_(b'cannot mark/unmark copy in merge commit') _(b'cannot mark/unmark copy in merge commit')
) )
else: else:
ctx = repo[None] ctx = repo[None]
pctx = ctx.p1() pctx = ctx.p1()

mercurial/commands.py

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
and (not opts.get(b'changeset')) and (not opts.get(b'changeset'))
and (not opts.get(b'number')) and (not opts.get(b'number'))
): ):
raise error.InputError(_(b'at least one of -n/-c is required for -l')) raise error.InputError(_(b'at least one of -n/-c is required for -l'))
rev = opts.get(b'rev') rev = opts.get(b'rev')
if rev: if rev:
repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn') repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
ctx = scmutil.revsingle(repo, rev) ctx = logcmdutil.revsingle(repo, rev)
ui.pager(b'annotate') ui.pager(b'annotate')
rootfm = ui.formatter(b'annotate', opts) rootfm = ui.formatter(b'annotate', opts)
if ui.debugflag: if ui.debugflag:
shorthex = pycompat.identity shorthex = pycompat.identity
else: else:
def shorthex(h): def shorthex(h):
Returns 0 on success. Returns 0 on success.
""" """
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
rev = opts.get(b'rev') rev = opts.get(b'rev')
if rev: if rev:
repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn') repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
ctx = scmutil.revsingle(repo, rev) ctx = logcmdutil.revsingle(repo, rev)
if not ctx: if not ctx:
raise error.InputError( raise error.InputError(
_(b'no working directory: please specify a revision') _(b'no working directory: please specify a revision')
) )
node = ctx.node() node = ctx.node()
dest = cmdutil.makefilename(ctx, dest) dest = cmdutil.makefilename(ctx, dest)
if os.path.realpath(dest) == repo.root: if os.path.realpath(dest) == repo.root:
raise error.InputError(_(b'repository root cannot be destination')) raise error.InputError(_(b'repository root cannot be destination'))
raise error.InputError(_(b"please specify a revision to backout")) raise error.InputError(_(b"please specify a revision to backout"))
date = opts.get(b'date') date = opts.get(b'date')
if date: if date:
opts[b'date'] = dateutil.parsedate(date) opts[b'date'] = dateutil.parsedate(date)
cmdutil.checkunfinished(repo) cmdutil.checkunfinished(repo)
cmdutil.bailifchanged(repo) cmdutil.bailifchanged(repo)
ctx = scmutil.revsingle(repo, rev) ctx = logcmdutil.revsingle(repo, rev)
node = ctx.node() node = ctx.node()
op1, op2 = repo.dirstate.parents() op1, op2 = repo.dirstate.parents()
if not repo.changelog.isancestor(node, op1): if not repo.changelog.isancestor(node, op1):
raise error.InputError( raise error.InputError(
_(b'cannot backout change that is not an ancestor') _(b'cannot backout change that is not an ancestor')
) )
:path: String. Repository-absolute path of the file. :path: String. Repository-absolute path of the file.
Returns 0 on success. Returns 0 on success.
""" """
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
rev = opts.get(b'rev') rev = opts.get(b'rev')
if rev: if rev:
repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn') repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
ctx = scmutil.revsingle(repo, rev) ctx = logcmdutil.revsingle(repo, rev)
m = scmutil.match(ctx, (file1,) + pats, opts) m = scmutil.match(ctx, (file1,) + pats, opts)
fntemplate = opts.pop(b'output', b'') fntemplate = opts.pop(b'output', b'')
if cmdutil.isstdiofilename(fntemplate): if cmdutil.isstdiofilename(fntemplate):
fntemplate = b'' fntemplate = b''
if fntemplate: if fntemplate:
fm = formatter.nullformatter(ui, b'cat', opts) fm = formatter.nullformatter(ui, b'cat', opts)
else: else:
to_rev = opts.get(b'to') to_rev = opts.get(b'to')
stat = opts.get(b'stat') stat = opts.get(b'stat')
reverse = opts.get(b'reverse') reverse = opts.get(b'reverse')
cmdutil.check_incompatible_arguments(opts, b'from', [b'rev', b'change']) cmdutil.check_incompatible_arguments(opts, b'from', [b'rev', b'change'])
cmdutil.check_incompatible_arguments(opts, b'to', [b'rev', b'change']) cmdutil.check_incompatible_arguments(opts, b'to', [b'rev', b'change'])
if change: if change:
repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn') repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
ctx2 = scmutil.revsingle(repo, change, None) ctx2 = logcmdutil.revsingle(repo, change, None)
ctx1 = logcmdutil.diff_parent(ctx2) ctx1 = logcmdutil.diff_parent(ctx2)
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 = logcmdutil.revsingle(repo, from_rev, None)
ctx2 = scmutil.revsingle(repo, to_rev, None) ctx2 = logcmdutil.revsingle(repo, to_rev, None)
else: else:
repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn') repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
ctx1, ctx2 = logcmdutil.revpair(repo, revs) ctx1, ctx2 = logcmdutil.revpair(repo, revs)
if reverse: if reverse:
ctxleft = ctx2 ctxleft = ctx2
ctxright = ctx1 ctxright = ctx1
else: else:
Returns 0 if a match is found, 1 otherwise. Returns 0 if a match is found, 1 otherwise.
""" """
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
rev = opts.get(b'rev') rev = opts.get(b'rev')
if rev: if rev:
repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn') repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
ctx = scmutil.revsingle(repo, rev, None) ctx = logcmdutil.revsingle(repo, rev, None)
end = b'\n' end = b'\n'
if opts.get(b'print0'): if opts.get(b'print0'):
end = b'\0' end = b'\0'
fmt = b'%s' + end fmt = b'%s' + end
m = scmutil.match(ctx, pats, opts) m = scmutil.match(ctx, pats, opts)
ui.pager(b'files') ui.pager(b'files')
raise error.InputError(_(b'no revisions specified')) raise error.InputError(_(b'no revisions specified'))
cmdutil.checkunfinished(repo) cmdutil.checkunfinished(repo)
cmdutil.bailifchanged(repo) cmdutil.bailifchanged(repo)
revs = logcmdutil.revrange(repo, revs) revs = logcmdutil.revrange(repo, revs)
skipped = set() skipped = set()
basectx = None basectx = None
if opts.get('base'): if opts.get('base'):
basectx = scmutil.revsingle(repo, opts['base'], None) basectx = logcmdutil.revsingle(repo, opts['base'], None)
if basectx is None: if basectx is None:
# check for merges # check for merges
for rev in repo.revs(b'%ld and merge()', revs): for rev in repo.revs(b'%ld and merge()', revs):
ui.warn(_(b'skipping ungraftable merge revision %d\n') % rev) ui.warn(_(b'skipping ungraftable merge revision %d\n') % rev)
skipped.add(rev) skipped.add(rev)
revs = [r for r in revs if r not in skipped] revs = [r for r in revs if r not in skipped]
if not revs: if not revs:
return -1 return -1
Returns 0 if matching heads are found, 1 if not. Returns 0 if matching heads are found, 1 if not.
""" """
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
start = None start = None
rev = opts.get(b'rev') rev = opts.get(b'rev')
if rev: if rev:
repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn') 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'): if opts.get(b'topo'):
heads = [repo[h] for h in repo.heads(start)] heads = [repo[h] for h in repo.heads(start)]
else: else:
heads = [] heads = []
for branch in repo.branchmap(): for branch in repo.branchmap():
heads += repo.branchheads(branch, start, opts.get(b'closed')) heads += repo.branchheads(branch, start, opts.get(b'closed'))
heads = [repo[h] for h in heads] heads = [repo[h] for h in heads]
output.append(bm) output.append(bm)
else: else:
fm.data(node=hex(remoterev)) fm.data(node=hex(remoterev))
if bookmarks or b'bookmarks' in fm.datahint(): if bookmarks or b'bookmarks' in fm.datahint():
fm.data(bookmarks=fm.formatlist(getbms(), name=b'bookmark')) fm.data(bookmarks=fm.formatlist(getbms(), name=b'bookmark'))
else: else:
if rev: if rev:
repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn') repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
ctx = scmutil.revsingle(repo, rev, None) ctx = logcmdutil.revsingle(repo, rev, None)
if ctx.rev() is None: if ctx.rev() is None:
ctx = repo[None] ctx = repo[None]
parents = ctx.parents() parents = ctx.parents()
taglist = [] taglist = []
for p in parents: for p in parents:
taglist.extend(p.tags()) taglist.extend(p.tags())
Returns 0 if a match is found, 1 otherwise. Returns 0 if a match is found, 1 otherwise.
""" """
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
if opts.get(b'print0'): if opts.get(b'print0'):
end = b'\0' end = b'\0'
else: else:
end = b'\n' end = b'\n'
ctx = scmutil.revsingle(repo, opts.get(b'rev'), None) ctx = logcmdutil.revsingle(repo, opts.get(b'rev'), None)
ret = 1 ret = 1
m = scmutil.match( m = scmutil.match(
ctx, pats, opts, default=b'relglob', badfn=lambda x, y: False ctx, pats, opts, default=b'relglob', badfn=lambda x, y: False
) )
ui.pager(b'locate') ui.pager(b'locate')
if ctx.rev() is None: if ctx.rev() is None:
if not node: if not node:
node = rev node = rev
char = {b'l': b'@', b'x': b'*', b'': b'', b't': b'd'} 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'} mode = {b'l': b'644', b'x': b'755', b'': b'644', b't': b'755'}
if node: if node:
repo = scmutil.unhidehashlikerevs(repo, [node], b'nowarn') repo = scmutil.unhidehashlikerevs(repo, [node], b'nowarn')
ctx = scmutil.revsingle(repo, node) ctx = logcmdutil.revsingle(repo, node)
mf = ctx.manifest() mf = ctx.manifest()
ui.pager(b'manifest') ui.pager(b'manifest')
for f in ctx: for f in ctx:
fm.startitem() fm.startitem()
fm.context(ctx=ctx) fm.context(ctx=ctx)
fl = ctx[f].flags() fl = ctx[f].flags()
fm.condwrite(ui.debugflag, b'hash', b'%s ', hex(mf[f])) fm.condwrite(ui.debugflag, b'hash', b'%s ', hex(mf[f]))
fm.condwrite(ui.verbose, b'mode type', b'%s %1s ', mode[fl], char[fl]) fm.condwrite(ui.verbose, b'mode type', b'%s %1s ', mode[fl], char[fl])
return hg.abortmerge(repo.ui, repo) return hg.abortmerge(repo.ui, repo)
if opts.get(b'rev') and node: if opts.get(b'rev') and node:
raise error.InputError(_(b"please specify just one revision")) raise error.InputError(_(b"please specify just one revision"))
if not node: if not node:
node = opts.get(b'rev') node = opts.get(b'rev')
if node: if node:
ctx = scmutil.revsingle(repo, node) ctx = logcmdutil.revsingle(repo, node)
else: else:
if ui.configbool(b'commands', b'merge.require-rev'): if ui.configbool(b'commands', b'merge.require-rev'):
raise error.InputError( raise error.InputError(
_( _(
b'configuration requires specifying revision to merge ' b'configuration requires specifying revision to merge '
b'with' b'with'
) )
) )
Returns 0 on success. Returns 0 on success.
""" """
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
rev = opts.get(b'rev') rev = opts.get(b'rev')
if rev: if rev:
repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn') repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
ctx = scmutil.revsingle(repo, rev, None) ctx = logcmdutil.revsingle(repo, rev, None)
if file_: if file_:
m = scmutil.match(ctx, (file_,), opts) m = scmutil.match(ctx, (file_,), opts)
if m.anypats() or len(m.files()) != 1: if m.anypats() or len(m.files()) != 1:
raise error.InputError(_(b'can only specify an explicit filename')) raise error.InputError(_(b'can only specify an explicit filename'))
file_ = m.files()[0] file_ = m.files()[0]
filenodes = [] filenodes = []
for cp in ctx.parents(): for cp in ctx.parents():
raise error.InputError( raise error.InputError(
_(b'uncommitted merge with no revision specified'), _(b'uncommitted merge with no revision specified'),
hint=_(b"use 'hg update' or see 'hg help revert'"), hint=_(b"use 'hg update' or see 'hg help revert'"),
) )
rev = opts.get(b'rev') rev = opts.get(b'rev')
if rev: if rev:
repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn') repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
ctx = scmutil.revsingle(repo, rev) ctx = logcmdutil.revsingle(repo, rev)
if not ( if not (
pats pats
or opts.get(b'include') or opts.get(b'include')
or opts.get(b'exclude') or opts.get(b'exclude')
or opts.get(b'all') or opts.get(b'all')
or opts.get(b'interactive') or opts.get(b'interactive')
): ):
else: else:
terse = ui.config(b'commands', b'status.terse') terse = ui.config(b'commands', b'status.terse')
if revs and terse: if revs and terse:
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 = logcmdutil.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 = logcmdutil.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')
bheads = repo.branchheads() bheads = repo.branchheads()
if not opts.get(b'force') and bheads and p1 not in bheads: if not opts.get(b'force') and bheads and p1 not in bheads:
raise error.InputError( raise error.InputError(
_( _(
b'working directory is not at a branch head ' b'working directory is not at a branch head '
b'(use -f to force)' b'(use -f to force)'
) )
) )
node = scmutil.revsingle(repo, rev_).node() node = logcmdutil.revsingle(repo, rev_).node()
if not message: if not message:
# we don't translate commit messages # we don't translate commit messages
message = b'Added tag %s for changeset %s' % ( message = b'Added tag %s for changeset %s' % (
b', '.join(names), b', '.join(names),
short(node), short(node),
) )
date = opts.get(b'date') date = opts.get(b'date')
if date: if date:
date = dateutil.parsedate(date) date = dateutil.parsedate(date)
if opts.get(b'remove'): if opts.get(b'remove'):
editform = b'tag.remove' editform = b'tag.remove'
else: else:
editform = b'tag.add' editform = b'tag.add'
editor = cmdutil.getcommiteditor( editor = cmdutil.getcommiteditor(
editform=editform, **pycompat.strkwargs(opts) editform=editform, **pycompat.strkwargs(opts)
) )
# don't allow tagging the null rev # don't allow tagging the null rev
if ( if (
not opts.get(b'remove') 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")) raise error.InputError(_(b"cannot tag null revision"))
tagsmod.tag( tagsmod.tag(
repo, repo,
names, names,
node, node,
message, message,
cmdutil.clearunfinished(repo) cmdutil.clearunfinished(repo)
if date: if date:
rev = cmdutil.finddate(ui, repo, date) rev = cmdutil.finddate(ui, repo, date)
# if we defined a bookmark, we have to remember the original name # if we defined a bookmark, we have to remember the original name
brev = rev brev = rev
if rev: if rev:
repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn') repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
ctx = scmutil.revsingle(repo, rev, default=None) ctx = logcmdutil.revsingle(repo, rev, default=None)
rev = ctx.rev() rev = ctx.rev()
hidden = ctx.hidden() hidden = ctx.hidden()
overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')} overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')}
with ui.configoverride(overrides, b'update'): with ui.configoverride(overrides, b'update'):
ret = hg.updatetotally( ret = hg.updatetotally(
ui, repo, rev, brev, clean=clean, updatecheck=updatecheck ui, repo, rev, brev, clean=clean, updatecheck=updatecheck
) )
if hidden: if hidden:

mercurial/debugcommands.py

False, False,
b"compute information instead of reading it from storage", b"compute information instead of reading it from storage",
), ),
], ],
b'REV', b'REV',
) )
def debugchangedfiles(ui, repo, rev, **opts): def debugchangedfiles(ui, repo, rev, **opts):
"""list the stored files changes for a revision""" """list the stored files changes for a revision"""
ctx = scmutil.revsingle(repo, rev, None) ctx = logcmdutil.revsingle(repo, rev, None)
files = None files = None
if opts['compute']: if opts['compute']:
files = metadata.compute_all_files_changes(ctx) files = metadata.compute_all_files_changes(ctx)
else: else:
sd = repo.changelog.sidedata(ctx.rev()) sd = repo.changelog.sidedata(ctx.rev())
files_block = sd.get(sidedata.SD_FILES) files_block = sd.get(sidedata.SD_FILES)
if files_block is not None: if files_block is not None:
_(b'[-r REV] [--all-files] [OPTION]... FILESPEC'), _(b'[-r REV] [--all-files] [OPTION]... FILESPEC'),
) )
def debugfileset(ui, repo, expr, **opts): def debugfileset(ui, repo, expr, **opts):
'''parse and apply a fileset specification''' '''parse and apply a fileset specification'''
from . import fileset from . import fileset
fileset.symbols # force import of fileset so we have predicates to optimize fileset.symbols # force import of fileset so we have predicates to optimize
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
ctx = scmutil.revsingle(repo, opts.get(b'rev'), None) ctx = logcmdutil.revsingle(repo, opts.get(b'rev'), None)
stages = [ stages = [
(b'parsed', pycompat.identity), (b'parsed', pycompat.identity),
(b'analyzed', filesetlang.analyze), (b'analyzed', filesetlang.analyze),
(b'optimized', filesetlang.optimize), (b'optimized', filesetlang.optimize),
] ]
stagenames = {n for n, f in stages} stagenames = {n for n, f in stages}

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 revsingle(repo, revspec, default=b'.', localalias=None):
"""Resolves user-provided revset(s) into a single revision.
This just wraps the lower-level scmutil.revsingle() in order to raise an
exception indicating user error.
"""
try:
return scmutil.revsingle(repo, revspec, default, localalias)
except error.RepoLookupError as e:
raise error.InputError(e.args[0], hint=e.hint)
def revpair(repo, revs): def revpair(repo, revs):
"""Resolves user-provided revset(s) into two revisions. """Resolves user-provided revset(s) into two revisions.
This just wraps the lower-level scmutil.revpair() in order to raise an This just wraps the lower-level scmutil.revpair() in order to raise an
exception indicating user error. exception indicating user error.
""" """
try: try:
return scmutil.revpair(repo, revs) return scmutil.revpair(repo, revs)

tests/test-commandserver.t

*** runcommand id *** runcommand id
000000000000 tip 000000000000 tip
*** runcommand id --config ui.quiet=True *** runcommand id --config ui.quiet=True
000000000000 000000000000
*** runcommand id *** runcommand id
000000000000 tip 000000000000 tip
*** runcommand id -runknown *** runcommand id -runknown
abort: unknown revision 'unknown' abort: unknown revision 'unknown'
[255] [10]
>>> from hgclient import bprint, check, readchannel >>> from hgclient import bprint, check, readchannel
>>> @check >>> @check
... def inputeof(server): ... def inputeof(server):
... readchannel(server) ... readchannel(server)
... server.stdin.write(b'runcommand\n') ... server.stdin.write(b'runcommand\n')
... # close stdin while server is waiting for input ... # close stdin while server is waiting for input
... server.stdin.close() ... server.stdin.close()

tests/test-directaccess.t

28ad74487de9 28ad74487de9
$ hg status --change 2 $ hg status --change 2
A c A c
$ hg status --change 2 --config experimental.directaccess.revnums=False $ hg status --change 2 --config experimental.directaccess.revnums=False
abort: hidden revision '2' was rewritten as: 2443a0e66469 abort: hidden revision '2' was rewritten as: 2443a0e66469
(use --hidden to access hidden revisions) (use --hidden to access hidden revisions)
[255] [10]
$ hg diff -c 2 $ hg diff -c 2
diff -r 29becc82797a -r 28ad74487de9 c diff -r 29becc82797a -r 28ad74487de9 c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/c Thu Jan 01 00:00:00 1970 +0000 +++ b/c Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+foo +foo

tests/test-manifest.t

a a
b/a b/a
l l
The next two calls are expected to abort: The next two calls are expected to abort:
$ hg manifest -r 2 $ hg manifest -r 2
abort: unknown revision '2' abort: unknown revision '2'
[255] [10]
$ hg manifest -r tip tip $ hg manifest -r tip tip
abort: please specify just one revision abort: please specify just one revision
[10] [10]
Testing the manifest full text cache utility Testing the manifest full text cache utility
-------------------------------------------- --------------------------------------------

tests/test-obshistory.t

date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: ROOT summary: ROOT
Actual test Actual test
----------- -----------
$ hg update 471f378eab4c $ hg update 471f378eab4c
abort: hidden revision '471f378eab4c' was rewritten as: 4ae3a4151de9 abort: hidden revision '471f378eab4c' was rewritten as: 4ae3a4151de9
(use --hidden to access hidden revisions) (use --hidden to access hidden revisions)
[255] [10]
$ hg update --hidden "desc(A0)" $ hg update --hidden "desc(A0)"
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to hidden changeset 471f378eab4c updated to hidden changeset 471f378eab4c
(hidden revision '471f378eab4c' was rewritten as: 4ae3a4151de9) (hidden revision '471f378eab4c' was rewritten as: 4ae3a4151de9)
Test output with pruned commit Test output with pruned commit
============================== ==============================
Actual test Actual test
----------- -----------
$ hg up 1 $ hg up 1
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg up 0dec01379d3b $ hg up 0dec01379d3b
abort: hidden revision '0dec01379d3b' is pruned abort: hidden revision '0dec01379d3b' is pruned
(use --hidden to access hidden revisions) (use --hidden to access hidden revisions)
[255] [10]
$ hg up --hidden -r 'desc(B0)' $ hg up --hidden -r 'desc(B0)'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to hidden changeset 0dec01379d3b updated to hidden changeset 0dec01379d3b
(hidden revision '0dec01379d3b' is pruned) (hidden revision '0dec01379d3b' is pruned)
Test output with splitted commit Test output with splitted commit
================================ ================================
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: ROOT summary: ROOT
Actual test Actual test
----------- -----------
$ hg update 471597cad322 $ hg update 471597cad322
abort: hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a abort: hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a
(use --hidden to access hidden revisions) (use --hidden to access hidden revisions)
[255] [10]
$ hg update --hidden 'min(desc(A0))' $ hg update --hidden 'min(desc(A0))'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to hidden changeset 471597cad322 updated to hidden changeset 471597cad322
(hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a) (hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a)
Test output with lots of splitted commit Test output with lots of splitted commit
======================================== ========================================
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: ROOT summary: ROOT
Actual test Actual test
----------- -----------
$ hg update de7290d8b885 $ hg update de7290d8b885
abort: hidden revision 'de7290d8b885' was split as: 337fec4d2edc, f257fde29c7a and 2 more abort: hidden revision 'de7290d8b885' was split as: 337fec4d2edc, f257fde29c7a and 2 more
(use --hidden to access hidden revisions) (use --hidden to access hidden revisions)
[255] [10]
$ hg update --hidden 'min(desc(A0))' $ hg update --hidden 'min(desc(A0))'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to hidden changeset de7290d8b885 updated to hidden changeset de7290d8b885
(hidden revision 'de7290d8b885' was split as: 337fec4d2edc, f257fde29c7a and 2 more) (hidden revision 'de7290d8b885' was split as: 337fec4d2edc, f257fde29c7a and 2 more)
Test output with folded commit Test output with folded commit
============================== ==============================
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: ROOT summary: ROOT
Actual test Actual test
----------- -----------
$ hg update 471f378eab4c $ hg update 471f378eab4c
abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192 abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192
(use --hidden to access hidden revisions) (use --hidden to access hidden revisions)
[255] [10]
$ hg update --hidden 'desc(A0)' $ hg update --hidden 'desc(A0)'
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
updated to hidden changeset 471f378eab4c updated to hidden changeset 471f378eab4c
(hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192) (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192)
$ hg update 0dec01379d3b $ hg update 0dec01379d3b
abort: hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192 abort: hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192
(use --hidden to access hidden revisions) (use --hidden to access hidden revisions)
[255] [10]
$ hg update --hidden 'desc(B0)' $ hg update --hidden 'desc(B0)'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to hidden changeset 0dec01379d3b updated to hidden changeset 0dec01379d3b
(hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192) (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192)
Test output with divergence Test output with divergence
=========================== ===========================
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: ROOT summary: ROOT
Actual test Actual test
----------- -----------
$ hg update 471f378eab4c $ hg update 471f378eab4c
abort: hidden revision '471f378eab4c' has diverged abort: hidden revision '471f378eab4c' has diverged
(use --hidden to access hidden revisions) (use --hidden to access hidden revisions)
[255] [10]
$ hg update --hidden 'desc(A0)' $ hg update --hidden 'desc(A0)'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to hidden changeset 471f378eab4c updated to hidden changeset 471f378eab4c
(hidden revision '471f378eab4c' has diverged) (hidden revision '471f378eab4c' has diverged)
Test output with amended + folded commit Test output with amended + folded commit
======================================== ========================================
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: ROOT summary: ROOT
Actual test Actual test
----------- -----------
$ hg update 471f378eab4c $ hg update 471f378eab4c
abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192 abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192
(use --hidden to access hidden revisions) (use --hidden to access hidden revisions)
[255] [10]
$ hg update --hidden 'desc(A0)' $ hg update --hidden 'desc(A0)'
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
updated to hidden changeset 471f378eab4c updated to hidden changeset 471f378eab4c
(hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192) (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192)
$ hg update --hidden 0dec01379d3b $ hg update --hidden 0dec01379d3b
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to hidden changeset 0dec01379d3b updated to hidden changeset 0dec01379d3b
(hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192) (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192)
$ hg update 0dec01379d3b $ hg update 0dec01379d3b
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg update --hidden 'desc(B0)' $ hg update --hidden 'desc(B0)'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved

tests/test-rebase-dest.t

Multiple destinations cannot be used with --base: Multiple destinations cannot be used with --base:
$ rebasewithdag -b B -b E -d 'SRC^^' --collapse <<'EOS' $ rebasewithdag -b B -b E -d 'SRC^^' --collapse <<'EOS'
> B E > B E
> | | > | |
> A D > A D
> EOS > EOS
abort: unknown revision 'SRC' abort: unknown revision 'SRC'
[255] [10]
Rebase to null should work: Rebase to null should work:
$ rebasewithdag -r A+C+D -d 'null' <<'EOS' $ rebasewithdag -r A+C+D -d 'null' <<'EOS'
> C D > C D
> | | > | |
> A B > A B
> EOS > EOS

tests/test-strip.t

abort: empty revision set abort: empty revision set
[255] [255]
$ hg strip -B todelete $ hg strip -B todelete
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/bookmarks/.hg/strip-backup/*-backup.hg (glob) saved backup bundle to $TESTTMP/bookmarks/.hg/strip-backup/*-backup.hg (glob)
bookmark 'todelete' deleted bookmark 'todelete' deleted
$ hg id -ir dcbb326fdec2 $ hg id -ir dcbb326fdec2
abort: unknown revision 'dcbb326fdec2' abort: unknown revision 'dcbb326fdec2'
[255] [10]
$ hg id -ir d62d843c9a01 $ hg id -ir d62d843c9a01
d62d843c9a01 d62d843c9a01
$ hg bookmarks $ hg bookmarks
B 9:ff43616e5d0f B 9:ff43616e5d0f
delete 6:2702dd0c91e7 delete 6:2702dd0c91e7
multipledelete1 11:e46a4836065c multipledelete1 11:e46a4836065c
multipledelete2 12:b4594d867745 multipledelete2 12:b4594d867745
singlenode1 13:43227190fef8 singlenode1 13:43227190fef8
singlenode2 13:43227190fef8 singlenode2 13:43227190fef8
$ hg strip -B multipledelete1 -B multipledelete2 $ hg strip -B multipledelete1 -B multipledelete2
saved backup bundle to $TESTTMP/bookmarks/.hg/strip-backup/e46a4836065c-89ec65c2-backup.hg saved backup bundle to $TESTTMP/bookmarks/.hg/strip-backup/e46a4836065c-89ec65c2-backup.hg
bookmark 'multipledelete1' deleted bookmark 'multipledelete1' deleted
bookmark 'multipledelete2' deleted bookmark 'multipledelete2' deleted
$ hg id -ir e46a4836065c $ hg id -ir e46a4836065c
abort: unknown revision 'e46a4836065c' abort: unknown revision 'e46a4836065c'
[255] [10]
$ hg id -ir b4594d867745 $ hg id -ir b4594d867745
abort: unknown revision 'b4594d867745' abort: unknown revision 'b4594d867745'
[255] [10]
$ hg strip -B singlenode1 -B singlenode2 $ hg strip -B singlenode1 -B singlenode2
saved backup bundle to $TESTTMP/bookmarks/.hg/strip-backup/43227190fef8-8da858f2-backup.hg saved backup bundle to $TESTTMP/bookmarks/.hg/strip-backup/43227190fef8-8da858f2-backup.hg
bookmark 'singlenode1' deleted bookmark 'singlenode1' deleted
bookmark 'singlenode2' deleted bookmark 'singlenode2' deleted
$ hg id -ir 43227190fef8 $ hg id -ir 43227190fef8
abort: unknown revision '43227190fef8' abort: unknown revision '43227190fef8'
[255] [10]
$ hg strip -B unknownbookmark $ hg strip -B unknownbookmark
abort: bookmark 'unknownbookmark' not found abort: bookmark 'unknownbookmark' not found
[255] [255]
$ hg strip -B unknownbookmark1 -B unknownbookmark2 $ hg strip -B unknownbookmark1 -B unknownbookmark2
abort: bookmark 'unknownbookmark1,unknownbookmark2' not found abort: bookmark 'unknownbookmark1,unknownbookmark2' not found
[255] [255]
$ hg strip -B delete -B unknownbookmark $ hg strip -B delete -B unknownbookmark
abort: bookmark 'unknownbookmark' not found abort: bookmark 'unknownbookmark' not found
[255] [255]
$ hg strip -B delete $ hg strip -B delete
saved backup bundle to $TESTTMP/bookmarks/.hg/strip-backup/*-backup.hg (glob) saved backup bundle to $TESTTMP/bookmarks/.hg/strip-backup/*-backup.hg (glob)
bookmark 'delete' deleted bookmark 'delete' deleted
$ hg id -ir 6:2702dd0c91e7 $ hg id -ir 6:2702dd0c91e7
abort: unknown revision '2702dd0c91e7' abort: unknown revision '2702dd0c91e7'
[255] [10]
$ hg update B $ hg update B
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(activating bookmark B) (activating bookmark B)
$ echo a > a $ echo a > a
$ hg add a $ hg add a
$ hg strip -B B $ hg strip -B B
abort: uncommitted changes abort: uncommitted changes
[20] [20]