Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
uncommit: use ctx1.status(ctx2) instead of repo.status(ctx1, ctx2)
authorMartin von Zweigbergk <martinvonz@google.com>
Fri, 27 Jul 2018 14:47:38 -0700
changeset 38812 3bd22c4d3711
parent 38811 260c17eaf3f7
child 38813 af5c0c933af8
uncommit: use ctx1.status(ctx2) instead of repo.status(ctx1, ctx2) Differential Revision: https://phab.mercurial-scm.org/D3998
hgext/uncommit.py file | annotate | diff | comparison | revisions 
--- a/hgext/uncommit.py	Fri Jul 27 14:46:59 2018 -0700
+++ b/hgext/uncommit.py	Fri Jul 27 14:47:38 2018 -0700
@@ -182,7 +182,7 @@
 
             with repo.dirstate.parentchange():
                 repo.dirstate.setparents(newid, node.nullid)
-                s = repo.status(old.p1(), old, match=match)
+                s = old.p1().status(old, match=match)
                 _fixdirstate(repo, old, repo[newid], s)
 
 def predecessormarkers(ctx):
hg-stable