This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9285

strip: move into core
ClosedPublic

Authored by valentin.gatienbaron on Nov 8 2020, 6:30 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGd7a508a75d72: strip: move into core
rHGa46efd42ae70: strip: move into core
Summary

As discussed at the 5.2 sprint, replace strip extension by a core
command, debugstrip. Obviously, the extension stays for backwards
compatibility.

As an implementation note, I moved the strip file as is into core,
which is not done elsewhere, AFAIK. I could have inlined it into
debugcommands, but that doesn't sound great.

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

joerg.sonnenberger added a subscriber: joerg.sonnenberger.Nov 8 2020, 6:48 PM

My memory from the discussion was that we explicitly wanted to keep it as extension as it normal users shouldn't use this and it is considered dangerous?

valentin.gatienbaron added a comment.Nov 8 2020, 7:16 PM

Was that the conclusion? I think I was taking notes and missed it. I thought turning the strip extension into a debugstrip command was already agreed upon a year ago, In fact, D6987 was started back then (and stalled, but that's unrelated).
There's no disagreement that the command is dangerous, that's why it's debugstrip and not strip. That seems like better pushback to me than an extension.

valentin.gatienbaron added a commit: rHGa46efd42ae70: strip: move into core.Nov 18 2020, 6:06 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGa46efd42ae70: strip: move into core (authored by valentin.gatienbaron). · Explain Why
This revision was automatically updated to reflect the committed changes.
martinvonz added a subscriber: martinvonz.Nov 19 2020, 6:15 PM

This fails test-check-format.t for me. I'll fix it in flight.

valentin.gatienbaron added a comment.Nov 25 2020, 12:52 AM

Oops, sorry, I didn't have black installed, so test-check-format.t was getting skipped. Having installed it now (at version 19.10, because 20.8b is broken), there are indeed formatting issues. Thanks for the fix.

Revision Contents
Changeset List

PathPackages
Mhgext/mq.py (9 lines)
Phgext/strip.py (281 lines)
Copied to mercurial/strip.py
Mmercurial/debugcommands.py (6 lines)
Mmercurial/registrar.py (5 lines)
Pmercurial/strip.py (22 lines)
Copied from hgext/strip.py
Mrelnotes/next (3 lines)
Mtests/test-completion.t (2 lines)
Mtests/test-help.t (2 lines)
Mtests/test-strip.t (10 lines)

Diff 23549

hgext/mq.py

logcmdutil, logcmdutil,
patch as patchmod, patch as patchmod,
phases, phases,
pycompat, pycompat,
registrar, registrar,
revsetlang, revsetlang,
scmutil, scmutil,
smartset, smartset,
strip,
subrepoutil, subrepoutil,
util, util,
vfs as vfsmod, vfs as vfsmod,
) )
from mercurial.utils import ( from mercurial.utils import (
dateutil, dateutil,
stringutil, stringutil,
) )
b'mq', b'plain', default=False, b'mq', b'plain', default=False,
) )
configitem( configitem(
b'mq', b'secret', default=False, b'mq', b'secret', default=False,
) )
# force load strip extension formerly included in mq and import some utility # force load strip extension formerly included in mq and import some utility
try: try:
stripext = extensions.find(b'strip') extensions.find(b'strip')
except KeyError: except KeyError:
# note: load is lazy so we could avoid the try-except, # note: load is lazy so we could avoid the try-except,
# but I (marmoute) prefer this explicit code. # but I (marmoute) prefer this explicit code.
class dummyui(object): class dummyui(object):
def debug(self, msg): def debug(self, msg):
pass pass
def log(self, event, msgfmt, *msgargs, **opts): def log(self, event, msgfmt, *msgargs, **opts):
pass pass
stripext = extensions.load(dummyui(), b'strip', b'') extensions.load(dummyui(), b'strip', b'')
strip = stripext.strip strip = strip.strip
def checksubstate(repo, baserev=None): def checksubstate(repo, baserev=None):
'''return list of subrepos at a different revision than substate. '''return list of subrepos at a different revision than substate.
Abort if any subrepos have uncommitted changes.''' Abort if any subrepos have uncommitted changes.'''
inclsubs = [] inclsubs = []
wctx = repo[None] wctx = repo[None]
if baserev: if baserev:

hgext/strip.py

  • This file was copied to mercurial/strip.py.
"""strip changesets and their descendants from history """strip changesets and their descendants from history (DEPRECATED)
The functionality of this extension has been included in core Mercurial
since version 5.7. Please use :hg:`debugstrip ...` instead.
This extension allows you to strip changesets and all their descendants from the This extension allows you to strip changesets and all their descendants from the
repository. See the command help for details. repository. See the command help for details.
""" """
from __future__ import absolute_import from __future__ import absolute_import
from mercurial.i18n import _
from mercurial.pycompat import getattr
from mercurial import ( from mercurial import (
bookmarks as bookmarksmod, commands,
cmdutil,
error,
hg,
lock as lockmod,
mergestate as mergestatemod,
node as nodemod,
pycompat,
registrar,
repair,
scmutil,
util,
) )
nullid = nodemod.nullid
release = lockmod.release
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.
testedwith = b'ships-with-hg-core' testedwith = b'ships-with-hg-core'
# This is a bit ugly, but a uisetup function that defines strip as an
def checklocalchanges(repo, force=False): # alias for debugstrip would override any user alias for strip,
s = repo.status() # including aliases like "strip = strip --no-backup".
if not force: commands.command.rename(old=b'debugstrip', new=b'debugstrip|strip')
cmdutil.checkunfinished(repo)
cmdutil.bailifchanged(repo)
else:
cmdutil.checkunfinished(repo, skipmerge=True)
return s
def _findupdatetarget(repo, nodes):
unode, p2 = repo.changelog.parents(nodes[0])
currentbranch = repo[None].branch()
if (
util.safehasattr(repo, b'mq')
and p2 != nullid
and p2 in [x.node for x in repo.mq.applied]
):
unode = p2
elif currentbranch != repo[unode].branch():
pwdir = b'parents(wdir())'
revset = b'max(((parents(%ln::%r) + %r) - %ln::%r) and branch(%s))'
branchtarget = repo.revs(
revset, nodes, pwdir, pwdir, nodes, pwdir, currentbranch
)
if branchtarget:
cl = repo.changelog
unode = cl.node(branchtarget.first())
return unode
def strip(
ui,
repo,
revs,
update=True,
backup=True,
force=None,
bookmarks=None,
soft=False,
):
with repo.wlock(), repo.lock():
if update:
checklocalchanges(repo, force=force)
urev = _findupdatetarget(repo, revs)
hg.clean(repo, urev)
repo.dirstate.write(repo.currenttransaction())
if soft:
repair.softstrip(ui, repo, revs, backup)
else:
repair.strip(ui, repo, revs, backup)
repomarks = repo._bookmarks
if bookmarks:
with repo.transaction(b'strip') as tr:
if repo._activebookmark in bookmarks:
bookmarksmod.deactivate(repo)
repomarks.applychanges(repo, tr, [(b, None) for b in bookmarks])
for bookmark in sorted(bookmarks):
ui.write(_(b"bookmark '%s' deleted\n") % bookmark)
@command(
b"strip",
[
(
b'r',
b'rev',
[],
_(
b'strip specified revision (optional, '
b'can specify revisions without this '
b'option)'
),
_(b'REV'),
),
(
b'f',
b'force',
None,
_(
b'force removal of changesets, discard '
b'uncommitted changes (no backup)'
),
),
(b'', b'no-backup', None, _(b'do not save backup bundle')),
(b'', b'nobackup', None, _(b'do not save backup bundle (DEPRECATED)'),),
(b'n', b'', None, _(b'ignored (DEPRECATED)')),
(
b'k',
b'keep',
None,
_(b"do not modify working directory during strip"),
),
(
b'B',
b'bookmark',
[],
_(b"remove revs only reachable from given bookmark"),
_(b'BOOKMARK'),
),
(
b'',
b'soft',
None,
_(b"simply drop changesets from visible history (EXPERIMENTAL)"),
),
],
_(b'hg strip [-k] [-f] [-B bookmark] [-r] REV...'),
helpcategory=command.CATEGORY_MAINTENANCE,
)
def stripcmd(ui, repo, *revs, **opts):
"""strip changesets and all their descendants from the repository
The strip command removes the specified changesets and all their
descendants. If the working directory has uncommitted changes, the
operation is aborted unless the --force flag is supplied, in which
case changes will be discarded.
If a parent of the working directory is stripped, then the working
directory will automatically be updated to the most recent
available ancestor of the stripped parent after the operation
completes.
Any stripped changesets are stored in ``.hg/strip-backup`` as a
bundle (see :hg:`help bundle` and :hg:`help unbundle`). They can
be restored by running :hg:`unbundle .hg/strip-backup/BUNDLE`,
where BUNDLE is the bundle file created by the strip. Note that
the local revision numbers will in general be different after the
restore.
Use the --no-backup option to discard the backup bundle once the
operation completes.
Strip is not a history-rewriting operation and can be used on
changesets in the public phase. But if the stripped changesets have
been pushed to a remote repository you will likely pull them again.
Return 0 on success.
"""
opts = pycompat.byteskwargs(opts)
backup = True
if opts.get(b'no_backup') or opts.get(b'nobackup'):
backup = False
cl = repo.changelog
revs = list(revs) + opts.get(b'rev')
revs = set(scmutil.revrange(repo, revs))
with repo.wlock():
bookmarks = set(opts.get(b'bookmark'))
if bookmarks:
repomarks = repo._bookmarks
if not bookmarks.issubset(repomarks):
raise error.Abort(
_(b"bookmark '%s' not found")
% b','.join(sorted(bookmarks - set(repomarks.keys())))
)
# If the requested bookmark is not the only one pointing to a
# a revision we have to only delete the bookmark and not strip
# anything. revsets cannot detect that case.
nodetobookmarks = {}
for mark, node in pycompat.iteritems(repomarks):
nodetobookmarks.setdefault(node, []).append(mark)
for marks in nodetobookmarks.values():
if bookmarks.issuperset(marks):
rsrevs = scmutil.bookmarkrevs(repo, marks[0])
revs.update(set(rsrevs))
if not revs:
with repo.lock(), repo.transaction(b'bookmark') as tr:
bmchanges = [(b, None) for b in bookmarks]
repomarks.applychanges(repo, tr, bmchanges)
for bookmark in sorted(bookmarks):
ui.write(_(b"bookmark '%s' deleted\n") % bookmark)
if not revs:
raise error.Abort(_(b'empty revision set'))
descendants = set(cl.descendants(revs))
strippedrevs = revs.union(descendants)
roots = revs.difference(descendants)
# if one of the wdir parent is stripped we'll need
# to update away to an earlier revision
update = any(
p != nullid and cl.rev(p) in strippedrevs
for p in repo.dirstate.parents()
)
rootnodes = {cl.node(r) for r in roots}
q = getattr(repo, 'mq', None)
if q is not None and q.applied:
# refresh queue state if we're about to strip
# applied patches
if cl.rev(repo.lookup(b'qtip')) in strippedrevs:
q.applieddirty = True
start = 0
end = len(q.applied)
for i, statusentry in enumerate(q.applied):
if statusentry.node in rootnodes:
# if one of the stripped roots is an applied
# patch, only part of the queue is stripped
start = i
break
del q.applied[start:end]
q.savedirty()
revs = sorted(rootnodes)
if update and opts.get(b'keep'):
urev = _findupdatetarget(repo, revs)
uctx = repo[urev]
# only reset the dirstate for files that would actually change
# between the working context and uctx
descendantrevs = repo.revs(b"only(., %d)", uctx.rev())
changedfiles = []
for rev in descendantrevs:
# blindly reset the files, regardless of what actually changed
changedfiles.extend(repo[rev].files())
# reset files that only changed in the dirstate too
dirstate = repo.dirstate
dirchanges = [f for f in dirstate if dirstate[f] != b'n']
changedfiles.extend(dirchanges)
repo.dirstate.rebuild(urev, uctx.manifest(), changedfiles)
repo.dirstate.write(repo.currenttransaction())
# clear resolve state
mergestatemod.mergestate.clean(repo)
update = False
strip(
ui,
repo,
revs,
backup=backup,
update=update,
force=opts.get(b'force'),
bookmarks=bookmarks,
soft=opts[b'soft'],
)
return 0

mercurial/debugcommands.py

revset, revset,
revsetlang, revsetlang,
scmutil, scmutil,
setdiscovery, setdiscovery,
simplemerge, simplemerge,
sshpeer, sshpeer,
sslutil, sslutil,
streamclone, streamclone,
strip,
tags as tagsmod, tags as tagsmod,
templater, templater,
treediscovery, treediscovery,
upgrade, upgrade,
url as urlmod, url as urlmod,
util, util,
vfs as vfsmod, vfs as vfsmod,
wireprotoframing, wireprotoframing,
from .revlogutils import ( from .revlogutils import (
deltas as deltautil, deltas as deltautil,
nodemap, nodemap,
sidedata, sidedata,
) )
release = lockmod.release release = lockmod.release
command = registrar.command() table = {}
table.update(strip.command._table)
command = registrar.command(table)
@command(b'debugancestor', [], _(b'[INDEX] REV1 REV2'), optionalrepo=True) @command(b'debugancestor', [], _(b'[INDEX] REV1 REV2'), optionalrepo=True)
def debugancestor(ui, repo, *args): def debugancestor(ui, repo, *args):
"""find the ancestor revision of two revisions in a given index""" """find the ancestor revision of two revisions in a given index"""
if len(args) == 3: if len(args) == 3:
index, rev1, rev2 = args index, rev1, rev2 = args
r = revlog.revlog(vfsmod.vfs(encoding.getcwd(), audit=False), index) r = revlog.revlog(vfsmod.vfs(encoding.getcwd(), audit=False), index)
lookup = r.lookup lookup = r.lookup

mercurial/registrar.py

func.helpcategory = helpcategory func.helpcategory = helpcategory
func.helpbasic = helpbasic func.helpbasic = helpbasic
if synopsis: if synopsis:
self._table[name] = func, list(options), synopsis self._table[name] = func, list(options), synopsis
else: else:
self._table[name] = func, list(options) self._table[name] = func, list(options)
return func return func
def rename(self, old, new):
"""rename a command. Used to add aliases, debugstrip ->
debugstrip|strip
"""
self._table[new] = self._table.pop(old)
INTENT_READONLY = b'readonly' INTENT_READONLY = b'readonly'
class revsetpredicate(_funcregistrarbase): class revsetpredicate(_funcregistrarbase):
"""Decorator to register revset predicate """Decorator to register revset predicate
Usage:: Usage::

mercurial/strip.py

  • This file was copied from hgext/strip.py.
"""strip changesets and their descendants from history
This extension allows you to strip changesets and all their descendants from the
repository. See the command help for details.
"""
from __future__ import absolute_import from __future__ import absolute_import
from mercurial.i18n import _ from .i18n import _
from mercurial.pycompat import getattr from .pycompat import getattr
from mercurial import ( from . import (
bookmarks as bookmarksmod, bookmarks as bookmarksmod,
cmdutil, cmdutil,
error, error,
hg, hg,
lock as lockmod, lock as lockmod,
mergestate as mergestatemod, mergestate as mergestatemod,
node as nodemod, node as nodemod,
pycompat, pycompat,
registrar, registrar,
repair, repair,
scmutil, scmutil,
util, util,
) )
nullid = nodemod.nullid nullid = nodemod.nullid
release = lockmod.release release = lockmod.release
cmdtable = {} cmdtable = {}
command = registrar.command(cmdtable) command = registrar.command(cmdtable)
# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
# extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
# be specifying the version(s) of Mercurial they are tested with, or
# leave the attribute unspecified.
testedwith = b'ships-with-hg-core'
def checklocalchanges(repo, force=False): def checklocalchanges(repo, force=False):
s = repo.status() s = repo.status()
if not force: if not force:
cmdutil.checkunfinished(repo) cmdutil.checkunfinished(repo)
cmdutil.bailifchanged(repo) cmdutil.bailifchanged(repo)
else: else:
if repo._activebookmark in bookmarks: if repo._activebookmark in bookmarks:
bookmarksmod.deactivate(repo) bookmarksmod.deactivate(repo)
repomarks.applychanges(repo, tr, [(b, None) for b in bookmarks]) repomarks.applychanges(repo, tr, [(b, None) for b in bookmarks])
for bookmark in sorted(bookmarks): for bookmark in sorted(bookmarks):
ui.write(_(b"bookmark '%s' deleted\n") % bookmark) ui.write(_(b"bookmark '%s' deleted\n") % bookmark)
@command( @command(
b"strip", b"debugstrip",
[ [
( (
b'r', b'r',
b'rev', b'rev',
[], [],
_( _(
b'strip specified revision (optional, ' b'strip specified revision (optional, '
b'can specify revisions without this ' b'can specify revisions without this '
), ),
( (
b'', b'',
b'soft', b'soft',
None, None,
_(b"simply drop changesets from visible history (EXPERIMENTAL)"), _(b"simply drop changesets from visible history (EXPERIMENTAL)"),
), ),
], ],
_(b'hg strip [-k] [-f] [-B bookmark] [-r] REV...'), _(b'hg debugstrip [-k] [-f] [-B bookmark] [-r] REV...'),
helpcategory=command.CATEGORY_MAINTENANCE, helpcategory=command.CATEGORY_MAINTENANCE,
) )
def stripcmd(ui, repo, *revs, **opts): def debugstrip(ui, repo, *revs, **opts):
"""strip changesets and all their descendants from the repository """strip changesets and all their descendants from the repository
The strip command removes the specified changesets and all their The strip command removes the specified changesets and all their
descendants. If the working directory has uncommitted changes, the descendants. If the working directory has uncommitted changes, the
operation is aborted unless the --force flag is supplied, in which operation is aborted unless the --force flag is supplied, in which
case changes will be discarded. case changes will be discarded.
If a parent of the working directory is stripped, then the working If a parent of the working directory is stripped, then the working

relnotes/next

== New Features == == New Features ==
* `hg strip`, from the strip extension, is now a core command, `hg
debugstrip`. The extension remains for compatibility.
== New Experimental Features == == New Experimental Features ==
== Bug Fixes == == Bug Fixes ==
== Backwards Compatibility Changes == == Backwards Compatibility Changes ==
== Internal API Changes == == Internal API Changes ==

tests/test-completion.t

debugrequires debugrequires
debugrevlog debugrevlog
debugrevlogindex debugrevlogindex
debugrevspec debugrevspec
debugserve debugserve
debugsetparents debugsetparents
debugsidedata debugsidedata
debugssl debugssl
debugstrip
debugsub debugsub
debugsuccessorssets debugsuccessorssets
debugtagscache debugtagscache
debugtemplate debugtemplate
debuguigetpass debuguigetpass
debuguiprompt debuguiprompt
debugupdatecaches debugupdatecaches
debugupgraderepo debugupgraderepo
debugrequires: debugrequires:
debugrevlog: changelog, manifest, dir, dump debugrevlog: changelog, manifest, dir, dump
debugrevlogindex: changelog, manifest, dir, format debugrevlogindex: changelog, manifest, dir, format
debugrevspec: optimize, show-revs, show-set, show-stage, no-optimized, verify-optimized debugrevspec: optimize, show-revs, show-set, show-stage, no-optimized, verify-optimized
debugserve: sshstdio, logiofd, logiofile debugserve: sshstdio, logiofd, logiofile
debugsetparents: debugsetparents:
debugsidedata: changelog, manifest, dir debugsidedata: changelog, manifest, dir
debugssl: debugssl:
debugstrip: rev, force, no-backup, nobackup, , keep, bookmark, soft
debugsub: rev debugsub: rev
debugsuccessorssets: closest debugsuccessorssets: closest
debugtagscache: debugtagscache:
debugtemplate: rev, define debugtemplate: rev, define
debuguigetpass: prompt debuguigetpass: prompt
debuguiprompt: prompt debuguiprompt: prompt
debugupdatecaches: debugupdatecaches:
debugupgraderepo: optimize, run, backup, changelog, manifest debugupgraderepo: optimize, run, backup, changelog, manifest

tests/test-help.t

mq manage a stack of patches mq manage a stack of patches
notify hooks for sending email push notifications notify hooks for sending email push notifications
patchbomb command to send changesets as (a series of) patch emails patchbomb command to send changesets as (a series of) patch emails
purge command to delete untracked files from the working purge command to delete untracked files from the working
directory directory
relink recreates hardlinks between repository clones relink recreates hardlinks between repository clones
schemes extend schemes with shortcuts to repository swarms schemes extend schemes with shortcuts to repository swarms
share share a common history between several working directories share share a common history between several working directories
strip strip changesets and their descendants from history
transplant command to transplant changesets from another branch transplant command to transplant changesets from another branch
win32mbcs allow the use of MBCS paths with problematic encodings win32mbcs allow the use of MBCS paths with problematic encodings
zeroconf discover and advertise repositories on the local network zeroconf discover and advertise repositories on the local network
#endif #endif
Verify that deprecated extensions are included if --verbose: Verify that deprecated extensions are included if --verbose:
dump the contents of a revlog index dump the contents of a revlog index
debugrevspec parse and apply a revision specification debugrevspec parse and apply a revision specification
debugserve run a server with advanced settings debugserve run a server with advanced settings
debugsetparents debugsetparents
manually set the parents of the current working directory manually set the parents of the current working directory
debugsidedata debugsidedata
dump the side data for a cl/manifest/file revision dump the side data for a cl/manifest/file revision
debugssl test a secure connection to a server debugssl test a secure connection to a server
debugstrip strip changesets and all their descendants from the repository
debugsub (no help text available) debugsub (no help text available)
debugsuccessorssets debugsuccessorssets
show set of successors for revision show set of successors for revision
debugtagscache debugtagscache
display the contents of .hg/cache/hgtagsfnodes1 display the contents of .hg/cache/hgtagsfnodes1
debugtemplate debugtemplate
parse and apply a template parse and apply a template
debuguigetpass debuguigetpass

tests/test-strip.t

$ echo "[extensions]" >> $HGRCPATH $ echo "[extensions]" >> $HGRCPATH
$ echo "strip=" >> $HGRCPATH $ echo "strip=" >> $HGRCPATH
$ echo "drawdag=$TESTDIR/drawdag.py" >> $HGRCPATH $ echo "drawdag=$TESTDIR/drawdag.py" >> $HGRCPATH
$ restore() { $ restore() {
> hg unbundle -q .hg/strip-backup/* > hg unbundle -q .hg/strip-backup/*
> rm .hg/strip-backup/* > rm .hg/strip-backup/*
> } > }
$ teststrip() { $ teststrip() {
> hg up -C $1 > hg up -C $1
> echo % before update $1, strip $2 > echo % before update $1, strip $2
> hg log -G -T '{rev}:{node}' > hg log -G -T '{rev}:{node}'
> hg --traceback strip $2 > hg --traceback debugstrip $2
> echo % after update $1, strip $2 > echo % after update $1, strip $2
> hg log -G -T '{rev}:{node}' > hg log -G -T '{rev}:{node}'
> restore > restore
> } > }
$ hg init test $ hg init test
$ cd test $ cd test
abort: uncommitted changes abort: uncommitted changes
[20] [20]
$ hg bookmarks $ hg bookmarks
* B 6:ff43616e5d0f * B 6:ff43616e5d0f
Make sure no one adds back a -b option: Make sure no one adds back a -b option:
$ hg strip -b tip $ hg strip -b tip
hg strip: option -b not recognized hg debugstrip: option -b not recognized
hg strip [-k] [-f] [-B bookmark] [-r] REV... hg debugstrip [-k] [-f] [-B bookmark] [-r] REV...
strip changesets and all their descendants from the repository strip changesets and all their descendants from the repository
(use 'hg help -e strip' to show help for the strip extension)
options ([+] can be repeated): options ([+] can be repeated):
-r --rev REV [+] strip specified revision (optional, can specify -r --rev REV [+] strip specified revision (optional, can specify
revisions without this option) revisions without this option)
-f --force force removal of changesets, discard uncommitted -f --force force removal of changesets, discard uncommitted
changes (no backup) changes (no backup)
--no-backup do not save backup bundle --no-backup do not save backup bundle
-k --keep do not modify working directory during strip -k --keep do not modify working directory during strip
-B --bookmark BOOKMARK [+] remove revs only reachable from given bookmark -B --bookmark BOOKMARK [+] remove revs only reachable from given bookmark
--mq operate on patch repository --mq operate on patch repository
(use 'hg strip -h' to show more help) (use 'hg debugstrip -h' to show more help)
[255] [255]
$ cd .. $ cd ..
Verify bundles don't get overwritten: Verify bundles don't get overwritten:
$ hg init doublebundle $ hg init doublebundle
$ cd doublebundle $ cd doublebundle