source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
source "$FEISTY_MEOW_SCRIPTS/tty/terminal_titler.sh"
+##############
+
# the maximum depth that the recursive functions will try to go below the starting directory.
export MAX_DEPTH=5
# this function sets a variable called "home_system" to "true" if the
# machine is considered one of fred's home machines. if you are not
# fred, you may want to change the machine choices.
-export home_system=
function is_home_system()
{
# load up the name of the host.
get_our_hostname
# reset the variable that we'll be setting.
- home_system=
+ unset home_system
+ export 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
+#hmmm: this "home system" feature seems to be unnecessary?
if [ "$in_or_out" == "out" ]; then
# need the right home machine for modifier when checking out.
-#huhhh? modifier="svn://shaggy/"
modifier=
else
# no modifier for checkin.
fi
}
+##############
+
# selects the method for check-in based on where we are.
function do_checkin()
{
save_terminal_title
- do_update "$directory"
- if [ $? -ne 0 ]; then
- echo "repository update failed; this should be fixed before check-in."
- return 1
+ # make a nice echoer since we want to use it inside conditions below.
+ local nicedir="$directory"
+ if [ $nicedir == "." ]; then
+ nicedir=$(\pwd)
fi
- pushd "$directory" &>/dev/null
+ local blatt="echo checking in '$nicedir'..."
+
local retval=0 # normally successful.
+
+ do_update "$directory"
+ retval=$?
+ test_or_die "repository update failed; this should be fixed before check-in."
+
+ pushd "$directory" &>/dev/null
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=$?
+echo A: retval=$retval
+
+ # see if there are any changes in the local repository.
+ if ! git diff-index --quiet HEAD --; then
+ # tell git about all the files and get a check-in comment.
+ git commit .
+ retval+=$?
+echo B.1: retval=$retval
+ fi
+ # catch if the diff-index failed somehow.
+ retval+=$?
+echo B.2: retval=$retval
+
+ # upload any changes to the upstream repo so others can see them.
+ git push 2>&1
+#| grep -v "X11 forwarding request failed"
+#have to do pipestatus if want to keep the above.
+ retval+=$?
+echo C: retval=$retval
+ fi
else
echo no repository in $directory
retval=1
# only update if we see a repository living there.
if [ -d ".svn" ]; then
svn diff .
+ retval+=$?
elif [ -d ".git" ]; then
git diff
+ retval+=$?
elif [ -d "CVS" ]; then
cvs diff .
+ retval+=$?
fi
popd &>/dev/null
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
+ test_or_die "running check-in on: $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
- echo "checking in '$path'..."
do_checkin $path
- sep 7
+ test_or_die "running check-in on: $path"
+ 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
- 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
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
+ test_or_die "running update on: $path"
+ 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
+ test_or_die "running update on: $path"
+ 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"
# on each directory name, it performs the action (second parameter) provided.
function perform_revctrl_action_on_file()
{
-
-#hmmm: this doesn't capture any error returns!
-
local tempfile="$1"; shift
local action="$1"; shift
pushd "$dirname" &>/dev/null
echo "[$(pwd)]"
$action .
- sep 7
+ test_or_die "performing action $action on: $(pwd)"
+ sep 28
popd &>/dev/null
done 3<"$tempfile"
projects / feisty_meow.git / blobdiff