From c30575891ae8ac0a6b0bf6fcf11ad5e538b5490c Mon Sep 17 00:00:00 2001 From: Laurent Charignon Date: Mon, 28 Dec 2015 17:01:01 -0800 Subject: [PATCH] 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 --- sparse.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sparse.py b/sparse.py index 4e5b1197a4..1e91d5b9c7 100644 --- a/sparse.py +++ b/sparse.py @@ -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