Mercurial > public > mercurial-scm > hg

diff mercurial/dirstatemap.py @ 47983:ffde999a3ea9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate: same logic as what we did for `_drop` This is part of the dirstatemap so let the dirstatemap deal with it. Differential Revision: https://phab.mercurial-scm.org/D11423
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 15 Sep 2021 10:05:25 +0200
parents 4e6f27230aee
children 0d2a404f1932
line wrap: on
line diff
--- a/mercurial/dirstatemap.py	Wed Sep 15 09:28:17 2021 +0200
+++ b/mercurial/dirstatemap.py	Wed Sep 15 10:05:25 2021 +0200
@@ -188,6 +188,7 @@
             assert not possibly_dirty
             assert not from_p2
             new_entry = DirstateItem.new_added()
+            self.copymap.pop(f, None)
         elif merged:
             assert not possibly_dirty
             assert not from_p2
@@ -567,7 +568,7 @@
             from_p2=False,
             possibly_dirty=False,
         ):
-            return self._rustmap.addfile(
+            ret = self._rustmap.addfile(
                 f,
                 mode,
                 size,
@@ -577,6 +578,9 @@
                 from_p2,
                 possibly_dirty,
             )
+            if added:
+                self.copymap.pop(f, None)
+            return ret
 
         def reset_state(
             self,