clanging away still

i hope this is closer.  this is definitely taking longer than expected.

diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh
index a37c24372710a190d334705ce842966a36bc999e..a3f91e6335d844e1cf4acc44a97a6999d213b573 100644 (file)
--- a/scripts/rev_control/version_control.sh
+++ b/scripts/rev_control/version_control.sh
@@ -55,11 +55,8 @@ function do_checkin()
   fi
   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."
+  test_or_die "repository update--this should be fixed before check-in."
 
   pushd "$directory" &>/dev/null
   if [ -f ".no-checkin" ]; then
@@ -68,29 +65,29 @@ function do_checkin()
     if test_writeable "CVS"; then
       $blatt
       cvs ci .
-      retval=$?
+      test_or_die "cvs checkin"
     fi
   elif [ -d ".svn" ]; then
     if test_writeable ".svn"; then
       $blatt
       svn ci .
-      retval=$?
+      test_or_die "svn checkin"
     fi
   elif [ -d ".git" ]; then
     if test_writeable ".git"; then
       $blatt
       # snag all new files.  not to everyone's liking.
       git add --all .
-      retval=$?
+      test_or_die "git add all new files"
 
       # see if there are any changes in the local repository.
       if ! git diff-index --quiet HEAD --; then
         # tell git about all the files and get a check-in comment.
         git commit .
-        let "retval = retval + $?"
+        test_or_die "git commit"
       fi
       # catch if the diff-index failed somehow.
-      let "retval = retval + $?"
+      test_or_die "git diff-index"
 
       local myself="$(my_branch_name)"
       local parent="$(parent_branch_name)"
@@ -98,24 +95,23 @@ function do_checkin()
       # upload any changes to the upstream repo so others can see them.
       if [ "$myself" != "$parent" ]; then
         git push origin "$(myself)" 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
-        let "retval = retval + ${PIPESTATUS[0]}"
+        test_or_die "git push to origin: $myself"
       else
         # this branch is the same as the parent, so just push.
         git push 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
-        let "retval = retval + ${PIPESTATUS[0]}"
+        test_or_die "normal git push"
       fi
 
     fi
   else
     # nothing there.  it's not an error though.
     echo no repository in $directory
-    retval=0
   fi
   popd &>/dev/null
 
   restore_terminal_title
 
-  return $retval
+  true;
 }
 
 # shows the local changes in a repository.
@@ -126,25 +122,24 @@ function do_diff
   save_terminal_title
 
   pushd "$directory" &>/dev/null
-  local retval=0  # normally successful.
 
   # only update if we see a repository living there.
   if [ -d ".svn" ]; then
     svn diff .
-    let "retval = retval + $?"
+    test_or_die "subversion diff"
   elif [ -d ".git" ]; then
     git diff 
-    let "retval = retval + $?"
+    test_or_die "git diff"
   elif [ -d "CVS" ]; then
     cvs diff .
-    let "retval = retval + $?"
+    test_or_die "cvs diff"
   fi
 
   popd &>/dev/null
 
   restore_terminal_title
 
-  return $retval
+  true;
 }
 
 # reports any files that are not already known to the upstream repository.
@@ -155,7 +150,6 @@ function do_report_new
   save_terminal_title
 
   pushd "$directory" &>/dev/null
-  local retval=0  # normally successful.
 
   # only update if we see a repository living there.
   if [ -f ".no-checkin" ]; then
@@ -163,17 +157,17 @@ function do_report_new
   elif [ -d ".svn" ]; then
     # this action so far only makes sense and is needed for svn.
     bash $FEISTY_MEOW_SCRIPTS/rev_control/svnapply.sh \? echo
-    retval=$?
+    test_or_die "svn diff"
   elif [ -d ".git" ]; then
     git status -u
-    retval=$?
+    test_or_die "git status -u"
   fi
 
   popd &>/dev/null
 
   restore_terminal_title
 
-  return $retval
+  true
 }
 
 # checks in all the folders in a specified list.
@@ -195,7 +189,7 @@ function checkin_list()
       # yep, this path is absolute.  just handle it directly.
       if [ ! -d "$outer" ]; then continue; fi
       do_checkin $outer
-      test_or_die "running check-in on: $outer"
+      test_or_die "running check-in (absolute) on path: $outer"
       sep 28
     else
       for inner in $list; do
@@ -203,7 +197,7 @@ function checkin_list()
         local path="$inner/$outer"
         if [ ! -d "$path" ]; then continue; fi
         do_checkin $path
-        test_or_die "running check-in on: $path"
+        test_or_die "running check-in (relative) on path: $path"
         sep 28
       done
     fi
@@ -257,47 +251,37 @@ function do_update()
   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]}
+      cvs update . | $TO_SPLITTER
+      test_or_die "cvs update"
     fi
   elif [ -d ".svn" ]; then
     if test_writeable ".svn"; then
       $blatt
-      svn update . | squash_first_few_crs
-      retval=${PIPESTATUS[0]}
+      svn update . | $TO_SPLITTER
+      test_or_die "svn update"
     fi
   elif [ -d ".git" ]; then
     if test_writeable ".git"; then
       $blatt
-      retval=0
 
       # from very helpful page:
       # https://stackoverflow.com/questions/10312521/how-to-fetch-all-git-branches
 
       for remote in $( git branch -r | grep -v -- '->' ); do
-        git branch --track ${remote#origin/} $remote
-        let "retval = retval + $?"
+        git branch --track ${remote#origin/} $remote 2>/dev/null
+#hmmm: ignoring errors from these, since they are continual.
+#hmmm: if we could find a way to not try to track with a local branch when there's already one present, that would be swell.  it's probably simple.
       done
 
-#tiny bit hosed
-#      git branch -r | grep -v -- '->' |
-#          while read remote; do
-#            git branch --track "${remote#origin/}" "$remote"
-#            # ensure we notice a failure when adding tracking.
-#            let "retval = retval + $?"
-#          done
-#      let "retval = retval + ${PIPESTATUS[0]}"
-
       git fetch --all 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
-      let "retval = retval + ${PIPESTATUS[0]}"
+      test_or_die "git fetch"
 
       git pull --all 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
-      let "retval = retval + ${PIPESTATUS[0]}"
+      test_or_die "git pull"
     fi
   else
     # this is not an error necessarily; we'll just pretend they planned this.
@@ -307,7 +291,7 @@ function do_update()
 
   restore_terminal_title
 
-  return $retval
+  true
 }
 
 # gets all the updates for a list of folders under revision control.