diff --git a/hgext/fsmonitor/__init__.py b/hgext/fsmonitor/__init__.py --- a/hgext/fsmonitor/__init__.py +++ b/hgext/fsmonitor/__init__.py @@ -727,7 +727,7 @@ def extsetup(ui): # An assist for avoiding the dangling-symlink fsevents bug extensions.wrapfunction(os, b'symlink', wrapsymlink) - extensions.wrapfunction(merge, b'update', wrapupdate) + extensions.wrapfunction(merge, b'_update', wrapupdate) def wrapsymlink(orig, source, link_name): diff --git a/hgext/largefiles/overrides.py b/hgext/largefiles/overrides.py --- a/hgext/largefiles/overrides.py +++ b/hgext/largefiles/overrides.py @@ -1717,7 +1717,7 @@ def overridecat(orig, ui, repo, file1, * return err -@eh.wrapfunction(merge, b'update') +@eh.wrapfunction(merge, b'_update') def mergeupdate(orig, repo, node, branchmerge, force, *args, **kwargs): matcher = kwargs.get('matcher', None) # note if this is a partial update diff --git a/hgext/rebase.py b/hgext/rebase.py --- a/hgext/rebase.py +++ b/hgext/rebase.py @@ -642,7 +642,7 @@ class rebaseruntime(object): cmdutil.bailifchanged(repo) self.inmemory = False self._assignworkingcopy() - mergemod.update( + mergemod._update( repo, p1, branchmerge=False, @@ -1517,7 +1517,7 @@ def rebasenode(repo, rev, p1, p2, base, # See explanation in merge.graft() mergeancestor = repo.changelog.isancestor(p1ctx.node(), ctx.node()) - stats = mergemod.update( + stats = mergemod._update( repo, rev, branchmerge=True, diff --git a/hgext/transplant.py b/hgext/transplant.py --- a/hgext/transplant.py +++ b/hgext/transplant.py @@ -198,7 +198,7 @@ class transplanter(object): if pulls: if source != repo: exchange.pull(repo, source.peer(), heads=pulls) - merge.update( + merge._update( repo, pulls[-1], branchmerge=False, force=False ) p1 = repo.dirstate.p1() @@ -275,7 +275,7 @@ class transplanter(object): tr.close() if pulls: exchange.pull(repo, source.peer(), heads=pulls) - merge.update(repo, pulls[-1], branchmerge=False, force=False) + merge._update(repo, pulls[-1], branchmerge=False, force=False) finally: self.saveseries(revmap, merges) self.transplants.write() diff --git a/mercurial/hg.py b/mercurial/hg.py --- a/mercurial/hg.py +++ b/mercurial/hg.py @@ -1049,7 +1049,7 @@ def updaterepo(repo, node, overwrite, up When overwrite is set, changes are clobbered, merged else returns stats (see pydoc mercurial.merge.applyupdates)""" - return mergemod.update( + return mergemod._update( repo, node, branchmerge=False, diff --git a/mercurial/merge.py b/mercurial/merge.py --- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -1694,7 +1694,7 @@ UPDATECHECK_LINEAR = b'linear' UPDATECHECK_NO_CONFLICT = b'noconflict' -def update( +def _update( repo, node, branchmerge, @@ -2045,7 +2045,7 @@ def merge(ctx, labels=None, force=False, force = whether the merge was run with 'merge --force' (deprecated) """ - return update( + return _update( ctx.repo(), ctx.rev(), labels=labels, @@ -2062,7 +2062,7 @@ def clean_update(ctx, wc=None): This involves updating to the commit and discarding any changes in the working copy. """ - return update(ctx.repo(), ctx.rev(), branchmerge=False, force=True, wc=wc) + return _update(ctx.repo(), ctx.rev(), branchmerge=False, force=True, wc=wc) def revert_to(ctx, matcher=None, wc=None): @@ -2072,7 +2072,7 @@ def revert_to(ctx, matcher=None, wc=None be the same as in the given commit. """ - return update( + return _update( ctx.repo(), ctx.rev(), branchmerge=False, @@ -2123,7 +2123,7 @@ def graft( or pctx.rev() == base.rev() ) - stats = update( + stats = _update( repo, ctx.node(), True, @@ -2166,7 +2166,7 @@ def back_out(ctx, parent=None, wc=None): b"must specify parent of merge commit to back out" ) parent = ctx.p1() - return update( + return _update( ctx.repo(), parent, branchmerge=True, diff --git a/relnotes/next b/relnotes/next --- a/relnotes/next +++ b/relnotes/next @@ -20,3 +20,7 @@ == Internal API Changes == + * `merge.update()` is now private (renamed to `_update()`). Hopefully + the higher-level functions available in the same module cover your + use cases. +