Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/hg.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 | 5c8230ca37f2 |
comparison
equal
deleted
inserted
replaced
| 45562:03726f5b6092 | 45563:2c86b9587740 |
|---|---|
| 1047 """Update the working directory to node. | 1047 """Update the working directory to node. |
| 1048 | 1048 |
| 1049 When overwrite is set, changes are clobbered, merged else | 1049 When overwrite is set, changes are clobbered, merged else |
| 1050 | 1050 |
| 1051 returns stats (see pydoc mercurial.merge.applyupdates)""" | 1051 returns stats (see pydoc mercurial.merge.applyupdates)""" |
| 1052 return mergemod.update( | 1052 return mergemod._update( |
| 1053 repo, | 1053 repo, |
| 1054 node, | 1054 node, |
| 1055 branchmerge=False, | 1055 branchmerge=False, |
| 1056 force=overwrite, | 1056 force=overwrite, |
| 1057 labels=[b'working copy', b'destination'], | 1057 labels=[b'working copy', b'destination'], |