From: Chris Koeritz Date: Fri, 10 Nov 2017 20:27:59 +0000 (+0000) Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev X-Git-Tag: 2.140.92^2~1^2~5 X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=9a20546504cdef8119e9431d521fc0429ac6b4a9;hp=e119f0f1cd5c6e64be0fa2c8739b999a591f48ee;p=feisty_meow.git Merge branch 'dev' of feistymeow.org:feisty_meow into dev --- diff --git a/scripts/rev_control/diff_repo.sh b/scripts/rev_control/diff_repo.sh deleted file mode 100644 index eb02719e..00000000 --- a/scripts/rev_control/diff_repo.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -# does differences on a set of folders checked out from subversion or git. -# this can take a directory as parameter, but will default to the current -# working directory. all the directories under the passed directory will -# be examined. - -source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh" -source "$FEISTY_MEOW_SCRIPTS/rev_control/version_control.sh" - -############## - -dir="$1"; shift -if [ -z "$dir" ]; then - dir=. -fi - -pushd "$dir" &>/dev/null -test_or_die "changing to directory: $dir" -tempfile=$(generate_rev_ctrl_filelist) -popd &>/dev/null - -perform_revctrl_action_on_file "$tempfile" do_diff -test_or_die "performing revision control action do_diff on: $tempfile" - diff --git a/scripts/rev_control/diff_repos.sh b/scripts/rev_control/diff_repos.sh new file mode 100644 index 00000000..eb02719e --- /dev/null +++ b/scripts/rev_control/diff_repos.sh @@ -0,0 +1,25 @@ +#!/bin/bash + +# does differences on a set of folders checked out from subversion or git. +# this can take a directory as parameter, but will default to the current +# working directory. all the directories under the passed directory will +# be examined. + +source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh" +source "$FEISTY_MEOW_SCRIPTS/rev_control/version_control.sh" + +############## + +dir="$1"; shift +if [ -z "$dir" ]; then + dir=. +fi + +pushd "$dir" &>/dev/null +test_or_die "changing to directory: $dir" +tempfile=$(generate_rev_ctrl_filelist) +popd &>/dev/null + +perform_revctrl_action_on_file "$tempfile" do_diff +test_or_die "performing revision control action do_diff on: $tempfile" + diff --git a/scripts/rev_control/push_repo_downstream.sh b/scripts/rev_control/push_repo_downstream.sh index ef1bb35a..4e1530f8 100644 --- a/scripts/rev_control/push_repo_downstream.sh +++ b/scripts/rev_control/push_repo_downstream.sh @@ -43,6 +43,10 @@ fi pushd "$dir" &>/dev/null test_or_die "changing to directory: $dir" +#switch this to the perform revctrl with a do_git_careful_update + + + # get everything from the origin. git fetch origin test_or_die "running git fetch origin" diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh index 8f1033cf..1224480f 100644 --- a/scripts/rev_control/version_control.sh +++ b/scripts/rev_control/version_control.sh @@ -88,7 +88,7 @@ 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. @@ -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? @@ -272,18 +279,25 @@ sep # 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)" +#proposition: this step didn't help before, and it seems redundant now. +#... +#hmmm, maybe it is needed. and people did seem to want it first, so trying that. + # first update all our remote branches to their current state from the repos. + git remote update + test_or_die "git remote update" + #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 - # 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" @@ -296,10 +310,6 @@ function careful_git_update() 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 diff --git a/temp/mod1 b/temp/mod1 deleted file mode 100644 index 7aff7ce4..00000000 --- a/temp/mod1 +++ /dev/null @@ -1 +0,0 @@ -arf diff --git a/temp/mod2 b/temp/mod2 deleted file mode 100644 index 445727d3..00000000 --- a/temp/mod2 +++ /dev/null @@ -1 +0,0 @@ -sdiuis diff --git a/temp/mod3 b/temp/mod3 deleted file mode 100644 index 2f55af39..00000000 --- a/temp/mod3 +++ /dev/null @@ -1 +0,0 @@ -farkle diff --git a/temp/mod4 b/temp/mod4 deleted file mode 100644 index 2f55af39..00000000 --- a/temp/mod4 +++ /dev/null @@ -1 +0,0 @@ -farkle diff --git a/temp/mod5 b/temp/mod5 deleted file mode 100644 index 440c7d7c..00000000 --- a/temp/mod5 +++ /dev/null @@ -1 +0,0 @@ -pustulingus diff --git a/temp/mod6 b/temp/mod6 deleted file mode 100644 index 0f12a484..00000000 --- a/temp/mod6 +++ /dev/null @@ -1 +0,0 @@ -muttgrabbers