##// END OF EJS Templates
dirstate.status: don't ignore symlink placeholders in the normal set...
Siddharth Agarwal -
r19651:902c6460 default
parent child Browse files
Show More
@@ -801,12 +801,9 b' class dirstate(object):'
801 801 mexact = match.exact
802 802 dirignore = self._dirignore
803 803 checkexec = self._checkexec
804 checklink = self._checklink
805 804 copymap = self._copymap
806 805 lastnormaltime = self._lastnormaltime
807 806
808 lnkkind = stat.S_IFLNK
809
810 807 # We need to do full walks when either
811 808 # - we're listing all clean files, or
812 809 # - match.traversedir does something, because match.traversedir should
@@ -827,20 +824,14 b' class dirstate(object):'
827 824 if not st and state in "nma":
828 825 dadd(fn)
829 826 elif state == 'n':
830 # The "mode & lnkkind != lnkkind or self._checklink"
831 # lines are an expansion of "islink => checklink"
832 # where islink means "is this a link?" and checklink
833 # means "can we check links?".
834 827 mtime = int(st.st_mtime)
835 828 if (size >= 0 and
836 829 ((size != st.st_size and size != st.st_size & _rangemask)
837 830 or ((mode ^ st.st_mode) & 0100 and checkexec))
838 and (mode & lnkkind != lnkkind or checklink)
839 831 or size == -2 # other parent
840 832 or fn in copymap):
841 833 madd(fn)
842 elif ((time != mtime and time != mtime & _rangemask)
843 and (mode & lnkkind != lnkkind or checklink)):
834 elif time != mtime and time != mtime & _rangemask:
844 835 ladd(fn)
845 836 elif mtime == lastnormaltime:
846 837 # fn may have been changed in the same timeslot without
General Comments 0
You need to be logged in to leave comments. Login now