Mercurial > public > mercurial-scm > hg-stable
diff hgext/rebase.py @ 45563: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
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Mon, 21 Sep 2020 11:12:58 -0700 |
| parents | 03726f5b6092 |
| children | c1b603cdc95a |
line wrap: on
line diff
--- a/hgext/rebase.py Mon Sep 21 10:09:39 2020 -0700 +++ b/hgext/rebase.py Mon Sep 21 11:12:58 2020 -0700 @@ -642,7 +642,7 @@ cmdutil.bailifchanged(repo) self.inmemory = False self._assignworkingcopy() - mergemod.update( + mergemod._update( repo, p1, branchmerge=False, @@ -1517,7 +1517,7 @@ # See explanation in merge.graft() mergeancestor = repo.changelog.isancestor(p1ctx.node(), ctx.node()) - stats = mergemod.update( + stats = mergemod._update( repo, rev, branchmerge=True,