equal
deleted
inserted
replaced
2561 flags = fctx.flags() |
2561 flags = fctx.flags() |
2562 mctx = context.memfilectx(repo, ctx_, |
2562 mctx = context.memfilectx(repo, ctx_, |
2563 fctx.path(), fctx.data(), |
2563 fctx.path(), fctx.data(), |
2564 islink='l' in flags, |
2564 islink='l' in flags, |
2565 isexec='x' in flags, |
2565 isexec='x' in flags, |
2566 copied=copied.get(path)) |
2566 copysource=copied.get(path)) |
2567 return mctx |
2567 return mctx |
2568 except KeyError: |
2568 except KeyError: |
2569 return None |
2569 return None |
2570 else: |
2570 else: |
2571 ui.note(_('copying changeset %s to %s\n') % (old, base)) |
2571 ui.note(_('copying changeset %s to %s\n') % (old, base)) |