equal
deleted
inserted
replaced
147 # case of computing what copies are in a commit versus its parent (like |
147 # case of computing what copies are in a commit versus its parent (like |
148 # during a rebase or histedit). Note, we exclude merge commits from this |
148 # during a rebase or histedit). Note, we exclude merge commits from this |
149 # optimization, since the ctx.files() for a merge commit is not correct for |
149 # optimization, since the ctx.files() for a merge commit is not correct for |
150 # this comparison. |
150 # this comparison. |
151 forwardmissingmatch = match |
151 forwardmissingmatch = match |
152 if b.p1() == a and b.p2().node() == nullid: |
152 if b.p1() == a and b.p2().rev() == nullrev: |
153 filesmatcher = matchmod.exact(b.files()) |
153 filesmatcher = matchmod.exact(b.files()) |
154 forwardmissingmatch = matchmod.intersectmatchers(match, filesmatcher) |
154 forwardmissingmatch = matchmod.intersectmatchers(match, filesmatcher) |
155 if repo.ui.configbool(b'devel', b'copy-tracing.trace-all-files'): |
155 if repo.ui.configbool(b'devel', b'copy-tracing.trace-all-files'): |
156 missing = list(b.walk(match)) |
156 missing = list(b.walk(match)) |
157 # _computeforwardmissing(a, b, match=forwardmissingmatch) |
157 # _computeforwardmissing(a, b, match=forwardmissingmatch) |