Show More
@@ -163,48 +163,46 b' def reposetup(ui, repo):' | |||
|
163 | 163 | result = super(lfilesrepo, self).status(node1, node2, m, |
|
164 | 164 | ignored, clean, unknown, listsubrepos) |
|
165 | 165 | if working: |
|
166 | try: | |
|
166 | ||
|
167 | def sfindirstate(f): | |
|
168 | sf = lfutil.standin(f) | |
|
169 | dirstate = self.dirstate | |
|
170 | return sf in dirstate or sf in dirstate.dirs() | |
|
167 | 171 | |
|
168 | def sfindirstate(f): | |
|
169 |
|
|
|
170 | dirstate = self.dirstate | |
|
171 | return sf in dirstate or sf in dirstate.dirs() | |
|
172 | match._files = [f for f in match._files | |
|
173 |
|
|
|
174 | # Don't waste time getting the ignored and unknown | |
|
175 |
|
|
|
176 | s = lfdirstate.status(match, [], False, | |
|
177 |
|
|
|
178 | (unsure, modified, added, removed, missing, _unknown, | |
|
179 |
|
|
|
180 |
|
|
|
181 |
|
|
|
182 |
|
|
|
183 |
|
|
|
184 |
|
|
|
185 |
|
|
|
186 |
e |
|
|
187 |
|
|
|
172 | match._files = [f for f in match._files | |
|
173 | if sfindirstate(f)] | |
|
174 | # Don't waste time getting the ignored and unknown | |
|
175 | # files from lfdirstate | |
|
176 | s = lfdirstate.status(match, [], False, | |
|
177 | listclean, False) | |
|
178 | (unsure, modified, added, removed, missing, _unknown, | |
|
179 | _ignored, clean) = s | |
|
180 | if parentworking: | |
|
181 | for lfile in unsure: | |
|
182 | standin = lfutil.standin(lfile) | |
|
183 | if standin not in ctx1: | |
|
184 | # from second parent | |
|
185 | modified.append(lfile) | |
|
186 | elif ctx1[standin].data().strip() \ | |
|
187 | != lfutil.hashfile(self.wjoin(lfile)): | |
|
188 | modified.append(lfile) | |
|
189 | else: | |
|
190 | clean.append(lfile) | |
|
191 | lfdirstate.normal(lfile) | |
|
192 | else: | |
|
193 | tocheck = unsure + modified + added + clean | |
|
194 | modified, added, clean = [], [], [] | |
|
195 | ||
|
196 | for lfile in tocheck: | |
|
197 | standin = lfutil.standin(lfile) | |
|
198 | if inctx(standin, ctx1): | |
|
199 | if ctx1[standin].data().strip() != \ | |
|
200 | lfutil.hashfile(self.wjoin(lfile)): | |
|
188 | 201 | modified.append(lfile) |
|
189 | 202 | else: |
|
190 | 203 | clean.append(lfile) |
|
191 |
|
|
|
192 |
|
|
|
193 | tocheck = unsure + modified + added + clean | |
|
194 | modified, added, clean = [], [], [] | |
|
195 | ||
|
196 | for lfile in tocheck: | |
|
197 | standin = lfutil.standin(lfile) | |
|
198 | if inctx(standin, ctx1): | |
|
199 | if ctx1[standin].data().strip() != \ | |
|
200 | lfutil.hashfile(self.wjoin(lfile)): | |
|
201 | modified.append(lfile) | |
|
202 | else: | |
|
203 | clean.append(lfile) | |
|
204 | else: | |
|
205 | added.append(lfile) | |
|
206 | finally: | |
|
207 | pass | |
|
204 | else: | |
|
205 | added.append(lfile) | |
|
208 | 206 | |
|
209 | 207 | # Standins no longer found in lfdirstate has been removed |
|
210 | 208 | for standin in ctx1.manifest(): |
General Comments 0
You need to be logged in to leave comments.
Login now