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()
{
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
+ cvs ci .
+ retval=$?
+ fi
elif [ -d ".svn" ]; then
- svn ci .
- retval=$?
+ if test_writeable ".svn"; then
+ 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
+ # 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
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
+ # 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
+ echo "checking in '$outer'..."
+ do_checkin $outer
sep 7
- done
+ 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
+ done
+ fi
done
restore_terminal_title
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
+ 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
+ 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
+ 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
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
+ echo "retrieving '$outer'..."
+ do_update $outer
+ sep 7
+ 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
+ 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
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)
+ local sortfile=$(mktemp /tmp/zz_checkin_sort.XXXXXX)
sort <"$tempfile" >"$sortfile"
\rm "$tempfile"
echo "$sortfile"