X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Frev_control%2Fversion_control.sh;h=b42df56850feecbc263313dd3faae1fd61131ff4;hb=73d9a64c814f223b7829642e06c1818efc0aa0bd;hp=40eb80e861d8b137fd1b851ab10630d459a978f0;hpb=5d16eec185d98c20c4d80e4fb63fdd8d17a121fd;p=feisty_meow.git diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh index 40eb80e8..b42df568 100644 --- a/scripts/rev_control/version_control.sh +++ b/scripts/rev_control/version_control.sh @@ -102,6 +102,7 @@ function compute_modifier() function do_checkin() { local directory="$1"; shift +echo "do_checkin sees directory '$directory'" do_update "$directory" if [ $? -ne 0 ]; then echo "Repository update failed; this should be fixed before check-in." @@ -191,7 +192,7 @@ function squash_first_few_crs() i=0 while read line; do i=$((i+1)) - if [ $i -le 3 ]; then + if [ $i -le 5 ]; then echo -n "$line " else echo $line @@ -220,8 +221,8 @@ function do_update() git pull 2>&1 | grep -v "X11 forwarding request failed" | squash_first_few_crs retval=${PIPESTATUS[0]} else + # this is not an error necessarily; we'll just pretend they planned this. echo no repository in $directory - retval=1 fi popd &>/dev/null return $retval @@ -270,21 +271,22 @@ function generate_rev_ctrl_filelist() # iterates across a list of directories contained in a file (first parameter). # on each directory name, it performs the action (second parameter) provided. -function perform_action_on_file() +function perform_revctrl_action_on_file() { local tempfile="$1"; shift local action="$1"; shift - dirs=($(cat $tempfile)) +# dirs=($(cat $tempfile)) - for dirname in ${dirs[@]}; do + while read -u 3 dirname; do +# for dirname in "${dirs[@]}"; do if [ -z "$dirname" ]; then continue; fi - pushd $dirname &>/dev/null + pushd "$dirname" &>/dev/null echo "[$(pwd)]" $action . echo "=======" popd &>/dev/null - done + done 3<"$tempfile" rm $tempfile }