Mercurial > public > mercurial-scm > hg-stable
diff hgext/transplant.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/transplant.py Mon Sep 21 10:09:39 2020 -0700 +++ b/hgext/transplant.py Mon Sep 21 11:12:58 2020 -0700 @@ -198,7 +198,7 @@ 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 @@ 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()