Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/merge.py @ 18456:8a811fa9a9c0 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: only sort manifests in debug mode (issue3769)
author Matt Mackall <mpm@selenic.com>
date Sun, 20 Jan 2013 17:18:00 -0600
parents 6252b4f1c4b4
children 9de9727cea53
comparison
equal deleted inserted replaced
18455:28aaa24dc36b 18456:8a811fa9a9c0
226 if p1.sub(s).dirty(): 226 if p1.sub(s).dirty():
227 m1['.hgsubstate'] += "+" 227 m1['.hgsubstate'] += "+"
228 break 228 break
229 229
230 # Compare manifests 230 # Compare manifests
231 for f, n in sorted(m1.iteritems()): 231 visit = m1.iteritems()
232 if repo.ui.debugflag:
233 visit = sorted(visit)
234 for f, n in visit:
232 if partial and not partial(f): 235 if partial and not partial(f):
233 continue 236 continue
234 if f in m2: 237 if f in m2:
235 n2 = m2[f] 238 n2 = m2[f]
236 fl1, fl2, fla = m1.flags(f), m2.flags(f), ma.flags(f) 239 fl1, fl2, fla = m1.flags(f), m2.flags(f), ma.flags(f)
272 elif n[20:] == "a": # added, no remote 275 elif n[20:] == "a": # added, no remote
273 act("remote deleted", "f", f) 276 act("remote deleted", "f", f)
274 else: 277 else:
275 act("other deleted", "r", f) 278 act("other deleted", "r", f)
276 279
277 for f, n in sorted(m2.iteritems()): 280 visit = m2.iteritems()
281 if repo.ui.debugflag:
282 visit = sorted(visit)
283 for f, n in visit:
278 if partial and not partial(f): 284 if partial and not partial(f):
279 continue 285 continue
280 if f in m1 or f in copied: # files already visited 286 if f in m1 or f in copied: # files already visited
281 continue 287 continue
282 if f in movewithdir: 288 if f in movewithdir: