equal
deleted
inserted
replaced
205 copies = all_copies.pop(r) |
205 copies = all_copies.pop(r) |
206 if r == b.rev(): |
206 if r == b.rev(): |
207 return copies |
207 return copies |
208 for i, c in enumerate(children[r]): |
208 for i, c in enumerate(children[r]): |
209 childctx = repo[c] |
209 childctx = repo[c] |
|
210 p1, p2 = cl.parentrevs(c) |
210 p1copies, p2copies = childctx._copies |
211 p1copies, p2copies = childctx._copies |
211 if r == childctx.p1().rev(): |
212 if r == p1: |
212 parent = 1 |
213 parent = 1 |
213 childcopies = p1copies |
214 childcopies = p1copies |
214 else: |
215 else: |
215 assert r == childctx.p2().rev() |
216 assert r == p2 |
216 parent = 2 |
217 parent = 2 |
217 childcopies = p2copies |
218 childcopies = p2copies |
218 if not alwaysmatch: |
219 if not alwaysmatch: |
219 childcopies = { |
220 childcopies = { |
220 dst: src for dst, src in childcopies.items() if match(dst) |
221 dst: src for dst, src in childcopies.items() if match(dst) |