Mercurial > hg
view tests/test-linelog.py @ 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 | e52a9c85a7a8 |
children | 89a2afe31e82 |
line wrap: on
line source
from __future__ import absolute_import, print_function import difflib import random import unittest from mercurial import linelog vecratio = 3 # number of replacelines / number of replacelines_vec maxlinenum = 0xFFFFFF maxb1 = 0xFFFFFF maxdeltaa = 10 maxdeltab = 10 def _genedits(seed, endrev): lines = [] random.seed(seed) for rev in range(0, endrev): n = len(lines) a1 = random.randint(0, n) a2 = random.randint(a1, min(n, a1 + maxdeltaa)) b1 = random.randint(0, maxb1) b2 = random.randint(b1, b1 + maxdeltab) usevec = not bool(random.randint(0, vecratio)) if usevec: blines = [ (random.randint(0, rev), random.randint(0, maxlinenum)) for _ in range(b1, b2) ] else: blines = [(rev, bidx) for bidx in range(b1, b2)] lines[a1:a2] = blines yield lines, rev, a1, a2, b1, b2, blines, usevec class linelogtests(unittest.TestCase): def testlinelogencodedecode(self): program = [ linelog._eof(0, 0), linelog._jge(41, 42), linelog._jump(0, 43), linelog._eof(0, 0), linelog._jl(44, 45), linelog._line(46, 47), ] ll = linelog.linelog(program, maxrev=100) enc = ll.encode() # round-trips okay self.assertEqual(linelog.linelog.fromdata(enc)._program, ll._program) self.assertEqual(linelog.linelog.fromdata(enc), ll) # This encoding matches the encoding used by hg-experimental's # linelog file, or is supposed to if it doesn't. self.assertEqual( enc, ( b'\x00\x00\x01\x90\x00\x00\x00\x06' b'\x00\x00\x00\xa4\x00\x00\x00*' b'\x00\x00\x00\x00\x00\x00\x00+' b'\x00\x00\x00\x00\x00\x00\x00\x00' b'\x00\x00\x00\xb1\x00\x00\x00-' b'\x00\x00\x00\xba\x00\x00\x00/' ), ) def testsimpleedits(self): ll = linelog.linelog() # Initial revision: add lines 0, 1, and 2 ll.replacelines(1, 0, 0, 0, 3) self.assertEqual( [(l.rev, l.linenum) for l in ll.annotate(1)], [(1, 0), (1, 1), (1, 2),], ) # Replace line 1 with a new line ll.replacelines(2, 1, 2, 1, 2) self.assertEqual( [(l.rev, l.linenum) for l in ll.annotate(2)], [(1, 0), (2, 1), (1, 2),], ) # delete a line out of 2 ll.replacelines(3, 1, 2, 0, 0) self.assertEqual( [(l.rev, l.linenum) for l in ll.annotate(3)], [(1, 0), (1, 2),] ) # annotation of 1 is unchanged self.assertEqual( [(l.rev, l.linenum) for l in ll.annotate(1)], [(1, 0), (1, 1), (1, 2),], ) ll.annotate(3) # set internal state to revision 3 start = ll.getoffset(0) end = ll.getoffset(1) self.assertEqual(ll.getalllines(start, end), [(1, 0), (2, 1), (1, 1),]) self.assertEqual(ll.getalllines(), [(1, 0), (2, 1), (1, 1), (1, 2),]) def testparseclinelogfile(self): # This data is what the replacements in testsimpleedits # produce when fed to the original linelog.c implementation. data = ( b'\x00\x00\x00\x0c\x00\x00\x00\x0f' b'\x00\x00\x00\x00\x00\x00\x00\x02' b'\x00\x00\x00\x05\x00\x00\x00\x06' b'\x00\x00\x00\x06\x00\x00\x00\x00' b'\x00\x00\x00\x00\x00\x00\x00\x07' b'\x00\x00\x00\x06\x00\x00\x00\x02' b'\x00\x00\x00\x00\x00\x00\x00\x00' b'\x00\x00\x00\t\x00\x00\x00\t' b'\x00\x00\x00\x00\x00\x00\x00\x0c' b'\x00\x00\x00\x08\x00\x00\x00\x05' b'\x00\x00\x00\x06\x00\x00\x00\x01' b'\x00\x00\x00\x00\x00\x00\x00\x05' b'\x00\x00\x00\x0c\x00\x00\x00\x05' b'\x00\x00\x00\n\x00\x00\x00\x01' b'\x00\x00\x00\x00\x00\x00\x00\t' ) llc = linelog.linelog.fromdata(data) self.assertEqual( [(l.rev, l.linenum) for l in llc.annotate(1)], [(1, 0), (1, 1), (1, 2),], ) self.assertEqual( [(l.rev, l.linenum) for l in llc.annotate(2)], [(1, 0), (2, 1), (1, 2),], ) self.assertEqual( [(l.rev, l.linenum) for l in llc.annotate(3)], [(1, 0), (1, 2),] ) # Check we emit the same bytecode. ll = linelog.linelog() # Initial revision: add lines 0, 1, and 2 ll.replacelines(1, 0, 0, 0, 3) # Replace line 1 with a new line ll.replacelines(2, 1, 2, 1, 2) # delete a line out of 2 ll.replacelines(3, 1, 2, 0, 0) diff = '\n ' + '\n '.join( difflib.unified_diff( ll.debugstr().splitlines(), llc.debugstr().splitlines(), 'python', 'c', lineterm='', ) ) self.assertEqual(ll._program, llc._program, 'Program mismatch: ' + diff) # Done as a secondary step so we get a better result if the # program is where the mismatch is. self.assertEqual(ll, llc) self.assertEqual(ll.encode(), data) def testanothersimplecase(self): ll = linelog.linelog() ll.replacelines(3, 0, 0, 0, 2) ll.replacelines(4, 0, 2, 0, 0) self.assertEqual([(l.rev, l.linenum) for l in ll.annotate(4)], []) self.assertEqual( [(l.rev, l.linenum) for l in ll.annotate(3)], [(3, 0), (3, 1)] ) # rev 2 is empty because contents were only ever introduced in rev 3 self.assertEqual([(l.rev, l.linenum) for l in ll.annotate(2)], []) def testrandomedits(self): # Inspired by original linelog tests. seed = random.random() numrevs = 2000 ll = linelog.linelog() # Populate linelog for lines, rev, a1, a2, b1, b2, blines, usevec in _genedits( seed, numrevs ): if usevec: ll.replacelines_vec(rev, a1, a2, blines) else: ll.replacelines(rev, a1, a2, b1, b2) ll.annotate(rev) self.assertEqual(ll.annotateresult, lines) # Verify we can get back these states by annotating each rev for lines, rev, a1, a2, b1, b2, blines, usevec in _genedits( seed, numrevs ): ar = ll.annotate(rev) self.assertEqual([(l.rev, l.linenum) for l in ar], lines) def testinfinitebadprogram(self): ll = linelog.linelog.fromdata( b'\x00\x00\x00\x00\x00\x00\x00\x02' # header b'\x00\x00\x00\x00\x00\x00\x00\x01' # JUMP to self ) with self.assertRaises(linelog.LineLogError): # should not be an infinite loop and raise ll.annotate(1) if __name__ == '__main__': import silenttestrunner silenttestrunner.main(__name__)