Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/filemerge.py @ 34946:5caae380ff90 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: pass a default value to _toolstr (issue5718) After a refactoring, _toolstr stopped having default="" as one of it's args, therefore when called without a default it returns None and not "". This causes concatenation to fail.
author Kostia Balytskyi <ikostia@fb.com>
date Thu, 26 Oct 2017 11:07:06 -0700
parents cab34bda259e
children 010179e21e91
comparison
equal deleted inserted replaced
34945:d2554ef04d26 34946:5caae380ff90
114 k = _toolstr(ui, tool, kn) 114 k = _toolstr(ui, tool, kn)
115 if not k: 115 if not k:
116 continue 116 continue
117 p = util.lookupreg(k, _toolstr(ui, tool, "regname")) 117 p = util.lookupreg(k, _toolstr(ui, tool, "regname"))
118 if p: 118 if p:
119 p = util.findexe(p + _toolstr(ui, tool, "regappend")) 119 p = util.findexe(p + _toolstr(ui, tool, "regappend", ""))
120 if p: 120 if p:
121 return p 121 return p
122 exe = _toolstr(ui, tool, "executable", tool) 122 exe = _toolstr(ui, tool, "executable", tool)
123 return util.findexe(util.expandpath(exe)) 123 return util.findexe(util.expandpath(exe))
124 124