This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7166

packaging: ship all help .txt files on WiX
ClosedPublic

Authored by indygreg on Oct 23 2019, 9:54 PM.

Download Raw Diff

Details

Reviewers

None

Group Reviewers

hg-reviewers

Commits

rHG697c2e32c490: packaging: ship all help .txt files on WiX
rHGe7896eaca05f: packaging: ship all help .txt files on WiX

Summary

These are technically not needed. But it is easier to ship
all files than to cherry-pick. A make install will copy
these files, so the new behavior is consistent with that.
This also makes WiX consistent with Inno, which is my main
reason for doing this.

If we don't want to ship the files (which is a valid argument),
I think we can do that in a follow up.

Diff Detail

Repository

rHG Mercurial

Branch

default

Lint

No Linters Available

Unit

No Unit Test Coverage

Event Timeline

indygreg created this revision.Oct 23 2019, 9:54 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptOct 23 2019, 9:54 PM

Herald added a subscriber: mercurial-devel. · View Herald Transcript

indygreg added a child revision: D7167: packaging: install contrib/mq.el on WiX.Oct 23 2019, 9:54 PM

indygreg added a commit: rHGe7896eaca05f: packaging: ship all help .txt files on WiX.Nov 8 2019, 7:05 PM

This revision was not accepted when it landed; it landed in state Needs Review.

Closed by commit rHGe7896eaca05f: packaging: ship all help .txt files on WiX (authored by indygreg). · Explain Why

This revision was automatically updated to reflect the committed changes.

I get this test failure from this commit:

@@ -223,11 +223,6 @@
 
   $ ( testrepohgenv; "$PYTHON" wixxml.py help )
   Not installed:
-    help/common.txt
-    help/hg-ssh.8.txt
-    help/hg.1.txt
-    help/hgignore.5.txt
-    help/hgrc.5.txt
   Not tracked:
 
   $ ( testrepohgenv; "$PYTHON" wixxml.py templates )

ERROR: test-install.t output changed

indygreg updated this revision to Diff 18031.Nov 11 2019, 9:56 PM

This got dropped on committed but Phabricator is confused about its closedstate. Please re-review and land @martinvonz or @durin42.

In D7166#108320, @indygreg wrote:

This got dropped on committed but Phabricator is confused about its closedstate. Please re-review and land @martinvonz or @durin42.

Per Martin's comment, it looks like you had test failures?

(Phabricator only ever closes things - it never reopens them.)

indygreg added a commit: rHG697c2e32c490: packaging: ship all help .txt files on WiX.Nov 12 2019, 10:25 AM

I re-landed this and tests passed on my workstation when I did so. Let's not drop this again without some additional coordination?

In D7166#108360, @durin42 wrote:

I re-landed this and tests passed on my workstation when I did so. Let's not drop this again without some additional coordination?

Agreed. I think it was I who pushed it last time and I must have done that before running tests, and then I dropped it after running tests. I'm sorry.

No worries, I'm not sure what went sideways there.

Revision Contents
Changeset List

			Path	Packages
M			contrib/packaging/wix/help.wxs (5 lines)
M			tests/test-install.t (5 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	17387		Oct 23 2019, 9:54 PM	★	★
Diff 2	17818	rHGe7896eaca05fdde9bda3ed3633e724c7f4426548	Oct 23 2019, 3:30 PM	★	★
Diff 3	18031		Nov 11 2019, 9:56 PM	★	★

Commit	Parents	Author	Summary	Date
b3a0ecf05b46	27c25c0dc967	Gregory Szorc		Nov 11 2019, 9:51 PM

Status	Author	Revision
Closed	indygreg	D7173 packaging: stage files and dynamically generate WiX installer
Closed	indygreg	D7172 packaging: use lower case for RC files
Closed	indygreg	D7171 packaging: write out editor.rc in Python
Closed	indygreg	D7170 packaging: stop installing Contributors.txt
Closed	indygreg	D7169 packaging: remove hg-ssh.8.html from Inno installer
Closed	indygreg	D7168 packaging: install .rc files to hgrc.d
Closed	indygreg	D7167 packaging: install contrib/mq.el on WiX
Closed	indygreg	D7166 packaging: ship all help .txt files on WiX
Closed	indygreg	D7165 packaging: stop installing i18n files
Closed	indygreg	D7164 packaging: install hgk as hgk.tcl
Closed	indygreg	D7163 packaging: add logo-droplets.svg
Closed	indygreg	D7162 packaging: install documentation to doc/ directory
Closed	indygreg	D7161 packaging: always pass VERSION into Inno invocation
Closed	indygreg	D7160 packaging: remove hg.exe.local file
Closed	indygreg	D7159 packaging: stage installed files for Inno
Closed	indygreg	D7158 packaging: process Inno Setup files with Jinja2
Closed	indygreg	D7157 packaging: install and run Inno files in a build directory
Closed	indygreg	D7156 packaging: consolidate CLI functionality into packaging.py
Closed	indygreg	D7155 packaging: clean up excess packages for Inno
Abandoned	indygreg	D7154 tests: run black on run-tests.py

Diff 18031

contrib/packaging/wix/help.wxs

	</Fragment>			</Fragment>

	<Fragment>			<Fragment>
	<DirectoryRef Id="INSTALLDIR">			<DirectoryRef Id="INSTALLDIR">
	<Directory Id="helpdir" Name="help" FileSource="$(var.SourceDir)">			<Directory Id="helpdir" Name="help" FileSource="$(var.SourceDir)">
	<Component Id="help.root" Guid="$(var.help.root.guid)" Win64='$(var.IsX64)'>			<Component Id="help.root" Guid="$(var.help.root.guid)" Win64='$(var.IsX64)'>
	<File Name="bundlespec.txt" />			<File Name="bundlespec.txt" />
	<File Name="color.txt" />			<File Name="color.txt" />
				<File Name="common.txt" />
	<File Name="config.txt" KeyPath="yes" />			<File Name="config.txt" KeyPath="yes" />
	<File Name="dates.txt" />			<File Name="dates.txt" />
	<File Name="deprecated.txt" />			<File Name="deprecated.txt" />
	<File Name="diffs.txt" />			<File Name="diffs.txt" />
	<File Name="environment.txt" />			<File Name="environment.txt" />
	<File Name="extensions.txt" />			<File Name="extensions.txt" />
	<File Name="filesets.txt" />			<File Name="filesets.txt" />
	<File Name="flags.txt" />			<File Name="flags.txt" />
	<File Name="glossary.txt" />			<File Name="glossary.txt" />
				<File Name="hg-ssh.8.txt" />
				<File Name="hg.1.txt" />
				<File Name="hgignore.5.txt" />
	<File Name="hgignore.txt" />			<File Name="hgignore.txt" />
				<File Name="hgrc.5.txt" />
	<File Name="hgweb.txt" />			<File Name="hgweb.txt" />
	<File Name="merge-tools.txt" />			<File Name="merge-tools.txt" />
	<File Name="pager.txt" />			<File Name="pager.txt" />
	<File Name="patterns.txt" />			<File Name="patterns.txt" />
	<File Name="phases.txt" />			<File Name="phases.txt" />
	<File Name="revisions.txt" />			<File Name="revisions.txt" />
	<File Name="scripting.txt" />			<File Name="scripting.txt" />
	<File Name="subrepos.txt" />			<File Name="subrepos.txt" />

tests/test-install.t

	>			>
	> print('Not tracked:')			> print('Not tracked:')
	> for f in sorted(set(installed) - set(tracked)):			> for f in sorted(set(installed) - set(tracked)):
	> print(' %s' % pycompat.sysstr(f))			> print(' %s' % pycompat.sysstr(f))
	> EOF			> EOF

	$ ( testrepohgenv; "$PYTHON" wixxml.py help )			$ ( testrepohgenv; "$PYTHON" wixxml.py help )
	Not installed:			Not installed:
	help/common.txt
	help/hg-ssh.8.txt
	help/hg.1.txt
	help/hgignore.5.txt
	help/hgrc.5.txt
	Not tracked:			Not tracked:

	$ ( testrepohgenv; "$PYTHON" wixxml.py templates )			$ ( testrepohgenv; "$PYTHON" wixxml.py templates )
	Not installed:			Not installed:
	Not tracked:			Not tracked:

	#endif			#endif