Mercurial > hg
comparison hgext/uncommit.py @ 38771:3bd22c4d3711
uncommit: use ctx1.status(ctx2) instead of repo.status(ctx1, ctx2)
Differential Revision: https://phab.mercurial-scm.org/D3998
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 27 Jul 2018 14:47:38 -0700 |
| parents | 32fba6fe893d |
| children | c303d65d2e34 |
comparison
equal
deleted
inserted
replaced
| 38770:260c17eaf3f7 | 38771:3bd22c4d3711 |
|---|---|
| 180 | 180 |
| 181 scmutil.cleanupnodes(repo, mapping, 'uncommit', fixphase=True) | 181 scmutil.cleanupnodes(repo, mapping, 'uncommit', fixphase=True) |
| 182 | 182 |
| 183 with repo.dirstate.parentchange(): | 183 with repo.dirstate.parentchange(): |
| 184 repo.dirstate.setparents(newid, node.nullid) | 184 repo.dirstate.setparents(newid, node.nullid) |
| 185 s = repo.status(old.p1(), old, match=match) | 185 s = old.p1().status(old, match=match) |
| 186 _fixdirstate(repo, old, repo[newid], s) | 186 _fixdirstate(repo, old, repo[newid], s) |
| 187 | 187 |
| 188 def predecessormarkers(ctx): | 188 def predecessormarkers(ctx): |
| 189 """yields the obsolete markers marking the given changeset as a successor""" | 189 """yields the obsolete markers marking the given changeset as a successor""" |
| 190 for data in ctx.repo().obsstore.predecessors.get(ctx.node(), ()): | 190 for data in ctx.repo().obsstore.predecessors.get(ctx.node(), ()): |