X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Frev_control%2Fversion_control.sh;h=718b602c0cb16fa20799da155fe7032851ddfc3f;hb=486c141d37d22879d338bf6489434c968a7f733b;hp=a3f91e6335d844e1cf4acc44a97a6999d213b573;hpb=3db6ecfccb41c870dfda635f5791c58840c49994;p=feisty_meow.git

diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh
index a3f91e63..718b602c 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...
-
 
 ##############
 
@@ -76,6 +77,10 @@ function do_checkin()
   elif [ -d ".git" ]; then
     if test_writeable ".git"; then
       $blatt
+
+# 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 .
       test_or_die "git add all new files"
@@ -86,9 +91,17 @@ function do_checkin()
         git commit .
         test_or_die "git commit"
       fi
+#      # upload the files to the server so others can see them.
+#      git push 2>&1 | grep -v "X11 forwarding request failed"
+#      if [ ${PIPESTATUS[0]} -ne 0 ]; then false; fi
+#      test_or_die "git push"
+
       # catch if the diff-index failed somehow.
       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)"
 
@@ -268,20 +281,64 @@ function do_update()
     if test_writeable ".git"; then
       $blatt
 
-      # from very helpful page:
-      # https://stackoverflow.com/questions/10312521/how-to-fetch-all-git-branches
+# classic implementation, but only works with one master branch.
+# fixes will be forthcoming from development branch.
+
+#      git pull 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
+#      if [ ${PIPESTATUS[0]} -ne 0 ]; then false; fi
+#      test_or_die "git pull"
+
+
+#let's start over clean here...
+
+      git remote update
+      test_or_die "git remote update"
+
+      git pull origin
+#--no-ff 
+      test_or_die "git fetch origin"
+
+# from: https://stackoverflow.com/questions/3258243/check-if-pull-needed-in-git
+UPSTREAM=$(parent_branch_name)
+#argh: original UPSTREAM='${1:-'\''@{u}'\''}'
+LOCAL=$(git rev-parse @)
+REMOTE=$(git rev-parse "$UPSTREAM")
+BASE=$(git merge-base @ "$UPSTREAM")
+var UPSTREAM LOCAL REMOTE BASE
+
+if [ "$LOCAL" == "$REMOTE" ]; then
+    echo "Up-to-date"
+elif [ "$LOCAL" == "$BASE" ]; then
+    echo "Need to pull"
+elif [ "$REMOTE" == "$BASE" ]; then
+    echo "Need to push"
+else
+    echo "Diverged"
+fi
+
+echo The rest of pull is not done yet.
+
+
+#      reslog=$(git log HEAD..origin/master --oneline)
+#      if [[ "${reslog}" != "" ]] ; then
+#        git merge origin/master
 
-      for remote in $( git branch -r | grep -v -- '->' ); do
-        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
 
-      git fetch --all 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
-      test_or_die "git fetch"
 
-      git pull --all 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
-      test_or_die "git pull"
+#      # 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 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
+#
+##hmmm: well, one time it failed without the fetch.  i hope that's because the fetch is actually needed and not because the whole approach is fubar.
+#      git fetch --all 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
+#      test_or_die "git fetch"
+#
+#      git pull --all 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
+#      test_or_die "git pull"
     fi
   else
     # this is not an error necessarily; we'll just pretend they planned this.