comparison hgext/rebase.py @ 45557:2c86b9587740

merge: make low-level update() private (API)

We have very few callers left that call the low-level `merge.update()`
function. I think it's time to make it private. I'll remove the
remaining callers in coming patches, except for one call from the
`rebase` module. I hope to eventually fix that too, but it's more
complex because it requires teaching `merge.graft()` to work with a
dirty working copy.

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

45556:03726f5b6092

                            )
                        )
                        cmdutil.bailifchanged(repo)
                        self.inmemory = False
                        self._assignworkingcopy()
                        mergemod.update(
                            repo,
                            p1,
                            branchmerge=False,
                            force=False,
                            wc=self.wctx,

    if base is not None:
        repo.ui.debug(b"   detach base %d:%s\n" % (base, repo[base]))

    # See explanation in merge.graft()
    mergeancestor = repo.changelog.isancestor(p1ctx.node(), ctx.node())
    stats = mergemod.update(
        repo,
        rev,
        branchmerge=True,
        force=True,
        ancestor=base,

45557:2c86b9587740

                            )
                        )
                        cmdutil.bailifchanged(repo)
                        self.inmemory = False
                        self._assignworkingcopy()
                        mergemod._update(
                            repo,
                            p1,
                            branchmerge=False,
                            force=False,
                            wc=self.wctx,

    if base is not None:
        repo.ui.debug(b"   detach base %d:%s\n" % (base, repo[base]))

    # See explanation in merge.graft()
    mergeancestor = repo.changelog.isancestor(p1ctx.node(), ctx.node())
    stats = mergemod._update(
        repo,
        rev,
        branchmerge=True,
        force=True,
        ancestor=base,