comparison hgext/transplant.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

                        p1 = node
                        continue
                    if pulls:
                        if source != repo:
                            exchange.pull(repo, source.peer(), heads=pulls)
                        merge.update(
                            repo, pulls[-1], branchmerge=False, force=False
                        )
                        p1 = repo.dirstate.p1()
                        pulls = []

                        if patchfile:
                            os.unlink(patchfile)
            tr.close()
            if pulls:
                exchange.pull(repo, source.peer(), heads=pulls)
                merge.update(repo, pulls[-1], branchmerge=False, force=False)
        finally:
            self.saveseries(revmap, merges)
            self.transplants.write()
            if tr:
                tr.release()

45557:2c86b9587740

                        p1 = node
                        continue
                    if pulls:
                        if source != repo:
                            exchange.pull(repo, source.peer(), heads=pulls)
                        merge._update(
                            repo, pulls[-1], branchmerge=False, force=False
                        )
                        p1 = repo.dirstate.p1()
                        pulls = []

                        if patchfile:
                            os.unlink(patchfile)
            tr.close()
            if pulls:
                exchange.pull(repo, source.peer(), heads=pulls)
                merge._update(repo, pulls[-1], branchmerge=False, force=False)
        finally:
            self.saveseries(revmap, merges)
            self.transplants.write()
            if tr:
                tr.release()