[PATCH 2 of 2] win32: remove Mercurial.ini file from Inno Setup installer (issue4435)

[Pascal Quantin]

Hi,

2014-11-05 2:16 GMT+01:00 Mads Kiilerich <mads at kiilerich.com>:

> On 11/04/2014 10:43 PM, Pascal Quantin wrote:
>
>> # HG changeset patch
>> # User Pascal Quantin <pascal.quantin at gmail.com>
>> # Date 1415134467 -3600
>> #      Tue Nov 04 21:54:27 2014 +0100
>> # Node ID 871aea23211152e39fb9b145e530ae5ab4886e21
>> # Parent  b792b22f8d3bf362c3a5c694b57214154463b8a8
>> win32: remove Mercurial.ini file from Inno Setup installer (issue4435)
>>
>
> Thanks for fixing my blind and bad changes.
>
>  diff --git a/contrib/win32/mercurial.iss b/contrib/win32/mercurial.iss
>> --- a/contrib/win32/mercurial.iss
>> +++ b/contrib/win32/mercurial.iss
>> @@ -67,7 +67,6 @@
>>   Source: contrib\hgweb.fcgi; DestDir: {app}/Contrib
>>   Source: contrib\hgweb.wsgi; DestDir: {app}/Contrib
>>   Source: contrib\win32\ReadMe.html; DestDir: {app}; Flags: isreadme
>> -Source: contrib\win32\mercurial.ini; DestDir: {app}; DestName:
>> Mercurial.ini; Check: CheckFile;
>>
>
> Should we really just stop installing contrib/win32/mercurial.ini ? If so,
> shouldn't the file be removed?
>

I did not remove it yet as it is still used by the WIX installer and I have
no knowledge on how to safely modify it. So I will let the "right" guy
finish the work :)


> From the "Do Not Edit This File" I would assume that it would be a good
> fit for installation in default.d . But from the actual (no) content of
> this file, it seems like it would be fine to install it as before but
> _never_ overwrite it on upgrades.
>

In fact there were still 2 useful things in this file: a default editor for
Windows (notepad) so that 'hg config --edit' works fine and the location of
the cacert.pem file (this entry is generated during the installation
procedure). Rather than keeping this now almost useless Mercurial.ini file
in the installation folder, I decided to follow your new proposal and
create cacerts.rc and editor.rc files in the default.d folder.

Pascal.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-devel/attachments/20141105/ec35174c/attachment-0002.html>