equal
deleted
inserted
replaced
75 if dst in files) |
75 if dst in files) |
76 def filectxfn(repo, memctx, path, contentctx=ctx, redirect=()): |
76 def filectxfn(repo, memctx, path, contentctx=ctx, redirect=()): |
77 if path not in contentctx: |
77 if path not in contentctx: |
78 return None |
78 return None |
79 fctx = contentctx[path] |
79 fctx = contentctx[path] |
80 mctx = context.memfilectx(repo, fctx.path(), fctx.data(), |
80 mctx = context.memfilectx(repo, memctx, fctx.path(), fctx.data(), |
81 fctx.islink(), |
81 fctx.islink(), |
82 fctx.isexec(), |
82 fctx.isexec(), |
83 copied=copied.get(path)) |
83 copied=copied.get(path)) |
84 return mctx |
84 return mctx |
85 |
85 |