Show More
@@ -130,7 +130,6 b' def findcopies(repo, m1, m2, ma, limit):' | |||||
130 |
|
130 | |||
131 | dcopies = repo.dirstate.copies() |
|
131 | dcopies = repo.dirstate.copies() | |
132 | copy = {} |
|
132 | copy = {} | |
133 | match = {} |
|
|||
134 | u1 = nonoverlap(m1, m2, ma) |
|
133 | u1 = nonoverlap(m1, m2, ma) | |
135 | u2 = nonoverlap(m2, m1, ma) |
|
134 | u2 = nonoverlap(m2, m1, ma) | |
136 | ctx = util.cachefunc(lambda f, n: repo.filectx(f, fileid=n[:20])) |
|
135 | ctx = util.cachefunc(lambda f, n: repo.filectx(f, fileid=n[:20])) | |
@@ -150,17 +149,12 b' def findcopies(repo, m1, m2, ma, limit):' | |||||
150 | for of in findold(c, limit): |
|
149 | for of in findold(c, limit): | |
151 | if of in m2: |
|
150 | if of in m2: | |
152 | checkpair(c, of, m2) |
|
151 | checkpair(c, of, m2) | |
153 | else: |
|
|||
154 | match.setdefault(of, []).append(f) |
|
|||
155 |
|
152 | |||
156 | for f in u2: |
|
153 | for f in u2: | |
157 | c = ctx(f, m2[f]) |
|
154 | c = ctx(f, m2[f]) | |
158 | for of in findold(c, limit): |
|
155 | for of in findold(c, limit): | |
159 | if of in m1: |
|
156 | if of in m1: | |
160 | checkpair(c, of, m1) |
|
157 | checkpair(c, of, m1) | |
161 | elif of in match: |
|
|||
162 | for mf in match[of]: |
|
|||
163 | checkpair(c, mf, m1) |
|
|||
164 |
|
158 | |||
165 | return copy |
|
159 | return copy | |
166 |
|
160 |
General Comments 0
You need to be logged in to leave comments.
Login now