##// END OF EJS Templates
tests: use an absolute path to get around '..' being invalid on a dead CWD...
tests: use an absolute path to get around '..' being invalid on a dead CWD Only FreeBSD seems to be this picky. Note that this explicit absolute-path `cd` exposes a defect in the test, in that we end up still inside the cwd-vanish repository, but that's not a regression in this change. Since we're in a code freeze, I'm doing the smallest thing possible to try and fix bugs on FreeBSD, rather than cleaning up the entire problem. I'll follow up with a more complete fix after the freeze.

File last commit:

r29841:d5883fd0 default
r30849:763031a7 stable
Show More
strip.py
242 lines | 9.0 KiB | text/x-python | PythonLexer
Mads Kiilerich
spelling: fixes from proofreading of spell checker issues
r23139 """strip changesets and their descendants from history
Pierre-Yves David
mq: extract strip function as its standalone extension (issue3824)...
r19826
Javi Merino
strip: fix spelling: "allows to" -> "allows you to"
r19945 This extension allows you to strip changesets and all their descendants from the
Pierre-Yves David
mq: extract strip function as its standalone extension (issue3824)...
r19826 repository. See the command help for details.
"""
timeless
strip: use absolute_import
r28377 from __future__ import absolute_import
Yuya Nishihara
py3: move up symbol imports to enforce import-checker rules...
r29205 from mercurial.i18n import _
timeless
strip: use absolute_import
r28377 from mercurial import (
bookmarks as bookmarksmod,
cmdutil,
error,
hg,
lock as lockmod,
merge,
node as nodemod,
repair,
scmutil,
util,
)
nullid = nodemod.nullid
release = lockmod.release
Pierre-Yves David
mq: prepare a strip extension for extraction...
r19822
cmdtable = {}
command = cmdutil.command(cmdtable)
Augie Fackler
extensions: change magic "shipped with hg" string...
r29841 # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
Augie Fackler
extensions: document that `testedwith = 'internal'` is special...
r25186 # 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.
Augie Fackler
extensions: change magic "shipped with hg" string...
r29841 testedwith = 'ships-with-hg-core'
Pierre-Yves David
strip: move checksubstate from mq to strip...
r19823
def checksubstate(repo, baserev=None):
'''return list of subrepos at a different revision than substate.
Abort if any subrepos have uncommitted changes.'''
inclsubs = []
wctx = repo[None]
if baserev:
bctx = repo[baserev]
else:
bctx = wctx.parents()[0]
for s in sorted(wctx.substate):
FUJIWARA Katsunori
subrepo: add bailifchanged to centralize raising Abort if subrepo is dirty...
r24471 wctx.sub(s).bailifchanged(True)
if s not in bctx.substate or bctx.sub(s).dirty():
Pierre-Yves David
strip: move checksubstate from mq to strip...
r19823 inclsubs.append(s)
return inclsubs
Pierre-Yves David
strip: move checklocalchanges from mq to strip...
r19824 def checklocalchanges(repo, force=False, excsuffix=''):
cmdutil.checkunfinished(repo)
Martin von Zweigbergk
strip: make checklocalchanges() return full status tuple...
r22925 s = repo.status()
Pierre-Yves David
strip: move checklocalchanges from mq to strip...
r19824 if not force:
Martin von Zweigbergk
strip: make checklocalchanges() return full status tuple...
r22925 if s.modified or s.added or s.removed or s.deleted:
Pierre-Yves David
strip: move checklocalchanges from mq to strip...
r19824 _("local changes found") # i18n tool detection
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(_("local changes found" + excsuffix))
Pierre-Yves David
strip: move checklocalchanges from mq to strip...
r19824 if checksubstate(repo):
_("local changed subrepos found") # i18n tool detection
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(_("local changed subrepos found" + excsuffix))
Martin von Zweigbergk
strip: make checklocalchanges() return full status tuple...
r22925 return s
Pierre-Yves David
strip: move checklocalchanges from mq to strip...
r19824
Shubhanshu Agrawal
strip: strip a list of bookmarks...
r27029 def strip(ui, repo, revs, update=True, backup=True, force=None, bookmarks=None):
Pierre-Yves David
strip: move the strip helper function for mq to strip...
r19825 wlock = lock = None
try:
wlock = repo.wlock()
lock = repo.lock()
if update:
checklocalchanges(repo, force=force)
urev, p2 = repo.changelog.parents(revs[0])
Matt Mackall
strip: fix last unprotected mq reference (issue4097)
r20009 if (util.safehasattr(repo, 'mq') and
p2 != nullid
and p2 in [x.node for x in repo.mq.applied]):
Pierre-Yves David
strip: move the strip helper function for mq to strip...
r19825 urev = p2
hg.clean(repo, urev)
FUJIWARA Katsunori
dirstate: make dirstate.write() callers pass transaction object to it...
r26748 repo.dirstate.write(repo.currenttransaction())
Pierre-Yves David
strip: move the strip helper function for mq to strip...
r19825
repair.strip(ui, repo, revs, backup)
David Soria Parra
strip: remove bookmarks after strip succeed (issue4295)...
r21847
Shubhanshu Agrawal
strip: renaming local variables...
r26972 repomarks = repo._bookmarks
Shubhanshu Agrawal
strip: strip a list of bookmarks...
r27029 if bookmarks:
Bryan O'Sullivan
with: use a context manager for transaction in strip
r27872 with repo.transaction('strip') as tr:
Laurent Charignon
strip: use repo._bookmarks.recordchange instead of repo._bookmarks.write...
r27052 if repo._activebookmark in bookmarks:
bookmarksmod.deactivate(repo)
for bookmark in bookmarks:
del repomarks[bookmark]
repomarks.recordchange(tr)
Bryan O'Sullivan
with: use a context manager for transaction in strip
r27872 for bookmark in sorted(bookmarks):
ui.write(_("bookmark '%s' deleted\n") % bookmark)
Pierre-Yves David
strip: move the strip helper function for mq to strip...
r19825 finally:
release(lock, wlock)
Pierre-Yves David
mq: extract strip function as its standalone extension (issue3824)...
r19826
@command("strip",
[
('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, _('no backups')),
('', 'nobackup', None, _('no backups (DEPRECATED)')),
('n', '', None, _('ignored (DEPRECATED)')),
Yuya Nishihara
commands: replace "working copy" with "working directory" in help/messages...
r24364 ('k', 'keep', None, _("do not modify working directory during "
"strip")),
Shubhanshu Agrawal
strip: changing bookmark argument to be a list...
r27030 ('B', 'bookmark', [], _("remove revs only reachable from given"
Pierre-Yves David
mq: extract strip function as its standalone extension (issue3824)...
r19826 " bookmark"))],
FUJIWARA Katsunori
doc: remove deprecated option from synopsis of command help...
r28288 _('hg strip [-k] [-f] [-B bookmark] [-r] REV...'))
Pierre-Yves David
mq: extract strip function as its standalone extension (issue3824)...
r19826 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.
"""
Jordi Gutiérrez Hermoso
strip: remove -b/--backup codepaths...
r22057 backup = True
if opts.get('no_backup') or opts.get('nobackup'):
backup = False
Pierre-Yves David
mq: extract strip function as its standalone extension (issue3824)...
r19826
cl = repo.changelog
revs = list(revs) + opts.get('rev')
revs = set(scmutil.revrange(repo, revs))
Bryan O'Sullivan
with: use context manager for wlock in shelve stripcmd
r27839 with repo.wlock():
Shubhanshu Agrawal
strip: changing bookmark argument to be a list...
r27030 bookmarks = set(opts.get('bookmark'))
Shubhanshu Agrawal
strip: strip a list of bookmarks...
r27029 if bookmarks:
Shubhanshu Agrawal
strip: renaming local variables...
r26972 repomarks = repo._bookmarks
Shubhanshu Agrawal
strip: strip a list of bookmarks...
r27029 if not bookmarks.issubset(repomarks):
raise error.Abort(_("bookmark '%s' not found") %
','.join(sorted(bookmarks - set(repomarks.keys()))))
Siddharth Agarwal
strip: hold wlock for entire duration...
r20096
# 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.
Shubhanshu Agrawal
strip: strip a list of bookmarks...
r27029 nodetobookmarks = {}
for mark, node in repomarks.iteritems():
nodetobookmarks.setdefault(node, []).append(mark)
for marks in nodetobookmarks.values():
if bookmarks.issuperset(marks):
Shubhanshu Agrawal
strip: changing bookmark argument to be a list...
r27030 rsrevs = repair.stripbmrevset(repo, marks[0])
revs.update(set(rsrevs))
Siddharth Agarwal
strip: hold wlock for entire duration...
r20096 if not revs:
Laurent Charignon
strip: use repo._bookmarks.recordchange instead of repo._bookmarks.write...
r27052 lock = tr = None
try:
lock = repo.lock()
tr = repo.transaction('bookmark')
for bookmark in bookmarks:
del repomarks[bookmark]
repomarks.recordchange(tr)
tr.close()
for bookmark in sorted(bookmarks):
ui.write(_("bookmark '%s' deleted\n") % bookmark)
finally:
release(lock, tr)
Siddharth Agarwal
strip: hold wlock for entire duration...
r20096
if not revs:
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(_('empty revision set'))
Siddharth Agarwal
strip: hold wlock for entire duration...
r20096
descendants = set(cl.descendants(revs))
strippedrevs = revs.union(descendants)
roots = revs.difference(descendants)
update = False
# if one of the wdir parent is stripped we'll need
# to update away to an earlier revision
for p in repo.dirstate.parents():
if p != nullid and cl.rev(p) in strippedrevs:
update = True
break
rootnodes = set(cl.node(r) for r in roots)
Pierre-Yves David
mq: extract strip function as its standalone extension (issue3824)...
r19826
Siddharth Agarwal
strip: hold wlock for entire duration...
r20096 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'):
Siddharth Agarwal
strip.stripcmd: remove redundant wlock acquire/release...
r20102 urev, p2 = repo.changelog.parents(revs[0])
if (util.safehasattr(repo, 'mq') and p2 != nullid
and p2 in [x.node for x in repo.mq.applied]):
urev = p2
uctx = repo[urev]
Siddharth Agarwal
strip: hold wlock for entire duration...
r20096
Siddharth Agarwal
strip.stripcmd: remove redundant wlock acquire/release...
r20102 # only reset the dirstate for files that would actually change
# between the working context and uctx
descendantrevs = repo.revs("%s::." % uctx.rev())
changedfiles = []
for rev in descendantrevs:
# blindly reset the files, regardless of what actually changed
changedfiles.extend(repo[rev].files())
Siddharth Agarwal
strip: hold wlock for entire duration...
r20096
Siddharth Agarwal
strip.stripcmd: remove redundant wlock acquire/release...
r20102 # 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)
Siddharth Agarwal
strip: hold wlock for entire duration...
r20096
Siddharth Agarwal
strip.stripcmd: remove redundant wlock acquire/release...
r20102 repo.dirstate.rebuild(urev, uctx.manifest(), changedfiles)
FUJIWARA Katsunori
dirstate: make dirstate.write() callers pass transaction object to it...
r26748 repo.dirstate.write(repo.currenttransaction())
Matt Mackall
strip: properly clear resolve state with --keep (issue4593)...
r24709
# clear resolve state
Siddharth Agarwal
strip: switch to mergestate.clean()...
r26988 merge.mergestate.clean(repo, repo['.'].node())
Matt Mackall
strip: properly clear resolve state with --keep (issue4593)...
r24709
Siddharth Agarwal
strip.stripcmd: remove redundant wlock acquire/release...
r20102 update = False
Siddharth Agarwal
strip: hold wlock for entire duration...
r20096
Pierre-Yves David
mq: extract strip function as its standalone extension (issue3824)...
r19826
Siddharth Agarwal
strip: hold wlock for entire duration...
r20096 strip(ui, repo, revs, backup=backup, update=update,
Shubhanshu Agrawal
strip: strip a list of bookmarks...
r27029 force=opts.get('force'), bookmarks=bookmarks)
Pierre-Yves David
mq: extract strip function as its standalone extension (issue3824)...
r19826
return 0