X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Frev_control%2Fversion_control.sh;h=4ea5ab5322a1ba7a0fa36ca35c611fa50886a1bd;hb=3f11b26ebf3d7bf9fb4fb00813034eda0076f8c0;hp=c87eee51b5442e46057271f4f1d7a97aa7f4594e;hpb=9a99a7a46834665ebf5cab081fa7fe3cc2a8aa11;p=feisty_meow.git

diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh
index c87eee51..4ea5ab53 100644
--- a/scripts/rev_control/version_control.sh
+++ b/scripts/rev_control/version_control.sh
@@ -9,8 +9,6 @@
 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.
@@ -78,10 +76,7 @@ function do_checkin()
     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.
+      # put all changed and new files in the commit.  not to everyone's liking.
       git add --all .
       test_or_die "git add all new files"
 
@@ -92,29 +87,15 @@ function do_checkin()
         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"
+      # a new set of steps we have to take to make sure the branch integrity is good.
+      careful_git_update 
 
       # 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)"
-
       # 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
-        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
-        test_or_die "normal git push"
-      fi
+      git push origin "$(my_branch_name)" 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
+      test_or_die "git push"
 
     fi
   else
@@ -125,7 +106,7 @@ function do_checkin()
 
   restore_terminal_title
 
-  true;
+  return 0
 }
 
 # shows the local changes in a repository.
@@ -153,7 +134,7 @@ function do_diff
 
   restore_terminal_title
 
-  true;
+  return 0
 }
 
 # reports any files that are not already known to the upstream repository.
@@ -181,7 +162,7 @@ function do_report_new
 
   restore_terminal_title
 
-  true
+  return 0
 }
 
 # checks in all the folders in a specified list.
@@ -242,14 +223,15 @@ function squash_first_few_crs()
 # git repository.
 function my_branch_name()
 {
-  echo "$(git branch | grep \* | cut -d ' ' -f2)"
+  echo "$(git branch | grep '\*' | cut -d ' ' -f2)"
 }
 
+#this had a -> in it at one point for not matching, didn't it?
 # this reports the upstream branch for the current repo.
-function parent_branch_name()
-{
-  echo "$(git branch -vv | grep \* | cut -d ' ' -f2)"
-}
+##function parent_branch_name()
+##{
+  ##echo "$(git branch -vv | grep \* | cut -d ' ' -f2)"
+##}
 
 # this exits with 0 for success (normal bash behavior) when up to date.  if the branch is not up to date,
 # then these values are returned:
@@ -261,6 +243,8 @@ function check_branch_state()
 
   local to_return=120  # unknown issue.
 
+sep
+
   LOCAL=$(git rev-parse @)
   REMOTE=$(git rev-parse "$branch")
   BASE=$(git merge-base @ "$branch")
@@ -280,57 +264,46 @@ var branch LOCAL REMOTE BASE
     to_return=3
   fi
 
+sep
+
   return $to_return
 }
 
 # the git update process just gets more and more complex when you bring in
 # branches, so we've moved this here to avoid having a ton of code in the
-# do_checkin method.
+# other methods.
 function careful_git_update()
 {
+  local this_branch="$(my_branch_name)"
+
+#appears to be useless; reports no changes when we need to know about remote changes that do exist:
+#  check_branch_state "$this_branch"
+#  state=$?
+#  test_or_continue "branch state check"
+#  echo the branch state is $state
+
+  # the above are just not enough.  this code is now doing what i have to do when i repair the repo.
+  local branch_list=$(git branch |grep -v '^\*')
+  local bran
+  for bran in $branch_list; do
+#    echo "synchronizing remote branch: $bran"
+    git checkout "$bran"
+    test_or_die "git checking out remote branch: $bran"
+    git pull --no-ff
+    test_or_die "git pull of remote branch: $bran"
+  done
+  # now switch back to our branch.
+  git checkout "$this_branch"
+  test_or_die "git checking out our current branch: $this_branch"
+
   # first update all our remote branches to their current state from the repos.
   git remote update
   test_or_die "git remote update"
 
-#is parent branch the right thing to tell it?
-#or we want mybranch for real, don't we?
-#  check_branch_state $(parent_branch_name)
-  state=$(check_branch_state $(my_branch_name) )
-test_or_continue "branch state check"
-#need to instead do something here if fails.
-
   # now pull down any changes in our own origin in the repo, to stay in synch
   # with any changes from others.
   git pull --no-ff --all
   test_or_die "git pulling all upstream"
-
-
-echo The rest of pull is not being done yet.
-return 1
-
-
-
-# below has older shards of partial knowledge.
-
-#      reslog=$(git log HEAD..origin/master --oneline)
-#      if [[ "${reslog}" != "" ]] ; then
-#        git merge origin/master
-
-#      # 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"
-
 }
 
 # gets the latest versions of the assets from the upstream repository.
@@ -363,17 +336,9 @@ function do_update()
   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.
-
-#      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"
-
-#any parms needed?
-      careful_git_update 
-
+      git pull --no-ff 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
+      if [ ${PIPESTATUS[0]} -ne 0 ]; then false; fi
+      test_or_die "git pull of origin without fast forwards"
     fi
   else
     # this is not an error necessarily; we'll just pretend they planned this.
@@ -383,7 +348,7 @@ function do_update()
 
   restore_terminal_title
 
-  true
+  return 0
 }
 
 # gets all the updates for a list of folders under revision control.