X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Frev_control%2Fversion_control.sh;h=96d4e4dca23b81245b2bbe2f2c73286ae5da5ff5;hb=41e8676a76167fd6909fcc21255bbdc0238e2c29;hp=2de20b0b0c17d401fd126b5c28953e0c6da52d04;hpb=2ad8e026a2b6d85e3b803fdf14491a1d455ba913;p=feisty_meow.git diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh index 2de20b0b..96d4e4dc 100644 --- a/scripts/rev_control/version_control.sh +++ b/scripts/rev_control/version_control.sh @@ -3,19 +3,33 @@ # 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 @@ -26,91 +40,9 @@ 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. -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= - 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 -#what was this section for again? - 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. - 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 @@ -125,50 +57,66 @@ function do_checkin() local blatt="echo checking in '$nicedir'..." do_update "$directory" - if [ $? -ne 0 ]; then - echo "repository update failed; this should be fixed before check-in." - return 1 - fi + test_or_die "repository update--this should be fixed before check-in." + pushd "$directory" &>/dev/null - local retval=0 # normally successful. if [ -f ".no-checkin" ]; then echo "skipping check-in due to presence of .no-checkin sentinel file." elif [ -d "CVS" ]; 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 - # snag all new files. not to everyone's liking. + + # put all changed and new files in the commit. 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+=$? + 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 . + 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" + + # a new set of steps we have to take to make sure the branch integrity is good. + careful_git_update + + # 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. + + # upload any changes to the upstream repo so others can see them. + git push 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER + 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 @@ -176,24 +124,27 @@ function do_diff 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 . + test_or_die "subversion diff" elif [ -d ".git" ]; then git diff + test_or_die "git diff" elif [ -d "CVS" ]; then cvs diff . + 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 @@ -201,7 +152,6 @@ function do_report_new 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 @@ -209,17 +159,17 @@ function do_report_new 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. @@ -241,6 +191,7 @@ function checkin_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 (absolute) on path: $outer" sep 28 else for inner in $list; do @@ -248,6 +199,7 @@ function checkin_list() local path="$inner/$outer" if [ ! -d "$path" ]; then continue; fi do_checkin $path + test_or_die "running check-in (relative) on path: $path" sep 28 done fi @@ -274,7 +226,127 @@ function squash_first_few_crs() 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 had a -> in it at one point for not matching, didn't it? +# this reports the upstream branch for the current repo. +##function parent_branch_name() +##{ + ##echo "$(git branch -vv | grep \* | cut -d ' ' -f2)" +##} + +# this exits with 0 for success (normal bash behavior) when up to date. if the branch is not up to date, +# then these values are returned: +#DOCUMENT THE VALUES +# reference: https://stackoverflow.com/questions/3258243/check-if-pull-needed-in-git +function check_branch_state() +{ + local branch="$1"; shift + + local to_return=120 # unknown issue. + +sep + + LOCAL=$(git rev-parse @) + REMOTE=$(git rev-parse "$branch") + BASE=$(git merge-base @ "$branch") +var branch LOCAL REMOTE BASE + + if [ "$LOCAL" == "$REMOTE" ]; then + echo "Up-to-date" + to_return=0 + elif [ "$LOCAL" == "$BASE" ]; then + echo "Need to pull" + to_return=1 + elif [ "$REMOTE" == "$BASE" ]; then + echo "Need to push" + to_return=2 + else + echo "Diverged" + to_return=3 + fi + +sep + + return $to_return +} + +# 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() +{ + + local this_branch="$(my_branch_name)" + +#we want my branch here, don't we? not like parent or anything? + check_branch_state "$this_branch" + state=$? + test_or_continue "branch state check" + echo the branch state is $state +#need to instead do something here if fails. +# above is worse than useless code; in the situations i'm seeing fail, it reports no changes. *&@#*&@# + +echo DOING BRANCH WALKER + # the above are just not enough. this code is now doing what i have to do when i repair the repo. + local branch_list=$(git branch |grep -v '^\*') + local bran + for bran in $branch_list; do +echo GETTING LATEST ON: $bran + git checkout "$bran" + test_or_die "git checking out remote branch: $bran" + git pull --no-ff + test_or_die "git pull of remote branch: $bran" + done + # now switch back to our branch. + git checkout "$this_branch" + test_or_die "git checking out our current branch: $this_branch" + +echo NOW REMOTE UPDATE + + # first update all our remote branches to their current state from the repos. + git remote update + test_or_die "git remote update" + +echo NOW THE FULL PULL + # 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 pulling all upstream" + +echo DONE CAREFUL UPDATE + + return 0 + +# 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() { directory="$1"; shift @@ -288,25 +360,25 @@ function do_update() 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]} + git pull --no-ff origin 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER + if [ ${PIPESTATUS[0]} -ne 0 ]; then false; fi + test_or_die "git pull of origin without fast forwards" fi else # this is not an error necessarily; we'll just pretend they planned this. @@ -316,7 +388,7 @@ function do_update() restore_terminal_title - return $retval + true } # gets all the updates for a list of folders under revision control. @@ -337,6 +409,7 @@ function checkout_list() # yep, this path is absolute. just handle it directly. if [ ! -d "$outer" ]; then continue; fi do_update $outer + test_or_die "running update on: $path" sep 28 else for inner in $list; do @@ -344,6 +417,7 @@ function checkout_list() local path="$inner/$outer" if [ ! -d "$path" ]; then continue; fi do_update $path + test_or_die "running update on: $path" sep 28 done fi @@ -382,9 +456,6 @@ function generate_rev_ctrl_filelist() # 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 @@ -395,6 +466,7 @@ function perform_revctrl_action_on_file() pushd "$dirname" &>/dev/null echo "[$(pwd)]" $action . + test_or_die "performing action $action on: $(pwd)" sep 28 popd &>/dev/null done 3<"$tempfile" @@ -404,4 +476,3 @@ function perform_revctrl_action_on_file() rm $tempfile } -