diff --git a/sette/all_functions.sh b/sette/all_functions.sh index 9b081783f9c702c5eb7c1eeac739d0e85a8499a0..0184f86db83ffb595518c425bdc24a761fcc7e78 100755 --- a/sette/all_functions.sh +++ b/sette/all_functions.sh @@ -172,7 +172,7 @@ clean_config() { # define validation dir set_valid_dir () { #REVISION_NB=`${SVN_CMD} info ${SETTE_DIR}/.. | grep "Last Changed Rev" | awk '{print $NF}'` - REVISION_NB=`git rev-list --abbrev-commit origin` + REVISION_NB=`git rev-list --abbrev-commit origin | tail -1l` if [ ${#REVISION_NB} -eq 0 ] then echo "some problems with ${SVN_CMD} info command" diff --git a/sette/sette_eval.sh b/sette/sette_eval.sh index 079d91b6b465b24387a12aee9440d1b9b4162df0..f204e4c9ad7a83df9a23b514a327d0ff6e2789cf 100755 --- a/sette/sette_eval.sh +++ b/sette/sette_eval.sh @@ -234,13 +234,18 @@ function runcmpres(){ # Show current revision tag and branch name # if [ ${quiet} -eq 0 ] ; then echo "" ; fi -#lastchange=`${SVN_CMD} info ${MAIN_DIR} | grep 'Last Changed Rev' | awk '{print $NF}'` -lastchange=`git rev-list --abbrev-commit origin` -#revision=`${SVN_CMD} info ${MAIN_DIR} | grep 'Revision' | awk '{print $NF}'` -revision=`git rev-list --abbrev-commit origin` +localchanges=`git status --short -uno | wc -l` +revision=`git rev-list --abbrev-commit origin | tail -1l` branchname=`${SVN_CMD} info ${MAIN_DIR} | grep ^URL | awk -F ipsl/forge/projets/nemo/svn/ '{print $NF}'` -if [ ${quiet} -eq 0 ] ; then echo "Current code is : $branchname @ $revision ( last change @ $lastchange )" ; fi -#[ `${SVN_CMD} status -q ${MAIN_DIR}/{cfgs,tests,src} | wc -l` -ge 1 ] && lastchange=${lastchange}+ +if [ ${quiet} -eq 0 ] ; then + if [ $localchanges > 0 ] ; then + echo "Current code is : $branchname @ $revision ( with local changes )" + lastchange=${revision}_++ + else + echo "Current code is : $branchname @ $revision" + lastchange=$revision + fi +fi # by default use the current lastchanged revision lastchange=${rev:-$lastchange} @@ -249,7 +254,11 @@ if [ ${quiet} -eq 0 ] ; then echo "" echo "SETTE evaluation for : " echo "" - echo " $branchname @ $lastchange (last changed revision)" + if [ $localchanges > 0 ] ; then + echo " $branchname @ $revision (with local changes)" + else + echo " $branchname @ $revision" + fi echo "" echo " on $COMPILER arch file" echo "" diff --git a/sette/sette_rpt.sh b/sette/sette_rpt.sh index 0f9c14b5a93a2bf015d7d90b2b4500a35dc5dfc8..62689be72d3de2211af6e3c2e79aeb42848fb1ee 100755 --- a/sette/sette_rpt.sh +++ b/sette/sette_rpt.sh @@ -541,13 +541,16 @@ function identictest(){ # Show current revision tag and branch name # echo "" -#lastchange=`${SVN_CMD} info ${MAIN_DIR} | grep 'Last Changed Rev' | awk '{print $NF}'` -lastchange=`git rev-list --abbrev-commit origin` -#revision=`${SVN_CMD} info ${MAIN_DIR} | grep 'Revision' | awk '{print $NF}'` -revision=`git rev-list --abbrev-commit origin` +localchanges=`git status --short -uno | wc -l` +revision=`git rev-list --abbrev-commit origin | tail -1l` branchname=`${SVN_CMD} info ${MAIN_DIR} | grep ^URL | awk -F ipsl/forge/projets/nemo/svn/ '{print $NF}'` -echo "Current code is : $branchname @ $revision ( last change @ $lastchange )" -#[ `${SVN_CMD} status -q ${MAIN_DIR}/{cfgs,tests,src} | wc -l` -ge 1 ] && lastchange=${lastchange}+ +if [ $localchanges > 0 ] ; then + echo "Current code is : $branchname @ $revision ( with local changes )" + lastchange=${revision}_++ +else + echo "Current code is : $branchname @ $revision" + lastchange=$revision +fi # by default use the current lastchanged revision lastchange=${rev:-$lastchange} @@ -555,7 +558,11 @@ lastchange=${rev:-$lastchange} echo "" echo "SETTE validation report generated for : " echo "" -echo " $branchname @ $lastchange (last changed revision)" +if [ $localchanges > 0 ] ; then + echo " $branchname @ $revision (with local changes)" +else + echo " $branchname @ $revision" +fi echo "" echo " on $COMPILER arch file" echo ""