Mercurial > hg

changeset 28193:19775bc34da3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
largefiles: don't explicitly list optional parameters that are not used This makes it easier for changes to the API.
author Tony Tung <tonytung@merly.org>
date Mon, 22 Feb 2016 23:18:19 -0800
parents e8d1460e2a72
children 7623ba92af72
files hgext/largefiles/overrides.py
diffstat 1 files changed, 2 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/largefiles/overrides.py	Mon Feb 08 14:07:17 2016 +0100
+++ b/hgext/largefiles/overrides.py	Mon Feb 22 23:18:19 2016 -0800
@@ -452,12 +452,10 @@
 # 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, *args, **kwargs):
     overwrite = force and not branchmerge
     actions, diverge, renamedelete = origfn(
-        repo, p1, p2, pas, branchmerge, force, acceptremote,
-        followcopies, matcher=matcher)
+        repo, p1, p2, pas, branchmerge, force, acceptremote, *args, **kwargs)
 
     if overwrite:
         return actions, diverge, renamedelete