[PATCH 2 of 3 stable] mergetools: drop superfluous quoting of diffargs variables

Mads Kiilerich mads at kiilerich.com
Tue Jan 27 18:31:55 CST 2015


On 01/27/2015 11:39 PM, Matt Mackall wrote:
> On Tue, 2015-01-27 at 03:15 +0100, Mads Kiilerich wrote:
>> # HG changeset patch
>> # User Mads Kiilerich <madski at unity3d.com>
>> # Date 1422324789 -3600
>> #      Tue Jan 27 03:13:09 2015 +0100
>> # Branch stable
>> # Node ID bf99a88b77b67ac4c88674ba5d1d19dd97092426
>> # Parent  aa7caa9b564fca7095f860178f18737cf360285d
>> mergetools: drop superfluous quoting of diffargs variables
> Seems like this wants to be on default?

extdiff with the "new" automatic quoting is incompatible with the 
diffargs we ship. I think that is a bug that should be fixed on stable. 
(I guess the "only quote when necessary" functionality do that the 
problem only is seen when running extdiff on a single file with a name 
that needs quoting.)

We could perhaps restore backwards compatibility, but I still think it 
makes sense to ship a configuration that makes sense, instead of 
shipping one with extra and apparently unsafe quoting. The superfluous 
quoting would then not be fatal but it would still be an "issue" that I 
would consider for stable.

/Mads


More information about the Mercurial-devel mailing list