home_system=
if [[ $this_host == *.gruntose.blurgh ]]; then
home_system=true
-#temp code
-elif [[ $this_host == buildy ]]; then
-home_system=true
-elif [[ $this_host == simmy ]]; then
-home_system=true
-#temp code
fi
}
+#hmmm: move to core.
+# makes sure that the "folder" is a directory and is writable.
+# remember that bash successful returns are zeroes...
+function test_writeable()
+{
+ local folder="$1"; shift
+ if [ ! -d "$folder" -o ! -w "$folder" ]; then return 1; fi
+ return 0
+}
+
# we only want to totally personalize this script if the user is right.
function check_user()
{
is_home_system
# special override to pick local servers when at home.
if [ "$home_system" == "true" ]; then
+#what was this section for again?
if [ "$in_or_out" == "out" ]; then
# need the right home machine for modifier when checking out.
#huhhh? modifier="svn://shaggy/"
save_terminal_title
+ # make a nice echoer since we want to use it inside conditions below.
+ local nicedir="$directory"
+ if [ $nicedir == "." ]; then
+ nicedir=$(\pwd)
+ fi
+ local blatt="echo checking in '$nicedir'..."
+
do_update "$directory"
if [ $? -ne 0 ]; then
echo "repository update failed; this should be fixed before check-in."
if [ -f ".no-checkin" ]; then
echo "skipping check-in due to presence of .no-checkin sentinel file."
elif [ -d "CVS" ]; then
- cvs ci .
- retval=$?
+ if test_writeable "CVS"; then
+ $blatt
+ cvs ci .
+ retval=$?
+ fi
elif [ -d ".svn" ]; then
- svn ci .
- retval=$?
+ if test_writeable ".svn"; then
+ $blatt
+ svn ci .
+ retval=$?
+ fi
elif [ -d ".git" ]; then
- # snag all new files. not to everyone's liking.
- git add --all .
- retval=$?
- # tell git about all the files and get a check-in comment.
- git commit .
- retval+=$?
- # upload the files to the server so others can see them.
- git push 2>&1 | grep -v "X11 forwarding request failed"
- retval+=$?
+ if test_writeable ".git"; then
+ $blatt
+ # snag all new files. not to everyone's liking.
+ git add --all .
+ retval=$?
+ # tell git about all the files and get a check-in comment.
+ git commit .
+ retval+=$?
+ # upload the files to the server so others can see them.
+ git push 2>&1 | grep -v "X11 forwarding request failed"
+ retval+=$?
+ fi
else
echo no repository in $directory
retval=1
# checks in all the folders in a specified list.
function checkin_list()
{
-echo list originally was: $*
-
# make the list of directories unique.
- HOLDIFS="$IFS"
- IFS=' '
- local list="$(echo $* | uniq)"
- IFS="$HOLDIFS"
-echo list became $list
-
-#hmmm: if above works, then it's needed in other places that
-# are passed lists.
-#hmmm: in fact, shouldn't it be a handy function of some sort for uniquifying lists?
+ local list="$(uniquify $*)"
save_terminal_title
- for i in $list; do
- # turn repo list back into an array.
- eval "repository_list=( ${REPOSITORY_LIST[*]} )"
- for j in "${repository_list[@]}"; do
- # add in the directory component.
- j="$i/$j"
- if [ ! -d "$j" ]; then continue; fi
- echo "checking in '$j'..."
- do_checkin $j
- sep 7
- done
+ # turn repo list back into an array.
+ eval "repository_list=( ${REPOSITORY_LIST[*]} )"
+
+ local outer inner
+
+ for outer in "${repository_list[@]}"; do
+ # check the repository first, since it might be an absolute path.
+ if [[ $outer =~ /.* ]]; then
+ # yep, this path is absolute. just handle it directly.
+ if [ ! -d "$outer" ]; then continue; fi
+ do_checkin $outer
+ sep 28
+ else
+ for inner in $list; do
+ # add in the directory component to see if we can find the folder.
+ local path="$inner/$outer"
+ if [ ! -d "$path" ]; then continue; fi
+ do_checkin $path
+ sep 28
+ done
+ fi
done
restore_terminal_title
save_terminal_title
+ # make a nice echoer since we want to use it inside conditions below.
+ local nicedir="$directory"
+ if [ $nicedir == "." ]; then
+ nicedir=$(\pwd)
+ fi
+ local blatt="echo retrieving '$nicedir'..."
+
local retval=0 # plan on success for now.
pushd "$directory" &>/dev/null
if [ -d "CVS" ]; then
- cvs update . | squash_first_few_crs
- retval=${PIPESTATUS[0]}
+ if test_writeable "CVS"; then
+ $blatt
+ cvs update . | squash_first_few_crs
+ retval=${PIPESTATUS[0]}
+ fi
elif [ -d ".svn" ]; then
- svn update . | squash_first_few_crs
- retval=${PIPESTATUS[0]}
+ if test_writeable ".svn"; then
+ $blatt
+ svn update . | squash_first_few_crs
+ retval=${PIPESTATUS[0]}
+ fi
elif [ -d ".git" ]; then
- git pull 2>&1 | grep -v "X11 forwarding request failed" | squash_first_few_crs
- retval=${PIPESTATUS[0]}
+ if test_writeable ".git"; then
+ $blatt
+ git pull 2>&1 | grep -v "X11 forwarding request failed" | squash_first_few_crs
+ retval=${PIPESTATUS[0]}
+ fi
else
# this is not an error necessarily; we'll just pretend they planned this.
echo no repository in $directory
}
# 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[*]} )"
- for j in "${repository_list[@]}"; do
- # add in the directory for our purposes here.
- j="$i/$j"
- if [ ! -d $j ]; then
- if [ ! -z "$SHELL_DEBUG" ]; then
- echo "no directory called $j exists."
- fi
- continue
- fi
-
- echo -n "retrieving '$j'... "
- do_update $j
- done
+ # turn repo list back into an array.
+ eval "repository_list=( ${REPOSITORY_LIST[*]} )"
+
+ local outer inner
+
+ for outer in "${repository_list[@]}"; do
+ # check the repository first, since it might be an absolute path.
+ if [[ $outer =~ /.* ]]; then
+ # yep, this path is absolute. just handle it directly.
+ if [ ! -d "$outer" ]; then continue; fi
+ do_update $outer
+ sep 28
+ else
+ for inner in $list; do
+ # add in the directory component to see if we can find the folder.
+ local path="$inner/$outer"
+ if [ ! -d "$path" ]; then continue; fi
+ do_update $path
+ sep 28
+ done
+ fi
done
restore_terminal_title
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
+ local additional_filter
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)
+
+ # see if they've warned us not to try checking in within vendor hierarchies.
+ if [ ! -z "NO_CHECKIN_VENDOR" ]; then
+ sed -i -e '/.*\/vendor\/.*/d' "$tempfile"
+ fi
+
+ local sortfile=$(mktemp /tmp/zz_checkin_sort.XXXXXX)
sort <"$tempfile" >"$sortfile"
\rm "$tempfile"
echo "$sortfile"
pushd "$dirname" &>/dev/null
echo "[$(pwd)]"
$action .
- sep 7
+ sep 28
popd &>/dev/null
done 3<"$tempfile"
projects / feisty_meow.git / blobdiff