X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Frev_control%2Fversion_control.sh;h=9e314d2ea36f4263eaf3c01f2f0a1a904fc8c009;hb=2ca53771151d942a630205e5f59f8f14365f6ae0;hp=f33532de8ac96d71d19e2d03219efd8f8ec3e6f3;hpb=281ed98b65a722e7c16dd6909c9b2ba1c9548a21;p=feisty_meow.git diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh index f33532de..9e314d2e 100644 --- a/scripts/rev_control/version_control.sh +++ b/scripts/rev_control/version_control.sh @@ -88,13 +88,13 @@ function do_checkin() fi # a new set of steps we have to take to make sure the branch integrity is good. - careful_git_update + do_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 + git push origin "$(my_branch_name)" 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER test_or_die "git push" fi @@ -219,11 +219,18 @@ function squash_first_few_crs() fi } +#hmmm: the below are git specific and should be named that way. + +function all_branch_names() +{ + echo "$(git branch -vv | cut -d ' ' -f2)" +} + # 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)" + echo "$(git branch -vv | grep '\*' | cut -d ' ' -f2)" } #this had a -> in it at one point for not matching, didn't it? @@ -233,9 +240,11 @@ function my_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 +# reports the status of the branch by echoing one of these values: +# okay: up to date and everything is good. +# needs_pull: this branch needs to be pulled from origins. +# needs_push: there are unsaved changes on this branch to push to remote store. +# diverged: the branches diverged and are going to need a merge. # reference: https://stackoverflow.com/questions/3258243/check-if-pull-needed-in-git function check_branch_state() { @@ -243,67 +252,76 @@ function check_branch_state() 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 + local local_branch=$(git rev-parse @) + local remote_branch=$(git rev-parse "$branch") + local merge_base=$(git merge-base @ "$branch") + + if [ "$local_branch" == "$remote_branch" ]; then + echo "okay" + elif [ "$local_branch" == "$merge_base" ]; then + echo "needs_pull" + elif [ "$remote_branch" == "$merge_base" ]; then + echo "needs_push" else - echo "Diverged" - to_return=3 + echo "diverged" 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 # other methods. -function careful_git_update() +function do_careful_git_update() { - local this_branch="$(my_branch_name)" + local directory="$1"; shift + pushd "$directory" &>/dev/null + test_or_die "changing to directory: $directory" + + if [ ! -d ".git" ]; then + # we ignore if they're jumping into a non-useful folder, but also tell them. + echo "Directory is not a git repository: $directory" + return 0 + fi + + # first update all our remote branches to their current state from the repos. + git remote update + test_or_die "git remote update" + local this_branch="$(my_branch_name)" #appears to be useless; reports no changes when we need to know about remote changes that do exist: -# check_branch_state "$this_branch" -# state=$? -# test_or_continue "branch state check" -# echo the branch state is $state +#hmmm: trying it out again now that things are better elsewhere. let's see what it says. + state=$(check_branch_state "$this_branch") + echo "=> branch '$this_branch' state is: $state" - # 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 '^\*') + # this code is now doing what i have to do when i repair the repo. and it seems to be good so far. + local branch_list=$(all_branch_names) local bran for bran in $branch_list; do # echo "synchronizing remote branch: $bran" git checkout "$bran" - test_or_die "git checking out remote branch: $bran" - git pull --no-ff + test_or_die "git switching checkout to remote branch: $bran" + + state=$(check_branch_state "$bran") + echo "=> branch '$bran' state is: $state" + + remote_branch_info=$(git ls-remote --heads origin $bran 2>/dev/null) + if [ ! -z "$remote_branch_info" ]; then + # we are pretty sure the remote branch does exist. + git pull --no-ff origin "$bran" + fi 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" - # first update all our remote branches to their current state from the repos. - git remote update - test_or_die "git remote update" - # 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" + + popd &>/dev/null } # gets the latest versions of the assets from the upstream repository. @@ -336,7 +354,7 @@ function do_update() elif [ -d ".git" ]; then if test_writeable ".git"; then $blatt - git pull --no-ff origin 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER + git pull --no-ff 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 @@ -421,8 +439,14 @@ function perform_revctrl_action_on_file() save_terminal_title + local did_anything= + while read -u 3 dirname; do - if [ -z "$dirname" ]; then continue; fi + if [ -z "$dirname" ]; then + # we often have blank lines in the input file for some reason. + continue + fi + did_anything=yes pushd "$dirname" &>/dev/null echo "[$(pwd)]" $action . @@ -431,6 +455,10 @@ function perform_revctrl_action_on_file() popd &>/dev/null done 3<"$tempfile" + if [ -z "$did_anything" ]; then + echo "There was nothing to do the action '$action' on." + fi + restore_terminal_title rm $tempfile