X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Frev_control%2Fversion_control.sh;h=c50ff7a85bd471d12c65f2c53dc28be74e27357e;hb=cf5ca14de074aaa046e8ac8b56f15513e97494d0;hp=8c714ece4974d0269ef4b8b13b715dd7e386a4d9;hpb=154c324a33c8566c9f10dae55f6cadaf30862338;p=feisty_meow.git diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh index 8c714ece..c50ff7a8 100644 --- a/scripts/rev_control/version_control.sh +++ b/scripts/rev_control/version_control.sh @@ -78,10 +78,7 @@ function do_checkin() 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. + # put all changed and new files in the commit. not to everyone's liking. git add --all . test_or_die "git add all new files" @@ -97,24 +94,15 @@ function do_checkin() # 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" + # 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. - 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 - 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 - test_or_die "normal git push" - fi + git push 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER + test_or_die "git push" fi else @@ -125,7 +113,7 @@ function do_checkin() restore_terminal_title - true; + return 0 } # shows the local changes in a repository. @@ -153,7 +141,7 @@ function do_diff restore_terminal_title - true; + return 0 } # reports any files that are not already known to the upstream repository. @@ -181,7 +169,7 @@ function do_report_new restore_terminal_title - true + return 0 } # checks in all the folders in a specified list. @@ -242,73 +230,96 @@ function squash_first_few_crs() # git repository. function my_branch_name() { - echo "$(git branch | grep \* | cut -d ' ' -f2)" + 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() +##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() { - echo "$(git branch -vv | grep \* | cut -d ' ' -f2)" -} + local branch="$1"; shift -# 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" + local to_return=120 # unknown issue. -#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 +sep -if [ "$LOCAL" == "$REMOTE" ]; then + 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" -elif [ "$LOCAL" == "$BASE" ]; then + to_return=0 + elif [ "$LOCAL" == "$BASE" ]; then echo "Need to pull" -elif [ "$REMOTE" == "$BASE" ]; then + to_return=1 + elif [ "$REMOTE" == "$BASE" ]; then echo "Need to push" -else + to_return=2 + else echo "Diverged" -fi + to_return=3 + fi -echo The rest of pull is not being done yet. -return 1 +sep - # 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 origin - test_or_die "git fetch origin" + 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" -# below has older shards of partial knowledge. +echo NOW REMOTE UPDATE -# reslog=$(git log HEAD..origin/master --oneline) -# if [[ "${reslog}" != "" ]] ; then -# git merge origin/master + # first update all our remote branches to their current state from the repos. + git remote update + test_or_die "git remote update" -# # 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" +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 } @@ -342,17 +353,9 @@ function do_update() 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. - -# 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" - -#any parms needed? - careful_git_update - + 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. @@ -362,7 +365,7 @@ function do_update() restore_terminal_title - true + return 0 } # gets all the updates for a list of folders under revision control.