[PATCH 1 of 2] largefiles: don't explicitly list optional parameters that are not used
Tony Tung
ttung at fb.com
Tue Feb 23 08:13:59 UTC 2016
# HG changeset patch
# User Tony Tung <tonytung at merly.org>
# Date 1456211899 28800
# Mon Feb 22 23:18:19 2016 -0800
# Node ID cbc605f28b61cc469e21186982d0569bf94f7d2a
# Parent 169a238c641540d1e78797fbce0f2599e60c85f6
largefiles: don't explicitly list optional parameters that are not used
This makes it easier for changes to the API.
diff --git a/hgext/largefiles/overrides.py b/hgext/largefiles/overrides.py
--- a/hgext/largefiles/overrides.py
+++ b/hgext/largefiles/overrides.py
@@ -452,12 +452,12 @@
# writing the files into the working copy and lfcommands.updatelfiles
# will update the largefiles.
def overridecalculateupdates(origfn, repo, p1, p2, pas, branchmerge, force,
- acceptremote, followcopies, matcher=None,
- mergeforce=False):
+ acceptremote, followcopies,
+ *args, **kwargs):
overwrite = force and not branchmerge
actions, diverge, renamedelete = origfn(
repo, p1, p2, pas, branchmerge, force, acceptremote,
- followcopies, matcher=matcher)
+ followcopies, *args, **kwargs)
if overwrite:
return actions, diverge, renamedelete
More information about the Mercurial-devel
mailing list