Filemerge: Environment Variable HGMERGE uses merge tool path from the configuration

Matt Mackall mpm at selenic.com
Fri Jul 25 18:10:03 CDT 2008


On Sat, 2008-07-26 at 01:48 +0200, Simon Heimberg wrote:
> # HG changeset patch
> # User simohe at besonet.ch
> # Date 1217029550 -7200
> # Node ID 9d823a0d9ca8a4703b97ff1e1810bd794417626b
> # Parent  cbdfd08eabc96116d801d0e2e7d1856adfdde911
> Filemerge: Environment Variable HGMERGE uses merge tool path from the
> configuration

What's this for? HGMERGE may not be a simple command name and we've
always just called out to HGMERGE as supplied.

> diff -r cbdfd08eabc9 -r 9d823a0d9ca8 mercurial/filemerge.py
> --- a/mercurial/filemerge.py    Tue Jul 22 13:03:31 2008 -0500
> +++ b/mercurial/filemerge.py    Sat Jul 26 01:45:50 2008 +0200
> @@ -47,6 +47,9 @@
>      # HGMERGE takes precedence
>      hgmerge = os.environ.get("HGMERGE")
>      if hgmerge:
> +        toolpath = _findtool(ui, hgmerge)
> +        if toolpath:
> +            return (hgmerge, '"' + toolpath + '"')
>          return (hgmerge, hgmerge)
> 
>      # then patterns
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel
-- 
Mathematics is the supreme nostalgia of our time.



More information about the Mercurial-devel mailing list