Mercurial > hg
annotate contrib/wix/dist.wxs @ 35816:f6ca1e11d8b4 stable
revset: evaluate filesets against each revision for 'file()' (issue5778)
After f2aeff8a87b6, the fileset was evaluated to a set of files against the
working directory, and then those files were applied against each revision. The
result was nonsense. For example, `hg log -r 'file("set:exec()")'` on the
Mercurial repo listed revision 0 because it has the `hg` script, which is
currently +x. But that bit wasn't applied until revision 280 (which
'contains()' properly indicates).
This technique was borrowed from checkstatus(), which services adds(),
modifies(), and removes(), so it seems safe enough. The 'r:' case is explicitly
assigned to wdirrev, freeing up rev=None to mean "re-evaluate at each revision".
The distinction is important to avoid behavior changes with `hg log set:...`
(test-largefiles-misc.t and test-fileset-generated.t drop current log output
without this). I'm not sure what the right behavior for that is (1fd352aa08fc
explicitly enabled this behavior for graphlog), but the day before the release
isn't the time to experiment.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Sun, 28 Jan 2018 14:08:59 -0500 |
parents | e12c3049af8e |
children | 2025bf60adb2 |
rev | line source |
---|---|
13041
79388a8325dc
wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
1 <?xml version="1.0" encoding="utf-8"?> |
79388a8325dc
wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
2 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> |
79388a8325dc
wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
3 |
79388a8325dc
wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
4 <?include guids.wxi ?> |
13042
bd9bc4123920
wix: add support for x64 native MSI packages
Steve Borho <steve@borho.org>
parents:
13041
diff
changeset
|
5 <?include defines.wxi ?> |
13041
79388a8325dc
wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
6 |
79388a8325dc
wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
7 <Fragment> |
79388a8325dc
wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
8 <DirectoryRef Id="INSTALLDIR" FileSource="$(var.SourceDir)"> |
13042
bd9bc4123920
wix: add support for x64 native MSI packages
Steve Borho <steve@borho.org>
parents:
13041
diff
changeset
|
9 <Component Id="distOutput" Guid="$(var.dist.guid)" Win64='$(var.IsX64)'> |
25409
95e042d77a5f
wix: move library.zip and all *.pyd into a lib/ folder
Steve Borho <steve@borho.org>
parents:
17389
diff
changeset
|
10 <File Name="python27.dll" KeyPath="yes" /> |
13041
79388a8325dc
wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
11 </Component> |
25409
95e042d77a5f
wix: move library.zip and all *.pyd into a lib/ folder
Steve Borho <steve@borho.org>
parents:
17389
diff
changeset
|
12 <Directory Id="libdir" Name="lib" FileSource="$(var.SourceDir)/lib"> |
95e042d77a5f
wix: move library.zip and all *.pyd into a lib/ folder
Steve Borho <steve@borho.org>
parents:
17389
diff
changeset
|
13 <Component Id="libOutput" Guid="$(var.lib.guid)" Win64='$(var.IsX64)'> |
95e042d77a5f
wix: move library.zip and all *.pyd into a lib/ folder
Steve Borho <steve@borho.org>
parents:
17389
diff
changeset
|
14 <File Name="library.zip" KeyPath="yes" /> |
32368
008d37c4d783
base85: switch to policy importer
Yuya Nishihara <yuya@tcha.org>
parents:
32367
diff
changeset
|
15 <File Name="mercurial.cext.base85.pyd" /> |
32369
3b88a7fa97d8
bdiff: switch to policy importer
Yuya Nishihara <yuya@tcha.org>
parents:
32368
diff
changeset
|
16 <File Name="mercurial.cext.bdiff.pyd" /> |
32370
017ad85e5ac8
diffhelpers: switch to policy importer
Yuya Nishihara <yuya@tcha.org>
parents:
32369
diff
changeset
|
17 <File Name="mercurial.cext.diffhelpers.pyd" /> |
32371
151cc3b3d799
mpatch: switch to policy importer
Yuya Nishihara <yuya@tcha.org>
parents:
32370
diff
changeset
|
18 <File Name="mercurial.cext.mpatch.pyd" /> |
32367
a9c71d578a1c
osutil: switch to policy importer
Yuya Nishihara <yuya@tcha.org>
parents:
25409
diff
changeset
|
19 <File Name="mercurial.cext.osutil.pyd" /> |
32372
df448de7cf3b
parsers: switch to policy importer
Yuya Nishihara <yuya@tcha.org>
parents:
32371
diff
changeset
|
20 <File Name="mercurial.cext.parsers.pyd" /> |
32455
5e1a91f693f0
wix: include zstd.pyd in the installation
Matt Harbison <matt_harbison@yahoo.com>
parents:
25409
diff
changeset
|
21 <File Name="mercurial.zstd.pyd" /> |
33581
e12c3049af8e
wix: update list of necessary pyd files
Steve Borho <steve@borho.org>
parents:
32652
diff
changeset
|
22 <File Name="hgext.fsmonitor.pywatchman.bser.pyd" /> |
25409
95e042d77a5f
wix: move library.zip and all *.pyd into a lib/ folder
Steve Borho <steve@borho.org>
parents:
17389
diff
changeset
|
23 <File Name="pyexpat.pyd" /> |
95e042d77a5f
wix: move library.zip and all *.pyd into a lib/ folder
Steve Borho <steve@borho.org>
parents:
17389
diff
changeset
|
24 <File Name="bz2.pyd" /> |
95e042d77a5f
wix: move library.zip and all *.pyd into a lib/ folder
Steve Borho <steve@borho.org>
parents:
17389
diff
changeset
|
25 <File Name="select.pyd" /> |
95e042d77a5f
wix: move library.zip and all *.pyd into a lib/ folder
Steve Borho <steve@borho.org>
parents:
17389
diff
changeset
|
26 <File Name="unicodedata.pyd" /> |
95e042d77a5f
wix: move library.zip and all *.pyd into a lib/ folder
Steve Borho <steve@borho.org>
parents:
17389
diff
changeset
|
27 <File Name="_ctypes.pyd" /> |
95e042d77a5f
wix: move library.zip and all *.pyd into a lib/ folder
Steve Borho <steve@borho.org>
parents:
17389
diff
changeset
|
28 <File Name="_elementtree.pyd" /> |
33581
e12c3049af8e
wix: update list of necessary pyd files
Steve Borho <steve@borho.org>
parents:
32652
diff
changeset
|
29 <File Name="_testcapi.pyd" /> |
25409
95e042d77a5f
wix: move library.zip and all *.pyd into a lib/ folder
Steve Borho <steve@borho.org>
parents:
17389
diff
changeset
|
30 <File Name="_hashlib.pyd" /> |
95e042d77a5f
wix: move library.zip and all *.pyd into a lib/ folder
Steve Borho <steve@borho.org>
parents:
17389
diff
changeset
|
31 <File Name="_socket.pyd" /> |
95e042d77a5f
wix: move library.zip and all *.pyd into a lib/ folder
Steve Borho <steve@borho.org>
parents:
17389
diff
changeset
|
32 <File Name="_ssl.pyd" /> |
95e042d77a5f
wix: move library.zip and all *.pyd into a lib/ folder
Steve Borho <steve@borho.org>
parents:
17389
diff
changeset
|
33 </Component> |
95e042d77a5f
wix: move library.zip and all *.pyd into a lib/ folder
Steve Borho <steve@borho.org>
parents:
17389
diff
changeset
|
34 </Directory> |
13041
79388a8325dc
wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
35 </DirectoryRef> |
79388a8325dc
wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
36 </Fragment> |
79388a8325dc
wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
37 |
79388a8325dc
wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
38 </Wix> |