equal
deleted
inserted
replaced
664 ): |
664 ): |
665 # Remember the most recent modification timeslot for status(), |
665 # Remember the most recent modification timeslot for status(), |
666 # to make sure we won't miss future size-preserving file content |
666 # to make sure we won't miss future size-preserving file content |
667 # modifications that happen within the same timeslot. |
667 # modifications that happen within the same timeslot. |
668 self._lastnormaltime = parentfiledata[2] |
668 self._lastnormaltime = parentfiledata[2] |
669 |
|
670 def _addpath( |
|
671 self, |
|
672 f, |
|
673 mode=0, |
|
674 size=None, |
|
675 mtime=None, |
|
676 added=False, |
|
677 merged=False, |
|
678 from_p2=False, |
|
679 possibly_dirty=False, |
|
680 ): |
|
681 entry = self._map.get(f) |
|
682 if added or entry is not None and not entry.tracked: |
|
683 self._check_new_tracked_filename(f) |
|
684 self._dirty = True |
|
685 self._updatedfiles.add(f) |
|
686 self._map.addfile( |
|
687 f, |
|
688 mode=mode, |
|
689 size=size, |
|
690 mtime=mtime, |
|
691 added=added, |
|
692 merged=merged, |
|
693 from_p2=from_p2, |
|
694 possibly_dirty=possibly_dirty, |
|
695 ) |
|
696 |
669 |
697 def _check_new_tracked_filename(self, filename): |
670 def _check_new_tracked_filename(self, filename): |
698 scmutil.checkfilename(filename) |
671 scmutil.checkfilename(filename) |
699 if self._map.hastrackeddir(filename): |
672 if self._map.hastrackeddir(filename): |
700 msg = _(b'directory %r already in dirstate') |
673 msg = _(b'directory %r already in dirstate') |