X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Frev_control%2Fcheckin.sh;h=23532985e5046ae4615ad33fad4580be4608383a;hb=7e1f82556c6f92a26d4ee7982805df75d6ce0553;hp=1fcc8d8c4d219472ab5d4144406984e714d1af6b;hpb=2952ccf47b80174880141a7ecfa122089f349b8d;p=feisty_meow.git

diff --git a/scripts/rev_control/checkin.sh b/scripts/rev_control/checkin.sh
index 1fcc8d8c..23532985 100644
--- a/scripts/rev_control/checkin.sh
+++ b/scripts/rev_control/checkin.sh
@@ -5,65 +5,34 @@
 
 source "$SHELLDIR/rev_control/rev_control.sh"
 
-use_bare_name=0
-
 # selects the method for check-in based on where we are.
 function do_checkin()
 {
-  directory="$1"; shift
-
-  pushd "$directory/.." &>/dev/null
-
-  # get the right modifier for the directory name.
-  compute_modifier "$directory" "in"
-
-  is_svn=1
-  checkin_cmd="echo unknown repository for $directory..."
-
-  if [ "$home_system" == "true" ]; then
-    checkin_cmd="svn ci ."
-#    use_bare_name=1
-  fi
-
-  # then we pretty much ignore what we guessed, and just use the
-  # appropriate command for what we see inside the directory.
-  if [ -d "$directory/CVS" ]; then
-    checkin_cmd="cvs ci "
-    is_svn=0
-    modifier=  # reset the modifier, since we know we have cvs.
-#    use_bare_name=0
-  elif [ -d "$directory/.svn" ]; then
-    checkin_cmd="svn ci ."
-#    use_bare_name=1
-  fi
-
-#  if [ "$use_bare_name" == "1" ]; then
-#    directory=$(basename "$directory")
-#  fi
-
-  if [ $is_svn -eq 1 ]; then
-    pushd "$directory" &>/dev/null
-    $checkin_cmd
+  local directory="$1"; shift
+  if [ -d "CVS" ]; then
+    # this appears to be cvs.
+    pushd "$directory/.." &>/dev/null
+    cvs ci "$directory"
     popd &>/dev/null
+  elif [ -d ".svn" ]; then
+    svn ci .
+  elif [ -d ".git" ]; then
+    git commit .
+    git push
   else
-    $checkin_cmd "$modifier$directory"
+    echo unknown repository for $directory...
   fi
-  popd &>/dev/null
 }
 
 function checkin_list {
-  list=$*
+  local list=$*
   for i in $list; do
-    for j in $i/feisty_meow $i/hoople $i/hoople2 $i/quartz $i/web $i/yeti $i/xsede/xsede_tests $i/xsede/code/cak0l/trunk ; do
-      if [ ! -d "$j" ]; then
-#echo no directory called $j exists
-        continue
-      fi
+    for j in $i/feisty_meow $i/hoople1 $i/hoople2 $i/quartz $i/web $i/yeti $i/xsede/xsede_tests $i/xsede/code/cak0l/trunk ; do
+      if [ ! -d "$j" ]; then continue; fi
 
-      pushd $i &>/dev/null
-      folder=$j
-      echo "checking in '$folder'..."
-      do_checkin $folder
+      pushd $j &>/dev/null
+      echo "checking in '$j'..."
+      do_checkin $j
       popd &>/dev/null
     done
   done
@@ -72,12 +41,6 @@ function checkin_list {
 if [ "$OS" != "Windows_NT" ]; then
   # first get individual folders.
   checkin_list $HOME
-##  # now check in the user's directory, if that is an asset in revision control.
-##  pushd $HOME  &>/dev/null
-##  cd ..
-##  echo "checking in '"$(pwd)"/$USER'..."
-##  $checkin_cmd $USER
-##  popd &>/dev/null
 else
   checkin_list c: c:/home d: d:/home e: e:/home f: f:/home g: g:/home h: h:/home i: i:/home 
 fi