equal
deleted
inserted
replaced
78 return ctx.p1().node() |
78 return ctx.p1().node() |
79 |
79 |
80 files = initialfiles - exclude |
80 files = initialfiles - exclude |
81 # Filter copies |
81 # Filter copies |
82 copied = copiesmod.pathcopies(base, ctx) |
82 copied = copiesmod.pathcopies(base, ctx) |
83 copied = { |
83 copied = {dst: src for dst, src in copied.items() if dst in files} |
84 dst: src for dst, src in pycompat.iteritems(copied) if dst in files |
|
85 } |
|
86 |
84 |
87 def filectxfn(repo, memctx, path, contentctx=ctx, redirect=()): |
85 def filectxfn(repo, memctx, path, contentctx=ctx, redirect=()): |
88 if path not in contentctx: |
86 if path not in contentctx: |
89 return None |
87 return None |
90 fctx = contentctx[path] |
88 fctx = contentctx[path] |