X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Frev_control%2Fversion_control.sh;h=61850e93b8dc951c7fb12f85d133677f5aed9717;hb=e77d89eb4a86eb0baa2daddc3c5a9567111e5bc2;hp=f76f3301a093d2b3068fe1176cabcf6ca82ce366;hpb=d4f36724048884d87a46f422aeaf7a45d5e09f11;p=feisty_meow.git

diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh
index f76f3301..61850e93 100644
--- a/scripts/rev_control/version_control.sh
+++ b/scripts/rev_control/version_control.sh
@@ -3,199 +3,220 @@
 # these are helper functions for doing localized revision control.
 # this script should be sourced into other scripts that use it.
 
-#hmmm: re-address this code, since it doesn't make a lot of sense to me right now...
+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="$(which splitter)"
+else
+  TO_SPLITTER=cat
+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.
-
 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
-  mkdir $TMP
+  mkdir -p $TMP
 fi
 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."
+  echo "could not create the temporary directory TMP in: $TMP"
+  echo "this script will not work properly without an existing TMP directory."
 fi
 
-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()
+# checks the directory provided into the revision control system repository it belongs to.
+function do_checkin()
 {
-  # 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
-#temp code
-elif [[ $this_host == buildy ]]; then
-home_system=true
-elif [[ $this_host == simmy ]]; then
-home_system=true
-#temp code
-  fi
-}
+  local directory="$1"; shift
 
-# 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
-}
+  save_terminal_title
 
-# 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
-    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
+  # make a nice echoer since we want to use it inside conditions below.
+  local nicedir="$directory"
+  if [ $nicedir == "." ]; then
+    nicedir=$(\pwd)
   fi
-}
+  local blatt="echo checking in '$nicedir'..."
 
-# selects the method for check-in based on where we are.
-function do_checkin()
-{
-  local directory="$1"; shift
   do_update "$directory"
-  if [ $? -ne 0 ]; then
-    echo "Repository update failed; this should be fixed before check-in."
-    return 1
-  fi
+  test_or_die "repository update--this should be fixed before check-in."
+
   pushd "$directory" &>/dev/null
-  retval=0  # normally successful.
-  if [ -d "CVS" ]; then
-    cvs ci .
-    retval=$?
+  if [ -f ".no-checkin" ]; then
+    echo "skipping check-in due to presence of .no-checkin sentinel file."
+  elif [ -d "CVS" ]; then
+    if test_writeable "CVS"; then
+      $blatt
+      cvs ci .
+      test_or_die "cvs checkin"
+    fi
   elif [ -d ".svn" ]; then
-    svn ci .
-    retval=$?
+    if test_writeable ".svn"; then
+      $blatt
+      svn ci .
+      test_or_die "svn checkin"
+    fi
   elif [ -d ".git" ]; then
-    # 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+=$?
+    if test_writeable ".git"; then
+      $blatt
+      # snag all new files.  not to everyone's liking.
+      git add --all .
+      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 .
+        test_or_die "git commit"
+      fi
+      # 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)"
+
+      # 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
+
+    fi
   else
+    # nothing there.  it's not an error though.
     echo no repository in $directory
-    retval=1
   fi
   popd &>/dev/null
-  return $retval
+
+  restore_terminal_title
+
+  true;
 }
 
+# shows the local changes in a repository.
 function do_diff
 {
   local directory="$1"; shift
+
+  save_terminal_title
+
   pushd "$directory" &>/dev/null
-  retval=0  # normally successful.
 
   # only update if we see a repository living there.
   if [ -d ".svn" ]; then
     svn diff .
+    test_or_die "subversion diff"
   elif [ -d ".git" ]; then
     git diff 
+    test_or_die "git diff"
   elif [ -d "CVS" ]; then
     cvs diff .
+    test_or_die "cvs diff"
   fi
 
   popd &>/dev/null
-  return $retval
+
+  restore_terminal_title
+
+  true;
 }
 
+# reports any files that are not already known to the upstream repository.
 function do_report_new
 {
   local directory="$1"; shift
+
+  save_terminal_title
+
   pushd "$directory" &>/dev/null
-  retval=0  # normally successful.
 
   # only update if we see a repository living there.
-  if [ -d ".svn" ]; then
+  if [ -f ".no-checkin" ]; then
+    echo "skipping reporting due to presence of .no-checkin sentinel file."
+  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
+    test_or_die "svn diff"
+  elif [ -d ".git" ]; then
+    git status -u
+    test_or_die "git status -u"
   fi
 
   popd &>/dev/null
-  return $retval
+
+  restore_terminal_title
+
+  true
 }
 
 # checks in all the folders in a specified list.
 function checkin_list()
 {
-  local list=$*
-  for i in $list; do
-    # turn repo list back into an array.
-    eval "repository_list=( ${REPOSITORY_LIST[*]} )"
-    for j in "${repository_list[@]}"; do
-      # add in the directory component.
-      j="$i/$j"
-      if [ ! -d "$j" ]; then continue; fi
-      echo "checking in '$j'..."
-      do_checkin $j
-    done
+  # make the list of directories unique.
+  local list="$(uniquify $*)"
+
+  save_terminal_title
+
+  # turn repo list back into an array.
+  eval "repository_list=( ${REPOSITORY_LIST[*]} )"
+
+  local outer inner
+
+  for outer in "${repository_list[@]}"; do
+    # check the repository first, since it might be an absolute path.
+    if [[ $outer =~ /.* ]]; then
+      # yep, this path is absolute.  just handle it directly.
+      if [ ! -d "$outer" ]; then continue; fi
+      do_checkin $outer
+      test_or_die "running check-in (absolute) on path: $outer"
+      sep 28
+    else
+      for inner in $list; do
+        # add in the directory component to see if we can find the folder.
+        local path="$inner/$outer"
+        if [ ! -d "$path" ]; then continue; fi
+        do_checkin $path
+        test_or_die "running check-in (relative) on path: $path"
+        sep 28
+      done
+    fi
   done
+
+  restore_terminal_title
 }
 
 # takes out the first few carriage returns that are in the input.
 function squash_first_few_crs()
 {
   i=0
-  while read line; do
+  while read input_text; do
     i=$((i+1))
     if [ $i -le 5 ]; then
-      echo -n "$line  "
+      echo -n "$input_text  "
     else
-      echo $line
+      echo $input_text
     fi
   done
   if [ $i -le 3 ]; then
@@ -204,50 +225,109 @@ 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 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 -vv | grep \* | cut -d ' ' -f2)"
+}
+
+# gets the latest versions of the assets from the upstream repository.
 function do_update()
 {
   directory="$1"; shift
-  # plan on success for now.
-  retval=0
+
+  save_terminal_title
+
+  # make a nice echoer since we want to use it inside conditions below.
+  local nicedir="$directory"
+  if [ $nicedir == "." ]; then
+    nicedir=$(\pwd)
+  fi
+  local blatt="echo retrieving '$nicedir'..."
+
   pushd "$directory" &>/dev/null
   if [ -d "CVS" ]; then
-    cvs update . | squash_first_few_crs
-    retval=${PIPESTATUS[0]}
+    if test_writeable "CVS"; then
+      $blatt
+      cvs update . | $TO_SPLITTER
+      test_or_die "cvs update"
+    fi
   elif [ -d ".svn" ]; then
-    svn update . | squash_first_few_crs
-    retval=${PIPESTATUS[0]}
+    if test_writeable ".svn"; then
+      $blatt
+      svn update . | $TO_SPLITTER
+      test_or_die "svn update"
+    fi
   elif [ -d ".git" ]; then
-    git pull 2>&1 | grep -v "X11 forwarding request failed" | squash_first_few_crs
-    retval=${PIPESTATUS[0]}
+    if test_writeable ".git"; then
+      $blatt
+
+      # 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.
     echo no repository in $directory
   fi
   popd &>/dev/null
-  return $retval
+
+  restore_terminal_title
+
+  true
 }
 
 # gets all the updates for a list of folders under revision control.
-function checkout_list {
-  list=$*
-  for i in $list; do
-    # turn repo list back into an array.
-    eval "repository_list=( ${REPOSITORY_LIST[*]} )"
-    for j in "${repository_list[@]}"; do
-      # add in the directory for our purposes here.
-      j="$i/$j"
-      if [ ! -d $j ]; then
-        if [ ! -z "$SHELL_DEBUG" ]; then
-          echo "No directory called $j exists."
-        fi
-        continue
-      fi
+function checkout_list()
+{
+  local list="$(uniquify $*)"
+
+  save_terminal_title
 
-      echo -n "retrieving '$j'...  "
-      do_update $j
-    done
+  # turn repo list back into an array.
+  eval "repository_list=( ${REPOSITORY_LIST[*]} )"
+
+  local outer inner
+
+  for outer in "${repository_list[@]}"; do
+    # check the repository first, since it might be an absolute path.
+    if [[ $outer =~ /.* ]]; then
+      # 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
+        # add in the directory component to see if we can find the folder.
+        local path="$inner/$outer"
+        if [ ! -d "$path" ]; then continue; fi
+        do_update $path
+        test_or_die "running update on: $path"
+        sep 28
+      done
+    fi
   done
+
+  restore_terminal_title
 }
 
 # provides a list of absolute paths of revision control directories
@@ -257,13 +337,20 @@ function generate_rev_ctrl_filelist()
   local dir="$1"; shift
   pushd "$dir" &>/dev/null
   local dirhere="$( \cd "$(\dirname "$dir")" && /bin/pwd )"
-  local tempfile=$(mktemp /tmp/zz_rev_checkin.XXXXXX)
+  local tempfile=$(mktemp /tmp/zz_checkins.XXXXXX)
   echo >$tempfile
-  find $dirhere -follow -maxdepth 5 -type d -iname ".svn" -exec echo {}/.. ';' >>$tempfile 2>/dev/null
-  find $dirhere -follow -maxdepth 5 -type d -iname ".git" -exec echo {}/.. ';' >>$tempfile 2>/dev/null
+  local additional_filter
+  find $dirhere -follow -maxdepth $MAX_DEPTH -type d -iname ".svn" -exec echo {}/.. ';' >>$tempfile 2>/dev/null
+  find $dirhere -follow -maxdepth $MAX_DEPTH -type d -iname ".git" -exec echo {}/.. ';' >>$tempfile 2>/dev/null
   # CVS is not well behaved like git and (now) svn, and we seldom use it anymore.
   popd &>/dev/null
-  local sortfile=$(mktemp /tmp/zz_rev_checkin_sort.XXXXXX)
+
+  # see if they've warned us not to try checking in within vendor hierarchies.
+  if [ ! -z "NO_CHECKIN_VENDOR" ]; then
+    sed -i -e '/.*\/vendor\/.*/d' "$tempfile"
+  fi
+
+  local sortfile=$(mktemp /tmp/zz_checkin_sort.XXXXXX)
   sort <"$tempfile" >"$sortfile"
   \rm "$tempfile"
   echo "$sortfile"
@@ -276,16 +363,20 @@ function perform_revctrl_action_on_file()
   local tempfile="$1"; shift
   local action="$1"; shift
 
+  save_terminal_title
+
   while read -u 3 dirname; do
     if [ -z "$dirname" ]; then continue; fi
     pushd "$dirname" &>/dev/null
     echo "[$(pwd)]"
     $action .
-    echo "======="
+    test_or_die "performing action $action on: $(pwd)"
+    sep 28
     popd &>/dev/null
   done 3<"$tempfile"
 
+  restore_terminal_title
+
   rm $tempfile
 }
 
-