equal
deleted
inserted
replaced
600 headmf = last.manifest() |
600 headmf = last.manifest() |
601 def filectxfn(repo, ctx, path): |
601 def filectxfn(repo, ctx, path): |
602 if path in headmf: |
602 if path in headmf: |
603 fctx = last[path] |
603 fctx = last[path] |
604 flags = fctx.flags() |
604 flags = fctx.flags() |
605 mctx = context.memfilectx(repo, |
605 mctx = context.memfilectx(repo, ctx, |
606 fctx.path(), fctx.data(), |
606 fctx.path(), fctx.data(), |
607 islink='l' in flags, |
607 islink='l' in flags, |
608 isexec='x' in flags, |
608 isexec='x' in flags, |
609 copied=copied.get(path)) |
609 copied=copied.get(path)) |
610 return mctx |
610 return mctx |