Message ID | 20200928113210.3153-1-patrickdepinguin@gmail.com |
---|---|
State | Changes Requested |
Headers | show |
Series | [master+LTS] support/scripts/setlocalversion: fix/improve Mercurial output | expand |
Thomas, All, On 2020-09-28 13:32 +0200, Thomas De Schampheleire spake thusly: > From: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com> > > 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. > > Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com> > --- > support/scripts/setlocalversion | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) > > diff --git a/support/scripts/setlocalversion b/support/scripts/setlocalversion > index e04c955d9e..49971b0fad 100755 > --- a/support/scripts/setlocalversion > +++ b/support/scripts/setlocalversion > @@ -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 > + printf "${latesttag}" > + fi I am not too fond of a multi-printf output, so: if [ "${latesttag}" = "null" ]; then latesttag='' fi ... and then... > + # add the commit id > id=`printf '%s' "$hgid" | sed 's/[+ ].*//'` > printf '%s%s' -hg "$id" printf '%s%s%s' "${latesttag}" -hg "${id}" which IMHO looks saner. Regards, Yann E. MORIN. > else > + # current revision is tagged, just print the tag > printf ${tag} > fi > > -- > 2.26.2 > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
diff --git a/support/scripts/setlocalversion b/support/scripts/setlocalversion index e04c955d9e..49971b0fad 100755 --- a/support/scripts/setlocalversion +++ b/support/scripts/setlocalversion @@ -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 + printf "${latesttag}" + fi + + # add the commit id id=`printf '%s' "$hgid" | sed 's/[+ ].*//'` printf '%s%s' -hg "$id" else + # current revision is tagged, just print the tag printf ${tag} fi