Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mq: use `update_file_p1` instead of `remove` when adjusting dirstate
authorPierre-Yves David <pierre-yves.david@octobus.net>
Sat, 17 Jul 2021 00:15:31 +0200
changeset 47697 c9e412712e0c
parent 47696 ff481c238496
child 47698 9fa1085fbd63
mq: use `update_file_p1` instead of `remove` when adjusting dirstate This is the new API. Differential Revision: https://phab.mercurial-scm.org/D11139
hgext/mq.py file | annotate | diff | comparison | revisions 
--- a/hgext/mq.py	Mon Jul 19 04:43:28 2021 +0200
+++ b/hgext/mq.py	Sat Jul 17 00:15:31 2021 +0200
@@ -1099,7 +1099,7 @@
                         removed.append(f)
                 with repo.dirstate.parentchange():
                     for f in removed:
-                        repo.dirstate.remove(f)
+                        repo.dirstate.update_file_p1(f, p1_tracked=True)
                     for f in merged:
                         repo.dirstate.merge(f)
                     p1 = repo.dirstate.p1()
@@ -2038,7 +2038,7 @@
                         for f in list(repo.dirstate.copies()):
                             repo.dirstate.copy(None, f)
                     for f in r:
-                        repo.dirstate.remove(f)
+                        repo.dirstate.update_file_p1(f, p1_tracked=True)
                     # if the patch excludes a modified file, mark that
                     # file with mtime=0 so status can see it.
                     mm = []
Mercurial