This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6987

debugstrip: add debugstrip to core
Needs RevisionPublic

Authored by navaneeth.suresh on Oct 5 2019, 3:41 PM.

Details

Reviewers
durin42
baymax
Group Reviewers
hg-reviewers
Summary

Until now, strip was bootstrapped as an extension. This patch adds
debugstrip on core. For the users who are still used to strip
extension, we will preserve that name.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

durin42 requested changes to this revision.Oct 5 2019, 3:55 PM
durin42 added inline comments.
mercurial/commands.py
5646 ↗(On Diff #16856)

debugstrip please (and put it in debugcommands)

and Gregory points out we need a strip extension that preserves the old strip name for users that are used to that

This revision now requires changes to proceed.Oct 5 2019, 3:55 PM
navaneeth.suresh added inline comments.Oct 5 2019, 4:10 PM
mercurial/commands.py
5646 ↗(On Diff #16856)

i see. do i need to replace strip by debugstrip on every occurrence in tests? otherwise, i would have to revert the changes in the tests and keep the extension as it is.

durin42 added inline comments.Oct 5 2019, 5:02 PM
mercurial/commands.py
5646 ↗(On Diff #16856)

One or two is fine, you can leave the majority on the legacy extension flavor. We want some using each so we don't have to add a new test to test one of them.

navaneeth.suresh retitled this revision from strip: move strip extension to core to strip: move strip extension to core as debugstrip.Oct 6 2019, 1:48 PM
navaneeth.suresh edited the summary of this revision. (Show Details)
navaneeth.suresh updated this revision to Diff 16914.
marmoute added a subscriber: marmoute.Oct 7 2019, 9:06 PM
marmoute added inline comments.
hgext/strip.py
1–47 ↗(On Diff #16914)

Why do we need that much code to remain into hgext/strip.py. What I would expect to see is a very small file that only register debugstrip as strip.

24–34 ↗(On Diff #16914)

What is going on here? IT seems like the same code with a different formatting.

pulkit added a subscriber: pulkit.Oct 9 2019, 9:55 AM
pulkit added inline comments.
hgext/strip.py
3 ↗(On Diff #16914)

the documentation should be left as it is.

navaneeth.suresh retitled this revision from strip: move strip extension to core as debugstrip to debugstrip: add debugstrip to core.Oct 12 2019, 5:59 PM
navaneeth.suresh updated this revision to Diff 17120.
baymax requested changes to this revision.Jan 24 2020, 12:31 PM

There seems to have been no activities on this Diff for the past 3 Months.

By policy, we are automatically moving it out of the need-review state.

Please, move it back to need-review without hesitation if this diff should still be discussed.

:baymax:need-review-idle:

This revision now requires changes to proceed.Jan 24 2020, 12:31 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/debugcommands.py (145 lines)
Mtests/test-completion.t (2 lines)
Ptests/test-debugstrip.t (214 lines)
Copied from tests/test-strip.t
Mtests/test-help.t (1 line)
Ptests/test-strip.t
Copied to tests/test-debugstrip.t

Diff 17120

mercurial/debugcommands.py

procutil, procutil,
stringutil, stringutil,
) )
from .revlogutils import ( from .revlogutils import (
deltas as deltautil deltas as deltautil
) )
from hgext import strip
release = lockmod.release release = lockmod.release
command = registrar.command() command = registrar.command()
@command('debugancestor', [], _('[INDEX] REV1 REV2'), optionalrepo=True) @command('debugancestor', [], _('[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:
ui.status(_('failed.\n')) ui.status(_('failed.\n'))
else: else:
ui.status(_('done.\n')) ui.status(_('done.\n'))
else: else:
ui.status(_('full certificate chain is available\n')) ui.status(_('full certificate chain is available\n'))
finally: finally:
s.close() s.close()
@command('debugstrip', [
('r', 'rev', [], _('strip specified revision (optional, '
'can specify revisions without this option)'),
_('REV')),
('f', 'force', None, _('force removal of changesets, discard '
'uncommitted changes (no backup)')),
('', 'no-backup', None, _('do not save backup bundle')),
('', 'nobackup', None, _('do not save backup bundle (DEPRECATED)')),
('n', '', None, _('ignored (DEPRECATED)')),
('k', 'keep', None, _('do not modify working directory during strip')),
('B', 'bookmark', [], _('remove revs only reachable from given bookmark'), _('BOOKMARK')),
('', 'soft', None,
_('simply drop changesets from visible history (EXPERIMENTAL)')),
],
_('hg debugstrip [-k] [-f] [-B bookmark] [-r] REV...'),
helpcategory=command.CATEGORY_MAINTENANCE)
def debugstrip(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('no_backup') or opts.get('nobackup'):
backup = False
cl = repo.changelog
revs = list(revs) + opts.get('rev')
revs = set(scmutil.revrange(repo, revs))
with repo.wlock():
bookmarks = set(opts.get('bookmark'))
if bookmarks:
repomarks = repo._bookmarks
if not bookmarks.issubset(repomarks):
raise error.Abort(_("bookmark '%s' not found") %
','.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 repomarks.iteritems():
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('bookmark') as tr:
bmchanges = [(b, None) for b in bookmarks]
repomarks.applychanges(repo, tr, bmchanges)
for bookmark in sorted(bookmarks):
ui.write(_("bookmark '%s' deleted\n") % bookmark)
if not revs:
raise error.Abort(_('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 = set(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('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('keep'):
urev = strip._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"%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] != 'n']
changedfiles.extend(dirchanges)
repo.dirstate.rebuild(urev, uctx.manifest(), changedfiles)
repo.dirstate.write(repo.currenttransaction())
# clear resolve state
mergemod.mergestate.clean(repo, repo['.'].node())
update = False
strip.strip(ui, repo, revs, backup=backup, update=update,
force=opts.get('force'), bookmarks=bookmarks,
soft=opts['soft'])
return 0
@command('debugsub', @command('debugsub',
[('r', 'rev', '', [('r', 'rev', '',
_('revision to check'), _('REV'))], _('revision to check'), _('REV'))],
_('[-r REV] [REV]')) _('[-r REV] [REV]'))
def debugsub(ui, repo, rev=None): def debugsub(ui, repo, rev=None):
ctx = scmutil.revsingle(repo, rev, None) ctx = scmutil.revsingle(repo, rev, None)
for k, v in sorted(ctx.substate.items()): for k, v in sorted(ctx.substate.items()):
ui.write(('path %s\n') % k) ui.write(('path %s\n') % k)

tests/test-completion.t

debugrename debugrename
debugrevlog debugrevlog
debugrevlogindex debugrevlogindex
debugrevspec debugrevspec
debugserve debugserve
debugsetparents debugsetparents
debugsidedata debugsidedata
debugssl debugssl
debugstrip
debugsub debugsub
debugsuccessorssets debugsuccessorssets
debugtemplate debugtemplate
debuguigetpass debuguigetpass
debuguiprompt debuguiprompt
debugupdatecaches debugupdatecaches
debugupgraderepo debugupgraderepo
debugwalk debugwalk
debugrename: rev debugrename: rev
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
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
debugwalk: include, exclude debugwalk: include, exclude

tests/test-debugstrip.t

  • This file was copied from tests/test-strip.t.
$ echo "[extensions]" >> $HGRCPATH $ echo "[extensions]" >> $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() { $ testdebugstrip() {
> hg up -C $1 > hg up -C $1
> echo % before update $1, strip $2 > echo % before update $1, debugstrip $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, debugstrip $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
$ echo foo > bar $ echo foo > bar
summary: b summary: b
changeset: 0:9ab35a2d17cb changeset: 0:9ab35a2d17cb
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: a summary: a
$ teststrip 4 4 $ testdebugstrip 4 4
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
% before update 4, strip 4 % before update 4, debugstrip 4
@ 4:443431ffac4f5b5a19b0b6c298a21b7ba736bcce @ 4:443431ffac4f5b5a19b0b6c298a21b7ba736bcce
| |
o 3:65bd5f99a4a376cdea23a1153f07856b0d881d64 o 3:65bd5f99a4a376cdea23a1153f07856b0d881d64
| |
| o 2:264128213d290d868c54642d13aeaa3675551a78 | o 2:264128213d290d868c54642d13aeaa3675551a78
|/ |/
o 1:ef3a871183d7199c541cc140218298bbfcc6c28a o 1:ef3a871183d7199c541cc140218298bbfcc6c28a
| |
o 0:9ab35a2d17cb64271241ea881efcc19dd953215b o 0:9ab35a2d17cb64271241ea881efcc19dd953215b
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
% after update 4, strip 4 % after update 4, debugstrip 4
@ 3:65bd5f99a4a376cdea23a1153f07856b0d881d64 @ 3:65bd5f99a4a376cdea23a1153f07856b0d881d64
| |
| o 2:264128213d290d868c54642d13aeaa3675551a78 | o 2:264128213d290d868c54642d13aeaa3675551a78
|/ |/
o 1:ef3a871183d7199c541cc140218298bbfcc6c28a o 1:ef3a871183d7199c541cc140218298bbfcc6c28a
| |
o 0:9ab35a2d17cb64271241ea881efcc19dd953215b o 0:9ab35a2d17cb64271241ea881efcc19dd953215b
$ teststrip 4 3 $ testdebugstrip 4 3
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% before update 4, strip 3 % before update 4, debugstrip 3
@ 4:443431ffac4f5b5a19b0b6c298a21b7ba736bcce @ 4:443431ffac4f5b5a19b0b6c298a21b7ba736bcce
| |
o 3:65bd5f99a4a376cdea23a1153f07856b0d881d64 o 3:65bd5f99a4a376cdea23a1153f07856b0d881d64
| |
| o 2:264128213d290d868c54642d13aeaa3675551a78 | o 2:264128213d290d868c54642d13aeaa3675551a78
|/ |/
o 1:ef3a871183d7199c541cc140218298bbfcc6c28a o 1:ef3a871183d7199c541cc140218298bbfcc6c28a
| |
o 0:9ab35a2d17cb64271241ea881efcc19dd953215b o 0:9ab35a2d17cb64271241ea881efcc19dd953215b
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
% after update 4, strip 3 % after update 4, debugstrip 3
o 2:264128213d290d868c54642d13aeaa3675551a78 o 2:264128213d290d868c54642d13aeaa3675551a78
| |
@ 1:ef3a871183d7199c541cc140218298bbfcc6c28a @ 1:ef3a871183d7199c541cc140218298bbfcc6c28a
| |
o 0:9ab35a2d17cb64271241ea881efcc19dd953215b o 0:9ab35a2d17cb64271241ea881efcc19dd953215b
$ teststrip 1 4 $ testdebugstrip 1 4
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
% before update 1, strip 4 % before update 1, debugstrip 4
o 4:443431ffac4f5b5a19b0b6c298a21b7ba736bcce o 4:443431ffac4f5b5a19b0b6c298a21b7ba736bcce
| |
o 3:65bd5f99a4a376cdea23a1153f07856b0d881d64 o 3:65bd5f99a4a376cdea23a1153f07856b0d881d64
| |
| o 2:264128213d290d868c54642d13aeaa3675551a78 | o 2:264128213d290d868c54642d13aeaa3675551a78
|/ |/
@ 1:ef3a871183d7199c541cc140218298bbfcc6c28a @ 1:ef3a871183d7199c541cc140218298bbfcc6c28a
| |
o 0:9ab35a2d17cb64271241ea881efcc19dd953215b o 0:9ab35a2d17cb64271241ea881efcc19dd953215b
saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
% after update 1, strip 4 % after update 1, debugstrip 4
o 3:65bd5f99a4a376cdea23a1153f07856b0d881d64 o 3:65bd5f99a4a376cdea23a1153f07856b0d881d64
| |
| o 2:264128213d290d868c54642d13aeaa3675551a78 | o 2:264128213d290d868c54642d13aeaa3675551a78
|/ |/
@ 1:ef3a871183d7199c541cc140218298bbfcc6c28a @ 1:ef3a871183d7199c541cc140218298bbfcc6c28a
| |
o 0:9ab35a2d17cb64271241ea881efcc19dd953215b o 0:9ab35a2d17cb64271241ea881efcc19dd953215b
$ teststrip 4 2 $ testdebugstrip 4 2
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% before update 4, strip 2 % before update 4, debugstrip 2
@ 4:443431ffac4f5b5a19b0b6c298a21b7ba736bcce @ 4:443431ffac4f5b5a19b0b6c298a21b7ba736bcce
| |
o 3:65bd5f99a4a376cdea23a1153f07856b0d881d64 o 3:65bd5f99a4a376cdea23a1153f07856b0d881d64
| |
| o 2:264128213d290d868c54642d13aeaa3675551a78 | o 2:264128213d290d868c54642d13aeaa3675551a78
|/ |/
o 1:ef3a871183d7199c541cc140218298bbfcc6c28a o 1:ef3a871183d7199c541cc140218298bbfcc6c28a
| |
o 0:9ab35a2d17cb64271241ea881efcc19dd953215b o 0:9ab35a2d17cb64271241ea881efcc19dd953215b
saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
% after update 4, strip 2 % after update 4, debugstrip 2
@ 3:443431ffac4f5b5a19b0b6c298a21b7ba736bcce @ 3:443431ffac4f5b5a19b0b6c298a21b7ba736bcce
| |
o 2:65bd5f99a4a376cdea23a1153f07856b0d881d64 o 2:65bd5f99a4a376cdea23a1153f07856b0d881d64
| |
o 1:ef3a871183d7199c541cc140218298bbfcc6c28a o 1:ef3a871183d7199c541cc140218298bbfcc6c28a
| |
o 0:9ab35a2d17cb64271241ea881efcc19dd953215b o 0:9ab35a2d17cb64271241ea881efcc19dd953215b
$ teststrip 4 1 $ testdebugstrip 4 1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% before update 4, strip 1 % before update 4, debugstrip 1
@ 4:264128213d290d868c54642d13aeaa3675551a78 @ 4:264128213d290d868c54642d13aeaa3675551a78
| |
| o 3:443431ffac4f5b5a19b0b6c298a21b7ba736bcce | o 3:443431ffac4f5b5a19b0b6c298a21b7ba736bcce
| | | |
| o 2:65bd5f99a4a376cdea23a1153f07856b0d881d64 | o 2:65bd5f99a4a376cdea23a1153f07856b0d881d64
|/ |/
o 1:ef3a871183d7199c541cc140218298bbfcc6c28a o 1:ef3a871183d7199c541cc140218298bbfcc6c28a
| |
o 0:9ab35a2d17cb64271241ea881efcc19dd953215b o 0:9ab35a2d17cb64271241ea881efcc19dd953215b
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
% after update 4, strip 1 % after update 4, debugstrip 1
@ 0:9ab35a2d17cb64271241ea881efcc19dd953215b @ 0:9ab35a2d17cb64271241ea881efcc19dd953215b
$ teststrip null 4 $ testdebugstrip null 4
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
% before update null, strip 4 % before update null, debugstrip 4
o 4:264128213d290d868c54642d13aeaa3675551a78 o 4:264128213d290d868c54642d13aeaa3675551a78
| |
| o 3:443431ffac4f5b5a19b0b6c298a21b7ba736bcce | o 3:443431ffac4f5b5a19b0b6c298a21b7ba736bcce
| | | |
| o 2:65bd5f99a4a376cdea23a1153f07856b0d881d64 | o 2:65bd5f99a4a376cdea23a1153f07856b0d881d64
|/ |/
o 1:ef3a871183d7199c541cc140218298bbfcc6c28a o 1:ef3a871183d7199c541cc140218298bbfcc6c28a
| |
o 0:9ab35a2d17cb64271241ea881efcc19dd953215b o 0:9ab35a2d17cb64271241ea881efcc19dd953215b
saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
% after update null, strip 4 % after update null, debugstrip 4
o 3:443431ffac4f5b5a19b0b6c298a21b7ba736bcce o 3:443431ffac4f5b5a19b0b6c298a21b7ba736bcce
| |
o 2:65bd5f99a4a376cdea23a1153f07856b0d881d64 o 2:65bd5f99a4a376cdea23a1153f07856b0d881d64
| |
o 1:ef3a871183d7199c541cc140218298bbfcc6c28a o 1:ef3a871183d7199c541cc140218298bbfcc6c28a
| |
o 0:9ab35a2d17cb64271241ea881efcc19dd953215b o 0:9ab35a2d17cb64271241ea881efcc19dd953215b
changeset: 4:264128213d29 changeset: 4:264128213d29
tag: tip tag: tip
parent: 1:ef3a871183d7 parent: 1:ef3a871183d7
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: c summary: c
$ hg --traceback strip 4 $ hg --traceback debugstrip 4
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/test/.hg/strip-backup/264128213d29-0b39d6bf-backup.hg saved backup bundle to $TESTTMP/test/.hg/strip-backup/264128213d29-0b39d6bf-backup.hg
$ hg parents $ hg parents
changeset: 1:ef3a871183d7 changeset: 1:ef3a871183d7
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: b summary: b
summary: a summary: a
$ hg up -C 2 $ hg up -C 2
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 4 $ hg merge 4
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
before strip of merge parent before debugstrip of merge parent
$ hg parents $ hg parents
changeset: 2:65bd5f99a4a3 changeset: 2:65bd5f99a4a3
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: d summary: d
changeset: 4:264128213d29 changeset: 4:264128213d29
tag: tip tag: tip
parent: 1:ef3a871183d7 parent: 1:ef3a871183d7
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: c summary: c
##strip not allowed with merge in progress ##debugstrip not allowed with merge in progress
$ hg strip 4 $ hg debugstrip 4
abort: outstanding uncommitted merge abort: outstanding uncommitted merge
(use 'hg commit' or 'hg merge --abort') (use 'hg commit' or 'hg merge --abort')
[255] [255]
##strip allowed --force with merge in progress ##debugstrip allowed --force with merge in progress
$ hg strip 4 --force $ hg debugstrip 4 --force
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
after strip of merge parent after debugstrip of merge parent
$ hg parents $ hg parents
changeset: 1:ef3a871183d7 changeset: 1:ef3a871183d7
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: b summary: b
$ restore $ restore
| summary: b | summary: b
| |
o changeset: 0:9ab35a2d17cb o changeset: 0:9ab35a2d17cb
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: a summary: a
2 is parent of 3, only one strip should happen 2 is parent of 3, only one debugstrip should happen
$ hg strip "roots(2)" 3 $ hg debugstrip "roots(2)" 3
saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
$ hg log -G $ hg log -G
@ changeset: 2:264128213d29 @ changeset: 2:264128213d29
| tag: tip | tag: tip
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| summary: c | summary: c
| |
| |
o changeset: 0:9ab35a2d17cb o changeset: 0:9ab35a2d17cb
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: a summary: a
Failed hook while applying "saveheads" bundle. Failed hook while applying "saveheads" bundle.
$ hg strip 2 --config hooks.pretxnchangegroup.bad=false $ hg debugstrip 2 --config hooks.pretxnchangegroup.bad=false
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
transaction abort! transaction abort!
rollback completed rollback completed
strip failed, backup bundle stored in '$TESTTMP/test/.hg/strip-backup/*-backup.hg' (glob) strip failed, backup bundle stored in '$TESTTMP/test/.hg/strip-backup/264128213d29-0b39d6bf-backup.hg'
strip failed, unrecovered changes stored in '$TESTTMP/test/.hg/strip-backup/*-temp.hg' (glob) strip failed, unrecovered changes stored in '$TESTTMP/test/.hg/strip-backup/264128213d29-0eb9aae0-temp.hg'
(fix the problem, then recover the changesets with "hg unbundle '$TESTTMP/test/.hg/strip-backup/*-temp.hg'") (glob) (fix the problem, then recover the changesets with "hg unbundle '$TESTTMP/test/.hg/strip-backup/*-temp.hg'") (glob)
abort: pretxnchangegroup.bad hook exited with status 1 abort: pretxnchangegroup.bad hook exited with status 1
[255] [255]
$ restore $ restore
$ hg log -G $ hg log -G
o changeset: 4:443431ffac4f o changeset: 4:443431ffac4f
| tag: tip | tag: tip
| user: test | user: test
| summary: b | summary: b
| |
o changeset: 0:9ab35a2d17cb o changeset: 0:9ab35a2d17cb
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: a summary: a
2 different branches: 2 strips 2 different branches: 2 debugstrips
$ hg strip 2 4 $ hg debugstrip 2 4
saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
$ hg log -G $ hg log -G
o changeset: 2:65bd5f99a4a3 o changeset: 2:65bd5f99a4a3
| tag: tip | tag: tip
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| summary: d | summary: d
| |
@ changeset: 1:ef3a871183d7 @ changeset: 1:ef3a871183d7
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| summary: b | summary: b
| |
o changeset: 0:9ab35a2d17cb o changeset: 0:9ab35a2d17cb
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: a summary: a
$ restore $ restore
2 different branches and a common ancestor: 1 strip 2 different branches and a common ancestor: 1 debugstrip
$ hg strip 1 "2|4" $ hg debugstrip 1 "2|4"
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
$ restore $ restore
verify fncache is kept up-to-date verify fncache is kept up-to-date
$ touch a $ touch a
$ hg ci -qAm a $ hg ci -qAm a
#if repofncache #if repofncache
$ cat .hg/store/fncache | sort $ cat .hg/store/fncache | sort
data/a.i data/a.i
data/bar.i data/bar.i
#endif #endif
$ hg strip tip $ hg debugstrip tip
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
#if repofncache #if repofncache
$ cat .hg/store/fncache $ cat .hg/store/fncache
data/bar.i data/bar.i
#endif #endif
stripping an empty revset debugstripping an empty revset
$ hg strip "1 and not 1" $ hg debugstrip "1 and not 1"
abort: empty revision set abort: empty revision set
[255] [255]
remove branchy history for qimport tests remove branchy history for qimport tests
$ hg strip 3 $ hg debugstrip 3
saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
strip of applied mq should cleanup status file debugstrip of applied mq should cleanup status file
$ echo "mq=" >> $HGRCPATH $ echo "mq=" >> $HGRCPATH
$ hg up -C 3 $ hg up -C 3
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo fooagain >> bar $ echo fooagain >> bar
$ hg ci -mf $ hg ci -mf
$ hg qimport -r tip:2 $ hg qimport -r tip:2
applied patches before strip applied patches before debugstrip
$ hg qapplied $ hg qapplied
d d
e e
f f
stripping revision in queue debugstripping revision in queue
$ hg strip 3 $ hg debugstrip 3
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
applied patches after stripping rev in queue applied patches after debugstripping rev in queue
$ hg qapplied $ hg qapplied
d d
stripping ancestor of queue debugstripping ancestor of queue
$ hg strip 1 $ hg debugstrip 1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
applied patches after stripping ancestor of queue applied patches after debugstripping ancestor of queue
$ hg qapplied $ hg qapplied
Verify strip protects against stripping wc parent when there are uncommitted mods Verify debugstrip protects against debugstripping wc parent when there are uncommitted mods
$ echo b > b $ echo b > b
$ echo bb > bar $ echo bb > bar
$ hg add b $ hg add b
$ hg ci -m 'b' $ hg ci -m 'b'
$ hg log --graph $ hg log --graph
@ changeset: 1:76dcf9fab855 @ changeset: 1:76dcf9fab855
| tag: tip | tag: tip
b b
branch: default branch: default
commit: 1 modified, 1 unknown, 1 unresolved commit: 1 modified, 1 unknown, 1 unresolved
update: (current) update: (current)
phases: 2 draft phases: 2 draft
mq: 3 unapplied mq: 3 unapplied
$ echo c > b $ echo c > b
$ hg strip tip $ hg debugstrip tip
abort: uncommitted changes abort: uncommitted changes
[255] [255]
$ hg strip tip --keep $ hg debugstrip tip --keep
saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
$ hg log --graph $ hg log --graph
@ changeset: 0:9ab35a2d17cb @ changeset: 0:9ab35a2d17cb
tag: tip tag: tip
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: a summary: a
$ hg status $ hg status
M bar M bar
? b ? b
? bar.orig ? bar.orig
$ rm bar.orig $ rm bar.orig
$ hg sum $ hg sum
parent: 0:9ab35a2d17cb tip parent: 0:9ab35a2d17cb tip
a a
branch: default branch: default
commit: 1 modified, 1 unknown commit: 1 modified, 1 unknown
update: (current) update: (current)
phases: 1 draft phases: 1 draft
mq: 3 unapplied mq: 3 unapplied
Strip adds, removes, modifies with --keep debugstrip adds, removes, modifies with --keep
$ touch b $ touch b
$ hg add b $ hg add b
$ hg commit -mb $ hg commit -mb
$ touch c $ touch c
... with a clean working dir ... with a clean working dir
$ hg add c $ hg add c
$ hg rm bar $ hg rm bar
$ hg commit -mc $ hg commit -mc
$ hg status $ hg status
$ hg strip --keep tip $ hg debugstrip --keep tip
saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
$ hg status $ hg status
! bar ! bar
? c ? c
... with a dirty working dir ... with a dirty working dir
$ hg add c $ hg add c
$ hg rm bar $ hg rm bar
$ hg commit -mc $ hg commit -mc
$ hg status $ hg status
$ echo b > b $ echo b > b
$ echo d > d $ echo d > d
$ hg strip --keep tip $ hg debugstrip --keep tip
saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
$ hg status $ hg status
M b M b
! bar ! bar
? c ? c
? d ? d
... after updating the dirstate ... after updating the dirstate
$ hg add c $ hg add c
$ hg commit -mc $ hg commit -mc
$ hg rm c $ hg rm c
$ hg commit -mc $ hg commit -mc
$ hg strip --keep '.^' -q $ hg debugstrip --keep '.^' -q
$ cd .. $ cd ..
stripping many nodes on a complex graph (issue3299) debugstripping many nodes on a complex graph (issue3299)
$ hg init issue3299 $ hg init issue3299
$ cd issue3299 $ cd issue3299
$ hg debugbuilddag '@a.:a@b.:b.:x<a@a.:a<b@b.:b<a@a.:a' $ hg debugbuilddag '@a.:a@b.:b.:x<a@a.:a<b@b.:b<a@a.:a'
$ hg strip 'not ancestors(x)' $ hg debugstrip 'not ancestors(x)'
saved backup bundle to $TESTTMP/issue3299/.hg/strip-backup/*-backup.hg (glob) saved backup bundle to $TESTTMP/issue3299/.hg/strip-backup/*-backup.hg (glob)
test hg strip -B bookmark test hg debugstrip -B bookmark
$ cd .. $ cd ..
$ hg init bookmarks $ hg init bookmarks
$ cd bookmarks $ cd bookmarks
$ hg debugbuilddag '..<2.*1/2:m<2+3:c<m+3:a<2.:b<m+2:d<2.:e<m+1:f' $ hg debugbuilddag '..<2.*1/2:m<2+3:c<m+3:a<2.:b<m+2:d<2.:e<m+1:f'
$ hg bookmark -r 'a' 'todelete' $ hg bookmark -r 'a' 'todelete'
$ hg bookmark -r 'b' 'B' $ hg bookmark -r 'b' 'B'
$ hg bookmark -r 'b' 'nostrip' $ hg bookmark -r 'b' 'nodebugstrip'
$ hg bookmark -r 'c' 'delete' $ hg bookmark -r 'c' 'delete'
$ hg bookmark -r 'd' 'multipledelete1' $ hg bookmark -r 'd' 'multipledelete1'
$ hg bookmark -r 'e' 'multipledelete2' $ hg bookmark -r 'e' 'multipledelete2'
$ hg bookmark -r 'f' 'singlenode1' $ hg bookmark -r 'f' 'singlenode1'
$ hg bookmark -r 'f' 'singlenode2' $ hg bookmark -r 'f' 'singlenode2'
$ hg up -C todelete $ hg up -C 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
(activating bookmark todelete) (activating bookmark todelete)
$ hg strip -B nostrip $ hg debugstrip -B nodebugstrip
bookmark 'nostrip' deleted bookmark 'nodebugstrip' deleted
abort: empty revision set abort: empty revision set
[255] [255]
$ hg strip -B todelete $ hg debugstrip -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] [255]
$ 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 debugstrip -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] [255]
$ hg id -ir b4594d867745 $ hg id -ir b4594d867745
abort: unknown revision 'b4594d867745'! abort: unknown revision 'b4594d867745'!
[255] [255]
$ hg strip -B singlenode1 -B singlenode2 $ hg debugstrip -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] [255]
$ hg strip -B unknownbookmark $ hg debugstrip -B unknownbookmark
abort: bookmark 'unknownbookmark' not found abort: bookmark 'unknownbookmark' not found
[255] [255]
$ hg strip -B unknownbookmark1 -B unknownbookmark2 $ hg debugstrip -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 debugstrip -B delete -B unknownbookmark
abort: bookmark 'unknownbookmark' not found abort: bookmark 'unknownbookmark' not found
[255] [255]
$ hg strip -B delete $ hg debugstrip -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] [255]
$ 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 debugstrip -B B
abort: uncommitted changes abort: uncommitted changes
[255] [255]
$ 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 debugstrip -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
$ touch a $ touch a
$ hg commit -Aqm a $ hg commit -Aqm a
$ touch b $ touch b
$ hg commit -Aqm b $ hg commit -Aqm b
$ hg strip -r 0 $ hg debugstrip -r 0
0 files updated, 0 files merged, 2 files removed, 0 files unresolved 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/doublebundle/.hg/strip-backup/3903775176ed-e68910bd-backup.hg saved backup bundle to $TESTTMP/doublebundle/.hg/strip-backup/3903775176ed-e68910bd-backup.hg
$ ls .hg/strip-backup $ ls .hg/strip-backup
3903775176ed-e68910bd-backup.hg 3903775176ed-e68910bd-backup.hg
#if repobundlerepo #if repobundlerepo
$ hg pull -q -r 3903775176ed .hg/strip-backup/3903775176ed-e68910bd-backup.hg $ hg pull -q -r 3903775176ed .hg/strip-backup/3903775176ed-e68910bd-backup.hg
$ hg strip -r 0 $ hg debugstrip -r 0
saved backup bundle to $TESTTMP/doublebundle/.hg/strip-backup/3903775176ed-54390173-backup.hg saved backup bundle to $TESTTMP/doublebundle/.hg/strip-backup/3903775176ed-54390173-backup.hg
$ ls .hg/strip-backup $ ls .hg/strip-backup
3903775176ed-54390173-backup.hg 3903775176ed-54390173-backup.hg
3903775176ed-e68910bd-backup.hg 3903775176ed-e68910bd-backup.hg
#endif #endif
$ cd .. $ cd ..
Test that we only bundle the stripped changesets (issue4736) Test that we only bundle the debugstripped changesets (issue4736)
------------------------------------------------------------ ------------------------------------------------------------
initialization (previous repo is empty anyway) initialization (previous repo is empty anyway)
$ hg init issue4736 $ hg init issue4736
$ cd issue4736 $ cd issue4736
$ echo a > a $ echo a > a
$ hg add a $ hg add a
parent: 2:5c51d8d6557d parent: 2:5c51d8d6557d
parent: 3:6625a5168474 parent: 3:6625a5168474
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: mergeCD summary: mergeCD
#endif #endif
check strip behavior check debugdebugstrip behavior
$ hg --config extensions.strip= strip 'desc(commitD)' --debug $ hg debugstrip 'desc(commitD)' --debug
resolving manifests resolving manifests
branchmerge: False, force: True, partial: False branchmerge: False, force: True, partial: False
ancestor: d8db9d137221+, local: d8db9d137221+, remote: eca11cf91c71 ancestor: d8db9d137221+, local: d8db9d137221+, remote: eca11cf91c71
c: other deleted -> r c: other deleted -> r
removing c removing c
d: other deleted -> r d: other deleted -> r
removing d removing d
starting 4 threads for background file closing (?) starting 4 threads for background file closing (?)
| summary: commitB | summary: commitB
| |
o changeset: 0:105141ef12d0 o changeset: 0:105141ef12d0
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: commitA summary: commitA
strip backup content debugstrip backup content
#if repobundlerepo #if repobundlerepo
$ hg log -r 'bundle()' -R .hg/strip-backup/6625a5168474-*-backup.hg $ hg log -r 'bundle()' -R .hg/strip-backup/6625a5168474-*-backup.hg
changeset: 3:6625a5168474 changeset: 3:6625a5168474
parent: 1:eca11cf91c71 parent: 1:eca11cf91c71
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: commitD summary: commitD
changeset: 4:d8db9d137221 changeset: 4:d8db9d137221
tag: tip tag: tip
parent: 2:5c51d8d6557d parent: 2:5c51d8d6557d
parent: 3:6625a5168474 parent: 3:6625a5168474
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: mergeCD summary: mergeCD
#endif #endif
Check that the phase cache is properly invalidated after a strip with bookmark. Check that the phase cache is properly invalidated after a debugstrip with bookmark.
$ cat > ../stripstalephasecache.py << EOF $ cat > ../debugstripstalephasecache.py << EOF
> from mercurial import extensions, localrepo > from mercurial import extensions, localrepo
> def transactioncallback(orig, repo, desc, *args, **kwargs): > def transactioncallback(orig, repo, desc, *args, **kwargs):
> def test(transaction): > def test(transaction):
> # observe cache inconsistency > # observe cache inconsistency
> try: > try:
> [repo.changelog.node(r) for r in repo.revs(b"not public()")] > [repo.changelog.node(r) for r in repo.revs(b"not public()")]
> except IndexError: > except IndexError:
> repo.ui.status(b"Index error!\n") > repo.ui.status(b"Index error!\n")
> transaction = orig(repo, desc, *args, **kwargs) > transaction = orig(repo, desc, *args, **kwargs)
> # warm up the phase cache > # warm up the phase cache
> list(repo.revs(b"not public()")) > list(repo.revs(b"not public()"))
> if desc != b'strip': > if desc != b'debugstrip':
> transaction.addpostclose(b"phase invalidation test", test) > transaction.addpostclose(b"phase invalidation test", test)
> return transaction > return transaction
> def extsetup(ui): > def extsetup(ui):
> extensions.wrapfunction(localrepo.localrepository, b"transaction", > extensions.wrapfunction(localrepo.localrepository, b"transaction",
> transactioncallback) > transactioncallback)
> EOF > EOF
$ hg up -C 2 $ hg up -C 2
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo k > k $ echo k > k
$ hg add k $ hg add k
$ hg commit -m commitK $ hg commit -m commitK
$ echo l > l $ echo l > l
$ hg add l $ hg add l
$ hg commit -m commitL $ hg commit -m commitL
$ hg book -r tip blah $ hg book -r tip blah
$ hg strip ".^" --config extensions.crash=$TESTTMP/stripstalephasecache.py $ hg debugstrip ".^" --config extensions.crash=$TESTTMP/debugstripstalephasecache.py
0 files updated, 0 files merged, 2 files removed, 0 files unresolved 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/8f0b4384875c-4fa10deb-backup.hg saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/8f0b4384875c-4fa10deb-backup.hg
$ hg up -C 1 $ hg up -C 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
Error during post-close callback of the strip transaction Error during post-close callback of the debugstrip transaction
(They should be gracefully handled and reported) (They should be gracefully handled and reported)
$ cat > ../crashstrip.py << EOF $ cat > ../crashdebugstrip.py << EOF
> from mercurial import error > from mercurial import error
> def reposetup(ui, repo): > def reposetup(ui, repo):
> class crashstriprepo(repo.__class__): > class crashdebugstriprepo(repo.__class__):
> def transaction(self, desc, *args, **kwargs): > def transaction(self, desc, *args, **kwargs):
> tr = super(crashstriprepo, self).transaction(desc, *args, **kwargs) > tr = super(crashdebugstriprepo, self).transaction(desc, *args, **kwargs)
> if desc == b'strip': > if desc == b'debugstrip':
> def crash(tra): raise error.Abort(b'boom') > def crash(tra): raise error.Abort(b'boom')
> tr.addpostclose(b'crash', crash) > tr.addpostclose(b'crash', crash)
> return tr > return tr
> repo.__class__ = crashstriprepo > repo.__class__ = crashdebugstriprepo
> EOF > EOF
$ hg strip tip --config extensions.crash=$TESTTMP/crashstrip.py $ hg debugstrip tip --config extensions.crash=$TESTTMP/crashdebugstrip.py
saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/5c51d8d6557d-70daef06-backup.hg saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/5c51d8d6557d-70daef06-backup.hg
strip failed, backup bundle stored in '$TESTTMP/issue4736/.hg/strip-backup/5c51d8d6557d-70daef06-backup.hg'
abort: boom
[255]
test stripping a working directory parent doesn't switch named branches test debugstripping a working directory parent doesn't switch named branches
$ hg log -G $ hg log -G
@ changeset: 1:eca11cf91c71 @ changeset: 1:eca11cf91c71
| bookmark: blah
| tag: tip | tag: tip
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| summary: commitB | summary: commitB
| |
o changeset: 0:105141ef12d0 o changeset: 0:105141ef12d0
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
| | | |
| o changeset: 2:b1d33a8cadd9 | o changeset: 2:b1d33a8cadd9
|/ branch: new-branch |/ branch: new-branch
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| summary: start new branch | summary: start new branch
| |
o changeset: 1:eca11cf91c71 o changeset: 1:eca11cf91c71
| bookmark: blah
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| summary: commitB | summary: commitB
| |
o changeset: 0:105141ef12d0 o changeset: 0:105141ef12d0
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: commitA summary: commitA
$ hg strip --force -r 35358f982181 $ hg debugstrip --force -r 35358f982181
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/35358f982181-50d992d4-backup.hg saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/35358f982181-50d992d4-backup.hg
$ hg log -G $ hg log -G
@ changeset: 3:f62c6c09b707 @ changeset: 3:f62c6c09b707
| branch: new-branch | branch: new-branch
| tag: tip | tag: tip
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| summary: foo | summary: foo
| |
o changeset: 2:b1d33a8cadd9 o changeset: 2:b1d33a8cadd9
| branch: new-branch | branch: new-branch
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| summary: start new branch | summary: start new branch
| |
o changeset: 1:eca11cf91c71 o changeset: 1:eca11cf91c71
| bookmark: blah
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| summary: commitB | summary: commitB
| |
o changeset: 0:105141ef12d0 o changeset: 0:105141ef12d0
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: commitA summary: commitA
| | | |
o | changeset: 2:b1d33a8cadd9 o | changeset: 2:b1d33a8cadd9
|/ branch: new-branch |/ branch: new-branch
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| summary: start new branch | summary: start new branch
| |
o changeset: 1:eca11cf91c71 o changeset: 1:eca11cf91c71
| bookmark: blah
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| summary: commitB | summary: commitB
| |
o changeset: 0:105141ef12d0 o changeset: 0:105141ef12d0
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: commitA summary: commitA
$ hg strip -r 35358f982181 $ hg debugstrip -r 35358f982181
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/35358f982181-a6f020aa-backup.hg saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/35358f982181-a6f020aa-backup.hg
$ hg log -G $ hg log -G
@ changeset: 3:f62c6c09b707 @ changeset: 3:f62c6c09b707
| branch: new-branch | branch: new-branch
| tag: tip | tag: tip
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| summary: foo | summary: foo
| |
o changeset: 2:b1d33a8cadd9 o changeset: 2:b1d33a8cadd9
| branch: new-branch | branch: new-branch
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| summary: start new branch | summary: start new branch
| |
o changeset: 1:eca11cf91c71 o changeset: 1:eca11cf91c71
| bookmark: blah
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| summary: commitB | summary: commitB
| |
o changeset: 0:105141ef12d0 o changeset: 0:105141ef12d0
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: commitA summary: commitA
$ hg unbundle -u $TESTTMP/issue4736/.hg/strip-backup/35358f982181-a6f020aa-backup.hg $ hg unbundle -u $TESTTMP/issue4736/.hg/strip-backup/35358f982181-a6f020aa-backup.hg
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 2 changesets with 1 changes to 1 files added 2 changesets with 1 changes to 1 files
new changesets 35358f982181:4cf5e92caec2 (2 drafts) new changesets 35358f982181:4cf5e92caec2 (2 drafts)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg strip -k -r 35358f982181 $ hg debugstrip -k -r 35358f982181
saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/35358f982181-a6f020aa-backup.hg saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/35358f982181-a6f020aa-backup.hg
$ hg log -G $ hg log -G
@ changeset: 3:f62c6c09b707 @ changeset: 3:f62c6c09b707
| branch: new-branch | branch: new-branch
| tag: tip | tag: tip
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| summary: foo | summary: foo
| |
o changeset: 2:b1d33a8cadd9 o changeset: 2:b1d33a8cadd9
| branch: new-branch | branch: new-branch
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| summary: start new branch | summary: start new branch
| |
o changeset: 1:eca11cf91c71 o changeset: 1:eca11cf91c71
| bookmark: blah
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| summary: commitB | summary: commitB
| |
o changeset: 0:105141ef12d0 o changeset: 0:105141ef12d0
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: commitA summary: commitA
$ hg diff $ hg diff
diff -r f62c6c09b707 bar.txt diff -r f62c6c09b707 bar.txt
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/bar.txt Thu Jan 01 00:00:00 1970 +0000 +++ b/bar.txt Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+bar +bar
Use delayedstrip to strip inside a transaction Use delayedstrip to debugstrip inside a transaction
$ cd $TESTTMP $ cd $TESTTMP
$ hg init delayedstrip $ hg init delayedstrip
$ cd delayedstrip $ cd delayedstrip
$ hg debugdrawdag <<'EOS' $ hg debugdrawdag <<'EOS'
> D > D
> | > |
> C F H # Commit on top of "I", > C F H # Commit on top of "I",
> | |/| # Strip B+D+I+E+G+H+Z > | |/| # debugstrip B+D+I+E+G+H+Z
> I B E G > I B E G
> \|/ > \|/
> A Z > A Z
> EOS > EOS
$ cp -R . ../scmutilcleanup $ cp -R . ../scmutilcleanup
$ hg up -C I $ hg up -C I
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
b-D 6:7c78f703e465 b-D 6:7c78f703e465
b-F 7:d11b3456a873 b-F 7:d11b3456a873
b-F@divergent1 3:7fb047a69f22 b-F@divergent1 3:7fb047a69f22
b-F@divergent3 8:1473d4b996d1 b-F@divergent3 8:1473d4b996d1
b-G 8:1473d4b996d1 b-G 8:1473d4b996d1
b-I 0:426bada5c675 b-I 0:426bada5c675
b-Z -1:000000000000 b-Z -1:000000000000
Test the above using obsstore "by the way". Not directly related to strip, but Test the above using obsstore "by the way". Not directly related to debugstrip, but
we have reusable code here we have reusable code here
$ cd $TESTTMP/scmutilcleanup.obsstore $ cd $TESTTMP/scmutilcleanup.obsstore
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [experimental] > [experimental]
> evolution=true > evolution=true
> evolution.track-operation=1 > evolution.track-operation=1
> EOF > EOF
> [experimental] > [experimental]
> evolution=true > evolution=true
> EOF > EOF
$ echo a > a $ echo a > a
$ hg ci -Aqm a $ hg ci -Aqm a
$ hg ci --amend -m a2 $ hg ci --amend -m a2
$ hg debugobsolete $ hg debugobsolete
cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b 489bac576828490c0bb8d45eac9e5e172e4ec0a8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'} cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b 489bac576828490c0bb8d45eac9e5e172e4ec0a8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
$ hg strip . $ hg debugstrip .
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/issue5678/.hg/strip-backup/489bac576828-bef27e14-backup.hg saved backup bundle to $TESTTMP/issue5678/.hg/strip-backup/489bac576828-bef27e14-backup.hg
$ hg unbundle -q .hg/strip-backup/* $ hg unbundle -q .hg/strip-backup/*
$ hg debugobsolete $ hg debugobsolete
cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b 489bac576828490c0bb8d45eac9e5e172e4ec0a8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'} cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b 489bac576828490c0bb8d45eac9e5e172e4ec0a8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
$ cd .. $ cd ..

tests/test-help.t

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
debugtemplate debugtemplate
parse and apply a template parse and apply a template
debuguigetpass debuguigetpass
show prompt to type password show prompt to type password
debuguiprompt debuguiprompt

tests/test-strip.t

  • This file was copied to tests/test-debugstrip.t.