From ffcd21a0e3d5a93d5c5b22fd82321394ee4cce77 Mon Sep 17 00:00:00 2001 From: "Fred T. Hamster" Date: Fri, 13 Jan 2012 20:33:24 -0800 Subject: [PATCH] working out kinks in git checkins and improving old versions for cvs and svn. --- scripts/rev_control/checkin.sh | 66 +++++++++------------------------- 1 file changed, 16 insertions(+), 50 deletions(-) diff --git a/scripts/rev_control/checkin.sh b/scripts/rev_control/checkin.sh index 1fcc8d8c..b81c85e6 100644 --- a/scripts/rev_control/checkin.sh +++ b/scripts/rev_control/checkin.sh @@ -5,62 +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 +echo dir is $directory +echo cur dir is $(pwd) + 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 + if [ ! -d "$j" ]; then continue; fi - pushd $i &>/dev/null + pushd $j &>/dev/null folder=$j echo "checking in '$folder'..." do_checkin $folder @@ -72,12 +44,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 -- 2.34.1