cleaning up revision control tools

[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 9228d12def3cf23c697d821c4416177f036e9f43..b28d6f303b7e69fc1edb7daa971e3ecfa8f2c3e7 100644 (file)
--- a/scripts/rev_control/version_control.sh
+++ b/scripts/rev_control/version_control.sh
@@ -3,7 +3,8 @@
 # these are helper functions for doing localized revision control.
 # this script should be sourced into other scripts that use it.
 
-source "$FEISTY_MEOW_SCRIPTS/core/functions.sh"
+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
@@ -108,6 +109,9 @@ function compute_modifier()
 function do_checkin()
 {
   local directory="$1"; shift
+
+  save_terminal_title
+
   do_update "$directory"
   if [ $? -ne 0 ]; then
     echo "repository update failed; this should be fixed before check-in."
@@ -138,12 +142,18 @@ function do_checkin()
     retval=1
   fi
   popd &>/dev/null
+
+  restore_terminal_title
+
   return $retval
 }
 
 function do_diff
 {
   local directory="$1"; shift
+
+  save_terminal_title
+
   pushd "$directory" &>/dev/null
   local retval=0  # normally successful.
 
@@ -157,12 +167,18 @@ function do_diff
   fi
 
   popd &>/dev/null
+
+  restore_terminal_title
+
   return $retval
 }
 
 function do_report_new
 {
   local directory="$1"; shift
+
+  save_terminal_title
+
   pushd "$directory" &>/dev/null
   local retval=0  # normally successful.
 
@@ -179,13 +195,20 @@ function do_report_new
   fi
 
   popd &>/dev/null
+
+  restore_terminal_title
+
   return $retval
 }
 
 # checks in all the folders in a specified list.
 function checkin_list()
 {
-  local list=$*
+  # make the list of directories unique.
+  local list="$(uniquify $*)"
+
+  save_terminal_title
+
   for i in $list; do
     # turn repo list back into an array.
     eval "repository_list=( ${REPOSITORY_LIST[*]} )"
@@ -198,6 +221,8 @@ function checkin_list()
       sep 7
     done
   done
+
+  restore_terminal_title
 }
 
 # takes out the first few carriage returns that are in the input.
@@ -222,6 +247,9 @@ function squash_first_few_crs()
 function do_update()
 {
   directory="$1"; shift
+
+  save_terminal_title
+
   local retval=0  # plan on success for now.
   pushd "$directory" &>/dev/null
   if [ -d "CVS" ]; then
@@ -238,12 +266,19 @@ function do_update()
     echo no repository in $directory
   fi
   popd &>/dev/null
+
+  restore_terminal_title
+
   return $retval
 }
 
 # gets all the updates for a list of folders under revision control.
-function checkout_list {
-  list=$*
+function checkout_list()
+{
+  local list="$(uniquify $*)"
+
+  save_terminal_title
+
   for i in $list; do
     # turn repo list back into an array.
     eval "repository_list=( ${REPOSITORY_LIST[*]} )"
@@ -261,6 +296,8 @@ function checkout_list {
       do_update $j
     done
   done
+
+  restore_terminal_title
 }
 
 # provides a list of absolute paths of revision control directories
@@ -270,13 +307,13 @@ 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 $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)
+  local sortfile=$(mktemp /tmp/zz_checkin_sort.XXXXXX)
   sort <"$tempfile" >"$sortfile"
   \rm "$tempfile"
   echo "$sortfile"
@@ -286,9 +323,14 @@ 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
 
+  save_terminal_title
+
   while read -u 3 dirname; do
     if [ -z "$dirname" ]; then continue; fi
     pushd "$dirname" &>/dev/null
@@ -298,6 +340,8 @@ function perform_revctrl_action_on_file()
     popd &>/dev/null
   done 3<"$tempfile"
 
+  restore_terminal_title
+
   rm $tempfile
 }