Show More
@@ -636,6 +636,14 b' class dirstate(object):' | |||
|
636 | 636 | possibly_dirty=possibly_dirty, |
|
637 | 637 | ) |
|
638 | 638 | |
|
639 | def _get_filedata(self, filename): | |
|
640 | """returns""" | |
|
641 | s = os.lstat(self._join(filename)) | |
|
642 | mode = s.st_mode | |
|
643 | size = s.st_size | |
|
644 | mtime = s[stat.ST_MTIME] | |
|
645 | return (mode, size, mtime) | |
|
646 | ||
|
639 | 647 | def normal(self, f, parentfiledata=None): |
|
640 | 648 | """Mark a file normal and clean. |
|
641 | 649 | |
@@ -649,10 +657,7 b' class dirstate(object):' | |||
|
649 | 657 | if parentfiledata: |
|
650 | 658 | (mode, size, mtime) = parentfiledata |
|
651 | 659 | else: |
|
652 | s = os.lstat(self._join(f)) | |
|
653 | mode = s.st_mode | |
|
654 | size = s.st_size | |
|
655 | mtime = s[stat.ST_MTIME] | |
|
660 | (mode, size, mtime) = self._get_filedata(f) | |
|
656 | 661 | self._addpath(f, mode=mode, size=size, mtime=mtime) |
|
657 | 662 | self._map.copymap.pop(f, None) |
|
658 | 663 | if f in self._map.nonnormalset: |
General Comments 0
You need to be logged in to leave comments.
Login now