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..e96af846e291aca24d97f1ec9f125a6938615cc7 100644 (file)
--- a/scripts/rev_control/version_control.sh
+++ b/scripts/rev_control/version_control.sh
@@ -121,7 +121,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 +147,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()
@@ -196,7 +211,7 @@ function do_update()
   elif [ -d ".git" ]; then
     git pull 2>&1 | grep -v "X11 forwarding request failed" | squash_first_few_crs
   else
-    echo unknown repository for $directory...
+    echo no repository in $directory
   fi
   popd &>/dev/null
 }
@@ -232,8 +247,8 @@ 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
+  find $dirhere -maxdepth 4 -type d -iname ".svn" -exec echo {}/.. ';' >>$tempfile
+  find $dirhere -maxdepth 4 -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
   popd &>/dev/null