Patchwork [STABLE] wix: avoid an abort with 'hg help -k foo'

login
register
mail settings
Submitter Matt Harbison
Date Sept. 1, 2015, 3:54 p.m.
Message ID <e03407fc5121c3f6ad97.1441122862@Envy>
Download mbox | patch
Permalink /patch/10346/
State Accepted
Headers show

Comments

Matt Harbison - Sept. 1, 2015, 3:54 p.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1441121948 14400
#      Tue Sep 01 11:39:08 2015 -0400
# Branch stable
# Node ID e03407fc5121c3f6ad97c62cb103d622926e594d
# Parent  006870583088a4767bcaa77903e9607ceb480cba
wix: avoid an abort with 'hg help -k foo'

Previously:

 $ /c/Program\ Files/Mercurial/hg help -k merge-tools
 abort: No such file or directory: c:\Program Files\Mercurial\help\scripting.txt

The Inno installer seems OK, but the TortoiseHg required the same fix.  That got
queued with an additional change of 'helpFolder.guid' in guids.wxi (probably by
Steve).  I'm not sure if that is necessary here too.
Augie Fackler - Sept. 1, 2015, 5:04 p.m.
On Tue, Sep 01, 2015 at 11:54:22AM -0400, Matt Harbison wrote:
> # HG changeset patch
> # User Matt Harbison <matt_harbison@yahoo.com>
> # Date 1441121948 14400
> #      Tue Sep 01 11:39:08 2015 -0400
> # Branch stable
> # Node ID e03407fc5121c3f6ad97c62cb103d622926e594d
> # Parent  006870583088a4767bcaa77903e9607ceb480cba
> wix: avoid an abort with 'hg help -k foo'

Queued for stable, thanks.

>
> Previously:
>
>  $ /c/Program\ Files/Mercurial/hg help -k merge-tools
>  abort: No such file or directory: c:\Program Files\Mercurial\help\scripting.txt
>
> The Inno installer seems OK, but the TortoiseHg required the same fix.  That got
> queued with an additional change of 'helpFolder.guid' in guids.wxi (probably by
> Steve).  I'm not sure if that is necessary here too.
>
> diff --git a/contrib/wix/help.wxs b/contrib/wix/help.wxs
> --- a/contrib/wix/help.wxs
> +++ b/contrib/wix/help.wxs
> @@ -23,6 +23,7 @@
>            <File Name="phases.txt" />
>            <File Name="revisions.txt" />
>            <File Name="revsets.txt" />
> +          <File Name="scripting.txt" />
>            <File Name="subrepos.txt" />
>            <File Name="templates.txt" />
>            <File Name="urls.txt" />
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@selenic.com
> https://selenic.com/mailman/listinfo/mercurial-devel
Pierre-Yves David - Sept. 8, 2015, 10:42 p.m.
On 09/01/2015 10:04 AM, Augie Fackler wrote:
> On Tue, Sep 01, 2015 at 11:54:22AM -0400, Matt Harbison wrote:
>> # HG changeset patch
>> # User Matt Harbison <matt_harbison@yahoo.com>
>> # Date 1441121948 14400
>> #      Tue Sep 01 11:39:08 2015 -0400
>> # Branch stable
>> # Node ID e03407fc5121c3f6ad97c62cb103d622926e594d
>> # Parent  006870583088a4767bcaa77903e9607ceb480cba
>> wix: avoid an abort with 'hg help -k foo'

Could we build a test checking all documentation.txt are refered there?

>
> Queued for stable, thanks.
>
>>
>> Previously:
>>
>>   $ /c/Program\ Files/Mercurial/hg help -k merge-tools
>>   abort: No such file or directory: c:\Program Files\Mercurial\help\scripting.txt
>>
>> The Inno installer seems OK, but the TortoiseHg required the same fix.  That got
>> queued with an additional change of 'helpFolder.guid' in guids.wxi (probably by
>> Steve).  I'm not sure if that is necessary here too.
>>
>> diff --git a/contrib/wix/help.wxs b/contrib/wix/help.wxs
>> --- a/contrib/wix/help.wxs
>> +++ b/contrib/wix/help.wxs
>> @@ -23,6 +23,7 @@
>>             <File Name="phases.txt" />
>>             <File Name="revisions.txt" />
>>             <File Name="revsets.txt" />
>> +          <File Name="scripting.txt" />
>>             <File Name="subrepos.txt" />
>>             <File Name="templates.txt" />
>>             <File Name="urls.txt" />
>> _______________________________________________
>> Mercurial-devel mailing list
>> Mercurial-devel@selenic.com
>> https://selenic.com/mailman/listinfo/mercurial-devel
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@selenic.com
> https://selenic.com/mailman/listinfo/mercurial-devel
>
Matt Harbison - Sept. 10, 2015, 12:33 a.m.
On Tue, 08 Sep 2015 18:42:44 -0400, Pierre-Yves David  
<pierre-yves.david@ens-lyon.org> wrote:

>
>
> On 09/01/2015 10:04 AM, Augie Fackler wrote:
>> On Tue, Sep 01, 2015 at 11:54:22AM -0400, Matt Harbison wrote:
>>> # HG changeset patch
>>> # User Matt Harbison <matt_harbison@yahoo.com>
>>> # Date 1441121948 14400
>>> #      Tue Sep 01 11:39:08 2015 -0400
>>> # Branch stable
>>> # Node ID e03407fc5121c3f6ad97c62cb103d622926e594d
>>> # Parent  006870583088a4767bcaa77903e9607ceb480cba
>>> wix: avoid an abort with 'hg help -k foo'
>
> Could we build a test checking all documentation.txt are refered there?

Seems like a good idea.  I'll put it on my todo list.

Patch

diff --git a/contrib/wix/help.wxs b/contrib/wix/help.wxs
--- a/contrib/wix/help.wxs
+++ b/contrib/wix/help.wxs
@@ -23,6 +23,7 @@ 
           <File Name="phases.txt" />
           <File Name="revisions.txt" />
           <File Name="revsets.txt" />
+          <File Name="scripting.txt" />
           <File Name="subrepos.txt" />
           <File Name="templates.txt" />
           <File Name="urls.txt" />