2128 islink='l' in flags, |
2128 islink='l' in flags, |
2129 isexec='x' in flags, |
2129 isexec='x' in flags, |
2130 copied=copied.get(path)) |
2130 copied=copied.get(path)) |
2131 return mctx |
2131 return mctx |
2132 except KeyError: |
2132 except KeyError: |
2133 raise IOError |
2133 return None |
2134 else: |
2134 else: |
2135 ui.note(_('copying changeset %s to %s\n') % (old, base)) |
2135 ui.note(_('copying changeset %s to %s\n') % (old, base)) |
2136 |
2136 |
2137 # Use version of files as in the old cset |
2137 # Use version of files as in the old cset |
2138 def filectxfn(repo, ctx_, path): |
2138 def filectxfn(repo, ctx_, path): |
2139 try: |
2139 try: |
2140 return old.filectx(path) |
2140 return old.filectx(path) |
2141 except KeyError: |
2141 except KeyError: |
2142 raise IOError |
2142 return None |
2143 |
2143 |
2144 user = opts.get('user') or old.user() |
2144 user = opts.get('user') or old.user() |
2145 date = opts.get('date') or old.date() |
2145 date = opts.get('date') or old.date() |
2146 editform = mergeeditform(old, 'commit.amend') |
2146 editform = mergeeditform(old, 'commit.amend') |
2147 editor = getcommiteditor(editform=editform, **opts) |
2147 editor = getcommiteditor(editform=editform, **opts) |