mirror of
https://github.com/facebook/sapling.git
synced 2024-10-12 09:48:05 +03:00
104261775b
Summary: Add support for the `unamend` command. It should use the mutation predecessors if mutation is enabled, and update the visibility of the commits. Reviewed By: quark-zju Differential Revision: D15146976 fbshipit-source-id: e9ee4d26f45ba9e5c3c05a7bca80c8ac326adb9c
94 lines
2.9 KiB
Python
94 lines
2.9 KiB
Python
# unamend.py - undo an amend operation
|
|
#
|
|
# Copyright 2016 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 (
|
|
error,
|
|
extensions,
|
|
mutation,
|
|
node as nodemod,
|
|
obsolete,
|
|
obsutil,
|
|
registrar,
|
|
visibility,
|
|
)
|
|
from edenscm.mercurial.i18n import _
|
|
|
|
|
|
cmdtable = {}
|
|
command = registrar.command(cmdtable)
|
|
|
|
|
|
def predecessormarkers(ctx):
|
|
"""yields the obsolete markers marking the given changeset as a successor"""
|
|
for data in ctx.repo().obsstore.predecessors.get(ctx.node(), ()):
|
|
yield obsutil.marker(ctx.repo(), data)
|
|
|
|
|
|
@command("^unamend", [])
|
|
def unamend(ui, repo, **opts):
|
|
"""undo an amend operation on the current commit
|
|
|
|
This command will roll back to the previous version of a changeset,
|
|
leaving working directory in state in which it was before running
|
|
`hg amend` (e.g. files modified as part of an amend will be
|
|
marked as modified `hg status`)"""
|
|
unfi = repo.unfiltered()
|
|
|
|
# identify the commit from which to unamend
|
|
curctx = repo["."]
|
|
|
|
# identify the commit to which to unamend
|
|
if mutation.enabled(repo):
|
|
prednodes = curctx.mutationpredecessors()
|
|
else:
|
|
prednodes = [marker.prednode() for marker in predecessormarkers(curctx)]
|
|
|
|
if len(prednodes) != 1:
|
|
e = _("changeset must have one predecessor, found %i predecessors")
|
|
raise error.Abort(e % len(prednodes))
|
|
prednode = prednodes[0]
|
|
|
|
if extensions.enabled().get("commitcloud", False):
|
|
repo.revs("cloudremote(%s)" % nodemod.hex(prednode))
|
|
|
|
predctx = unfi[prednode]
|
|
|
|
if curctx.children():
|
|
raise error.Abort(_("cannot unamend in the middle of a stack"))
|
|
|
|
with repo.wlock(), repo.lock():
|
|
ctxbookmarks = curctx.bookmarks()
|
|
changedfiles = []
|
|
wctx = repo[None]
|
|
wm = wctx.manifest()
|
|
cm = predctx.manifest()
|
|
dirstate = repo.dirstate
|
|
diff = cm.diff(wm)
|
|
changedfiles.extend(diff.iterkeys())
|
|
|
|
tr = repo.transaction("unamend")
|
|
with dirstate.parentchange():
|
|
dirstate.rebuild(prednode, cm, changedfiles)
|
|
# we want added and removed files to be shown
|
|
# properly, not with ? and ! prefixes
|
|
for filename, data in diff.iteritems():
|
|
if data[0][0] is None:
|
|
dirstate.add(filename)
|
|
if data[1][0] is None:
|
|
dirstate.remove(filename)
|
|
changes = []
|
|
for book in ctxbookmarks:
|
|
changes.append((book, prednode))
|
|
repo._bookmarks.applychanges(repo, tr, changes)
|
|
if obsolete.isenabled(repo, obsolete.createmarkersopt):
|
|
obsolete.createmarkers(repo, [(curctx, (predctx,))])
|
|
visibility.remove(repo, [curctx.node()])
|
|
visibility.add(repo, [predctx.node()])
|
|
tr.close()
|