# HG changeset patch # User Pierre-Yves David # Date 2021-07-16 22:15:31 # Node ID c9e412712e0c4d4161d74eda81fc58d68ff776b4 # Parent ff481c23849691313de6140e558301939470d036 mq: use `update_file_p1` instead of `remove` when adjusting dirstate This is the new API. Differential Revision: https://phab.mercurial-scm.org/D11139 diff --git a/hgext/mq.py b/hgext/mq.py --- a/hgext/mq.py +++ b/hgext/mq.py @@ -1099,7 +1099,7 @@ class queue(object): 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 @@ class queue(object): 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 = []