# these are helper functions for doing localized revision control.
# this script should be sourced into other scripts that use it.
+# Author: Chris Koeritz
+# Author: Kevin Wentworth
+
source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
source "$FEISTY_MEOW_SCRIPTS/tty/terminal_titler.sh"
+#hmmm: we need to dump all the outputs in this script into splitter
+
##############
# the maximum depth that the recursive functions will try to go below the starting directory.
export MAX_DEPTH=5
-#hmmm: re-address this code, since it doesn't make a lot of sense to me right now...
+# use our splitter tool for lengthy output if it's available.
+if [ ! -z "$(which splitter)" ]; then
+ TO_SPLITTER="$(which splitter)"
+else
+ TO_SPLITTER=cat
+fi
+
+##############
+
# one unpleasantry to take care of first; cygwin barfs aggressively if the TMP directory
# is a DOS path, but we need it to be a DOS path for our GFFS testing, so that blows.
# to get past this, TMP gets changed below to a hopefully generic and safe place.
-
if [[ "$TMP" =~ .:.* ]]; then
- echo making weirdo temporary directory for DOS path.
+ echo "making weirdo temporary directory for PCDOS-style path."
export TMP=/tmp/rev_control_$USER
fi
if [ ! -d "$TMP" ]; then
echo "this script will not work properly without an existing TMP directory."
fi
-this_host=
-# gets the machine's hostname and stores it in the variable "this_host".
-function get_our_hostname()
-{
- if [ "$OS" == "Windows_NT" ]; then
- this_host=$(hostname)
- elif [ ! -z "$(echo $MACHTYPE | grep apple)" ]; then
- this_host=$(hostname)
- elif [ ! -z "$(echo $MACHTYPE | grep suse)" ]; then
- this_host=$(hostname --long)
- else
- this_host=$(hostname)
- fi
- #echo "hostname is $this_host"
-}
-
-# 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.
-function is_home_system()
-{
- # load up the name of the host.
- get_our_hostname
- # reset the variable that we'll be setting.
- unset home_system
- export home_system
- if [[ $this_host == *.gruntose.blurgh ]]; then
- home_system=true
- 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 [ "$USER" == "fred" ]; then
- export SVNUSER=fred_t_hamster@
- export EXTRA_PROTOCOL=+ssh
- else
- export SVNUSER=
- export EXTRA_PROTOCOL=
- fi
-}
-
-# calculates the right modifier for hostnames / repositories.
-modifier=
-function compute_modifier()
-{
- modifier=
- directory="$1"; shift
- in_or_out="$1"; shift
- check_user
- # some project specific overrides.
- if [[ "$directory" == hoople* ]]; then
- modifier="svn${EXTRA_PROTOCOL}://${SVNUSER}svn.code.sf.net/p/hoople2/svn/"
- fi
- if [[ "$directory" == yeti* ]]; then
- modifier="svn${EXTRA_PROTOCOL}://${SVNUSER}svn.code.sf.net/p/yeti/svn/"
- fi
- # see if we're on one of fred's home machines.
- 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.
- modifier=
- else
- # no modifier for checkin.
- modifier=
- fi
- fi
-}
-
##############
-# selects the method for check-in based on where we are.
+# checks the directory provided into the revision control system repository it belongs to.
function do_checkin()
{
local directory="$1"; shift
fi
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."
+ test_or_die "repository update--this should be fixed before check-in."
pushd "$directory" &>/dev/null
if [ -f ".no-checkin" ]; then
if test_writeable "CVS"; then
$blatt
cvs ci .
- retval=$?
+ test_or_die "cvs checkin"
fi
elif [ -d ".svn" ]; then
if test_writeable ".svn"; then
$blatt
svn ci .
- retval=$?
+ test_or_die "svn checkin"
fi
elif [ -d ".git" ]; then
if test_writeable ".git"; then
$blatt
+
+# classic implementation, but only works with one master branch.
+# fixes will be forthcoming from development branch.
+
# snag all new files. not to everyone's liking.
git add --all .
- retval=$?
-echo A: retval=$retval
+ test_or_die "git add all new files"
# 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
+ test_or_die "git commit"
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
+ # upload the files to the server so others can see them.
+ git push 2>&1 | grep -v "X11 forwarding request failed"
+ if [ ${PIPESTATUS[0]} -ne 0 ]; then false; fi
+ test_or_die "git push"
fi
else
+ # nothing there. it's not an error though.
echo no repository in $directory
- retval=1
fi
popd &>/dev/null
restore_terminal_title
- return $retval
+ true;
}
+# shows the local changes in a repository.
function do_diff
{
local directory="$1"; shift
save_terminal_title
pushd "$directory" &>/dev/null
- local retval=0 # normally successful.
# only update if we see a repository living there.
if [ -d ".svn" ]; then
svn diff .
- retval+=$?
+ test_or_die "subversion diff"
elif [ -d ".git" ]; then
git diff
- retval+=$?
+ test_or_die "git diff"
elif [ -d "CVS" ]; then
cvs diff .
- retval+=$?
+ test_or_die "cvs diff"
fi
popd &>/dev/null
restore_terminal_title
- return $retval
+ true;
}
+# reports any files that are not already known to the upstream repository.
function do_report_new
{
local directory="$1"; shift
save_terminal_title
pushd "$directory" &>/dev/null
- local retval=0 # normally successful.
# only update if we see a repository living there.
if [ -f ".no-checkin" ]; then
elif [ -d ".svn" ]; then
# this action so far only makes sense and is needed for svn.
bash $FEISTY_MEOW_SCRIPTS/rev_control/svnapply.sh \? echo
- retval=$?
+ test_or_die "svn diff"
elif [ -d ".git" ]; then
git status -u
- retval=$?
+ test_or_die "git status -u"
fi
popd &>/dev/null
restore_terminal_title
- return $retval
+ true
}
# checks in all the folders in a specified list.
# yep, this path is absolute. just handle it directly.
if [ ! -d "$outer" ]; then continue; fi
do_checkin $outer
- test_or_die "running check-in on: $outer"
+ test_or_die "running check-in (absolute) on path: $outer"
sep 28
else
for inner in $list; do
local path="$inner/$outer"
if [ ! -d "$path" ]; then continue; fi
do_checkin $path
- test_or_die "running check-in on: $path"
+ test_or_die "running check-in (relative) on path: $path"
sep 28
done
fi
fi
}
-# selects the checkout method based on where we are (the host the script runs on).
+# a helpful method that reports the git branch for the current directory's
+# git repository.
+function my_branch_name()
+{
+ echo "$(git branch | grep \* | cut -d ' ' -f2)"
+}
+
+# this reports the upstream branch for the current repo.
+function parent_branch_name()
+{
+ echo "$(git branch -vv | grep \* | cut -d ' ' -f2)"
+}
+
+# gets the latest versions of the assets from the upstream repository.
function do_update()
{
directory="$1"; shift
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]}
+ cvs update . | $TO_SPLITTER
+ test_or_die "cvs update"
fi
elif [ -d ".svn" ]; then
if test_writeable ".svn"; then
$blatt
- svn update . | squash_first_few_crs
- retval=${PIPESTATUS[0]}
+ svn update . | $TO_SPLITTER
+ test_or_die "svn update"
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]}
+
+# classic implementation, but only works with one master branch.
+# fixes will be forthcoming from development branch.
+
+ git pull 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
+ if [ ${PIPESTATUS[0]} -ne 0 ]; then false; fi
+ test_or_die "git pull"
+
fi
else
# this is not an error necessarily; we'll just pretend they planned this.
restore_terminal_title
- return $retval
+ true
}
# gets all the updates for a list of folders under revision control.
rm $tempfile
}
-