This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10060

build: make version from .hg_archival.txt consistent with that from .hg/
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG359bdd8fc60a: build: make version from .hg_archival.txt consistent with that from .hg/
Summary

D9955 changed the version format to replace "-" by "." and to add "hg"
before the number representing the distance from the latest
tag. However, it missed the "hg" string and added an extra "." to the
version string we produce when there's a .hg_archival.txt. This
patch makes it consistent.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Feb 23 2021, 3:43 PM
martinvonz updated this revision to Diff 25803.Feb 23 2021, 3:57 PM
martinvonz added a commit: rHG359bdd8fc60a: build: make version from .hg_archival.txt consistent with that from .hg/.Feb 24 2021, 10:54 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG359bdd8fc60a: build: make version from .hg_archival.txt consistent with that from .hg/ (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Msetup.py (6 lines)

Diff 25809

setup.py

kw = dict( kw = dict(
[[t.strip() for t in l.split(':', 1)] for l in open('.hg_archival.txt')] [[t.strip() for t in l.split(':', 1)] for l in open('.hg_archival.txt')]
) )
if 'tag' in kw: if 'tag' in kw:
version = kw['tag'] version = kw['tag']
elif 'latesttag' in kw: elif 'latesttag' in kw:
if 'changessincelatesttag' in kw: if 'changessincelatesttag' in kw:
version = ( version = (
'%(latesttag)s+.%(changessincelatesttag)s.%(node).12s' % kw '%(latesttag)s+hg%(changessincelatesttag)s.%(node).12s' % kw
) )
else: else:
version = '%(latesttag)s+.%(latesttagdistance)s.%(node).12s' % kw version = '%(latesttag)s+hg%(latesttagdistance)s.%(node).12s' % kw
else: else:
version = '0+' + kw.get('node', '')[:12] version = '0+hg' + kw.get('node', '')[:12]
if version: if version:
versionb = version versionb = version
if not isinstance(versionb, bytes): if not isinstance(versionb, bytes):
versionb = versionb.encode('ascii') versionb = versionb.encode('ascii')
write_if_changed( write_if_changed(
'mercurial/__version__.py', 'mercurial/__version__.py',