##// END OF EJS Templates
largefiles: don't explicitly list optional parameters that are not used...
Tony Tung -
r28193:19775bc3 default
parent child Browse files
Show More
@@ -452,12 +452,10 b' def overridecheckunknownfile(origfn, rep'
452 # writing the files into the working copy and lfcommands.updatelfiles
452 # writing the files into the working copy and lfcommands.updatelfiles
453 # will update the largefiles.
453 # will update the largefiles.
454 def overridecalculateupdates(origfn, repo, p1, p2, pas, branchmerge, force,
454 def overridecalculateupdates(origfn, repo, p1, p2, pas, branchmerge, force,
455 acceptremote, followcopies, matcher=None,
455 acceptremote, *args, **kwargs):
456 mergeforce=False):
457 overwrite = force and not branchmerge
456 overwrite = force and not branchmerge
458 actions, diverge, renamedelete = origfn(
457 actions, diverge, renamedelete = origfn(
459 repo, p1, p2, pas, branchmerge, force, acceptremote,
458 repo, p1, p2, pas, branchmerge, force, acceptremote, *args, **kwargs)
460 followcopies, matcher=matcher)
461
459
462 if overwrite:
460 if overwrite:
463 return actions, diverge, renamedelete
461 return actions, diverge, renamedelete
General Comments 0
You need to be logged in to leave comments. Login now