X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Frev_control%2Fversion_control.sh;h=c3e21b2108c0007e25c8c0281c91c5434781ebfd;hb=170a8e062d9283e65716e7aa55930ade13a66f7a;hp=c8854104bca34467f859cc63e750d8702fb04887;hpb=5e349cccdb9983d24b2f335edfa6f33c650e3870;p=feisty_meow.git

diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh
index c8854104..c3e21b21 100644
--- a/scripts/rev_control/version_control.sh
+++ b/scripts/rev_control/version_control.sh
@@ -6,6 +6,8 @@
 source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
 source "$FEISTY_MEOW_SCRIPTS/tty/terminal_titler.sh"
 
+##############
+
 # the maximum depth that the recursive functions will try to go below the starting directory.
 export MAX_DEPTH=5
 
@@ -45,21 +47,15 @@ function get_our_hostname()
 # this function sets a variable called "home_system" to "true" if the
 # machine is considered one of fred's home machines.  if you are not
 # fred, you may want to change the machine choices.
-export home_system=
 function is_home_system()
 {
   # load up the name of the host.
   get_our_hostname
   # reset the variable that we'll be setting.
-  home_system=
+  unset home_system
+  export home_system
   if [[ $this_host == *.gruntose.blurgh ]]; then
     home_system=true
-#temp code
-elif [[ $this_host == buildy ]]; then
-home_system=true
-elif [[ $this_host == simmy ]]; then
-home_system=true
-#temp code
   fi
 }
 
@@ -104,9 +100,9 @@ function compute_modifier()
   is_home_system
   # special override to pick local servers when at home.
   if [ "$home_system" == "true" ]; then
+#hmmm: this "home system" feature seems to be unnecessary?
     if [ "$in_or_out" == "out" ]; then
       # need the right home machine for modifier when checking out.
-#huhhh?      modifier="svn://shaggy/"
       modifier=
     else 
       # no modifier for checkin.
@@ -115,6 +111,8 @@ function compute_modifier()
   fi
 }
 
+##############
+
 # selects the method for check-in based on where we are.
 function do_checkin()
 {
@@ -122,27 +120,37 @@ function do_checkin()
 
   save_terminal_title
 
-  do_update "$directory"
-  if [ $? -ne 0 ]; then
-    echo "repository update failed; this should be fixed before check-in."
-    return 1
+  # make a nice echoer since we want to use it inside conditions below.
+  local nicedir="$directory"
+  if [ $nicedir == "." ]; then
+    nicedir=$(\pwd)
   fi
-  pushd "$directory" &>/dev/null
+  local blatt="echo checking in '$nicedir'..."
+
   local retval=0  # normally successful.
+
+  do_update "$directory"
+  retval=$?
+  test_or_die "repository update failed; this should be fixed before check-in."
+
+  pushd "$directory" &>/dev/null
   if [ -f ".no-checkin" ]; then
     echo "skipping check-in due to presence of .no-checkin sentinel file."
   elif [ -d "CVS" ]; then
     if test_writeable "CVS"; then
+      $blatt
       cvs ci .
       retval=$?
     fi
   elif [ -d ".svn" ]; then
     if test_writeable ".svn"; then
+      $blatt
       svn ci .
       retval=$?
     fi
   elif [ -d ".git" ]; then
     if test_writeable ".git"; then
+      $blatt
       # snag all new files.  not to everyone's liking.
       git add --all .
       retval=$?
@@ -176,10 +184,13 @@ function do_diff
   # only update if we see a repository living there.
   if [ -d ".svn" ]; then
     svn diff .
+    retval+=$?
   elif [ -d ".git" ]; then
     git diff 
+    retval+=$?
   elif [ -d "CVS" ]; then
     cvs diff .
+    retval+=$?
   fi
 
   popd &>/dev/null
@@ -235,17 +246,17 @@ function checkin_list()
     if [[ $outer =~ /.* ]]; then
       # yep, this path is absolute.  just handle it directly.
       if [ ! -d "$outer" ]; then continue; fi
-      echo "checking in '$outer'..."
       do_checkin $outer
-      sep 7
+      test_or_die "running check-in on: $outer"
+      sep 28
     else
       for inner in $list; do
         # add in the directory component to see if we can find the folder.
         local path="$inner/$outer"
         if [ ! -d "$path" ]; then continue; fi
-        echo "checking in '$path'..."
         do_checkin $path
-        sep 7
+        test_or_die "running check-in on: $path"
+        sep 28
       done
     fi
   done
@@ -278,20 +289,30 @@ function do_update()
 
   save_terminal_title
 
+  # make a nice echoer since we want to use it inside conditions below.
+  local nicedir="$directory"
+  if [ $nicedir == "." ]; then
+    nicedir=$(\pwd)
+  fi
+  local blatt="echo retrieving '$nicedir'..."
+
   local retval=0  # plan on success for now.
   pushd "$directory" &>/dev/null
   if [ -d "CVS" ]; then
     if test_writeable "CVS"; then
+      $blatt
       cvs update . | squash_first_few_crs
       retval=${PIPESTATUS[0]}
     fi
   elif [ -d ".svn" ]; then
     if test_writeable ".svn"; then
+      $blatt
       svn update . | squash_first_few_crs
       retval=${PIPESTATUS[0]}
     fi
   elif [ -d ".git" ]; then
     if test_writeable ".git"; then
+      $blatt
       git pull 2>&1 | grep -v "X11 forwarding request failed" | squash_first_few_crs
       retval=${PIPESTATUS[0]}
     fi
@@ -323,17 +344,17 @@ function checkout_list()
     if [[ $outer =~ /.* ]]; then
       # yep, this path is absolute.  just handle it directly.
       if [ ! -d "$outer" ]; then continue; fi
-      echo "retrieving '$outer'..."
       do_update $outer
-      sep 7
+      test_or_die "running update on: $path"
+      sep 28
     else
       for inner in $list; do
         # add in the directory component to see if we can find the folder.
         local path="$inner/$outer"
         if [ ! -d "$path" ]; then continue; fi
-        echo "retrieving '$path'..."
         do_update $path
-        sep 7
+        test_or_die "running update on: $path"
+        sep 28
       done
     fi
   done
@@ -350,10 +371,17 @@ function generate_rev_ctrl_filelist()
   local dirhere="$( \cd "$(\dirname "$dir")" && /bin/pwd )"
   local tempfile=$(mktemp /tmp/zz_checkins.XXXXXX)
   echo >$tempfile
+  local additional_filter
   find $dirhere -follow -maxdepth $MAX_DEPTH -type d -iname ".svn" -exec echo {}/.. ';' >>$tempfile 2>/dev/null
   find $dirhere -follow -maxdepth $MAX_DEPTH -type d -iname ".git" -exec echo {}/.. ';' >>$tempfile 2>/dev/null
   # CVS is not well behaved like git and (now) svn, and we seldom use it anymore.
   popd &>/dev/null
+
+  # see if they've warned us not to try checking in within vendor hierarchies.
+  if [ ! -z "NO_CHECKIN_VENDOR" ]; then
+    sed -i -e '/.*\/vendor\/.*/d' "$tempfile"
+  fi
+
   local sortfile=$(mktemp /tmp/zz_checkin_sort.XXXXXX)
   sort <"$tempfile" >"$sortfile"
   \rm "$tempfile"
@@ -364,9 +392,6 @@ function generate_rev_ctrl_filelist()
 # on each directory name, it performs the action (second parameter) provided.
 function perform_revctrl_action_on_file()
 {
-
-#hmmm: this doesn't capture any error returns!
-
   local tempfile="$1"; shift
   local action="$1"; shift
 
@@ -377,7 +402,8 @@ function perform_revctrl_action_on_file()
     pushd "$dirname" &>/dev/null
     echo "[$(pwd)]"
     $action .
-    sep 7
+    test_or_die "performing action $action on: $(pwd)"
+    sep 28
     popd &>/dev/null
   done 3<"$tempfile"