diff -r 416e8c497829 -r 9d52b119b3f5 tools/updaterevision.py --- a/tools/updaterevision.py Mon Jun 27 02:01:52 2022 +0300 +++ b/tools/updaterevision.py Mon Jun 27 15:46:12 2022 +0300 @@ -33,36 +33,47 @@ import argparse import outputfile -def main(): +if __name__ == '__main__': import subprocess from datetime import datetime parser = argparse.ArgumentParser(description='Writes a header file with Hg commit information') parser.add_argument('--cwd', default = '.') parser.add_argument('output') args = parser.parse_args() - f = outputfile.OutputFile(args.output) data = subprocess.check_output(['hg', 'log', '--cwd', args.cwd, '-r.', '--template', - '{node|short} {branch} {date|hgdate}']).decode().replace('\n', '').split(' ') - + '{node|short} {branch} {date|hgdate} {tags}']).decode().replace('\n', '').split() rev = data[0] branch = data[1] timestamp = int(data[2]) + all_tags = set(data[4:]) + try: + version_tag = [tag for tag in all_tags if tag.startswith('v')][0] + except IndexError: + version_tag = None date = datetime.utcfromtimestamp(timestamp) datestring = date.strftime('%y%m%d-%H%M') if date.year >= 2000 else '000000-0000' - if len(rev) > 7: - rev = rev[0:7] - - if subprocess.check_output(['hg', 'id', '--cwd', args.cwd, '-n']).decode().replace('\n', '').endswith('+'): + rev = rev[:7] + modified = subprocess.check_output(['hg', 'id', '--cwd', args.cwd, '-n']).decode().strip().endswith('+') + if modified: rev += '+' - - f.write('#define HG_NODE "%s"\n' % rev) - f.write('#define HG_BRANCH "%s"\n' % branch) - f.write('#define HG_DATE_VERSION "%s"\n' % datestring) - f.write('#define HG_DATE_STRING "%s"\n' % date.strftime('%d %b %Y')) - f.write('#define HG_DATE_TIME %d\n' % int(timestamp)) - if f.save(): - print('%s updated to %s' %(f.filename, rev)) - -if __name__ == '__main__': - main() + # if the source tree is modified, it's not the released version + version_tag = None + if version_tag is not None: + # tags should be the same in released versions whether or not it's tip + # (though released versions shouldn't be tip because hgtags is modified + # to create the tag 🤔, but let's do this anyway) + all_tags -= {'tip'} + with outputfile.OutputFile(args.output, verbose = True) as f: + f.write(f'#define HG_NODE "{rev}"\n') + if branch != 'default': + f.write(f'#define HG_BRANCH "{branch}"\n') + f.write(f'#define HG_DATE_VERSION "{datestring}"\n') + f.write(f'#define HG_DATE_TIME {int(timestamp)}\n') + if all_tags: + f.write(f'#define HG_ALL_TAGS "{" ".join(sorted(all_tags))}"\n') + if version_tag: + f.write(f'#define HG_VERSION_TAG "{version_tag[1:]}"\n') + if 'tip' in all_tags: + f.write('#define HG_TIP\n') + print(f'Current Hg revision: {rev}')