facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-11 17:27:53 +03:00
Code Issues Projects Releases Wiki Activity

sparse: fix compat with upstream

Browse Source 
Summary: Upstream changed _calculateupdates, this patch fixes our wrapping

Test Plan: tests pass

Reviewers: ericsumner

Differential Revision: https://phabricator.fb.com/D2791576
This commit is contained in:
Laurent Charignon 2015-12-28 17:01:01 -08:00
parent a024de142b
commit c30575891a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sparse.py
View File

@ -82,12 +82,12 @@ def replacefilecache(cls, propname, replacement):
propname))
def _setupupdates(ui):
def _calculateupdates(orig, repo, wctx, mctx, pas, branchmerge, force,
partial, mergeancestor, followcopies):
def _calculateupdates(orig, repo, wctx, mctx, ancestors, branchmerge, *arg,
**kwargs):
"""Filter updates to only lay out files that match the sparse rules.
"""
actions, diverge, renamedelete = orig(repo, wctx, mctx, pas,
branchmerge, force, partial, mergeancestor, followcopies)
actions, diverge, renamedelete = orig(repo, wctx, mctx, ancestors,
branchmerge, *arg, **kwargs)
if not util.safehasattr(repo, 'sparsematch'):
return actions, diverge, renamedelete