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

equal deleted inserted replaced

-:b008deae9910
+:0912d8df5e19
 # This software may be used and distributed according to the terms
 # of the GNU General Public License, incorporated herein by reference.
 from node import *
 from i18n import _
-import errno, util, os, tempfile
+import errno, util, os, tempfile, context
 def filemerge(repo, fw, fo, wctx, mctx):
 """perform a 3-way merge in the working directory
 fw = filename in the working directory
 f = dirname(f)
 while f not in d:
 d[f] = True
 f = dirname(f)
 return d
+wctx = repo.workingctx()
+def makectx(f, n):
+if len(n) == 20:
+return repo.filectx(f, fileid=n)
+return wctx.filectx(f)
+ctx = util.cachefunc(makectx)
 def findold(fctx):
 "find files that path was copied from, back to linkrev limit"
 old = {}
 seen = {}
 if not ca: # unrelated?
 continue
 # named changed on only one side?
 if ca.path() == c.path() or ca.path() == c2.path():
 fullcopy[c.path()] = of # remember for dir rename detection
-if c == c2: # no merge needed, ignore copy
+if c == ca or c2 == ca: # no merge needed, ignore copy
 continue
 copy[c.path()] = of
 if not repo.ui.configbool("merge", "followcopies", True):
 return {}
 # avoid silly behavior for update from empty dir
 if not m1 or not m2 or not ma:
 return {}
-dcopies = repo.dirstate.copies()
 u1 = nonoverlap(m1, m2, ma)
 u2 = nonoverlap(m2, m1, ma)
-ctx = util.cachefunc(lambda f, n: repo.filectx(f, fileid=n[:20]))
 for f in u1:
-checkcopies(ctx(dcopies.get(f, f), m1[f]), m2)
+checkcopies(ctx(f, m1[f]), m2)
 for f in u2:
 checkcopies(ctx(f, m2[f]), m1)
 if not fullcopy or not repo.ui.configbool("merge", "followdirs", True):

changeset 4417	0912d8df5e19
parent 4410	bbc97d419b16
parent 4416	bb1800a7d7e1
child 4603	66ed92ed115a