equal
deleted
inserted
replaced
211 if size and (size != st_size or (mode ^ st_mode) & 0100): |
211 if size and (size != st_size or (mode ^ st_mode) & 0100): |
212 return 'm' |
212 return 'm' |
213 if time != int(st_mtime): |
213 if time != int(st_mtime): |
214 return 'l' |
214 return 'l' |
215 return 'n' |
215 return 'n' |
216 if type_ == '?' and self.dirstate._ignore(fn): |
216 if type_ == '?' and self.dirstate._dirignore(fn): |
|
217 # we must check not only if the file is ignored, but if any part |
|
218 # of its path match an ignore pattern |
217 return 'i' |
219 return 'i' |
218 return type_ |
220 return type_ |
219 |
221 |
220 def updatefile(self, wfn, osstat): |
222 def updatefile(self, wfn, osstat): |
221 ''' |
223 ''' |