comparison hgext/histedit.py @ 44270:f546d2170b0f

merge: introduce a clean_update() for that use-case

I find it hard to understand what value to pass for all the arguments
to `merge.update()`. I would like to introduce functions that are more
specific to each use-case. We already have `graft()`. This patch
introduces a `clean_update()` and uses it in some places to show that
it works.

Differential Revision: https://phab.mercurial-scm.org/D7902

44269:48a1a974a92c

    _(b'checkout changeset and apply further changesets from there'),
)
class base(histeditaction):
    def run(self):
        if self.repo[b'.'].node() != self.node:
            mergemod.update(self.repo, self.node, branchmerge=False, force=True)
        return self.continueclean()

    def continuedirty(self):
        abortdirty()

44270:f546d2170b0f

    _(b'checkout changeset and apply further changesets from there'),
)
class base(histeditaction):
    def run(self):
        if self.repo[b'.'].node() != self.node:
            mergemod.clean_update(self.repo[self.node])
        return self.continueclean()

    def continuedirty(self):
        abortdirty()