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

[Mads Kiilerich]

On 01/28/2015 01:57 AM, Matt Mackall wrote:
> On Wed, 2015-01-28 at 01:31 +0100, Mads Kiilerich wrote:
>> 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
> superfluous = unneeded but harmless = does not belong on stable
>
> So, is the quoting superfluous or not?

As stable is now, the quoting is not harmless. As it was posted as patch 
2 coming after patch 1, the quoting was harmless (but still wrong).

>>> 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.
> Wasn't that the point of patch one that I accepted (and then dropped
> because it broke tests, see your mail)?

Correct, that tried to be backwards compatible and handle "incorrect" 
quoting.

/Mads