[PATCH 2 of 2] filemerge: protect against missing regappend key in _findtool

[Matt Mackall]

On Sun, 2008-02-03 at 23:11 -0800, Lee Cantey wrote:
> # HG changeset patch
> # User Lee Cantey <lcantey at gmail.com>
> # Date 1202108966 28800
> # Node ID bbf99f428bedf315c2a035a6249ac2e45b37d83b
> # Parent  ddd5b1a7984fce0a23062804d54454ddbed45bfa
> filemerge: protect against missing regappend key in _findtool
> 
> diff -r ddd5b1a7984f -r bbf99f428bed mercurial/filemerge.py
> --- a/mercurial/filemerge.py	Sun Feb 03 23:08:16 2008 -0800
> +++ b/mercurial/filemerge.py	Sun Feb 03 23:09:26 2008 -0800
> @@ -20,9 +20,11 @@
>      if k:
>          p = util.lookup_reg(k, _toolstr(ui, tool, "regname"))
>          if p:
> -            p = util.find_exe(p + _toolstr(ui, tool, "regappend"))
> -            if p:
> -                return p
> +            e = _toolstr(ui, tool, "regappend")
> +            if e:
> +                p = util.find_exe(p + e)
> +                if p:
> +                    return p
>      return util.find_exe(_toolstr(ui, tool, "executable", tool))

That doesn't seem to return p if !e. But really, this is what I meant to
do:

diff -r e45de0f47215 mercurial/filemerge.py
--- a/mercurial/filemerge.py	Sun Feb 03 23:08:16 2008 -0800
+++ b/mercurial/filemerge.py	Mon Feb 04 09:50:11 2008 -0600
@@ -9,7 +9,7 @@
 from i18n import _
 import util, os, tempfile, context, simplemerge, re
 
-def _toolstr(ui, tool, part, default=None):
+def _toolstr(ui, tool, part, default=""):
     return ui.config("merge-tools", tool + "." + part, default)
 
 def _toolbool(ui, tool, part, default=False):

-- 
Mathematics is the supreme nostalgia of our time.