mirror of
https://github.com/facebook/sapling.git
synced 2024-10-12 01:39:21 +03:00
d7375d7397
Summary: When commits are added or modified, update the set of visible heads if visibility tracking is enabled. Reviewed By: DurhamG Differential Revision: D12980779 fbshipit-source-id: 8f44045159c86a374ae530fa4327ee0807b4320d
142 lines
4.6 KiB
Python
142 lines
4.6 KiB
Python
# hide.py - simple and user-friendly commands to hide and unhide commits
|
|
#
|
|
# Copyright 2011 Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
|
|
# Logilab SA <contact@logilab.fr>
|
|
# Pierre-Yves David <pierre-yves.david@ens-lyon.org>
|
|
# Patrick Mezard <patrick@mezard.eu>
|
|
# Copyright 2017 Facebook, Inc.
|
|
#
|
|
# This software may be used and distributed according to the terms of the
|
|
# GNU General Public License version 2 or any later version.
|
|
from __future__ import absolute_import
|
|
|
|
from edenscm.mercurial import (
|
|
bookmarks as bookmarksmod,
|
|
cmdutil,
|
|
error,
|
|
extensions,
|
|
hg,
|
|
hintutil,
|
|
obsolete,
|
|
registrar,
|
|
scmutil,
|
|
visibility,
|
|
)
|
|
from edenscm.mercurial.i18n import _
|
|
from edenscm.mercurial.node import short
|
|
|
|
|
|
cmdtable = {}
|
|
command = registrar.command(cmdtable)
|
|
|
|
|
|
@command(
|
|
"^hide",
|
|
[
|
|
("r", "rev", [], _("revisions to hide")),
|
|
(
|
|
"c",
|
|
"cleanup",
|
|
None,
|
|
_("cleanup obsolete commits (eg. marked as landed, amended, etc.)"),
|
|
),
|
|
],
|
|
_("[OPTION]... [-r] REV..."),
|
|
)
|
|
def hide(ui, repo, *revs, **opts):
|
|
"""hide changesets and their descendants
|
|
|
|
Hidden changesets are still accessible by their hashes which can be found
|
|
in ``hg journal``.
|
|
|
|
If a parent of the working directory is hidden, then the working directory
|
|
will automatically be updated to the most recent available ancestor of the
|
|
hidden parent.
|
|
|
|
If there is a bookmark pointing to the commit it will be removed.
|
|
|
|
--cleanup hides all the draft, obsolete commits that don't have non-obsolete
|
|
descendants.
|
|
"""
|
|
if opts.get("cleanup") and len(opts.get("rev") + list(revs)) != 0:
|
|
raise error.Abort(_("--rev and --cleanup are incompatible"))
|
|
elif opts.get("cleanup"):
|
|
# hides all the draft, obsolete commits that
|
|
# don't have non-obsolete descendants
|
|
revs = ["draft() & ::(head() & obsolete()) - ::(not obsolete())"]
|
|
else:
|
|
revs = list(revs) + opts.pop("rev", [])
|
|
revs = set(scmutil.revrange(repo, revs))
|
|
hidectxs = list(repo.set("(%ld)::", revs))
|
|
|
|
if not hidectxs:
|
|
raise error.Abort(_("nothing to hide"))
|
|
|
|
with repo.wlock(), repo.lock(), repo.transaction("hide") as tr:
|
|
# revs to be hidden
|
|
for ctx in hidectxs:
|
|
if not ctx.mutable():
|
|
raise error.Abort(
|
|
_("cannot hide immutable changeset: %s") % ctx,
|
|
hint="see 'hg help phases' for details",
|
|
)
|
|
if not ui.quiet:
|
|
ui.status(
|
|
_('hiding commit %s "%s"\n')
|
|
% (ctx, ctx.description().split("\n")[0][:50])
|
|
)
|
|
|
|
wdp = repo["."]
|
|
newnode = wdp
|
|
|
|
while newnode in hidectxs:
|
|
newnode = newnode.parents()[0]
|
|
|
|
if newnode.node() != wdp.node():
|
|
cmdutil.bailifchanged(repo, merge=False)
|
|
hg.update(repo, newnode, False)
|
|
ui.status(
|
|
_("working directory now at %s\n") % ui.label(str(newnode), "node")
|
|
)
|
|
|
|
# create markers
|
|
if obsolete.isenabled(repo, obsolete.createmarkersopt):
|
|
obsolete.createmarkers(repo, [(r, []) for r in hidectxs], operation="hide")
|
|
visibility.remove(repo, [c.node() for c in hidectxs])
|
|
ui.status(_("%i changesets hidden\n") % len(hidectxs))
|
|
|
|
# remove bookmarks pointing to hidden changesets
|
|
hnodes = [r.node() for r in hidectxs]
|
|
bmchanges = []
|
|
for book, node in sorted(bookmarksmod.listbinbookmarks(repo)):
|
|
if node in hnodes:
|
|
bmchanges.append((book, None))
|
|
if not ui.quiet:
|
|
ui.status(
|
|
_('removing bookmark "%s (was at: %s)"\n') % (book, short(node))
|
|
)
|
|
|
|
repo._bookmarks.applychanges(repo, tr, bmchanges)
|
|
|
|
if len(bmchanges) > 0:
|
|
ui.status(_("%i bookmarks removed\n") % len(bmchanges))
|
|
hintutil.trigger("undo")
|
|
|
|
|
|
@command(
|
|
"^unhide",
|
|
[("r", "rev", [], _("revisions to unhide"))],
|
|
_("[OPTION]... [-r] REV..."),
|
|
)
|
|
def unhide(ui, repo, *revs, **opts):
|
|
"""unhide changesets and their ancestors
|
|
"""
|
|
unfi = repo.unfiltered()
|
|
revs = list(revs) + opts.pop("rev", [])
|
|
with repo.lock():
|
|
revs = set(scmutil.revrange(unfi, revs))
|
|
if obsolete.isenabled(repo, obsolete.createmarkersopt):
|
|
ctxs = unfi.set("::(%ld) & obsolete()", revs)
|
|
obsolete.revive(ctxs, operation="unhide")
|
|
visibility.add(repo, [unfi[r].node() for r in revs])
|