equal
deleted
inserted
replaced
179 else: |
179 else: |
180 newfiles.append(f) |
180 newfiles.append(f) |
181 return newfiles |
181 return newfiles |
182 |
182 |
183 m = copy.copy(match) |
183 m = copy.copy(match) |
|
184 m._was_tampered_with = True |
184 m._files = tostandins(m._files) |
185 m._files = tostandins(m._files) |
185 |
186 |
186 result = orig( |
187 result = orig( |
187 node1, node2, m, ignored, clean, unknown, listsubrepos |
188 node1, node2, m, ignored, clean, unknown, listsubrepos |
188 ) |
189 ) |
191 def sfindirstate(f): |
192 def sfindirstate(f): |
192 sf = lfutil.standin(f) |
193 sf = lfutil.standin(f) |
193 dirstate = self.dirstate |
194 dirstate = self.dirstate |
194 return sf in dirstate or dirstate.hasdir(sf) |
195 return sf in dirstate or dirstate.hasdir(sf) |
195 |
196 |
|
197 match._was_tampered_with = True |
196 match._files = [f for f in match._files if sfindirstate(f)] |
198 match._files = [f for f in match._files if sfindirstate(f)] |
197 # Don't waste time getting the ignored and unknown |
199 # Don't waste time getting the ignored and unknown |
198 # files from lfdirstate |
200 # files from lfdirstate |
199 unsure, s, mtime_boundary = lfdirstate.status( |
201 unsure, s, mtime_boundary = lfdirstate.status( |
200 match, |
202 match, |