This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3964

macosx: fixing macOS version generation after db9d1dd01bf0
ClosedPublic

Authored by rdamazio on Jul 18 2018, 9:45 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG25880ddf9a86: macosx: fixing macOS version generation after db9d1dd01bf0
Summary

With the Python3 change, the string is now something like
version = b'4.6.2+848-88be288e8ac1'
where it was previously just:
version = '4.6.2+848-88be288e8ac1'

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

rdamazio created this revision.Jul 18 2018, 9:45 PM
rdamazio retitled this revision from macosx: fixing macOS version generation after dbbe45ae5ad1 to macosx: fixing macOS version generation after db9d1dd01bf0.Jul 18 2018, 9:48 PM
rdamazio added a comment.Jul 18 2018, 10:02 PM

Er, actually, let me fix this again - this unbreaks the build but generates packages like 'Mercurial-"4.6.2+674-f83600efa1ca-macosx10.13.dmg'.

glandium added a subscriber: glandium.Jul 18 2018, 10:14 PM

This is python code, why is it parsing the version file instead of importing it?

rdamazio added a comment.Jul 18 2018, 10:30 PM

Hmm and nevermind, the weird package name doesn't reproduce on a vanilla hg build, you can go ahead and review.

rdamazio added a comment.Jul 18 2018, 10:31 PM
In D3964#61696, @glandium wrote:

This is python code, why is it parsing the version file instead of importing it?

Great question, no idea :) I took the minimal fix approach to reduce the change of further breaking it.

Closed by commit rHG25880ddf9a86: macosx: fixing macOS version generation after db9d1dd01bf0 (authored by rdamazio). · Explain WhyJul 19 2018, 8:28 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mcontrib/genosxversion.py (4 lines)

Diff 9633

contrib/genosxversion.py

def main(argv): def main(argv):
opts = ap.parse_args(argv[1:]) opts = ap.parse_args(argv[1:])
if opts.selftest: if opts.selftest:
import doctest import doctest
doctest.testmod() doctest.testmod()
return return
with open(opts.versionfile) as f: with open(opts.versionfile) as f:
for l in f: for l in f:
if l.startswith('version = '): if l.startswith('version = b'):
# version number is entire line minus the quotes # version number is entire line minus the quotes
ver = l[len('version = ') + 1:-2] ver = l[len('version = b') + 1:-2]
break break
if opts.paranoid: if opts.paranoid:
print(paranoidver(ver)) print(paranoidver(ver))
else: else:
print(ver) print(ver)
if __name__ == '__main__': if __name__ == '__main__':
main(sys.argv) main(sys.argv)