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
}
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."
echo "skipping check-in due to presence of .no-checkin sentinel file."
elif [ -d "CVS" ]; then
if test_writeable "CVS"; then
+ $blatt
cvs ci .
retval=$?
fi
elif [ -d ".svn" ]; then
if test_writeable ".svn"; then
+ $blatt
svn ci .
retval=$?
fi
elif [ -d ".git" ]; then
if test_writeable ".git"; then
+ $blatt
# snag all new files. not to everyone's liking.
git add --all .
retval=$?
if [[ $outer =~ /.* ]]; then
# yep, this path is absolute. just handle it directly.
if [ ! -d "$outer" ]; then continue; fi
- echo "checking in '$outer'..."
do_checkin $outer
- sep 7
+ 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
- echo "checking in '$path'..."
do_checkin $path
- sep 7
+ sep 28
done
fi
done
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
if test_writeable "CVS"; then
+ $blatt
cvs update . | squash_first_few_crs
retval=${PIPESTATUS[0]}
fi
elif [ -d ".svn" ]; then
if test_writeable ".svn"; then
+ $blatt
svn update . | squash_first_few_crs
retval=${PIPESTATUS[0]}
fi
elif [ -d ".git" ]; then
if test_writeable ".git"; then
+ $blatt
git pull 2>&1 | grep -v "X11 forwarding request failed" | squash_first_few_crs
retval=${PIPESTATUS[0]}
fi
if [[ $outer =~ /.* ]]; then
# yep, this path is absolute. just handle it directly.
if [ ! -d "$outer" ]; then continue; fi
- echo "retrieving '$outer'..."
do_update $outer
- sep 7
+ 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
- echo "retrieving '$path'..."
do_update $path
- sep 7
+ sep 28
done
fi
done
local dirhere="$( \cd "$(\dirname "$dir")" && /bin/pwd )"
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
+
+ # 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"
pushd "$dirname" &>/dev/null
echo "[$(pwd)]"
$action .
- sep 7
+ sep 28
popd &>/dev/null
done 3<"$tempfile"