mercurial-crew-with-dirclash: mercurial/merge.py comparison

merge: move partial filtering out of manifest merge

comparison

equal deleted inserted replaced

-:84561ea8711e
+:a9e75b371315
 for mf in match[of]:
 checkpair(c, mf, m1)
 return copy
-def manifestmerge(ui, m1, m2, ma, overwrite, backwards, partial):
+def filtermanifest(man, partial):
+if partial:
+for k in man.keys():
+if not partial(k): del man[k]
+def manifestmerge(ui, m1, m2, ma, overwrite, backwards):
 """
 Merge manifest m1 with m2 using ancestor ma and generate merge action list
 """
 def fmerge(f):
 action = []
 def act(msg, f, m, *args):
 ui.debug(" %s: %s -> %s\n" % (f, msg, m))
 action.append((f, m) + args)
-# Filter manifests
-if partial:
-for f in m1.keys():
-if not partial(f): del m1[f]
-for f in m2.keys():
-if not partial(f): del m2[f]
 # Compare manifests
 for f, n in m1.iteritems():
 if f in m2:
 # are files different?
 action = []
 copy = {}
 m1 = workingmanifest(repo, m1, status)
+filtermanifest(m1, partial)
+filtermanifest(m2, partial)
 if not force:
 checkunknown(repo, m2, status)
 if not branchmerge:
 action += forgetremoved(m2, status)
 if not (backwards or overwrite):
 copy = findcopies(repo, m1, m2, repo.changelog.rev(pa))
-action += manifestmerge(repo.ui, m1, m2, ma, overwrite, backwards, partial)
+action += manifestmerge(repo.ui, m1, m2, ma, overwrite, backwards)
 del m1, m2, ma
 ### apply phase
 if not branchmerge:

Mercurial > hg > mercurial-crew-with-dirclash