equal
deleted
inserted
replaced
599 |
599 |
600 def filectxfn(repo, memctx, path): |
600 def filectxfn(repo, memctx, path): |
601 if path not in ctx: |
601 if path not in ctx: |
602 return None |
602 return None |
603 fctx = ctx[path] |
603 fctx = ctx[path] |
604 copied = fctx.copysource() |
604 copysource = fctx.copysource() |
605 return context.memfilectx( |
605 return context.memfilectx( |
606 repo, |
606 repo, |
607 memctx, |
607 memctx, |
608 path=fctx.path(), |
608 path=fctx.path(), |
609 data=filedata.get(path, fctx.data()), |
609 data=filedata.get(path, fctx.data()), |
610 islink=fctx.islink(), |
610 islink=fctx.islink(), |
611 isexec=fctx.isexec(), |
611 isexec=fctx.isexec(), |
612 copied=copied) |
612 copysource=copysource) |
613 |
613 |
614 extra = ctx.extra().copy() |
614 extra = ctx.extra().copy() |
615 extra['fix_source'] = ctx.hex() |
615 extra['fix_source'] = ctx.hex() |
616 |
616 |
617 memctx = context.memctx( |
617 memctx = context.memctx( |