( )⚙ D10061 windows: fix parsing of version number to match format from D9955

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10061

windows: fix parsing of version number to match format from D9955
ClosedPublic

Authored by martinvonz on Feb 23 2021, 3:43 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGe3f23814bac7: windows: fix parsing of version number to match format from D9955

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

martinvonz created this revision.Feb 23 2021, 3:43 PM
martinvonz added a commit: rHGe3f23814bac7: windows: fix parsing of version number to match format from D9955.Feb 24 2021, 10:54 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGe3f23814bac7: windows: fix parsing of version number to match format from D9955 (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 25802

contrib/packaging/hgpackaging/util.py

'5.3.0' '5.3.0'
>>> normalize_windows_version("5.3rc0") >>> normalize_windows_version("5.3rc0")
'5.3.0.0' '5.3.0.0'
>>> normalize_windows_version("5.3rc1") >>> normalize_windows_version("5.3rc1")
'5.3.0.1' '5.3.0.1'
>>> normalize_windows_version("5.3rc1+2-abcdef") >>> normalize_windows_version("5.3rc1+hg2.abcdef")
'5.3.0.1' '5.3.0.1'
>>> normalize_windows_version("5.3+2-abcdef") >>> normalize_windows_version("5.3+hg2.abcdef")
'5.3.0.2' '5.3.0.2'
""" """
if '+' in version: if '+' in version:
version, extra = version.split('+', 1) version, extra = version.split('+', 1)
else: else:
extra = None extra = None
# 4.9rc0 # 4.9rc0
if version[:-1].endswith('rc'): if version[:-1].endswith('rc'):
rc = int(version[-1:]) rc = int(version[-1:])
version = version[:-3] version = version[:-3]
else: else:
rc = None rc = None
# Ensure we have at least X.Y version components. # Ensure we have at least X.Y version components.
versions = [int(v) for v in version.split('.')] versions = [int(v) for v in version.split('.')]
while len(versions) < 3: while len(versions) < 3:
versions.append(0) versions.append(0)
if len(versions) < 4: if len(versions) < 4:
if rc is not None: if rc is not None:
versions.append(rc) versions.append(rc)
elif extra: elif extra:
# <commit count>-<hash>+<date> # hg<commit count>.<hash>+<date>
versions.append(int(extra.split('-')[0])) versions.append(int(extra.split('.')[0][2:]))
return '.'.join('%d' % x for x in versions[0:4]) return '.'.join('%d' % x for x in versions[0:4])
def find_signtool(): def find_signtool():
"""Find signtool.exe from the Windows SDK.""" """Find signtool.exe from the Windows SDK."""
sdk = windows_10_sdk_info() sdk = windows_10_sdk_info()