support/scripts/setlocalversion: fix/improve Mercurial output
PATCH v2 1/1 support/scripts/setlocalversion: fix/improve Mercurial output
From: Thomas De Schampheleire <[email protected]>
Commit 9e4ffdc8cfdf4c73f4fa8c66259a5aadaee4ae88 modified the output of 'setlocalversion' so that the Buildroot version tag is included in the output, the version part was added in Makefile.
Due to differences in behavior of the used git and Mercurial commands, this caused different output for the Mercurial case, in BR2_VERSION_FULL and thus /etc/os-release and 'make print-version'. Assuming the official Buildroot releases are tagged and no project-specific tags are present, the output after commit 9e4ffdc8cfdf4c73f4fa8c66259a5aadaee4ae88 is:
-hg<commit>
whereas it is expected to be something like:
2020.02.6-hg<commit>Change the Mercurial case in setlocalversion to behave similar to git, looking up the latest tag if the current revision is not itself tagged.
The number of commits after the latest tag is not added, unlike in git, as this value is not commonly present in Mercurial output, and its added value can be disputed in this context. Even one commit could bring a huge change to the sources, so in order to interpret the number one has to look at the repository anyhow, in which case the commit ID can just be used.
---
v2: use intermediate var 'latesttag' rather than separate printf (Yann)
support/scripts/setlocalversion | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)
support/scripts/setlocalversion +15 -1
@@ -48,14 +48,28 @@ if head=`git rev-parse --verify --short HEAD 2>/dev/null`; then fi # Check for mercurial and a mercurial repo. +# In the git case, 'git describe' will show the latest tag, and unless we are +# exactly on that tag, the number of commits since then, and last commit id. +# Mimic something similar in the Mercurial case. if hgid=`HGRCPATH= hg id --id --tags 2>/dev/null`; then tag=`printf '%s' "$hgid" | cut -d' ' -f2 --only-delimited` # Do we have an untagged version? if [ -z "$tag" -o "$tag" = tip ]; then + # current revision is not tagged, determine latest tag + latesttag=`HGRCPATH= hg log -r. -T '{latesttag}' 2>/dev/null` + # In case there is more than one tag on the latest tagged commit, + # 'latesttag' will separate them by colon (:). We'll retain this. + # In case there is no tag at all, 'null' will be returned. + if [ "$latesttag" = "null" ]; then + latesttag='' + fi + + # add the commit id id=`printf '%s' "$hgid" | sed 's/[+ ].*//'` - printf '%s%s' -hg "$id" + printf '%s%s%s' "${latesttag}" -hg "$id" else + # current revision is tagged, just print the tag printf ${tag} fi
Signature · 1 line
2.26.2
PATCH v2 1/1 support/scripts/setlocalversion: fix/improve Mercurial output
Quoted 25 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas De Schampheleire <[email protected]> writes:
From: Thomas De Schampheleire <[email protected]> Commit
9e4ffdc8cfdf4c73f4fa8c66259a5aadaee4ae88modified the output of 'setlocalversion' so that the Buildroot version tag is included in the output, the version part was added inMakefile.Due to differences in behavior of the used git and Mercurial commands, this caused different output for the Mercurial case, in
BR2_VERSION_FULLand thus/etc/os-releaseand 'make print-version'. Assuming the official Buildroot releases are tagged and no project-specific tags are present, the output after commit9e4ffdc8cfdf4c73f4fa8c66259a5aadaee4ae88is:-hg<commit> whereas it is expected to be something like: 2020.02.6-hg<commit>Change the Mercurial case in setlocalversion to behave similar to git, looking up the latest tag if the current revision is not itself tagged.
The number of commits after the latest tag is not added, unlike in git, as this value is not commonly present in Mercurial output, and its added value can be disputed in this context. Even one commit could bring a huge change to the sources, so in order to interpret the number one has to look at the repository anyhow, in which case the commit ID can just be used.
Quoted 4 lines
Signed-off-by Thomas De Schampheleire <[email protected]>---
v2: use intermediate var 'latesttag' rather than separate printf (Yann)
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH v2 1/1 support/scripts/setlocalversion: fix/improve Mercurial output
In reply to Thomas De SchampheleireQuoted 25 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas De Schampheleire <[email protected]> writes:
From: Thomas De Schampheleire <[email protected]> Commit
9e4ffdc8cfdf4c73f4fa8c66259a5aadaee4ae88modified the output of 'setlocalversion' so that the Buildroot version tag is included in the output, the version part was added inMakefile.Due to differences in behavior of the used git and Mercurial commands, this caused different output for the Mercurial case, in
BR2_VERSION_FULLand thus/etc/os-releaseand 'make print-version'. Assuming the official Buildroot releases are tagged and no project-specific tags are present, the output after commit9e4ffdc8cfdf4c73f4fa8c66259a5aadaee4ae88is:-hg<commit> whereas it is expected to be something like: 2020.02.6-hg<commit>Change the Mercurial case in setlocalversion to behave similar to git, looking up the latest tag if the current revision is not itself tagged.
The number of commits after the latest tag is not added, unlike in git, as this value is not commonly present in Mercurial output, and its added value can be disputed in this context. Even one commit could bring a huge change to the sources, so in order to interpret the number one has to look at the repository anyhow, in which case the commit ID can just be used.
Quoted 4 lines
Signed-off-by Thomas De Schampheleire <[email protected]>---
v2: use intermediate var 'latesttag' rather than separate printf (Yann)
Committed to 2020.02.x, 2020.05.x and 2020.08.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard