From 3dd9d8af2b122824314b848f81973d3a110eef92 Mon Sep 17 00:00:00 2001
From: not populated <acc@noc.ac.uk>
Date: Tue, 30 Nov 2021 14:31:18 +0000
Subject: [PATCH] Updated sette functions to work correctly after multiple
 commits

---
 sette/all_functions.sh |  2 +-
 sette/sette_eval.sh    | 23 ++++++++++++++++-------
 sette/sette_rpt.sh     | 21 ++++++++++++++-------
 3 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/sette/all_functions.sh b/sette/all_functions.sh
index 9b081783f..0184f86db 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 079d91b6b..f204e4c9a 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 0f9c14b5a..62689be72 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 ""
-- 
GitLab