From 9f5a17d07652ce3b043b7dd69aa98dd38cae5b28 Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Sat, 24 Aug 2013 13:19:58 -0400 Subject: [PATCH] now all are updated to recurse a bit, and go to maxdepth of 4. --- scripts/rev_control/rev_diff.sh | 22 ---------------------- scripts/rev_control/rev_report_new.sh | 19 ++++--------------- scripts/rev_control/rev_update.sh | 12 ++---------- scripts/rev_control/version_control.sh | 19 +++++++++++++++++-- 4 files changed, 23 insertions(+), 49 deletions(-) diff --git a/scripts/rev_control/rev_diff.sh b/scripts/rev_control/rev_diff.sh index 8682714a..aba5d718 100644 --- a/scripts/rev_control/rev_diff.sh +++ b/scripts/rev_control/rev_diff.sh @@ -15,25 +15,3 @@ tempfile=$(generate_rev_ctrl_filelist) perform_action_on_file "$tempfile" do_diff - -#pushd "$dir" &>/dev/null -# -#for i in * ; do -# if [ -d "$i" ]; then -# echo "[$i]" -# pushd $i &>/dev/null -# # only update if we see a repository living there. -# if [ -d ".svn" ]; then -# svn diff . -# elif [ -d ".git" ]; then -# git diff -# elif [ -d "CVS" ]; then -# cvs diff . -# fi -# popd &>/dev/null -# echo "=======" -# fi -#done -# -#popd &>/dev/null - diff --git a/scripts/rev_control/rev_report_new.sh b/scripts/rev_control/rev_report_new.sh index cac32b6f..2197346d 100644 --- a/scripts/rev_control/rev_report_new.sh +++ b/scripts/rev_control/rev_report_new.sh @@ -1,5 +1,4 @@ #!/bin/bash - # this script reports files that are not checked in yet in a set of folders. # it works with subversion only, since git handles new files well whereas # subversion ignores them until you tell it about them. this script can take @@ -11,19 +10,9 @@ if [ -z "$dir" ]; then dir=. fi -pushd "$dir" &>/dev/null +source "$FEISTY_MEOW_SCRIPTS/rev_control/version_control.sh" + +tempfile=$(generate_rev_ctrl_filelist) -for i in * ; do - if [ -d "$i" ]; then - echo "[$i]" - pushd $i &>/dev/null - # only update if we see a repository living there. - if [ -d ".svn" ]; then - bash $FEISTY_MEOW_SCRIPTS/rev_control/svnapply.sh \? echo - fi - popd &>/dev/null - echo "=======" - fi -done +perform_action_on_file "$tempfile" do_report_new -popd &>/dev/null diff --git a/scripts/rev_control/rev_update.sh b/scripts/rev_control/rev_update.sh index 3bf92132..7d01dcae 100644 --- a/scripts/rev_control/rev_update.sh +++ b/scripts/rev_control/rev_update.sh @@ -11,15 +11,7 @@ fi source "$FEISTY_MEOW_SCRIPTS/rev_control/version_control.sh" -pushd "$dir" &>/dev/null +tempfile=$(generate_rev_ctrl_filelist) -for i in * ; do - if [ -d "$i" ]; then - echo "[$i]" - do_update "$i" - echo "=======" - fi -done - -popd &>/dev/null +perform_action_on_file "$tempfile" do_update diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh index 4da2c6a7..6e574bd1 100644 --- a/scripts/rev_control/version_control.sh +++ b/scripts/rev_control/version_control.sh @@ -147,6 +147,21 @@ function do_diff return $retval } +function do_report_new +{ + local directory="$1"; shift + pushd "$directory" &>/dev/null + retval=0 # normally successful. + + # only update if we see a repository living there. + if [ -d ".svn" ]; then + # this action so far only makes sense and is needed for svn. + bash $FEISTY_MEOW_SCRIPTS/rev_control/svnapply.sh \? echo + fi + + popd &>/dev/null + return $retval +} # checks in all the folders in a specified list. function checkin_list() @@ -232,8 +247,8 @@ function generate_rev_ctrl_filelist() local dirhere="$(\pwd)" local tempfile=$(mktemp /tmp/zz_rev_checkin.XXXXXX) echo >$tempfile - find $dirhere -maxdepth 3 -type d -iname ".svn" -exec echo {}/.. ';' >>$tempfile - find $dirhere -maxdepth 3 -type d -iname ".git" -exec echo {}/.. ';' >>$tempfile + find $dirhere -maxdepth 4 -type d -iname ".svn" -exec echo {}/.. ';' >>$tempfile + find $dirhere -maxdepth 4 -type d -iname ".git" -exec echo {}/.. ';' >>$tempfile #CVS is not well behaved, and we seldom use it anymore. # find $dirhere -maxdepth 3 -type d -iname "CVS" -exec echo {}/.. ';' >>$tempfile popd &>/dev/null -- 2.34.1