| pulkit |
| hg-reviewers |
It's now done in the same way for uncommit and unamend, so we can
share the code.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/uncommit.py (3 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| extra=ctx.extra()) | extra=ctx.extra()) | ||||
| return repo.commitctx(new) | return repo.commitctx(new) | ||||
| def _fixdirstate(repo, oldctx, newctx, match=None): | def _fixdirstate(repo, oldctx, newctx, match=None): | ||||
| """ fix the dirstate after switching the working directory from oldctx to | """ fix the dirstate after switching the working directory from oldctx to | ||||
| newctx which can be result of either unamend or uncommit. | newctx which can be result of either unamend or uncommit. | ||||
| """ | """ | ||||
| ds = repo.dirstate | ds = repo.dirstate | ||||
| ds.setparents(newctx.node(), node.nullid) | |||||
| copies = dict(ds.copies()) | copies = dict(ds.copies()) | ||||
| s = newctx.status(oldctx, match=match) | s = newctx.status(oldctx, match=match) | ||||
| for f in s.modified: | for f in s.modified: | ||||
| if ds[f] == 'r': | if ds[f] == 'r': | ||||
| # modified + removed -> removed | # modified + removed -> removed | ||||
| continue | continue | ||||
| ds.normallookup(f) | ds.normallookup(f) | ||||
| 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()] = () | ||||
| with repo.dirstate.parentchange(): | with repo.dirstate.parentchange(): | ||||
| repo.dirstate.setparents(newid, node.nullid) | |||||
| _fixdirstate(repo, old, repo[newid], match) | _fixdirstate(repo, old, repo[newid], match) | ||||
| scmutil.cleanupnodes(repo, mapping, 'uncommit', fixphase=True) | 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) | ||||
| user=predctx.user(), | user=predctx.user(), | ||||
| date=predctx.date(), | date=predctx.date(), | ||||
| extra=extras) | extra=extras) | ||||
| newprednode = repo.commitctx(newctx) | newprednode = repo.commitctx(newctx) | ||||
| newpredctx = repo[newprednode] | newpredctx = repo[newprednode] | ||||
| dirstate = repo.dirstate | dirstate = repo.dirstate | ||||
| with dirstate.parentchange(): | with dirstate.parentchange(): | ||||
| dirstate.setparents(newprednode, node.nullid) | |||||
| _fixdirstate(repo, curctx, newpredctx) | _fixdirstate(repo, curctx, newpredctx) | ||||
| mapping = {curctx.node(): (newprednode,)} | mapping = {curctx.node(): (newprednode,)} | ||||
| scmutil.cleanupnodes(repo, mapping, 'unamend', fixphase=True) | scmutil.cleanupnodes(repo, mapping, 'unamend', fixphase=True) | ||||