equal
deleted
inserted
replaced
2055 |
2055 |
2056 def filectxfn(repo, ctx_, path): |
2056 def filectxfn(repo, ctx_, path): |
2057 try: |
2057 try: |
2058 fctx = ctx[path] |
2058 fctx = ctx[path] |
2059 flags = fctx.flags() |
2059 flags = fctx.flags() |
2060 mctx = context.memfilectx(fctx.path(), fctx.data(), |
2060 mctx = context.memfilectx(repo, |
|
2061 fctx.path(), fctx.data(), |
2061 islink='l' in flags, |
2062 islink='l' in flags, |
2062 isexec='x' in flags, |
2063 isexec='x' in flags, |
2063 copied=copied.get(path)) |
2064 copied=copied.get(path)) |
2064 return mctx |
2065 return mctx |
2065 except KeyError: |
2066 except KeyError: |