X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Frev_control%2Fversion_control.sh;h=a0e419ea636e910c148500e6f52f478dd4c08de9;hb=9bb435b2e47b84e8086063089f9611231381f2c2;hp=e7b29b0110ac7a86c512dad134c2fa7c1f44256f;hpb=3ff1c842fd1406d22b7c66a3c8d1d8bac31c43c5;p=feisty_meow.git

diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh
index e7b29b01..a0e419ea 100644
--- a/scripts/rev_control/version_control.sh
+++ b/scripts/rev_control/version_control.sh
@@ -3,6 +3,9 @@
 # these are helper functions for doing localized revision control.
 # this script should be sourced into other scripts that use it.
 
+# Author: Chris Koeritz
+# Author: Kevin Wentworth
+
 source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
 source "$FEISTY_MEOW_SCRIPTS/tty/terminal_titler.sh"
 
@@ -36,8 +39,6 @@ if [ ! -d "$TMP" ]; then
   echo "could not create the temporary directory TMP in: $TMP"
   echo "this script will not work properly without an existing TMP directory."
 fi
-#hmmm: re-address the above code, since it doesn't make a lot of sense to me right now...
-
 
 ##############
 
@@ -55,11 +56,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 +66,32 @@ 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 .
-        retval+=$?
+        test_or_die "git commit"
       fi
       # catch if the diff-index failed somehow.
-      retval+=$?
+      test_or_die "git diff-index"
+
+      # we continue on to the push, even if there were no changes this time, because
+      # there could already be committed changes that haven't been pushed yet.
 
       local myself="$(my_branch_name)"
       local parent="$(parent_branch_name)"
@@ -98,24 +99,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
-        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
-        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 +126,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 .
-    retval+=$?
+    test_or_die "subversion diff"
   elif [ -d ".git" ]; then
     git diff 
-    retval+=$?
+    test_or_die "git diff"
   elif [ -d "CVS" ]; then
     cvs diff .
-    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 +154,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 +161,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 +193,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 +201,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,40 +255,35 @@ 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
-      git branch -r | grep -v '\->' |
-          while read remote; do
-            git branch --track "${remote#origin/}" "$remote"
-            # ensure we notice a failure when adding tracking.
-            retval+=$?
-          done
-      retval+=${PIPESTATUS[0]}$?
-
-      git fetch --all 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
-      retval+=${PIPESTATUS[0]}
-
-      git pull --all 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
-      retval+=${PIPESTATUS[0]}
+
+# classic implementation, but only works with one master branch.
+# fixes will be forthcoming from development branch.
+
+      # snag all new files.  not to everyone's liking.
+      git add --all .
+      retval=$?
+      # tell git about all the files and get a check-in comment.
+      git commit .
+      retval+=$?
+      # upload the files to the server so others can see them.
+      git push 2>&1 | grep -v "X11 forwarding request failed"
+      retval+=$?
     fi
   else
     # this is not an error necessarily; we'll just pretend they planned this.
@@ -300,7 +293,7 @@ function do_update()
 
   restore_terminal_title
 
-  return $retval
+  true
 }
 
 # gets all the updates for a list of folders under revision control.
@@ -388,4 +381,3 @@ function perform_revctrl_action_on_file()
   rm $tempfile
 }
 
-