mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 09:17:30 +03:00
sparse: fix compat with upstream
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:
parent
a024de142b
commit
c30575891a
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user