Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: drop a default argument to appease pytype
authorMatt Harbison <matt_harbison@yahoo.com>
Wed, 20 Nov 2019 13:01:56 -0500
changeset 43845 1ffbd03c8d75
parent 43844 b7af8a02a304
child 43846 d5ce99a6db52
filemerge: drop a default argument to appease pytype The function slices and takes the length of this argument without internally setting it if not provided. There was no bug here because both callers passed the argument. Differential Revision: https://phab.mercurial-scm.org/D7464
mercurial/filemerge.py file | annotate | diff | comparison | revisions 
--- a/mercurial/filemerge.py	Tue Dec 10 19:04:53 2019 -0500
+++ b/mercurial/filemerge.py	Wed Nov 20 13:01:56 2019 -0500
@@ -693,7 +693,7 @@
     ui.status(t.renderdefault(props))
 
 
-def _xmerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None):
+def _xmerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels):
     tool, toolpath, binary, symlink, scriptfn = toolconf
     uipathfn = scmutil.getuipathfn(repo)
     if fcd.isabsent() or fco.isabsent():
mercurial