X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Frev_control%2Fversion_control.sh;h=9f955d28ab2d62d619f2bab9c7e0a7a65c186776;hb=0466d7ce1311f3c808e38a2b160e5c5c90b1699f;hp=2de20b0b0c17d401fd126b5c28953e0c6da52d04;hpb=2ad8e026a2b6d85e3b803fdf14491a1d455ba913;p=feisty_meow.git

diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh
index 2de20b0b..9f955d28 100644
--- a/scripts/rev_control/version_control.sh
+++ b/scripts/rev_control/version_control.sh
@@ -6,16 +6,16 @@
 source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
 source "$FEISTY_MEOW_SCRIPTS/tty/terminal_titler.sh"
 
+##############
+
 # the maximum depth that the recursive functions will try to go below the starting directory.
 export MAX_DEPTH=5
 
-#hmmm: re-address this code, since it doesn't make a lot of sense to me right now...
 # 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.
-
 if [[ "$TMP" =~ .:.* ]]; then
-  echo making weirdo temporary directory for DOS path.
+  echo "making weirdo temporary directory for PCDOS-style path."
   export TMP=/tmp/rev_control_$USER
 fi
 if [ ! -d "$TMP" ]; then
@@ -25,92 +25,12 @@ 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...
 
-this_host=
-# gets the machine's hostname and stores it in the variable "this_host".
-function get_our_hostname()
-{
-  if [ "$OS" == "Windows_NT" ]; then
-    this_host=$(hostname)
-  elif [ ! -z "$(echo $MACHTYPE | grep apple)" ]; then
-    this_host=$(hostname)
-  elif [ ! -z "$(echo $MACHTYPE | grep suse)" ]; then
-    this_host=$(hostname --long)
-  else
-    this_host=$(hostname)
-  fi
-  #echo "hostname is $this_host"
-}
-
-# this function sets a variable called "home_system" to "true" if the
-# machine is considered one of fred's home machines.  if you are not
-# fred, you may want to change the machine choices.
-export home_system=
-function is_home_system()
-{
-  # load up the name of the host.
-  get_our_hostname
-  # reset the variable that we'll be setting.
-  home_system=
-  if [[ $this_host == *.gruntose.blurgh ]]; then
-    home_system=true
-  fi
-}
-
-#hmmm: move to core.
-# makes sure that the "folder" is a directory and is writable.
-# remember that bash successful returns are zeroes...
-function test_writeable()
-{
-  local folder="$1"; shift
-  if [ ! -d "$folder" -o ! -w "$folder" ]; then return 1; fi
-  return 0
-}
 
-# we only want to totally personalize this script if the user is right.
-function check_user()
-{
-  if [ "$USER" == "fred" ]; then
-    export SVNUSER=fred_t_hamster@
-    export EXTRA_PROTOCOL=+ssh
-  else
-    export SVNUSER=
-    export EXTRA_PROTOCOL=
-  fi
-}
+##############
 
-# calculates the right modifier for hostnames / repositories.
-modifier=
-function compute_modifier()
-{
-  modifier=
-  directory="$1"; shift
-  in_or_out="$1"; shift
-  check_user
-  # some project specific overrides.
-  if [[ "$directory" == hoople* ]]; then
-    modifier="svn${EXTRA_PROTOCOL}://${SVNUSER}svn.code.sf.net/p/hoople2/svn/"
-  fi
-  if [[ "$directory" == yeti* ]]; then
-    modifier="svn${EXTRA_PROTOCOL}://${SVNUSER}svn.code.sf.net/p/yeti/svn/"
-  fi
-  # see if we're on one of fred's home machines.
-  is_home_system
-  # special override to pick local servers when at home.
-  if [ "$home_system" == "true" ]; then
-#what was this section for again?
-    if [ "$in_or_out" == "out" ]; then
-      # need the right home machine for modifier when checking out.
-#huhhh?      modifier="svn://shaggy/"
-      modifier=
-    else 
-      # no modifier for checkin.
-      modifier=
-    fi
-  fi
-}
-
-# selects the method for check-in based on where we are.
+# checks the directory provided into the revision control system repository it belongs to.
 function do_checkin()
 {
   local directory="$1"; shift
@@ -124,13 +44,13 @@ function do_checkin()
   fi
   local blatt="echo checking in '$nicedir'..."
 
+  local retval=0  # normally successful.
+
   do_update "$directory"
-  if [ $? -ne 0 ]; then
-    echo "repository update failed; this should be fixed before check-in."
-    return 1
-  fi
+  retval=$?
+  test_or_die "repository update failed; this should be fixed before check-in."
+
   pushd "$directory" &>/dev/null
-  local retval=0  # normally successful.
   if [ -f ".no-checkin" ]; then
     echo "skipping check-in due to presence of .no-checkin sentinel file."
   elif [ -d "CVS" ]; then
@@ -151,16 +71,31 @@ function do_checkin()
       # 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"
+
+      # 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+=$?
+      fi
+      # catch if the diff-index failed somehow.
       retval+=$?
+
+#push the changes to where?  locally?
+      git push 2>&1 | grep -v "X11 forwarding request failed" | squash_first_few_crs
+      retval+=${PIPESTATUS[0]}
+
+      # upload any changes to the upstream repo so others can see them.
+      if [ "$(git_branch_name)" != "master" ]; then
+        git push origin "$(git_branch_name)" 2>&1 | grep -v "X11 forwarding request failed" | squash_first_few_crs
+        retval+=${PIPESTATUS[0]}
+      fi
+
     fi
   else
+    # nothing there.  it's not an error though.
     echo no repository in $directory
-    retval=1
+    retval=0
   fi
   popd &>/dev/null
 
@@ -169,6 +104,7 @@ function do_checkin()
   return $retval
 }
 
+# shows the local changes in a repository.
 function do_diff
 {
   local directory="$1"; shift
@@ -181,10 +117,13 @@ function do_diff
   # only update if we see a repository living there.
   if [ -d ".svn" ]; then
     svn diff .
+    retval+=$?
   elif [ -d ".git" ]; then
     git diff 
+    retval+=$?
   elif [ -d "CVS" ]; then
     cvs diff .
+    retval+=$?
   fi
 
   popd &>/dev/null
@@ -194,6 +133,7 @@ function do_diff
   return $retval
 }
 
+# reports any files that are not already known to the upstream repository.
 function do_report_new
 {
   local directory="$1"; shift
@@ -241,6 +181,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"
       sep 28
     else
       for inner in $list; do
@@ -248,6 +189,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"
         sep 28
       done
     fi
@@ -274,7 +216,14 @@ function squash_first_few_crs()
   fi
 }
 
-# selects the checkout method based on where we are (the host the script runs on).
+# a helpful method that reports the git branch for the current directory's
+# git repository.
+function git_branch_name()
+{
+  echo "$(git branch | grep \* | cut -d ' ' -f2-)"
+}
+
+# gets the latest versions of the assets from the upstream repository.
 function do_update()
 {
   directory="$1"; shift
@@ -305,8 +254,15 @@ function do_update()
   elif [ -d ".git" ]; then
     if test_writeable ".git"; then
       $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
+
       git pull 2>&1 | grep -v "X11 forwarding request failed" | squash_first_few_crs
-      retval=${PIPESTATUS[0]}
+      retval+=${PIPESTATUS[0]}
     fi
   else
     # this is not an error necessarily; we'll just pretend they planned this.
@@ -337,6 +293,7 @@ function checkout_list()
       # yep, this path is absolute.  just handle it directly.
       if [ ! -d "$outer" ]; then continue; fi
       do_update $outer
+      test_or_die "running update on: $path"
       sep 28
     else
       for inner in $list; do
@@ -344,6 +301,7 @@ function checkout_list()
         local path="$inner/$outer"
         if [ ! -d "$path" ]; then continue; fi
         do_update $path
+        test_or_die "running update on: $path"
         sep 28
       done
     fi
@@ -382,9 +340,6 @@ function generate_rev_ctrl_filelist()
 # on each directory name, it performs the action (second parameter) provided.
 function perform_revctrl_action_on_file()
 {
-
-#hmmm: this doesn't capture any error returns!
-
   local tempfile="$1"; shift
   local action="$1"; shift
 
@@ -395,6 +350,7 @@ function perform_revctrl_action_on_file()
     pushd "$dirname" &>/dev/null
     echo "[$(pwd)]"
     $action .
+    test_or_die "performing action $action on: $(pwd)"
     sep 28
     popd &>/dev/null
   done 3<"$tempfile"