equal
deleted
inserted
replaced
226 m1['.hgsubstate'] += "+" |
226 m1['.hgsubstate'] += "+" |
227 break |
227 break |
228 |
228 |
229 prompts = [] |
229 prompts = [] |
230 # Compare manifests |
230 # Compare manifests |
231 visit = m1.iteritems() |
231 for f, n in m1.iteritems(): |
232 if repo.ui.debugflag: |
|
233 visit = sorted(visit) |
|
234 for f, n in visit: |
|
235 if partial and not partial(f): |
232 if partial and not partial(f): |
236 continue |
233 continue |
237 if f in m2: |
234 if f in m2: |
238 n2 = m2[f] |
235 n2 = m2[f] |
239 fl1, fl2, fla = m1.flags(f), m2.flags(f), ma.flags(f) |
236 fl1, fl2, fla = m1.flags(f), m2.flags(f), ma.flags(f) |
269 elif n[20:] == "a": # added, no remote |
266 elif n[20:] == "a": # added, no remote |
270 act("remote deleted", "f", f) |
267 act("remote deleted", "f", f) |
271 else: |
268 else: |
272 act("other deleted", "r", f) |
269 act("other deleted", "r", f) |
273 |
270 |
274 visit = m2.iteritems() |
271 for f, n in m2.iteritems(): |
275 if repo.ui.debugflag: |
|
276 visit = sorted(visit) |
|
277 for f, n in visit: |
|
278 if partial and not partial(f): |
272 if partial and not partial(f): |
279 continue |
273 continue |
280 if f in m1 or f in copied: # files already visited |
274 if f in m1 or f in copied: # files already visited |
281 continue |
275 continue |
282 if f in movewithdir: |
276 if f in movewithdir: |