new fortune

[feisty_meow.git] / scripts / rev_control / version_control.sh

diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh
index 4da2c6a7d64271dd131ac2120209dfd3083532e3..e3e0c4b17c1132835f36787d4a4e0c7613e78857 100644 (file)
--- a/scripts/rev_control/version_control.sh
+++ b/scripts/rev_control/version_control.sh
@@ -102,6 +102,11 @@ function compute_modifier()
 function do_checkin()
 {
   local directory="$1"; shift
+  do_update "$directory"
+  if [ $? -ne 0 ]; then
+    echo "Repository update failed; this should be fixed before check-in."
+    return 1
+  fi
   pushd "$directory" &>/dev/null
   retval=0  # normally successful.
   if [ -d "CVS" ]; then
@@ -121,7 +126,7 @@ function do_checkin()
     git push 2>&1 | grep -v "X11 forwarding request failed"
     retval+=$?
   else
-    echo unknown repository for $directory...
+    echo no repository in $directory
     retval=1
   fi
   popd &>/dev/null
@@ -147,6 +152,21 @@ function do_diff
   return $retval
 }
 
+function do_report_new
+{
+  local directory="$1"; shift
+  pushd "$directory" &>/dev/null
+  retval=0  # normally successful.
+
+  # only update if we see a repository living there.
+  if [ -d ".svn" ]; then
+    # this action so far only makes sense and is needed for svn.
+    bash $FEISTY_MEOW_SCRIPTS/rev_control/svnapply.sh \? echo
+  fi
+
+  popd &>/dev/null
+  return $retval
+}
 
 # checks in all the folders in a specified list.
 function checkin_list()
@@ -187,18 +207,24 @@ function squash_first_few_crs()
 function do_update()
 {
   directory="$1"; shift
- 
+  # plan on success for now.
+  retval=0
   pushd "$directory" &>/dev/null
   if [ -d "CVS" ]; then
     cvs update . | squash_first_few_crs
+    retval=${PIPESTATUS[0]}
   elif [ -d ".svn" ]; then
     svn update . | squash_first_few_crs
+    retval=${PIPESTATUS[0]}
   elif [ -d ".git" ]; then
     git pull 2>&1 | grep -v "X11 forwarding request failed" | squash_first_few_crs
+    retval=${PIPESTATUS[0]}
   else
-    echo unknown repository for $directory...
+    # this is not an error necessarily; we'll just pretend they planned this.
+    echo no repository in $directory
   fi
   popd &>/dev/null
+  return $retval
 }
 
 # gets all the updates for a list of folders under revision control.
@@ -232,12 +258,14 @@ function generate_rev_ctrl_filelist()
   local dirhere="$(\pwd)"
   local tempfile=$(mktemp /tmp/zz_rev_checkin.XXXXXX)
   echo >$tempfile
-  find $dirhere -maxdepth 3 -type d -iname ".svn" -exec echo {}/.. ';' >>$tempfile
-  find $dirhere -maxdepth 3 -type d -iname ".git" -exec echo {}/.. ';' >>$tempfile
-#CVS is not well behaved, and we seldom use it anymore.
-#  find $dirhere -maxdepth 3 -type d -iname "CVS" -exec echo {}/.. ';' >>$tempfile
+  find $dirhere -maxdepth 5 -type d -iname ".svn" -exec echo {}/.. ';' >>$tempfile
+  find $dirhere -maxdepth 5 -type d -iname ".git" -exec echo {}/.. ';' >>$tempfile
+  # CVS is not well behaved like git and (now) svn, and we seldom use it anymore.
   popd &>/dev/null
-  echo "$tempfile"
+  local sortfile=$(mktemp /tmp/zz_rev_checkin_sort.XXXXXX)
+  sort <"$tempfile" >"$sortfile"
+  \rm "$tempfile"
+  echo "$sortfile"
 }
 
 # iterates across a list of directories contained in a file (first parameter).