equal
deleted
inserted
replaced
186 if added: |
186 if added: |
187 assert not merged |
187 assert not merged |
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 |
194 new_entry = DirstateItem.new_merged() |
195 new_entry = DirstateItem.new_merged() |
195 elif from_p2: |
196 elif from_p2: |
565 added=False, |
566 added=False, |
566 merged=False, |
567 merged=False, |
567 from_p2=False, |
568 from_p2=False, |
568 possibly_dirty=False, |
569 possibly_dirty=False, |
569 ): |
570 ): |
570 return self._rustmap.addfile( |
571 ret = self._rustmap.addfile( |
571 f, |
572 f, |
572 mode, |
573 mode, |
573 size, |
574 size, |
574 mtime, |
575 mtime, |
575 added, |
576 added, |
576 merged, |
577 merged, |
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, |
583 filename, |
587 filename, |
584 wc_tracked, |
588 wc_tracked, |