# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 2021-07-16 12:06:32
# Node ID 0e87c90f1cd53186228a5be2f702fd157786607f
# Parent  9217ab0ecdb8442f55deb9bb1b979f8934658257

dirstate: deprecate `dirstate.remove` in all cases

This will make sure that code will use the newer, more semantic API sooner than
later.

Differential Revision: https://phab.mercurial-scm.org/D11143

diff --git a/mercurial/dirstate.py b/mercurial/dirstate.py
--- a/mercurial/dirstate.py
+++ b/mercurial/dirstate.py
@@ -765,7 +765,14 @@ class dirstate(object):
 
     def remove(self, f):
         '''Mark a file removed'''
-        if not self.pendingparentchange():
+        if self.pendingparentchange():
+            util.nouideprecwarn(
+                b"do not use `remove` insde of update/merge context."
+                b" Use `update_file` or `update_file_p1`",
+                b'6.0',
+                stacklevel=2,
+            )
+        else:
             util.nouideprecwarn(
                 b"do not use `remove` outside of update/merge context."
                 b" Use `set_untracked`",