Mercurial > public > mercurial-scm > hg-stable
diff hgext/largefiles/overrides.py @ 27344:43c00ca887d1
merge: have merge.update use a matcher instead of partial fn
This is relatively rarely used functionality, but migrating this to a
matcher will make future work on narrow clones more feasible.
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Mon, 14 Dec 2015 18:54:03 -0500 |
| parents | df9b73d2d444 |
| children | 98266b1d144d |
line wrap: on
line diff
--- a/hgext/largefiles/overrides.py Sat Dec 12 09:57:05 2015 -0800 +++ b/hgext/largefiles/overrides.py Mon Dec 14 18:54:03 2015 -0500 @@ -1364,8 +1364,11 @@ err = 0 return err -def mergeupdate(orig, repo, node, branchmerge, force, partial, +def mergeupdate(orig, repo, node, branchmerge, force, *args, **kwargs): + matcher = kwargs.get('matcher', None) + # note if this is a partial update + partial = matcher and not matcher.always() wlock = repo.wlock() try: # branch | | | @@ -1405,7 +1408,7 @@ oldstandins = lfutil.getstandinsstate(repo) - result = orig(repo, node, branchmerge, force, partial, *args, **kwargs) + result = orig(repo, node, branchmerge, force, *args, **kwargs) newstandins = lfutil.getstandinsstate(repo) filelist = lfutil.getlfilestoupdate(oldstandins, newstandins)