Show More
@@ -738,7 +738,6 class dirstate(object): | |||||
738 | def _add(self, filename): |
|
738 | def _add(self, filename): | |
739 | """internal function to mark a file as added""" |
|
739 | """internal function to mark a file as added""" | |
740 | self._addpath(filename, added=True) |
|
740 | self._addpath(filename, added=True) | |
741 | self._map.copymap.pop(filename, None) |
|
|||
742 |
|
741 | |||
743 | def _drop(self, filename): |
|
742 | def _drop(self, filename): | |
744 | """internal function to drop a file from the dirstate""" |
|
743 | """internal function to drop a file from the dirstate""" |
@@ -188,6 +188,7 class dirstatemap(object): | |||||
188 | assert not possibly_dirty |
|
188 | assert not possibly_dirty | |
189 | assert not from_p2 |
|
189 | assert not from_p2 | |
190 | new_entry = DirstateItem.new_added() |
|
190 | new_entry = DirstateItem.new_added() | |
|
191 | self.copymap.pop(f, None) | |||
191 | elif merged: |
|
192 | elif merged: | |
192 | assert not possibly_dirty |
|
193 | assert not possibly_dirty | |
193 | assert not from_p2 |
|
194 | assert not from_p2 | |
@@ -567,7 +568,7 if rustmod is not None: | |||||
567 | from_p2=False, |
|
568 | from_p2=False, | |
568 | possibly_dirty=False, |
|
569 | possibly_dirty=False, | |
569 | ): |
|
570 | ): | |
570 |
ret |
|
571 | ret = self._rustmap.addfile( | |
571 | f, |
|
572 | f, | |
572 | mode, |
|
573 | mode, | |
573 | size, |
|
574 | size, | |
@@ -577,6 +578,9 if rustmod is not None: | |||||
577 | from_p2, |
|
578 | from_p2, | |
578 | possibly_dirty, |
|
579 | possibly_dirty, | |
579 | ) |
|
580 | ) | |
|
581 | if added: | |||
|
582 | self.copymap.pop(f, None) | |||
|
583 | return ret | |||
580 |
|
584 | |||
581 | def reset_state( |
|
585 | def reset_state( | |
582 | self, |
|
586 | self, |
General Comments 0
You need to be logged in to leave comments.
Login now