# 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"
echo "could not create the temporary directory TMP in: $TMP"
echo "this script will not work properly without an existing TMP directory."
fi
-#hmmm: re-address the above code, since it doesn't make a lot of sense to me right now...
-
##############
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=$?
+ 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 .
- let "retval = retval + $?"
+ test_or_die "git commit"
fi
+# # 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"
+
# catch if the diff-index failed somehow.
- let "retval = retval + $?"
+ test_or_die "git diff-index"
+
+ # we continue on to the push, even if there were no changes this time, because
+ # there could already be committed changes that haven't been pushed yet.
local myself="$(my_branch_name)"
local parent="$(parent_branch_name)"
# upload any changes to the upstream repo so others can see them.
if [ "$myself" != "$parent" ]; then
git push origin "$(myself)" 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
- let "retval = retval + ${PIPESTATUS[0]}"
+ test_or_die "git push to origin: $myself"
else
# this branch is the same as the parent, so just push.
git push 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
- let "retval = retval + ${PIPESTATUS[0]}"
+ test_or_die "normal git push"
fi
fi
else
# nothing there. it's not an error though.
echo no repository in $directory
- retval=0
fi
popd &>/dev/null
restore_terminal_title
- return $retval
+ true;
}
# shows the local changes in a repository.
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 .
- let "retval = retval + $?"
+ test_or_die "subversion diff"
elif [ -d ".git" ]; then
git diff
- let "retval = retval + $?"
+ test_or_die "git diff"
elif [ -d "CVS" ]; then
cvs diff .
- let "retval = 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.
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
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
- retval=0
- # from very helpful page:
- # https://stackoverflow.com/questions/10312521/how-to-fetch-all-git-branches
+# classic implementation, but only works with one master branch.
+# fixes will be forthcoming from development branch.
- for remote in $( git branch -r | grep -v -- '->' ); do
- git branch --track ${remote#origin/} $remote
- let "retval = retval + $?"
- done
+# 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"
+
+
+#let's start over clean here...
+
+ git remote update
+ test_or_die "git remote update"
+
+# from: https://stackoverflow.com/questions/3258243/check-if-pull-needed-in-git
+UPSTREAM=$(parent_branch_name)
+#argh: original UPSTREAM='${1:-'\''@{u}'\''}'
+LOCAL=$(git rev-parse @)
+REMOTE=$(git rev-parse "$UPSTREAM")
+BASE=$(git merge-base @ "$UPSTREAM")
+var UPSTREAM LOCAL REMOTE BASE
+
+if [ "$LOCAL" == "$REMOTE" ]; then
+ echo "Up-to-date"
+elif [ "$LOCAL" == "$BASE" ]; then
+ echo "Need to pull"
+elif [ "$REMOTE" == "$BASE" ]; then
+ echo "Need to push"
+else
+ echo "Diverged"
+fi
+
+echo The rest of pull is not being done yet.
+return 1
+
+ git pull --no-ff origin
+ test_or_die "git fetch origin"
+
+
+# reslog=$(git log HEAD..origin/master --oneline)
+# if [[ "${reslog}" != "" ]] ; then
+# git merge origin/master
-#tiny bit hosed
-# git branch -r | grep -v -- '->' |
-# while read remote; do
-# git branch --track "${remote#origin/}" "$remote"
-# # ensure we notice a failure when adding tracking.
-# let "retval = retval + $?"
-# done
-# let "retval = retval + ${PIPESTATUS[0]}"
- git fetch --all 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
- let "retval = retval + ${PIPESTATUS[0]}"
- git pull --all 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
- let "retval = retval + ${PIPESTATUS[0]}"
+# # from very helpful page:
+# # https://stackoverflow.com/questions/10312521/how-to-fetch-all-git-branches
+# for remote in $( git branch -r | grep -v -- '->' ); do
+# git branch --track ${remote#origin/} $remote 2>/dev/null
+##hmmm: ignoring errors from these, since they are continual.
+##hmmm: if we could find a way to not try to track with a local branch when there's already one present, that would be swell. it's probably simple.
+# done
+#
+##hmmm: well, one time it failed without the fetch. i hope that's because the fetch is actually needed and not because the whole approach is fubar.
+# git fetch --all 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
+# test_or_die "git fetch"
+#
+# git pull --all 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
+# 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.
projects / feisty_meow.git / blobdiff