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