Mercurial > hg
view tests/test-revset-legacy-lookup.t @ 44763:94f4f2ec7dee stable
packaging: support building Inno installer with PyOxidizer
We want to start distributing Mercurial on Python 3 on
Windows. PyOxidizer will be our vehicle for achieving that.
This commit implements basic support for producing Inno
installers using PyOxidizer.
While it is an eventual goal of PyOxidizer to produce
installers, those features aren't yet implemented. So our
strategy for producing Mercurial installers is similar to
what we've been doing with py2exe: invoke a build system to
produce files then stage those files into a directory so they
can be turned into an installer.
We had to make significant alterations to the pyoxidizer.bzl
config file to get it to produce the files that we desire for
a Windows install. This meant differentiating the build targets
so we can target Windows specifically.
We've added a new module to hgpackaging to deal with interacting
with PyOxidizer. It is similar to pyexe: we invoke a build process
then copy files to a staging directory. Ideally these extra
files would be defined in pyoxidizer.bzl. But I don't think it
is worth doing at this time, as PyOxidizer's config files are
lacking some features to make this turnkey.
The rest of the change is introducing a variant of the
Inno installer code that invokes PyOxidizer instead of
py2exe.
Comparing the Python 2.7 based Inno installers with this
one, the following changes were observed:
* No lib/*.{pyd, dll} files
* No Microsoft.VC90.CRT.manifest
* No msvc{m,p,r}90.dll files
* python27.dll replaced with python37.dll
* Add vcruntime140.dll file
The disappearance of the .pyd and .dll files is acceptable, as
PyOxidizer has embedded these in hg.exe and loads them from
memory.
The disappearance of the *90* files is acceptable because those
provide the Visual C++ 9 runtime, as required by Python 2.7.
Similarly, the appearance of vcruntime140.dll is a requirement
of Python 3.7.
Differential Revision: https://phab.mercurial-scm.org/D8473
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Thu, 23 Apr 2020 18:06:02 -0700 |
parents | 29eb4cafeeb8 |
children | ed84a4d48910 |
line wrap: on
line source
$ cat >> $HGRCPATH << EOF > [ui] > logtemplate="{rev}:{node|short} {desc} [{tags}]\n" > EOF $ hg init legacy-lookup $ cd legacy-lookup $ echo a > a $ hg add a $ hg commit -m 'first' $ echo aa > a $ hg commit -m 'second' $ hg log -G @ 1:43114e71eddd second [tip] | o 0:a87874c6ec31 first [] Create a tag that looks like a revset $ hg tag 'rev(0)' $ hg log -G @ 2:fb616635b18f Added tag rev(0) for changeset 43114e71eddd [tip] | o 1:43114e71eddd second [rev(0)] | o 0:a87874c6ec31 first [] See how various things are resolved ----------------------------------- Revision numbers $ hg log -r '0' 0:a87874c6ec31 first [] $ hg log -r '1' 1:43114e71eddd second [rev(0)] "rev(x)" form (the one conflicting with the tags) (resolved as a label) $ hg log -r 'rev(0)' 1:43114e71eddd second [rev(0)] $ hg log -r 'rev(1)' 1:43114e71eddd second [rev(0)] same within a simple revspec (still resolved as the label) $ hg log -r ':rev(0)' 0:a87874c6ec31 first [] 1:43114e71eddd second [rev(0)] $ hg log -r 'rev(0):' 1:43114e71eddd second [rev(0)] 2:fb616635b18f Added tag rev(0) for changeset 43114e71eddd [tip] within a more advances revset (still resolved as the label) $ hg log -r 'rev(0) and branch(default)' 0:a87874c6ec31 first [] with explicit revset resolution (still resolved as the label) $ hg log -r 'revset(rev(0))' 0:a87874c6ec31 first [] some of the above with quote to force its resolution as a label $ hg log -r ':"rev(0)"' 0:a87874c6ec31 first [] 1:43114e71eddd second [rev(0)] $ hg log -r '"rev(0)":' 1:43114e71eddd second [rev(0)] 2:fb616635b18f Added tag rev(0) for changeset 43114e71eddd [tip] $ hg log -r '"rev(0)" and branch(default)' 1:43114e71eddd second [rev(0)] confusing bits within parents $ hg log -r '(rev(0))' 0:a87874c6ec31 first [] $ hg log -r '( rev(0))' 0:a87874c6ec31 first [] $ hg log -r '("rev(0)")' 1:43114e71eddd second [rev(0)] Test label with quote in them. $ hg tag '"foo"' $ hg log -r '"foo"' 2:fb616635b18f Added tag rev(0) for changeset 43114e71eddd ["foo"] $ hg log -r '("foo")' abort: unknown revision 'foo'! [255] $ hg log -r 'revset("foo")' abort: unknown revision 'foo'! [255] $ hg log -r '("\"foo\"")' 2:fb616635b18f Added tag rev(0) for changeset 43114e71eddd ["foo"] $ hg log -r 'revset("\"foo\"")' 2:fb616635b18f Added tag rev(0) for changeset 43114e71eddd ["foo"] Test label with dash in them. $ hg tag 'foo-bar' $ hg log -r 'foo-bar' 3:a50aae922707 Added tag "foo" for changeset fb616635b18f [foo-bar] $ hg log -r '(foo-bar)' 3:a50aae922707 Added tag "foo" for changeset fb616635b18f [foo-bar] $ hg log -r '"foo-bar"' 3:a50aae922707 Added tag "foo" for changeset fb616635b18f [foo-bar] $ hg log -r '("foo-bar")' 3:a50aae922707 Added tag "foo" for changeset fb616635b18f [foo-bar] Test label with + in them. $ hg tag 'foo+bar' $ hg log -r 'foo+bar' 4:bbf52b87b370 Added tag foo-bar for changeset a50aae922707 [foo+bar] $ hg log -r '(foo+bar)' abort: unknown revision 'foo'! [255] $ hg log -r 'revset(foo+bar)' abort: unknown revision 'foo'! [255] $ hg log -r '"foo+bar"' 4:bbf52b87b370 Added tag foo-bar for changeset a50aae922707 [foo+bar] $ hg log -r '("foo+bar")' 4:bbf52b87b370 Added tag foo-bar for changeset a50aae922707 [foo+bar] Test tag with numeric version number. $ hg tag '1.2' $ hg log -r '1.2' 5:ff42fde8edbb Added tag foo+bar for changeset bbf52b87b370 [1.2] $ hg log -r '(1.2)' 5:ff42fde8edbb Added tag foo+bar for changeset bbf52b87b370 [1.2] $ hg log -r 'revset(1.2)' 5:ff42fde8edbb Added tag foo+bar for changeset bbf52b87b370 [1.2] $ hg log -r '"1.2"' 5:ff42fde8edbb Added tag foo+bar for changeset bbf52b87b370 [1.2] $ hg log -r '("1.2")' 5:ff42fde8edbb Added tag foo+bar for changeset bbf52b87b370 [1.2] $ hg log -r '::"1.2"' 0:a87874c6ec31 first [] 1:43114e71eddd second [rev(0)] 2:fb616635b18f Added tag rev(0) for changeset 43114e71eddd ["foo"] 3:a50aae922707 Added tag "foo" for changeset fb616635b18f [foo-bar] 4:bbf52b87b370 Added tag foo-bar for changeset a50aae922707 [foo+bar] 5:ff42fde8edbb Added tag foo+bar for changeset bbf52b87b370 [1.2] $ hg log -r '::1.2' 0:a87874c6ec31 first [] 1:43114e71eddd second [rev(0)] 2:fb616635b18f Added tag rev(0) for changeset 43114e71eddd ["foo"] 3:a50aae922707 Added tag "foo" for changeset fb616635b18f [foo-bar] 4:bbf52b87b370 Added tag foo-bar for changeset a50aae922707 [foo+bar] 5:ff42fde8edbb Added tag foo+bar for changeset bbf52b87b370 [1.2] Test tag with parenthesis (but not a valid revset) $ hg tag 'release_4.1(candidate1)' $ hg log -r 'release_4.1(candidate1)' 6:db72e24fe069 Added tag 1.2 for changeset ff42fde8edbb [release_4.1(candidate1)] $ hg log -r '(release_4.1(candidate1))' hg: parse error: unknown identifier: release_4.1 [255] $ hg log -r 'revset(release_4.1(candidate1))' hg: parse error: unknown identifier: release_4.1 [255] $ hg log -r '"release_4.1(candidate1)"' 6:db72e24fe069 Added tag 1.2 for changeset ff42fde8edbb [release_4.1(candidate1)] $ hg log -r '("release_4.1(candidate1)")' 6:db72e24fe069 Added tag 1.2 for changeset ff42fde8edbb [release_4.1(candidate1)] $ hg log -r '::"release_4.1(candidate1)"' 0:a87874c6ec31 first [] 1:43114e71eddd second [rev(0)] 2:fb616635b18f Added tag rev(0) for changeset 43114e71eddd ["foo"] 3:a50aae922707 Added tag "foo" for changeset fb616635b18f [foo-bar] 4:bbf52b87b370 Added tag foo-bar for changeset a50aae922707 [foo+bar] 5:ff42fde8edbb Added tag foo+bar for changeset bbf52b87b370 [1.2] 6:db72e24fe069 Added tag 1.2 for changeset ff42fde8edbb [release_4.1(candidate1)] $ hg log -r '::release_4.1(candidate1)' hg: parse error: unknown identifier: release_4.1 [255] Test tag with parenthesis and other function like char $ hg tag 'release_4.1(arch=x86,arm)' $ hg log -r 'release_4.1(arch=x86,arm)' 7:b29b25d7d687 Added tag release_4.1(candidate1) for changeset db72e24fe069 [release_4.1(arch=x86,arm)] $ hg log -r '(release_4.1(arch=x86,arm))' hg: parse error: unknown identifier: release_4.1 [255] $ hg log -r 'revset(release_4.1(arch=x86,arm))' hg: parse error: unknown identifier: release_4.1 [255] $ hg log -r '"release_4.1(arch=x86,arm)"' 7:b29b25d7d687 Added tag release_4.1(candidate1) for changeset db72e24fe069 [release_4.1(arch=x86,arm)] $ hg log -r '("release_4.1(arch=x86,arm)")' 7:b29b25d7d687 Added tag release_4.1(candidate1) for changeset db72e24fe069 [release_4.1(arch=x86,arm)] $ hg log -r '::"release_4.1(arch=x86,arm)"' 0:a87874c6ec31 first [] 1:43114e71eddd second [rev(0)] 2:fb616635b18f Added tag rev(0) for changeset 43114e71eddd ["foo"] 3:a50aae922707 Added tag "foo" for changeset fb616635b18f [foo-bar] 4:bbf52b87b370 Added tag foo-bar for changeset a50aae922707 [foo+bar] 5:ff42fde8edbb Added tag foo+bar for changeset bbf52b87b370 [1.2] 6:db72e24fe069 Added tag 1.2 for changeset ff42fde8edbb [release_4.1(candidate1)] 7:b29b25d7d687 Added tag release_4.1(candidate1) for changeset db72e24fe069 [release_4.1(arch=x86,arm)] $ hg log -r '::release_4.1(arch=x86,arm)' hg: parse error: unknown identifier: release_4.1 [255] Test tag conflicting with revset function $ hg tag 'secret(team=foo,project=bar)' $ hg log -r 'secret(team=foo,project=bar)' 8:6b2e2d4ea455 Added tag release_4.1(arch=x86,arm) for changeset b29b25d7d687 [secret(team=foo,project=bar)] $ hg log -r '(secret(team=foo,project=bar))' hg: parse error: secret takes no arguments [255] $ hg log -r 'revset(secret(team=foo,project=bar))' hg: parse error: secret takes no arguments [255] $ hg log -r '"secret(team=foo,project=bar)"' 8:6b2e2d4ea455 Added tag release_4.1(arch=x86,arm) for changeset b29b25d7d687 [secret(team=foo,project=bar)] $ hg log -r '("secret(team=foo,project=bar)")' 8:6b2e2d4ea455 Added tag release_4.1(arch=x86,arm) for changeset b29b25d7d687 [secret(team=foo,project=bar)] $ hg log -r '::"secret(team=foo,project=bar)"' 0:a87874c6ec31 first [] 1:43114e71eddd second [rev(0)] 2:fb616635b18f Added tag rev(0) for changeset 43114e71eddd ["foo"] 3:a50aae922707 Added tag "foo" for changeset fb616635b18f [foo-bar] 4:bbf52b87b370 Added tag foo-bar for changeset a50aae922707 [foo+bar] 5:ff42fde8edbb Added tag foo+bar for changeset bbf52b87b370 [1.2] 6:db72e24fe069 Added tag 1.2 for changeset ff42fde8edbb [release_4.1(candidate1)] 7:b29b25d7d687 Added tag release_4.1(candidate1) for changeset db72e24fe069 [release_4.1(arch=x86,arm)] 8:6b2e2d4ea455 Added tag release_4.1(arch=x86,arm) for changeset b29b25d7d687 [secret(team=foo,project=bar)] $ hg log -r '::secret(team=foo,project=bar)' hg: parse error: secret takes no arguments [255] Test tag with space $ hg tag 'my little version' $ hg log -r 'my little version' 9:269192bf8fc3 Added tag secret(team=foo,project=bar) for changeset 6b2e2d4ea455 [my little version] $ hg log -r '(my little version)' hg: parse error at 4: unexpected token: symbol ((my little version) ^ here) [255] $ hg log -r 'revset(my little version)' hg: parse error at 10: unexpected token: symbol (revset(my little version) ^ here) [255] $ hg log -r '"my little version"' 9:269192bf8fc3 Added tag secret(team=foo,project=bar) for changeset 6b2e2d4ea455 [my little version] $ hg log -r '("my little version")' 9:269192bf8fc3 Added tag secret(team=foo,project=bar) for changeset 6b2e2d4ea455 [my little version] $ hg log -r '::"my little version"' 0:a87874c6ec31 first [] 1:43114e71eddd second [rev(0)] 2:fb616635b18f Added tag rev(0) for changeset 43114e71eddd ["foo"] 3:a50aae922707 Added tag "foo" for changeset fb616635b18f [foo-bar] 4:bbf52b87b370 Added tag foo-bar for changeset a50aae922707 [foo+bar] 5:ff42fde8edbb Added tag foo+bar for changeset bbf52b87b370 [1.2] 6:db72e24fe069 Added tag 1.2 for changeset ff42fde8edbb [release_4.1(candidate1)] 7:b29b25d7d687 Added tag release_4.1(candidate1) for changeset db72e24fe069 [release_4.1(arch=x86,arm)] 8:6b2e2d4ea455 Added tag release_4.1(arch=x86,arm) for changeset b29b25d7d687 [secret(team=foo,project=bar)] 9:269192bf8fc3 Added tag secret(team=foo,project=bar) for changeset 6b2e2d4ea455 [my little version] $ hg log -r '::my little version' hg: parse error at 5: invalid token (::my little version ^ here) [255]