Mercurial > hg
diff hgext/largefiles/overrides.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 | e5e1285b6f6f |
| children | d2e1dcd4490d |
line wrap: on
line diff
--- a/hgext/largefiles/overrides.py Mon Sep 21 10:09:39 2020 -0700 +++ b/hgext/largefiles/overrides.py Mon Sep 21 11:12:58 2020 -0700 @@ -1717,7 +1717,7 @@ 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