equal
deleted
inserted
replaced
773 # XXX this should probably be dealt with a a lower level |
773 # XXX this should probably be dealt with a a lower level |
774 # (see `merged_removed` and `from_p2_removed`) |
774 # (see `merged_removed` and `from_p2_removed`) |
775 if entry.merged_removed or entry.from_p2_removed: |
775 if entry.merged_removed or entry.from_p2_removed: |
776 source = self._map.copymap.get(f) |
776 source = self._map.copymap.get(f) |
777 if entry.merged_removed: |
777 if entry.merged_removed: |
778 self.merge(f) |
778 self._merge(f) |
779 elif entry.from_p2_removed: |
779 elif entry.from_p2_removed: |
780 self._otherparent(f) |
780 self._otherparent(f) |
781 if source is not None: |
781 if source is not None: |
782 self.copy(source, f) |
782 self.copy(source, f) |
783 return |
783 return |
857 self._updatedfiles.add(filename) |
857 self._updatedfiles.add(filename) |
858 self._map.removefile(filename, in_merge=self.in_merge) |
858 self._map.removefile(filename, in_merge=self.in_merge) |
859 |
859 |
860 def merge(self, f): |
860 def merge(self, f): |
861 '''Mark a file merged.''' |
861 '''Mark a file merged.''' |
|
862 if self.pendingparentchange(): |
|
863 util.nouideprecwarn( |
|
864 b"do not use `merge` inside of update/merge context." |
|
865 b" Use `update_file`", |
|
866 b'6.0', |
|
867 stacklevel=2, |
|
868 ) |
|
869 else: |
|
870 util.nouideprecwarn( |
|
871 b"do not use `merge` outside of update/merge context." |
|
872 b"It should have been set by the update/merge code", |
|
873 b'6.0', |
|
874 stacklevel=2, |
|
875 ) |
|
876 self._merge(f) |
|
877 |
|
878 def _merge(self, f): |
862 if not self.in_merge: |
879 if not self.in_merge: |
863 return self._normallookup(f) |
880 return self._normallookup(f) |
864 return self._otherparent(f) |
881 return self._otherparent(f) |
865 |
882 |
866 def drop(self, f): |
883 def drop(self, f): |