# 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...
-
##############
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 .
test_or_die "git add all new files"
git commit .
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.
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)"
echo "$(git branch -vv | grep \* | cut -d ' ' -f2)"
}
+# the git update process just gets more and more complex when you bring in
+# branches, so we've moved this here to avoid having a ton of code in the
+# do_checkin method.
+function careful_git_update()
+{
+ # first update all our remote branches to their current state from the repos.
+ git remote update
+ test_or_die "git remote update"
+
+#hmmm: this should be a function:
+# 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
+
+ # now pull down any changes in our own origin in the repo, to stay in synch
+ # with any changes from others.
+ git pull --no-ff --all
+ test_or_die "git fetch origin"
+
+
+echo The rest of pull is not being done yet.
+return 1
+
+
+
+# below has older shards of partial knowledge.
+
+# reslog=$(git log HEAD..origin/master --oneline)
+# if [[ "${reslog}" != "" ]] ; then
+# git merge origin/master
+
+# # 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"
+
+}
+
# gets the latest versions of the assets from the upstream repository.
function do_update()
{
if test_writeable ".git"; then
$blatt
- # 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 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
+# 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"
- git fetch --all 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
- test_or_die "git fetch"
+#any parms needed?
+ careful_git_update
- 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.
projects / feisty_meow.git / blobdiff