157 |
157 |
158 match._files = [f for f in match._files |
158 match._files = [f for f in match._files |
159 if sfindirstate(f)] |
159 if sfindirstate(f)] |
160 # Don't waste time getting the ignored and unknown |
160 # Don't waste time getting the ignored and unknown |
161 # files from lfdirstate |
161 # files from lfdirstate |
162 s = lfdirstate.status(match, [], False, |
162 unsure, s = lfdirstate.status(match, [], False, listclean, |
163 listclean, False) |
163 False) |
164 (unsure, modified, added, removed, missing, _unknown, |
164 (modified, added, removed, missing, _unknown, _ignored, |
165 _ignored, clean) = s |
165 clean) = s |
166 if parentworking: |
166 if parentworking: |
167 for lfile in unsure: |
167 for lfile in unsure: |
168 standin = lfutil.standin(lfile) |
168 standin = lfutil.standin(lfile) |
169 if standin not in ctx1: |
169 if standin not in ctx1: |
170 # from second parent |
170 # from second parent |
294 # It can cost a lot of time (several seconds) |
294 # It can cost a lot of time (several seconds) |
295 # otherwise to update all standins if the largefiles are |
295 # otherwise to update all standins if the largefiles are |
296 # large. |
296 # large. |
297 lfdirstate = lfutil.openlfdirstate(ui, self) |
297 lfdirstate = lfutil.openlfdirstate(ui, self) |
298 dirtymatch = match_.always(self.root, self.getcwd()) |
298 dirtymatch = match_.always(self.root, self.getcwd()) |
299 s = lfdirstate.status(dirtymatch, [], False, False, False) |
299 unsure, s = lfdirstate.status(dirtymatch, [], False, False, |
300 (unsure, modified, added, removed, _missing, _unknown, |
300 False) |
301 _ignored, _clean) = s |
301 modified, added, removed = s[:3] |
302 modifiedfiles = unsure + modified + added + removed |
302 modifiedfiles = unsure + modified + added + removed |
303 lfiles = lfutil.listlfiles(self) |
303 lfiles = lfutil.listlfiles(self) |
304 # this only loops through largefiles that exist (not |
304 # this only loops through largefiles that exist (not |
305 # removed/renamed) |
305 # removed/renamed) |
306 for lfile in lfiles: |
306 for lfile in lfiles: |