Mercurial > hg
comparison mercurial/filemerge.py @ 43845:1ffbd03c8d75
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
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Wed, 20 Nov 2019 13:01:56 -0500 |
parents | be8552f25cab |
children | d5ce99a6db52 |
comparison
equal
deleted
inserted
replaced
43844:b7af8a02a304 | 43845:1ffbd03c8d75 |
---|---|
691 ui, tmpl, defaults=templatekw.keywords, resources=tres | 691 ui, tmpl, defaults=templatekw.keywords, resources=tres |
692 ) | 692 ) |
693 ui.status(t.renderdefault(props)) | 693 ui.status(t.renderdefault(props)) |
694 | 694 |
695 | 695 |
696 def _xmerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None): | 696 def _xmerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels): |
697 tool, toolpath, binary, symlink, scriptfn = toolconf | 697 tool, toolpath, binary, symlink, scriptfn = toolconf |
698 uipathfn = scmutil.getuipathfn(repo) | 698 uipathfn = scmutil.getuipathfn(repo) |
699 if fcd.isabsent() or fco.isabsent(): | 699 if fcd.isabsent() or fco.isabsent(): |
700 repo.ui.warn( | 700 repo.ui.warn( |
701 _(b'warning: %s cannot merge change/delete conflict for %s\n') | 701 _(b'warning: %s cannot merge change/delete conflict for %s\n') |