##############
-# check git version to see if we can use autostash.
-# this appears to be an ubuntu issue, where xenial did not provide it even though the
-# feature appeared in git 2.6 and xenial claims it has git version 2.7.4. eventually,
-# this version test can go away.
-gitvertest="$(git version | sed -e 's/git version [0-9]\.//' | sed -e 's/\.[0-9][0-9]*$//' )"
-if (( $gitvertest >= 11 )); then
- # auto-stash is not available until 2.6 for git, but ubuntu is misreporting or using a
- # differing version number somehow. we are sure autostash was missing on ubuntu xenial
- # with git 2.7.4 and it's definitely present in zesty with git at 2.11.
-# PULL_ADDITION='--rebase --autostash'
-#although initially attractive, above set of flags seems to lose history we don't want to
-#lose.
-PULL_ADDITION=
-fi
-
-##############
-
# the maximum depth that the recursive functions will try to go below the starting directory.
export MAX_DEPTH=5
+# the name of our "don't check this stuff in" file.
+export NO_CHECKIN=".no-checkin"
+
# use our splitter tool for lengthy output if it's available.
-if [ ! -z "$(which splitter 2>/dev/null)" ]; then
- TO_SPLITTER="$(which splitter)"
+if [ ! -z "$(whichable splitter)" ]; then
+ TO_SPLITTER="$(whichable splitter)"
# calculate the number of columsn in the terminal.
cols=$(get_maxcols)
TO_SPLITTER+=" --maxcol $(($cols - 1))"
nicedir=$(\pwd)
fi
local blatt_report="echo -ne \nchecking in '$nicedir'... "
- local tell_no_checkin="echo -ne \nskipping check-in due to presence of .no-checkin sentinel file: $nicedir"
+ local tell_no_checkin="echo -ne \nskipping check-in due to presence of $NO_CHECKIN sentinel file: $nicedir"
pushd "$directory" &>/dev/null
#hmmm: overly elaborate sections below here, but we do want precise handling for git case.
if test_writeable "CVS"; then
do_revctrl_simple_update "$directory"
exit_on_error "updating repository; this issue should be fixed before check-in."
- if [ -f ".no-checkin" ]; then
-# echo -ne "\nskipping check-in due to presence of .no-checkin sentinel file: $directory"
- tell_no_checkin
+ if [ -f "$NO_CHECKIN" ]; then
+# echo -ne "\nskipping check-in due to presence of $NO_CHECKIN sentinel file: $directory"
+ $tell_no_checkin
else
$blatt_report
cvs ci .
if test_writeable ".svn"; then
do_revctrl_simple_update "$directory"
exit_on_error "updating repository; this issue should be fixed before check-in."
- if [ -f ".no-checkin" ]; then
-# echo -ne "\nskipping check-in due to presence of .no-checkin sentinel file: $directory"
- tell_no_checkin
+ if [ -f "$NO_CHECKIN" ]; then
+# echo -ne "\nskipping check-in due to presence of $NO_CHECKIN sentinel file: $directory"
+ $tell_no_checkin
else
$blatt_report
svn ci .
# take steps to make sure the branch integrity is good and we're up to date against remote repos.
do_revctrl_careful_update "$(\pwd)"
- if [ -f ".no-checkin" ]; then
-# echo -ne "\nskipping check-in due to presence of .no-checkin sentinel file: $directory"
- tell_no_checkin
+ if [ -f "$NO_CHECKIN" ]; then
+# echo -ne "\nskipping check-in due to presence of $NO_CHECKIN sentinel file: $directory"
+ $tell_no_checkin
else
$blatt_report
svn diff .
exit_on_error "subversion diff"
elif [ -d ".git" ]; then
- git diff
+ git --no-pager diff
exit_on_error "git diff"
elif [ -d "CVS" ]; then
cvs diff .
pushd "$directory" &>/dev/null
# only update if we see a repository living there.
- if [ -f ".no-checkin" ]; then
- echo -ne "\nskipping reporting due to presence of .no-checkin sentinel file: $directory"
+ if [ -f "$NO_CHECKIN" ]; then
+ echo -ne "\nskipping reporting due to presence of $NO_CHECKIN sentinel file: $directory"
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
local to_return=120 # unknown issue.
- local local_branch=$(git rev-parse @)
+ local local_branch=$(git rev-parse HEAD)
local remote_branch=$(git rev-parse "$branch")
- local merge_base=$(git merge-base @ "$branch")
+ local merge_base=$(git merge-base HEAD "$branch")
local to_echo=
if [ "$local_branch" == "$remote_branch" ]; then
return $to_return
}
+# showes the branch currently active in the repository.
+function show_active_branch()
+{
+#hmmm: if no args, assume current dir!
+
+ for directory in "$@"; do
+ echo -n "active branch for '$directory': "
+ pushd "$directory" &>/dev/null
+
+#hmmm: if git...
+ git rev-parse --abbrev-ref HEAD
+#hmmm: else OTHERS!!!
+
+ popd &>/dev/null
+ done
+}
+
# only shows the branch state if it's not okay.
# note that this is not the same as a conditional branch (ha ha).
function show_branch_conditionally()
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 --tags $PULL_ADDITION origin "$bran" | $TO_SPLITTER
+ git pull --tags origin "$bran" | $TO_SPLITTER
promote_pipe_return 0
fi
exit_on_error "git pull of remote branch: $bran"
# now pull down any changes in our own origin in the repo, to stay in synch
# with any changes from others.
- git pull --tags $PULL_ADDITION --all | $TO_SPLITTER
+ git fetch --tags --all | $TO_SPLITTER
#is the above really important when we did this branch already in the loop?
#it does an --all, but is that effective or different? should we be doing that in above loop?
promote_pipe_return 0
elif [ -d ".git" ]; then
if test_writeable ".git"; then
$blatt_report
- git pull --tags $PULL_ADDITION 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
+ git pull --tags 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
promote_pipe_return 0
exit_on_error "git pull of origin"
fi
projects / feisty_meow.git / blobdiff