##// END OF EJS Templates
copies: iterate over children directly (instead of parents)...
copies: iterate over children directly (instead of parents) Before this change we would gather all parent → child edges and iterate on all parent, gathering copy information for children and aggregating them from there. They are not strict requirement for edges to be processed in that specific order. We could also simply iterate over all "children" revision and aggregate data from both parents at the same time. This patch does that. It make various things simpler: * since both parents are processed at the same time, we no longer need to cache data for merge (see next changeset for details), * we no longer need nested loop to process data, * we no longer need to store partial merge data for a rev from distinct loop interaction to another when processing merges, * we no longer need to build a full parent -> children mapping (we only rely on a simpler "parent -> number of children" map (for memory efficiency), * the data access pattern is now simpler (from lower revisions to higher revisions) and entirely predicable. That predictability open the way to prefetching and parallel processing. So that new iterations order requires simpler code and open the way to interesting optimisation. The effect on performance is quite good. In the worse case, we don't see any significant negative impact. And in the best case, the reduction of roundtrip to Python provide us with a significant speed. Some example below: Repo Case Source-Rev Dest-Rev # of revisions old time new time Difference Factor time per rev --------------------------------------------------------------------------------------------------------------------------------------------------------------- mozilla-try x00000_revs_x00000_added_0_copies dc8a3ca7010e d16fde900c9c : 34414 revs, 0.962867 s, 0.502584 s, -0.460283 s, × 0.5220, 14 µs/rev mozilla-try x0000_revs_xx000_added_x_copies 156f6e2674f2 4d0f2c178e66 : 8598 revs, 0.110717 s, 0.076323 s, -0.034394 s, × 0.6894, 8 µs/rev # full comparison between the previous changeset and this one Repo Case Source-Rev Dest-Rev # of revisions old time new time Difference Factor time per rev --------------------------------------------------------------------------------------------------------------------------------------------------------------- mercurial x_revs_x_added_0_copies ad6b123de1c7 39cfcef4f463 : 1 revs, 0.000048 s, 0.000041 s, -0.000007 s, × 0.8542, 41 µs/rev mercurial x_revs_x_added_x_copies 2b1c78674230 0c1d10351869 : 6 revs, 0.000153 s, 0.000102 s, -0.000051 s, × 0.6667, 17 µs/rev mercurial x000_revs_x000_added_x_copies 81f8ff2a9bf2 dd3267698d84 : 1032 revs, 0.004209 s, 0.004254 s, +0.000045 s, × 1.0107, 4 µs/rev pypy x_revs_x_added_0_copies aed021ee8ae8 099ed31b181b : 9 revs, 0.000203 s, 0.000282 s, +0.000079 s, × 1.3892, 31 µs/rev pypy x_revs_x000_added_0_copies 4aa4e1f8e19a 359343b9ac0e : 1 revs, 0.000059 s, 0.000048 s, -0.000011 s, × 0.8136, 48 µs/rev pypy x_revs_x_added_x_copies ac52eb7bbbb0 72e022663155 : 7 revs, 0.000194 s, 0.000211 s, +0.000017 s, × 1.0876, 30 µs/rev pypy x_revs_x00_added_x_copies c3b14617fbd7 ace7255d9a26 : 1 revs, 0.000380 s, 0.000375 s, -0.000005 s, × 0.9868, 375 µs/rev pypy x_revs_x000_added_x000_copies df6f7a526b60 a83dc6a2d56f : 6 revs, 0.010588 s, 0.010574 s, -0.000014 s, × 0.9987, 1762 µs/rev pypy x000_revs_xx00_added_0_copies 89a76aede314 2f22446ff07e : 4785 revs, 0.048961 s, 0.049974 s, +0.001013 s, × 1.0207, 10 µs/rev pypy x000_revs_x000_added_x_copies 8a3b5bfd266e 2c68e87c3efe : 6780 revs, 0.083612 s, 0.084300 s, +0.000688 s, × 1.0082, 12 µs/rev pypy x000_revs_x000_added_x000_copies 89a76aede314 7b3dda341c84 : 5441 revs, 0.058579 s, 0.060128 s, +0.001549 s, × 1.0264, 11 µs/rev pypy x0000_revs_x_added_0_copies d1defd0dc478 c9cb1334cc78 : 43645 revs, 0.736783 s, 0.686542 s, -0.050241 s, × 0.9318, 15 µs/rev pypy x0000_revs_xx000_added_0_copies bf2c629d0071 4ffed77c095c : 2 revs, 0.022050 s, 0.009277 s, -0.012773 s, × 0.4207, 4638 µs/rev pypy x0000_revs_xx000_added_x000_copies 08ea3258278e d9fa043f30c0 : 11316 revs, 0.120800 s, 0.114733 s, -0.006067 s, × 0.9498, 10 µs/rev netbeans x_revs_x_added_0_copies fb0955ffcbcd a01e9239f9e7 : 2 revs, 0.000140 s, 0.000081 s, -0.000059 s, × 0.5786, 40 µs/rev netbeans x_revs_x000_added_0_copies 6f360122949f 20eb231cc7d0 : 2 revs, 0.000114 s, 0.000107 s, -0.000007 s, × 0.9386, 53 µs/rev netbeans x_revs_x_added_x_copies 1ada3faf6fb6 5a39d12eecf4 : 3 revs, 0.000224 s, 0.000173 s, -0.000051 s, × 0.7723, 57 µs/rev netbeans x_revs_x00_added_x_copies 35be93ba1e2c 9eec5e90c05f : 9 revs, 0.000723 s, 0.000698 s, -0.000025 s, × 0.9654, 77 µs/rev netbeans x000_revs_xx00_added_0_copies eac3045b4fdd 51d4ae7f1290 : 1421 revs, 0.009665 s, 0.009248 s, -0.000417 s, × 0.9569, 6 µs/rev netbeans x000_revs_x000_added_x_copies e2063d266acd 6081d72689dc : 1533 revs, 0.014820 s, 0.015446 s, +0.000626 s, × 1.0422, 10 µs/rev netbeans x000_revs_x000_added_x000_copies ff453e9fee32 411350406ec2 : 5750 revs, 0.076049 s, 0.074373 s, -0.001676 s, × 0.9780, 12 µs/rev netbeans x0000_revs_xx000_added_x000_copies 588c2d1ced70 1aad62e59ddd : 66949 revs, 0.683603 s, 0.639870 s, -0.043733 s, × 0.9360, 9 µs/rev mozilla-central x_revs_x_added_0_copies 3697f962bb7b 7015fcdd43a2 : 2 revs, 0.000161 s, 0.000088 s, -0.000073 s, × 0.5466, 44 µs/rev mozilla-central x_revs_x000_added_0_copies dd390860c6c9 40d0c5bed75d : 8 revs, 0.000234 s, 0.000199 s, -0.000035 s, × 0.8504, 24 µs/rev mozilla-central x_revs_x_added_x_copies 8d198483ae3b 14207ffc2b2f : 9 revs, 0.000247 s, 0.000171 s, -0.000076 s, × 0.6923, 19 µs/rev mozilla-central x_revs_x00_added_x_copies 98cbc58cc6bc 446a150332c3 : 7 revs, 0.000630 s, 0.000592 s, -0.000038 s, × 0.9397, 84 µs/rev mozilla-central x_revs_x000_added_x000_copies 3c684b4b8f68 0a5e72d1b479 : 3 revs, 0.003286 s, 0.003151 s, -0.000135 s, × 0.9589, 1050 µs/rev mozilla-central x_revs_x0000_added_x0000_copies effb563bb7e5 c07a39dc4e80 : 6 revs, 0.062441 s, 0.061612 s, -0.000829 s, × 0.9867, 10268 µs/rev mozilla-central x000_revs_xx00_added_0_copies 6100d773079a 04a55431795e : 1593 revs, 0.005423 s, 0.005381 s, -0.000042 s, × 0.9923, 3 µs/rev mozilla-central x000_revs_x000_added_x_copies 9f17a6fc04f9 2d37b966abed : 41 revs, 0.005919 s, 0.003742 s, -0.002177 s, × 0.6322, 91 µs/rev mozilla-central x000_revs_x000_added_x000_copies 7c97034feb78 4407bd0c6330 : 7839 revs, 0.062597 s, 0.061983 s, -0.000614 s, × 0.9902, 7 µs/rev mozilla-central x0000_revs_xx000_added_0_copies 9eec5917337d 67118cc6dcad : 615 revs, 0.043551 s, 0.019861 s, -0.023690 s, × 0.4560, 32 µs/rev mozilla-central x0000_revs_xx000_added_x000_copies f78c615a656c 96a38b690156 : 30263 revs, 0.192475 s, 0.188101 s, -0.004374 s, × 0.9773, 6 µs/rev mozilla-central x00000_revs_x0000_added_x0000_copies 6832ae71433c 4c222a1d9a00 : 153721 revs, 1.955575 s, 1.806696 s, -0.148879 s, × 0.9239, 11 µs/rev mozilla-central x00000_revs_x00000_added_x000_copies 76caed42cf7c 1daa622bbe42 : 204976 revs, 2.886501 s, 2.682987 s, -0.203514 s, × 0.9295, 13 µs/rev mozilla-try x_revs_x_added_0_copies aaf6dde0deb8 9790f499805a : 2 revs, 0.001181 s, 0.000852 s, -0.000329 s, × 0.7214, 426 µs/rev mozilla-try x_revs_x000_added_0_copies d8d0222927b4 5bb8ce8c7450 : 2 revs, 0.001189 s, 0.000859 s, -0.000330 s, × 0.7225, 429 µs/rev mozilla-try x_revs_x_added_x_copies 092fcca11bdb 936255a0384a : 4 revs, 0.000563 s, 0.000150 s, -0.000413 s, × 0.2664, 37 µs/rev mozilla-try x_revs_x00_added_x_copies b53d2fadbdb5 017afae788ec : 2 revs, 0.001548 s, 0.001158 s, -0.000390 s, × 0.7481, 579 µs/rev mozilla-try x_revs_x000_added_x000_copies 20408ad61ce5 6f0ee96e21ad : 1 revs, 0.027782 s, 0.027240 s, -0.000542 s, × 0.9805, 27240 µs/rev mozilla-try x_revs_x0000_added_x0000_copies effb563bb7e5 c07a39dc4e80 : 6 revs, 0.062781 s, 0.062824 s, +0.000043 s, × 1.0007, 10470 µs/rev mozilla-try x000_revs_xx00_added_0_copies 6100d773079a 04a55431795e : 1593 revs, 0.005778 s, 0.005463 s, -0.000315 s, × 0.9455, 3 µs/rev mozilla-try x000_revs_x000_added_x_copies 9f17a6fc04f9 2d37b966abed : 41 revs, 0.006192 s, 0.004238 s, -0.001954 s, × 0.6844, 103 µs/rev mozilla-try x000_revs_x000_added_x000_copies 1346fd0130e4 4c65cbdabc1f : 6657 revs, 0.065391 s, 0.064113 s, -0.001278 s, × 0.9805, 9 µs/rev mozilla-try x0000_revs_x_added_0_copies 63519bfd42ee a36a2a865d92 : 40314 revs, 0.317216 s, 0.294063 s, -0.023153 s, × 0.9270, 7 µs/rev mozilla-try x0000_revs_x_added_x_copies 9fe69ff0762d bcabf2a78927 : 38690 revs, 0.303119 s, 0.281493 s, -0.021626 s, × 0.9287, 7 µs/rev mozilla-try x0000_revs_xx000_added_x_copies 156f6e2674f2 4d0f2c178e66 : 8598 revs, 0.110717 s, 0.076323 s, -0.034394 s, × 0.6894, 8 µs/rev mozilla-try x0000_revs_xx000_added_0_copies 9eec5917337d 67118cc6dcad : 615 revs, 0.045739 s, 0.020390 s, -0.025349 s, × 0.4458, 33 µs/rev mozilla-try x0000_revs_xx000_added_x000_copies 89294cd501d9 7ccb2fc7ccb5 : 97052 revs, 3.098021 s, 3.023879 s, -0.074142 s, × 0.9761, 31 µs/rev mozilla-try x0000_revs_x0000_added_x0000_copies e928c65095ed e951f4ad123a : 52031 revs, 0.771480 s, 0.735549 s, -0.035931 s, × 0.9534, 14 µs/rev mozilla-try x00000_revs_x_added_0_copies 6a320851d377 1ebb79acd503 : 363753 revs, 18.813422 s, 18.568900 s, -0.244522 s, × 0.9870, 51 µs/rev mozilla-try x00000_revs_x00000_added_0_copies dc8a3ca7010e d16fde900c9c : 34414 revs, 0.962867 s, 0.502584 s, -0.460283 s, × 0.5220, 14 µs/rev mozilla-try x00000_revs_x_added_x_copies 5173c4b6f97c 95d83ee7242d : 362229 revs, 18.684923 s, 18.356645 s, -0.328278 s, × 0.9824, 50 µs/rev mozilla-try x00000_revs_x000_added_x_copies 9126823d0e9c ca82787bb23c : 359344 revs, 18.296305 s, 18.250393 s, -0.045912 s, × 0.9975, 50 µs/rev mozilla-try x00000_revs_x0000_added_x0000_copies 8d3fafa80d4b eb884023b810 : 192665 revs, 3.061887 s, 2.792459 s, -0.269428 s, × 0.9120, 14 µs/rev mozilla-try x00000_revs_x00000_added_x0000_copies 1b661134e2ca 1ae03d022d6d : 228985 revs, 103.869641 s, 107.697264 s, +3.827623 s, × 1.0369, 470 µs/rev mozilla-try x00000_revs_x00000_added_x000_copies 9b2a99adc05e 8e29777b48e6 : 382065 revs, 64.262957 s, 63.961040 s, -0.301917 s, × 0.9953, 167 µs/rev Differential Revision: https://phab.mercurial-scm.org/D9422

File last commit:

r46554:89a2afe3 default
r46764:294d5aca default
Show More
windows.py
674 lines | 22.0 KiB | text/x-python | PythonLexer
Gregory Szorc
automation: perform tasks on remote machines...
r42191 # windows.py - Automation specific to Windows
#
# Copyright 2019 Gregory Szorc <gregory.szorc@gmail.com>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
# no-check-code because Python 3 native.
Gregory Szorc
automation: implement "publish-windows-artifacts" command...
r43177 import datetime
Gregory Szorc
automation: perform tasks on remote machines...
r42191 import os
Gregory Szorc
automation: implement "publish-windows-artifacts" command...
r43177 import paramiko
Gregory Szorc
automation: perform tasks on remote machines...
r42191 import pathlib
import re
import subprocess
import tempfile
Augie Fackler
formatting: blacken the codebase...
r43346 from .pypi import upload as pypi_upload
from .winrm import run_powershell
Gregory Szorc
automation: perform tasks on remote machines...
r42191
# PowerShell commands to activate a Visual Studio 2008 environment.
# This is essentially a port of vcvarsall.bat to PowerShell.
ACTIVATE_VC9_AMD64 = r'''
Write-Output "activating Visual Studio 2008 environment for AMD64"
$root = "$env:LOCALAPPDATA\Programs\Common\Microsoft\Visual C++ for Python\9.0"
$Env:VCINSTALLDIR = "${root}\VC\"
$Env:WindowsSdkDir = "${root}\WinSDK\"
$Env:PATH = "${root}\VC\Bin\amd64;${root}\WinSDK\Bin\x64;${root}\WinSDK\Bin;$Env:PATH"
$Env:INCLUDE = "${root}\VC\Include;${root}\WinSDK\Include;$Env:PATH"
$Env:LIB = "${root}\VC\Lib\amd64;${root}\WinSDK\Lib\x64;$Env:LIB"
$Env:LIBPATH = "${root}\VC\Lib\amd64;${root}\WinSDK\Lib\x64;$Env:LIBPATH"
'''.lstrip()
ACTIVATE_VC9_X86 = r'''
Write-Output "activating Visual Studio 2008 environment for x86"
$root = "$env:LOCALAPPDATA\Programs\Common\Microsoft\Visual C++ for Python\9.0"
$Env:VCINSTALLDIR = "${root}\VC\"
$Env:WindowsSdkDir = "${root}\WinSDK\"
$Env:PATH = "${root}\VC\Bin;${root}\WinSDK\Bin;$Env:PATH"
$Env:INCLUDE = "${root}\VC\Include;${root}\WinSDK\Include;$Env:INCLUDE"
$Env:LIB = "${root}\VC\Lib;${root}\WinSDK\Lib;$Env:LIB"
Matt Harbison
automation: correct the path separator in LIBPATH on Windows...
r42804 $Env:LIBPATH = "${root}\VC\lib;${root}\WinSDK\Lib;$Env:LIBPATH"
Gregory Szorc
automation: perform tasks on remote machines...
r42191 '''.lstrip()
HG_PURGE = r'''
$Env:PATH = "C:\hgdev\venv-bootstrap\Scripts;$Env:PATH"
Set-Location C:\hgdev\src
hg.exe --config extensions.purge= purge --all
if ($LASTEXITCODE -ne 0) {
throw "process exited non-0: $LASTEXITCODE"
}
Write-Output "purged Mercurial repo"
'''
HG_UPDATE_CLEAN = r'''
$Env:PATH = "C:\hgdev\venv-bootstrap\Scripts;$Env:PATH"
Set-Location C:\hgdev\src
hg.exe --config extensions.purge= purge --all
if ($LASTEXITCODE -ne 0) {{
throw "process exited non-0: $LASTEXITCODE"
}}
hg.exe update -C {revision}
if ($LASTEXITCODE -ne 0) {{
throw "process exited non-0: $LASTEXITCODE"
}}
hg.exe log -r .
Write-Output "updated Mercurial working directory to {revision}"
'''.lstrip()
Gregory Szorc
automation: support building Python 3 Inno installers...
r45278 BUILD_INNO_PYTHON3 = r'''
$Env:RUSTUP_HOME = "C:\hgdev\rustup"
$Env:CARGO_HOME = "C:\hgdev\cargo"
Set-Location C:\hgdev\src
C:\hgdev\python37-x64\python.exe contrib\packaging\packaging.py inno --pyoxidizer-target {pyoxidizer_target} --version {version}
if ($LASTEXITCODE -ne 0) {{
throw "process exited non-0: $LASTEXITCODE"
}}
'''
BUILD_INNO_PYTHON2 = r'''
Gregory Szorc
automation: perform tasks on remote machines...
r42191 Set-Location C:\hgdev\src
$python = "C:\hgdev\python27-{arch}\python.exe"
Gregory Szorc
automation: add extra arguments when building Inno...
r45277 C:\hgdev\python37-x64\python.exe contrib\packaging\packaging.py inno --python $python {extra_args}
Gregory Szorc
automation: perform tasks on remote machines...
r42191 if ($LASTEXITCODE -ne 0) {{
throw "process exited non-0: $LASTEXITCODE"
}}
'''.lstrip()
BUILD_WHEEL = r'''
Set-Location C:\hgdev\src
Gregory Szorc
automation: support building Windows wheels for Python 3.7 and 3.8...
r45275 C:\hgdev\python{python_version}-{arch}\python.exe -m pip wheel --wheel-dir dist .
Gregory Szorc
automation: perform tasks on remote machines...
r42191 if ($LASTEXITCODE -ne 0) {{
throw "process exited non-0: $LASTEXITCODE"
}}
'''
Gregory Szorc
automation: support building Python 3 MSI installers...
r45279 BUILD_WIX_PYTHON3 = r'''
$Env:RUSTUP_HOME = "C:\hgdev\rustup"
$Env:CARGO_HOME = "C:\hgdev\cargo"
Set-Location C:\hgdev\src
C:\hgdev\python37-x64\python.exe contrib\packaging\packaging.py wix --pyoxidizer-target {pyoxidizer_target} --version {version}
if ($LASTEXITCODE -ne 0) {{
throw "process exited non-0: $LASTEXITCODE"
}}
'''
BUILD_WIX_PYTHON2 = r'''
Gregory Szorc
automation: perform tasks on remote machines...
r42191 Set-Location C:\hgdev\src
$python = "C:\hgdev\python27-{arch}\python.exe"
Gregory Szorc
packaging: consolidate CLI functionality into packaging.py...
r43913 C:\hgdev\python37-x64\python.exe contrib\packaging\packaging.py wix --python $python {extra_args}
Gregory Szorc
automation: perform tasks on remote machines...
r42191 if ($LASTEXITCODE -ne 0) {{
throw "process exited non-0: $LASTEXITCODE"
}}
'''
RUN_TESTS = r'''
C:\hgdev\MinGW\msys\1.0\bin\sh.exe --login -c "cd /c/hgdev/src/tests && /c/hgdev/{python_path}/python.exe run-tests.py {test_flags}"
if ($LASTEXITCODE -ne 0) {{
throw "process exited non-0: $LASTEXITCODE"
}}
'''
Gregory Szorc
automation: support building Windows wheels for Python 3.7 and 3.8...
r45275 WHEEL_FILENAME_PYTHON27_X86 = 'mercurial-{version}-cp27-cp27m-win32.whl'
WHEEL_FILENAME_PYTHON27_X64 = 'mercurial-{version}-cp27-cp27m-win_amd64.whl'
WHEEL_FILENAME_PYTHON37_X86 = 'mercurial-{version}-cp37-cp37m-win32.whl'
WHEEL_FILENAME_PYTHON37_X64 = 'mercurial-{version}-cp37-cp37m-win_amd64.whl'
WHEEL_FILENAME_PYTHON38_X86 = 'mercurial-{version}-cp38-cp38-win32.whl'
WHEEL_FILENAME_PYTHON38_X64 = 'mercurial-{version}-cp38-cp38-win_amd64.whl'
Gregory Szorc
automation: upload Python 3.9 Windows wheels...
r46345 WHEEL_FILENAME_PYTHON39_X86 = 'mercurial-{version}-cp39-cp39-win32.whl'
WHEEL_FILENAME_PYTHON39_X64 = 'mercurial-{version}-cp39-cp39-win_amd64.whl'
Gregory Szorc
automation: support building Windows wheels for Python 3.7 and 3.8...
r45275
Gregory Szorc
automation: support building Python 3 Inno installers...
r45278 EXE_FILENAME_PYTHON2_X86 = 'Mercurial-{version}-x86-python2.exe'
EXE_FILENAME_PYTHON2_X64 = 'Mercurial-{version}-x64-python2.exe'
EXE_FILENAME_PYTHON3_X86 = 'Mercurial-{version}-x86.exe'
EXE_FILENAME_PYTHON3_X64 = 'Mercurial-{version}-x64.exe'
Gregory Szorc
automation: support building Python 3 MSI installers...
r45279
MSI_FILENAME_PYTHON2_X86 = 'mercurial-{version}-x86-python2.msi'
MSI_FILENAME_PYTHON2_X64 = 'mercurial-{version}-x64-python2.msi'
MSI_FILENAME_PYTHON3_X86 = 'mercurial-{version}-x86.msi'
MSI_FILENAME_PYTHON3_X64 = 'mercurial-{version}-x64.msi'
Gregory Szorc
automation: implement "publish-windows-artifacts" command...
r43177
MERCURIAL_SCM_BASE_URL = 'https://mercurial-scm.org/release/windows'
X86_USER_AGENT_PATTERN = '.*Windows.*'
X64_USER_AGENT_PATTERN = '.*Windows.*(WOW|x)64.*'
Gregory Szorc
automation: support building Python 3 Inno installers...
r45278 EXE_PYTHON2_X86_DESCRIPTION = (
'Mercurial {version} Inno Setup installer - x86 Windows (Python 2) '
'- does not require admin rights'
)
EXE_PYTHON2_X64_DESCRIPTION = (
'Mercurial {version} Inno Setup installer - x64 Windows (Python 2) '
Augie Fackler
formatting: blacken the codebase...
r43346 '- does not require admin rights'
)
Gregory Szorc
automation: support building Python 3 Inno installers...
r45278 # TODO remove Python version once Python 2 is dropped.
EXE_PYTHON3_X86_DESCRIPTION = (
'Mercurial {version} Inno Setup installer - x86 Windows (Python 3) '
'- does not require admin rights'
)
EXE_PYTHON3_X64_DESCRIPTION = (
'Mercurial {version} Inno Setup installer - x64 Windows (Python 3) '
Augie Fackler
formatting: blacken the codebase...
r43346 '- does not require admin rights'
)
Gregory Szorc
automation: support building Python 3 MSI installers...
r45279 MSI_PYTHON2_X86_DESCRIPTION = (
'Mercurial {version} MSI installer - x86 Windows (Python 2) '
'- requires admin rights'
)
MSI_PYTHON2_X64_DESCRIPTION = (
'Mercurial {version} MSI installer - x64 Windows (Python 2) '
'- requires admin rights'
Augie Fackler
formatting: blacken the codebase...
r43346 )
Gregory Szorc
automation: support building Python 3 MSI installers...
r45279 MSI_PYTHON3_X86_DESCRIPTION = (
'Mercurial {version} MSI installer - x86 Windows (Python 3) '
'- requires admin rights'
)
MSI_PYTHON3_X64_DESCRIPTION = (
'Mercurial {version} MSI installer - x64 Windows (Python 3) '
'- requires admin rights'
Augie Fackler
formatting: blacken the codebase...
r43346 )
Gregory Szorc
automation: perform tasks on remote machines...
r42191
def get_vc_prefix(arch):
if arch == 'x86':
return ACTIVATE_VC9_X86
elif arch == 'x64':
return ACTIVATE_VC9_AMD64
else:
raise ValueError('illegal arch: %s; must be x86 or x64' % arch)
def fix_authorized_keys_permissions(winrm_client, path):
commands = [
'$ErrorActionPreference = "Stop"',
'Repair-AuthorizedKeyPermission -FilePath %s -Confirm:$false' % path,
Gregory Szorc
automation: use raw strings when there are backslashes...
r42231 r'icacls %s /remove:g "NT Service\sshd"' % path,
Gregory Szorc
automation: perform tasks on remote machines...
r42191 ]
run_powershell(winrm_client, '\n'.join(commands))
def synchronize_hg(hg_repo: pathlib.Path, revision: str, ec2_instance):
"""Synchronize local Mercurial repo to remote EC2 instance."""
winrm_client = ec2_instance.winrm_client
with tempfile.TemporaryDirectory() as temp_dir:
temp_dir = pathlib.Path(temp_dir)
ssh_dir = temp_dir / '.ssh'
ssh_dir.mkdir()
ssh_dir.chmod(0o0700)
# Generate SSH key to use for communication.
Augie Fackler
formatting: blacken the codebase...
r43346 subprocess.run(
[
'ssh-keygen',
'-t',
'rsa',
'-b',
'4096',
'-N',
'',
'-f',
str(ssh_dir / 'id_rsa'),
],
check=True,
capture_output=True,
)
Gregory Szorc
automation: perform tasks on remote machines...
r42191
# Add it to ~/.ssh/authorized_keys on remote.
# This assumes the file doesn't already exist.
authorized_keys = r'c:\Users\Administrator\.ssh\authorized_keys'
winrm_client.execute_cmd(r'mkdir c:\Users\Administrator\.ssh')
winrm_client.copy(str(ssh_dir / 'id_rsa.pub'), authorized_keys)
fix_authorized_keys_permissions(winrm_client, authorized_keys)
public_ip = ec2_instance.public_ip_address
ssh_config = temp_dir / '.ssh' / 'config'
with open(ssh_config, 'w', encoding='utf-8') as fh:
fh.write('Host %s\n' % public_ip)
fh.write(' User Administrator\n')
fh.write(' StrictHostKeyChecking no\n')
fh.write(' UserKnownHostsFile %s\n' % (ssh_dir / 'known_hosts'))
fh.write(' IdentityFile %s\n' % (ssh_dir / 'id_rsa'))
Gregory Szorc
automation: add check that hg source directory is a repo...
r42467 if not (hg_repo / '.hg').is_dir():
Augie Fackler
formatting: blacken the codebase...
r43346 raise Exception(
'%s is not a Mercurial repository; '
'synchronization not yet supported' % hg_repo
)
Gregory Szorc
automation: add check that hg source directory is a repo...
r42467
Gregory Szorc
automation: perform tasks on remote machines...
r42191 env = dict(os.environ)
env['HGPLAIN'] = '1'
env['HGENCODING'] = 'utf-8'
hg_bin = hg_repo / 'hg'
res = subprocess.run(
['python2.7', str(hg_bin), 'log', '-r', revision, '-T', '{node}'],
Augie Fackler
formatting: blacken the codebase...
r43346 cwd=str(hg_repo),
env=env,
check=True,
capture_output=True,
)
Gregory Szorc
automation: perform tasks on remote machines...
r42191
full_revision = res.stdout.decode('ascii')
args = [
Augie Fackler
formatting: blacken the codebase...
r43346 'python2.7',
hg_bin,
'--config',
'ui.ssh=ssh -F %s' % ssh_config,
'--config',
'ui.remotecmd=c:/hgdev/venv-bootstrap/Scripts/hg.exe',
Gregory Szorc
automation: push changes affecting .hgtags...
r42911 # Also ensure .hgtags changes are present so auto version
# calculation works.
Augie Fackler
formatting: blacken the codebase...
r43346 'push',
'-f',
'-r',
full_revision,
'-r',
'file(.hgtags)',
Gregory Szorc
automation: do a force push to synchronize...
r42468 'ssh://%s/c:/hgdev/src' % public_ip,
Gregory Szorc
automation: perform tasks on remote machines...
r42191 ]
Gregory Szorc
automation: allow exit code of 1 for `hg push`...
r42884 res = subprocess.run(args, cwd=str(hg_repo), env=env)
# Allow 1 (no-op) to not trigger error.
if res.returncode not in (0, 1):
res.check_returncode()
Gregory Szorc
automation: perform tasks on remote machines...
r42191
Augie Fackler
formatting: blacken the codebase...
r43346 run_powershell(
winrm_client, HG_UPDATE_CLEAN.format(revision=full_revision)
)
Gregory Szorc
automation: perform tasks on remote machines...
r42191
# TODO detect dirty local working directory and synchronize accordingly.
def purge_hg(winrm_client):
"""Purge the Mercurial source repository on an EC2 instance."""
run_powershell(winrm_client, HG_PURGE)
def find_latest_dist(winrm_client, pattern):
"""Find path to newest file in dist/ directory matching a pattern."""
res = winrm_client.execute_ps(
Gregory Szorc
automation: use raw strings when there are backslashes...
r42231 r'$v = Get-ChildItem -Path C:\hgdev\src\dist -Filter "%s" '
Gregory Szorc
automation: perform tasks on remote machines...
r42191 '| Sort-Object LastWriteTime -Descending '
'| Select-Object -First 1\n'
'$v.name' % pattern
)
return res[0]
def copy_latest_dist(winrm_client, pattern, dest_path):
"""Copy latest file matching pattern in dist/ directory.
Given a WinRM client and a file pattern, find the latest file on the remote
matching that pattern and copy it to the ``dest_path`` directory on the
local machine.
"""
latest = find_latest_dist(winrm_client, pattern)
source = r'C:\hgdev\src\dist\%s' % latest
dest = dest_path / latest
print('copying %s to %s' % (source, dest))
winrm_client.fetch(source, str(dest))
Augie Fackler
formatting: blacken the codebase...
r43346 def build_inno_installer(
Gregory Szorc
automation: support building Python 3 Inno installers...
r45278 winrm_client,
python_version: int,
arch: str,
dest_path: pathlib.Path,
version=None,
Augie Fackler
formatting: blacken the codebase...
r43346 ):
Gregory Szorc
automation: perform tasks on remote machines...
r42191 """Build the Inno Setup installer on a remote machine.
Using a WinRM client, remote commands are executed to build
a Mercurial Inno Setup installer.
"""
Gregory Szorc
automation: support building Python 3 Inno installers...
r45278 print(
'building Inno Setup installer for Python %d %s'
% (python_version, arch)
)
if python_version == 3:
# TODO fix this limitation in packaging code
if not version:
raise Exception(
"version string is required when building for Python 3"
)
Gregory Szorc
automation: perform tasks on remote machines...
r42191
Gregory Szorc
automation: support building Python 3 Inno installers...
r45278 if arch == "x86":
target_triple = "i686-pc-windows-msvc"
elif arch == "x64":
target_triple = "x86_64-pc-windows-msvc"
else:
raise Exception("unhandled arch: %s" % arch)
Gregory Szorc
automation: perform tasks on remote machines...
r42191
Gregory Szorc
automation: support building Python 3 Inno installers...
r45278 ps = BUILD_INNO_PYTHON3.format(
Augie Fackler
formating: upgrade to black 20.8b1...
r46554 pyoxidizer_target=target_triple,
version=version,
Gregory Szorc
automation: support building Python 3 Inno installers...
r45278 )
else:
extra_args = []
if version:
extra_args.extend(['--version', version])
ps = get_vc_prefix(arch) + BUILD_INNO_PYTHON2.format(
arch=arch, extra_args=' '.join(extra_args)
)
Gregory Szorc
automation: perform tasks on remote machines...
r42191 run_powershell(winrm_client, ps)
copy_latest_dist(winrm_client, '*.exe', dest_path)
Gregory Szorc
automation: support building Windows wheels for Python 3.7 and 3.8...
r45275 def build_wheel(
winrm_client, python_version: str, arch: str, dest_path: pathlib.Path
):
Gregory Szorc
automation: perform tasks on remote machines...
r42191 """Build Python wheels on a remote machine.
Using a WinRM client, remote commands are executed to build a Python wheel
for Mercurial.
"""
Gregory Szorc
automation: support building Windows wheels for Python 3.7 and 3.8...
r45275 print('Building Windows wheel for Python %s %s' % (python_version, arch))
ps = BUILD_WHEEL.format(
python_version=python_version.replace(".", ""), arch=arch
)
# Python 2.7 requires an activated environment.
if python_version == "2.7":
ps = get_vc_prefix(arch) + ps
Gregory Szorc
automation: perform tasks on remote machines...
r42191 run_powershell(winrm_client, ps)
copy_latest_dist(winrm_client, '*.whl', dest_path)
Augie Fackler
formatting: blacken the codebase...
r43346 def build_wix_installer(
Gregory Szorc
automation: support building Python 3 MSI installers...
r45279 winrm_client,
python_version: int,
arch: str,
dest_path: pathlib.Path,
version=None,
Augie Fackler
formatting: blacken the codebase...
r43346 ):
Gregory Szorc
automation: perform tasks on remote machines...
r42191 """Build the WiX installer on a remote machine.
Using a WinRM client, remote commands are executed to build a WiX installer.
"""
Gregory Szorc
automation: support building Python 3 MSI installers...
r45279 print('Building WiX installer for Python %d %s' % (python_version, arch))
if python_version == 3:
# TODO fix this limitation in packaging code
if not version:
raise Exception(
"version string is required when building for Python 3"
)
Gregory Szorc
automation: perform tasks on remote machines...
r42191
Gregory Szorc
automation: support building Python 3 MSI installers...
r45279 if arch == "x86":
target_triple = "i686-pc-windows-msvc"
elif arch == "x64":
target_triple = "x86_64-pc-windows-msvc"
else:
raise Exception("unhandled arch: %s" % arch)
ps = BUILD_WIX_PYTHON3.format(
Augie Fackler
formating: upgrade to black 20.8b1...
r46554 pyoxidizer_target=target_triple,
version=version,
Gregory Szorc
automation: support building Python 3 MSI installers...
r45279 )
else:
extra_args = []
if version:
extra_args.extend(['--version', version])
ps = get_vc_prefix(arch) + BUILD_WIX_PYTHON2.format(
arch=arch, extra_args=' '.join(extra_args)
)
Gregory Szorc
automation: perform tasks on remote machines...
r42191 run_powershell(winrm_client, ps)
copy_latest_dist(winrm_client, '*.msi', dest_path)
def run_tests(winrm_client, python_version, arch, test_flags=''):
"""Run tests on a remote Windows machine.
``python_version`` is a ``X.Y`` string like ``2.7`` or ``3.7``.
``arch`` is ``x86`` or ``x64``.
``test_flags`` is a str representing extra arguments to pass to
``run-tests.py``.
"""
Gregory Szorc
automation: use raw strings when there are backslashes...
r42231 if not re.match(r'\d\.\d', python_version):
Augie Fackler
formatting: blacken the codebase...
r43346 raise ValueError(
r'python_version must be \d.\d; got %s' % python_version
)
Gregory Szorc
automation: perform tasks on remote machines...
r42191
if arch not in ('x86', 'x64'):
raise ValueError('arch must be x86 or x64; got %s' % arch)
python_path = 'python%s-%s' % (python_version.replace('.', ''), arch)
Augie Fackler
formating: upgrade to black 20.8b1...
r46554 ps = RUN_TESTS.format(
python_path=python_path,
test_flags=test_flags or '',
)
Gregory Szorc
automation: perform tasks on remote machines...
r42191
run_powershell(winrm_client, ps)
Gregory Szorc
automation: implement "publish-windows-artifacts" command...
r43177
def resolve_wheel_artifacts(dist_path: pathlib.Path, version: str):
return (
Gregory Szorc
automation: support building Windows wheels for Python 3.7 and 3.8...
r45275 dist_path / WHEEL_FILENAME_PYTHON27_X86.format(version=version),
dist_path / WHEEL_FILENAME_PYTHON27_X64.format(version=version),
dist_path / WHEEL_FILENAME_PYTHON37_X86.format(version=version),
dist_path / WHEEL_FILENAME_PYTHON37_X64.format(version=version),
dist_path / WHEEL_FILENAME_PYTHON38_X86.format(version=version),
dist_path / WHEEL_FILENAME_PYTHON38_X64.format(version=version),
Gregory Szorc
automation: upload Python 3.9 Windows wheels...
r46345 dist_path / WHEEL_FILENAME_PYTHON39_X86.format(version=version),
dist_path / WHEEL_FILENAME_PYTHON39_X64.format(version=version),
Gregory Szorc
automation: implement "publish-windows-artifacts" command...
r43177 )
def resolve_all_artifacts(dist_path: pathlib.Path, version: str):
return (
Gregory Szorc
automation: support building Windows wheels for Python 3.7 and 3.8...
r45275 dist_path / WHEEL_FILENAME_PYTHON27_X86.format(version=version),
dist_path / WHEEL_FILENAME_PYTHON27_X64.format(version=version),
dist_path / WHEEL_FILENAME_PYTHON37_X86.format(version=version),
dist_path / WHEEL_FILENAME_PYTHON37_X64.format(version=version),
dist_path / WHEEL_FILENAME_PYTHON38_X86.format(version=version),
dist_path / WHEEL_FILENAME_PYTHON38_X64.format(version=version),
Gregory Szorc
automation: upload Python 3.9 Windows wheels...
r46345 dist_path / WHEEL_FILENAME_PYTHON39_X86.format(version=version),
dist_path / WHEEL_FILENAME_PYTHON39_X64.format(version=version),
Gregory Szorc
automation: support building Python 3 Inno installers...
r45278 dist_path / EXE_FILENAME_PYTHON2_X86.format(version=version),
dist_path / EXE_FILENAME_PYTHON2_X64.format(version=version),
dist_path / EXE_FILENAME_PYTHON3_X86.format(version=version),
dist_path / EXE_FILENAME_PYTHON3_X64.format(version=version),
Gregory Szorc
automation: support building Python 3 MSI installers...
r45279 dist_path / MSI_FILENAME_PYTHON2_X86.format(version=version),
dist_path / MSI_FILENAME_PYTHON2_X64.format(version=version),
dist_path / MSI_FILENAME_PYTHON3_X86.format(version=version),
dist_path / MSI_FILENAME_PYTHON3_X64.format(version=version),
Gregory Szorc
automation: implement "publish-windows-artifacts" command...
r43177 )
def generate_latest_dat(version: str):
Gregory Szorc
automation: support building Python 3 Inno installers...
r45278 python2_x86_exe_filename = EXE_FILENAME_PYTHON2_X86.format(version=version)
python2_x64_exe_filename = EXE_FILENAME_PYTHON2_X64.format(version=version)
python3_x86_exe_filename = EXE_FILENAME_PYTHON3_X86.format(version=version)
python3_x64_exe_filename = EXE_FILENAME_PYTHON3_X64.format(version=version)
Gregory Szorc
automation: support building Python 3 MSI installers...
r45279 python2_x86_msi_filename = MSI_FILENAME_PYTHON2_X86.format(version=version)
python2_x64_msi_filename = MSI_FILENAME_PYTHON2_X64.format(version=version)
python3_x86_msi_filename = MSI_FILENAME_PYTHON3_X86.format(version=version)
python3_x64_msi_filename = MSI_FILENAME_PYTHON3_X64.format(version=version)
Gregory Szorc
automation: implement "publish-windows-artifacts" command...
r43177
entries = (
(
'10',
version,
X86_USER_AGENT_PATTERN,
Gregory Szorc
automation: support building Python 3 Inno installers...
r45278 '%s/%s' % (MERCURIAL_SCM_BASE_URL, python3_x86_exe_filename),
EXE_PYTHON3_X86_DESCRIPTION.format(version=version),
Gregory Szorc
automation: implement "publish-windows-artifacts" command...
r43177 ),
(
'10',
version,
X64_USER_AGENT_PATTERN,
Gregory Szorc
automation: support building Python 3 Inno installers...
r45278 '%s/%s' % (MERCURIAL_SCM_BASE_URL, python3_x64_exe_filename),
EXE_PYTHON3_X64_DESCRIPTION.format(version=version),
),
(
'9',
version,
X86_USER_AGENT_PATTERN,
'%s/%s' % (MERCURIAL_SCM_BASE_URL, python2_x86_exe_filename),
EXE_PYTHON2_X86_DESCRIPTION.format(version=version),
),
(
'9',
version,
X64_USER_AGENT_PATTERN,
'%s/%s' % (MERCURIAL_SCM_BASE_URL, python2_x64_exe_filename),
EXE_PYTHON2_X64_DESCRIPTION.format(version=version),
Gregory Szorc
automation: implement "publish-windows-artifacts" command...
r43177 ),
(
'10',
version,
X86_USER_AGENT_PATTERN,
Gregory Szorc
automation: support building Python 3 MSI installers...
r45279 '%s/%s' % (MERCURIAL_SCM_BASE_URL, python3_x86_msi_filename),
MSI_PYTHON3_X86_DESCRIPTION.format(version=version),
Gregory Szorc
automation: implement "publish-windows-artifacts" command...
r43177 ),
(
'10',
version,
X64_USER_AGENT_PATTERN,
Gregory Szorc
automation: support building Python 3 MSI installers...
r45279 '%s/%s' % (MERCURIAL_SCM_BASE_URL, python3_x64_msi_filename),
MSI_PYTHON3_X64_DESCRIPTION.format(version=version),
),
(
'9',
version,
X86_USER_AGENT_PATTERN,
'%s/%s' % (MERCURIAL_SCM_BASE_URL, python2_x86_msi_filename),
MSI_PYTHON2_X86_DESCRIPTION.format(version=version),
),
(
'9',
version,
X64_USER_AGENT_PATTERN,
'%s/%s' % (MERCURIAL_SCM_BASE_URL, python2_x64_msi_filename),
MSI_PYTHON2_X64_DESCRIPTION.format(version=version),
Augie Fackler
formatting: blacken the codebase...
r43346 ),
Gregory Szorc
automation: implement "publish-windows-artifacts" command...
r43177 )
lines = ['\t'.join(e) for e in entries]
return '\n'.join(lines) + '\n'
def publish_artifacts_pypi(dist_path: pathlib.Path, version: str):
"""Publish Windows release artifacts to PyPI."""
wheel_paths = resolve_wheel_artifacts(dist_path, version)
for p in wheel_paths:
if not p.exists():
raise Exception('%s not found' % p)
print('uploading wheels to PyPI (you may be prompted for credentials)')
pypi_upload(wheel_paths)
Augie Fackler
formatting: blacken the codebase...
r43346 def publish_artifacts_mercurial_scm_org(
dist_path: pathlib.Path, version: str, ssh_username=None
):
Gregory Szorc
automation: implement "publish-windows-artifacts" command...
r43177 """Publish Windows release artifacts to mercurial-scm.org."""
all_paths = resolve_all_artifacts(dist_path, version)
for p in all_paths:
if not p.exists():
raise Exception('%s not found' % p)
client = paramiko.SSHClient()
client.load_system_host_keys()
# We assume the system SSH configuration knows how to connect.
print('connecting to mercurial-scm.org via ssh...')
try:
client.connect('mercurial-scm.org', username=ssh_username)
except paramiko.AuthenticationException:
print('error authenticating; is an SSH key available in an SSH agent?')
raise
print('SSH connection established')
print('opening SFTP client...')
sftp = client.open_sftp()
print('SFTP client obtained')
for p in all_paths:
dest_path = '/var/www/release/windows/%s' % p.name
print('uploading %s to %s' % (p, dest_path))
with p.open('rb') as fh:
data = fh.read()
with sftp.open(dest_path, 'wb') as fh:
fh.write(data)
fh.chmod(0o0664)
latest_dat_path = '/var/www/release/windows/latest.dat'
now = datetime.datetime.utcnow()
backup_path = dist_path / (
Augie Fackler
formatting: blacken the codebase...
r43346 'latest-windows-%s.dat' % now.strftime('%Y%m%dT%H%M%S')
)
Gregory Szorc
automation: implement "publish-windows-artifacts" command...
r43177 print('backing up %s to %s' % (latest_dat_path, backup_path))
with sftp.open(latest_dat_path, 'rb') as fh:
latest_dat_old = fh.read()
with backup_path.open('wb') as fh:
fh.write(latest_dat_old)
print('writing %s with content:' % latest_dat_path)
latest_dat_content = generate_latest_dat(version)
print(latest_dat_content)
with sftp.open(latest_dat_path, 'wb') as fh:
fh.write(latest_dat_content.encode('ascii'))
Augie Fackler
formatting: blacken the codebase...
r43346 def publish_artifacts(
dist_path: pathlib.Path,
version: str,
pypi=True,
mercurial_scm_org=True,
ssh_username=None,
):
Gregory Szorc
automation: implement "publish-windows-artifacts" command...
r43177 """Publish Windows release artifacts.
Files are found in `dist_path`. We will look for files with version string
`version`.
`pypi` controls whether we upload to PyPI.
`mercurial_scm_org` controls whether we upload to mercurial-scm.org.
"""
if pypi:
publish_artifacts_pypi(dist_path, version)
if mercurial_scm_org:
Augie Fackler
formatting: blacken the codebase...
r43346 publish_artifacts_mercurial_scm_org(
dist_path, version, ssh_username=ssh_username
)