Mercurial > hg-stable
changeset 42658:9e0f1c80cddb stable
automation: push changes affecting .hgtags
When I went to build the 5.1 tag using the in-repo automation, the
automatic version calculation failed to deduce the clean 5.1 version
string because we had only pushed the changeset corresponding to the 5.1
tag and not the changeset containing the 5.1 tag. So from the
perspective of the remote repo, the 5.1 tag didn't exist yet and
automatic version deduction failed.
This commit changes the `hg push` to also push all changesets affecting
the .hgtags file, ensuring the remote has up-to-date tags information.
I tested this by creating a local draft changeset with a dummy tag
value on a different DAG head and instructed the automation to build
a revision that didn't have this change to .hgtags. The tag was
successfully pushed and the built package had a version number
incorporating that tag.
Sending this to stable so the 5.1.1 automation hopefully "just works."
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Sat, 03 Aug 2019 12:13:51 -0700 |
| parents | e0cf09bc35ef |
| children | cba59b338976 863e9e7f8850 |
| files | contrib/automation/hgautomation/linux.py contrib/automation/hgautomation/windows.py |
| diffstat | 2 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/automation/hgautomation/linux.py Fri Jun 21 03:50:40 2019 +0200 +++ b/contrib/automation/hgautomation/linux.py Sat Aug 03 12:13:51 2019 -0700 @@ -485,7 +485,9 @@ 'python2.7', str(hg_bin), '--config', 'ui.ssh=ssh -F %s' % ssh_config, '--config', 'ui.remotecmd=/hgdev/venv-bootstrap/bin/hg', - 'push', '-f', '-r', full_revision, + # Also ensure .hgtags changes are present so auto version + # calculation works. + 'push', '-f', '-r', full_revision, '-r', 'file(.hgtags)', 'ssh://%s//hgwork/src' % public_ip, ]
--- a/contrib/automation/hgautomation/windows.py Fri Jun 21 03:50:40 2019 +0200 +++ b/contrib/automation/hgautomation/windows.py Sat Aug 03 12:13:51 2019 -0700 @@ -176,7 +176,9 @@ 'python2.7', hg_bin, '--config', 'ui.ssh=ssh -F %s' % ssh_config, '--config', 'ui.remotecmd=c:/hgdev/venv-bootstrap/Scripts/hg.exe', - 'push', '-f', '-r', full_revision, + # Also ensure .hgtags changes are present so auto version + # calculation works. + 'push', '-f', '-r', full_revision, '-r', 'file(.hgtags)', 'ssh://%s/c:/hgdev/src' % public_ip, ]