717 if mtime > self._lastnormaltime: |
717 if mtime > self._lastnormaltime: |
718 # Remember the most recent modification timeslot for status(), |
718 # Remember the most recent modification timeslot for status(), |
719 # to make sure we won't miss future size-preserving file content |
719 # to make sure we won't miss future size-preserving file content |
720 # modifications that happen within the same timeslot. |
720 # modifications that happen within the same timeslot. |
721 self._lastnormaltime = mtime |
721 self._lastnormaltime = mtime |
722 |
|
723 def normallookup(self, f): |
|
724 '''Mark a file normal, but possibly dirty.''' |
|
725 if self.pendingparentchange(): |
|
726 util.nouideprecwarn( |
|
727 b"do not use `normallookup` inside of update/merge context." |
|
728 b" Use `update_file` or `update_file_p1`", |
|
729 b'6.0', |
|
730 stacklevel=2, |
|
731 ) |
|
732 else: |
|
733 util.nouideprecwarn( |
|
734 b"do not use `normallookup` outside of update/merge context." |
|
735 b" Use `set_possibly_dirty` or `set_tracked`", |
|
736 b'6.0', |
|
737 stacklevel=2, |
|
738 ) |
|
739 self._normallookup(f) |
|
740 |
722 |
741 def _normallookup(self, f): |
723 def _normallookup(self, f): |
742 '''Mark a file normal, but possibly dirty.''' |
724 '''Mark a file normal, but possibly dirty.''' |
743 if self.in_merge: |
725 if self.in_merge: |
744 # if there is a merge going on and the file was either |
726 # if there is a merge going on and the file was either |