This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5660

uncommit: mark old node obsolete after updating dirstate
ClosedPublic

Authored by martinvonz on Jan 23 2019, 1:37 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGc9f1fd82a826: uncommit: mark old node obsolete after updating dirstate
Summary

The next patch will start doing more things with the context object
for the old node and that ran into problems without this
change. Regardless of that, I think it seems better to first update to
the new node and then mark the old node obsolete.

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.

Revision Contents
Changeset List

Diff 13407

hgext/uncommit.py

mapping = {} mapping = {}
if newid != old.p1().node(): if newid != old.p1().node():
# Move local changes on filtered changeset # Move local changes on filtered changeset
mapping[old.node()] = (newid,) mapping[old.node()] = (newid,)
else: else:
# Fully removed the old commit # Fully removed the old commit
mapping[old.node()] = () mapping[old.node()] = ()
scmutil.cleanupnodes(repo, mapping, 'uncommit', fixphase=True)
with repo.dirstate.parentchange(): with repo.dirstate.parentchange():
repo.dirstate.setparents(newid, node.nullid) repo.dirstate.setparents(newid, node.nullid)
s = old.p1().status(old, match=match) s = old.p1().status(old, match=match)
_fixdirstate(repo, old, repo[newid], s) _fixdirstate(repo, old, repo[newid], s)
scmutil.cleanupnodes(repo, mapping, 'uncommit', fixphase=True)
def predecessormarkers(ctx): def predecessormarkers(ctx):
"""yields the obsolete markers marking the given changeset as a successor""" """yields the obsolete markers marking the given changeset as a successor"""
for data in ctx.repo().obsstore.predecessors.get(ctx.node(), ()): for data in ctx.repo().obsstore.predecessors.get(ctx.node(), ()):
yield obsutil.marker(ctx.repo(), data) yield obsutil.marker(ctx.repo(), data)
@command('unamend', [], helpcategory=command.CATEGORY_CHANGE_MANAGEMENT, @command('unamend', [], helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
helpbasic=True) helpbasic=True)
def unamend(ui, repo, **opts): def unamend(ui, repo, **opts):