Show More
@@ -750,13 +750,19 b' class dirstate(object):' | |||||
750 | radd = removed.append |
|
750 | radd = removed.append | |
751 | dadd = deleted.append |
|
751 | dadd = deleted.append | |
752 | cadd = clean.append |
|
752 | cadd = clean.append | |
|
753 | mexact = match.exact | |||
|
754 | dirignore = self._dirignore | |||
|
755 | checkexec = self._checkexec | |||
|
756 | checklink = self._checklink | |||
|
757 | copymap = self._copymap | |||
|
758 | lastnormaltime = self._lastnormaltime | |||
753 |
|
759 | |||
754 | lnkkind = stat.S_IFLNK |
|
760 | lnkkind = stat.S_IFLNK | |
755 |
|
761 | |||
756 | for fn, st in self.walk(match, subrepos, listunknown, |
|
762 | for fn, st in self.walk(match, subrepos, listunknown, | |
757 | listignored).iteritems(): |
|
763 | listignored).iteritems(): | |
758 | if fn not in dmap: |
|
764 | if fn not in dmap: | |
759 |
if (listignored or m |
|
765 | if (listignored or mexact(fn)) and dirignore(fn): | |
760 | if listignored: |
|
766 | if listignored: | |
761 | iadd(fn) |
|
767 | iadd(fn) | |
762 | elif listunknown: |
|
768 | elif listunknown: | |
@@ -775,15 +781,15 b' class dirstate(object):' | |||||
775 | mtime = int(st.st_mtime) |
|
781 | mtime = int(st.st_mtime) | |
776 | if (size >= 0 and |
|
782 | if (size >= 0 and | |
777 | ((size != st.st_size and size != st.st_size & _rangemask) |
|
783 | ((size != st.st_size and size != st.st_size & _rangemask) | |
778 |
or ((mode ^ st.st_mode) & 0100 and |
|
784 | or ((mode ^ st.st_mode) & 0100 and checkexec)) | |
779 |
and (mode & lnkkind != lnkkind or |
|
785 | and (mode & lnkkind != lnkkind or checklink) | |
780 | or size == -2 # other parent |
|
786 | or size == -2 # other parent | |
781 |
or fn in |
|
787 | or fn in copymap): | |
782 | madd(fn) |
|
788 | madd(fn) | |
783 | elif ((time != mtime and time != mtime & _rangemask) |
|
789 | elif ((time != mtime and time != mtime & _rangemask) | |
784 |
and (mode & lnkkind != lnkkind or |
|
790 | and (mode & lnkkind != lnkkind or checklink)): | |
785 | ladd(fn) |
|
791 | ladd(fn) | |
786 |
elif mtime == |
|
792 | elif mtime == lastnormaltime: | |
787 | # fn may have been changed in the same timeslot without |
|
793 | # fn may have been changed in the same timeslot without | |
788 | # changing its size. This can happen if we quickly do |
|
794 | # changing its size. This can happen if we quickly do | |
789 | # multiple commits in a single transaction. |
|
795 | # multiple commits in a single transaction. |
General Comments 0
You need to be logged in to leave comments.
Login now