Mercurial > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
45556:03726f5b6092 | 45557:2c86b9587740 |
---|---|
1715 fp.write(chunk) | 1715 fp.write(chunk) |
1716 err = 0 | 1716 err = 0 |
1717 return err | 1717 return err |
1718 | 1718 |
1719 | 1719 |
1720 @eh.wrapfunction(merge, b'update') | 1720 @eh.wrapfunction(merge, b'_update') |
1721 def mergeupdate(orig, repo, node, branchmerge, force, *args, **kwargs): | 1721 def mergeupdate(orig, repo, node, branchmerge, force, *args, **kwargs): |
1722 matcher = kwargs.get('matcher', None) | 1722 matcher = kwargs.get('matcher', None) |
1723 # note if this is a partial update | 1723 # note if this is a partial update |
1724 partial = matcher and not matcher.always() | 1724 partial = matcher and not matcher.always() |
1725 with repo.wlock(): | 1725 with repo.wlock(): |