Mercurial > hg
diff hgext/fsmonitor/__init__.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
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Mon, 21 Sep 2020 11:12:58 -0700 |
| parents | c1d6e930ac8a |
| children | 89a2afe31e82 |
line wrap: on
line diff
--- a/hgext/fsmonitor/__init__.py Mon Sep 21 10:09:39 2020 -0700 +++ b/hgext/fsmonitor/__init__.py Mon Sep 21 11:12:58 2020 -0700 @@ -727,7 +727,7 @@ # 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):