much more complicated now

[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 be183ae1bf3cf1c82b6250a2c99f4fd95bac53a1..475ae748c05363a71e510e2be185664ecfa6dc9c 100644 (file)
--- a/scripts/rev_control/version_control.sh
+++ b/scripts/rev_control/version_control.sh
@@ -6,11 +6,20 @@
 source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
 source "$FEISTY_MEOW_SCRIPTS/tty/terminal_titler.sh"
 
+#hmmm: we need to dump all the outputs in this script into splitter
+
 ##############
 
 # the maximum depth that the recursive functions will try to go below the starting directory.
 export MAX_DEPTH=5
 
+# use our splitter tool for lengthy output if it's available.
+if [ ! -z "$(which splitter)" ]; then
+  TO_SPLITTER='| splitter'
+fi
+
+##############
+
 # one unpleasantry to take care of first; cygwin barfs aggressively if the TMP directory
 # is a DOS path, but we need it to be a DOS path for our GFFS testing, so that blows.
 # to get past this, TMP gets changed below to a hopefully generic and safe place.
@@ -81,9 +90,19 @@ function do_checkin()
       # catch if the diff-index failed somehow.
       retval+=$?
 
+      local myself="$(my_branch_name)"
+      local parent="$(parent_branch_name)"
+
       # upload any changes to the upstream repo so others can see them.
-      git push 2>&1 | grep -v "X11 forwarding request failed" | squash_first_few_crs
-      retval+=${PIPESTATUS[0]}
+      if [ "$myself" != "$parent" ]; then
+        git push origin "$(myself)" 2>&1 | grep -v "X11 forwarding request failed" $TO_SPLITTER
+        retval+=${PIPESTATUS[0]}
+      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]}
+      fi
+
     fi
   else
     # nothing there.  it's not an error though.
@@ -211,9 +230,15 @@ function squash_first_few_crs()
 
 # a helpful method that reports the git branch for the current directory's
 # git repository.
-function git_branch_name()
+function my_branch_name()
+{
+  echo "$(git branch | grep \* | cut -d ' ' -f2)"
+}
+
+# this reports the upstream branch for the current repo.
+function parent_branch_name()
 {
-  echo "$(git branch | grep \* | cut -d ' ' -f2-)"
+  echo "$(git branch -vv | grep \* | cut -d ' ' -f2)"
 }
 
 # gets the latest versions of the assets from the upstream repository.
@@ -249,12 +274,20 @@ function do_update()
       $blatt
       retval=0
 
-      if [ "$(git_branch_name)" != "master" ]; then
-        git pull origin master 2>&1 | grep -v "X11 forwarding request failed" | squash_first_few_crs
-        retval+=${PIPESTATUS[0]}
-      fi
+      # 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 2>&1 | grep -v "X11 forwarding request failed" | squash_first_few_crs
+      git pull --all 2>&1 | grep -v "X11 forwarding request failed" $TO_SPLITTER
       retval+=${PIPESTATUS[0]}
     fi
   else