comparison hgext/histedit.py @ 24773:090da03361c5

histedit: improve roll action integration with fold

Previously the fold action would inspect it's class to figure out if it was a
rollup or not. This was hacky. Now that finishfold is inside the fold class,
let's modify it to check a function (which roll can override) to determine if it
should be prompting for a commit message.

24772:8f6494eb16eb

            return ctx, [(self.node, (ctx.node(),))]

        middlecommits = newcommits.copy()
        middlecommits.discard(ctx.node())

        foldopts = {}
        if isinstance(self, rollup):
            foldopts['rollup'] = True

        return self.finishfold(repo.ui, repo, parentctx, rulectx, ctx.node(),
                               foldopts, middlecommits)

    def finishfold(self, ui, repo, ctx, oldctx, newnode, opts, internalchanges):
        parent = ctx.parents()[0].node()
        hg.update(repo, parent)
        ### prepare new commit data
        commitopts = opts.copy()
        commitopts['user'] = ctx.user()
        # commit message
        if opts.get('rollup'):
            newmessage = ctx.description()
        else:
            newmessage = '\n***\n'.join(
                [ctx.description()] +
                [repo[r].description() for r in internalchanges] +

        for ich in internalchanges:
            replacements.append((ich, (n,)))
        return repo[n], replacements

class rollup(fold):
    pass

class drop(histeditaction):
    def run(self):
        parentctx = self.repo[self.state.parentctxnode]
        return parentctx, [(self.node, tuple())]

24773:090da03361c5

            return ctx, [(self.node, (ctx.node(),))]

        middlecommits = newcommits.copy()
        middlecommits.discard(ctx.node())

        return self.finishfold(repo.ui, repo, parentctx, rulectx, ctx.node(),
                               middlecommits)

    def skipprompt(self):
        return False

    def finishfold(self, ui, repo, ctx, oldctx, newnode, internalchanges):
        parent = ctx.parents()[0].node()
        hg.update(repo, parent)
        ### prepare new commit data
        commitopts = {}
        commitopts['user'] = ctx.user()
        # commit message
        if self.skipprompt():
            newmessage = ctx.description()
        else:
            newmessage = '\n***\n'.join(
                [ctx.description()] +
                [repo[r].description() for r in internalchanges] +

        for ich in internalchanges:
            replacements.append((ich, (n,)))
        return repo[n], replacements

class rollup(fold):
    def skipprompt(self):
        return True

class drop(histeditaction):
    def run(self):
        parentctx = self.repo[self.state.parentctxnode]
        return parentctx, [(self.node, tuple())]