| durin42 | |
| yuja |
| hg-reviewers |
It is convention for context instances to end with "ctx." Until
we have type annotations, this makes auditing much, much easier.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| # ui.forcemerge is an internal variable, do not document | # ui.forcemerge is an internal variable, do not document | ||||
| repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), | repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), | ||||
| 'histedit') | 'histedit') | ||||
| stats = mergemod.graft(repo, ctx, ctx.p1(), ['local', 'histedit']) | stats = mergemod.graft(repo, ctx, ctx.p1(), ['local', 'histedit']) | ||||
| finally: | finally: | ||||
| repo.ui.setconfig('ui', 'forcemerge', '', 'histedit') | repo.ui.setconfig('ui', 'forcemerge', '', 'histedit') | ||||
| return stats | return stats | ||||
| def collapse(repo, first, last, commitopts, skipprompt=False): | def collapse(repo, firstctx, lastctx, commitopts, skipprompt=False): | ||||
| """collapse the set of revisions from first to last as new one. | """collapse the set of revisions from first to last as new one. | ||||
| Expected commit options are: | Expected commit options are: | ||||
| - message | - message | ||||
| - date | - date | ||||
| - username | - username | ||||
| Commit message is edited in all cases. | Commit message is edited in all cases. | ||||
| This function works in memory.""" | This function works in memory.""" | ||||
| ctxs = list(repo.set('%d::%d', first, last)) | ctxs = list(repo.set('%d::%d', firstctx, lastctx)) | ||||
| if not ctxs: | if not ctxs: | ||||
| return None | return None | ||||
| for c in ctxs: | for c in ctxs: | ||||
| if not c.mutable(): | if not c.mutable(): | ||||
| raise error.ParseError( | raise error.ParseError( | ||||
| _("cannot fold into public change %s") % node.short(c.node())) | _("cannot fold into public change %s") % node.short(c.node())) | ||||
| base = first.parents()[0] | base = firstctx.parents()[0] | ||||
| # commit a new version of the old changeset, including the update | # commit a new version of the old changeset, including the update | ||||
| # collect all files which might be affected | # collect all files which might be affected | ||||
| files = set() | files = set() | ||||
| for ctx in ctxs: | for ctx in ctxs: | ||||
| files.update(ctx.files()) | files.update(ctx.files()) | ||||
| # Recompute copies (avoid recording a -> b -> a) | # Recompute copies (avoid recording a -> b -> a) | ||||
| copied = copies.pathcopies(base, last) | copied = copies.pathcopies(base, lastctx) | ||||
| # prune files which were reverted by the updates | # prune files which were reverted by the updates | ||||
| files = [f for f in files if not cmdutil.samefile(f, last, base)] | files = [f for f in files if not cmdutil.samefile(f, lastctx, base)] | ||||
| # commit version of these files as defined by head | # commit version of these files as defined by head | ||||
| headmf = last.manifest() | headmf = lastctx.manifest() | ||||
| def filectxfn(repo, ctx, path): | def filectxfn(repo, ctx, path): | ||||
| if path in headmf: | if path in headmf: | ||||
| fctx = last[path] | fctx = lastctx[path] | ||||
| flags = fctx.flags() | flags = fctx.flags() | ||||
| mctx = context.memfilectx(repo, ctx, | mctx = context.memfilectx(repo, ctx, | ||||
| fctx.path(), fctx.data(), | fctx.path(), fctx.data(), | ||||
| islink='l' in flags, | islink='l' in flags, | ||||
| isexec='x' in flags, | isexec='x' in flags, | ||||
| copied=copied.get(path)) | copied=copied.get(path)) | ||||
| return mctx | return mctx | ||||
| return None | return None | ||||
| if commitopts.get('message'): | if commitopts.get('message'): | ||||
| message = commitopts['message'] | message = commitopts['message'] | ||||
| else: | else: | ||||
| message = first.description() | message = firstctx.description() | ||||
| user = commitopts.get('user') | user = commitopts.get('user') | ||||
| date = commitopts.get('date') | date = commitopts.get('date') | ||||
| extra = commitopts.get('extra') | extra = commitopts.get('extra') | ||||
| parents = (first.p1().node(), first.p2().node()) | parents = (firstctx.p1().node(), firstctx.p2().node()) | ||||
| editor = None | editor = None | ||||
| if not skipprompt: | if not skipprompt: | ||||
| editor = cmdutil.getcommiteditor(edit=True, editform='histedit.fold') | editor = cmdutil.getcommiteditor(edit=True, editform='histedit.fold') | ||||
| new = context.memctx(repo, | new = context.memctx(repo, | ||||
| parents=parents, | parents=parents, | ||||
| text=message, | text=message, | ||||
| files=files, | files=files, | ||||
| filectxfn=filectxfn, | filectxfn=filectxfn, | ||||