equal
deleted
inserted
replaced
154 return newfiles |
154 return newfiles |
155 |
155 |
156 # Create a function that we can use to override what is |
156 # Create a function that we can use to override what is |
157 # normally the ignore matcher. We've already checked |
157 # normally the ignore matcher. We've already checked |
158 # for ignored files on the first dirstate walk, and |
158 # for ignored files on the first dirstate walk, and |
159 # unecessarily re-checking here causes a huge performance |
159 # unnecessarily re-checking here causes a huge performance |
160 # hit because lfdirstate only knows about largefiles |
160 # hit because lfdirstate only knows about largefiles |
161 def _ignoreoverride(self): |
161 def _ignoreoverride(self): |
162 return False |
162 return False |
163 |
163 |
164 m = copy.copy(match) |
164 m = copy.copy(match) |
190 s = lfdirstate.status(match, [], False, |
190 s = lfdirstate.status(match, [], False, |
191 listclean, False) |
191 listclean, False) |
192 (unsure, modified, added, removed, missing, unknown, |
192 (unsure, modified, added, removed, missing, unknown, |
193 ignored, clean) = s |
193 ignored, clean) = s |
194 # Replace the list of ignored and unknown files with |
194 # Replace the list of ignored and unknown files with |
195 # the previously caclulated lists, and strip out the |
195 # the previously calculated lists, and strip out the |
196 # largefiles |
196 # largefiles |
197 lfiles = set(lfdirstate._map) |
197 lfiles = set(lfdirstate._map) |
198 ignored = set(result[5]).difference(lfiles) |
198 ignored = set(result[5]).difference(lfiles) |
199 unknown = set(result[4]).difference(lfiles) |
199 unknown = set(result[4]).difference(lfiles) |
200 if parentworking: |
200 if parentworking: |