projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
[feisty_meow.git]
/
scripts
/
rev_control
/
version_control.sh
diff --git
a/scripts/rev_control/version_control.sh
b/scripts/rev_control/version_control.sh
index 1d8b56083717c4a0b120cdcbb9a848a2f4ec0039..08a9a07c1f0880bb33b07e1eb7cac00fd56f8ad8 100644
(file)
--- a/
scripts/rev_control/version_control.sh
+++ b/
scripts/rev_control/version_control.sh
@@
-17,6
+17,11
@@
export MAX_DEPTH=5
# use our splitter tool for lengthy output if it's available.
if [ ! -z "$(which splitter)" ]; then
TO_SPLITTER="$(which splitter)"
# use our splitter tool for lengthy output if it's available.
if [ ! -z "$(which splitter)" ]; then
TO_SPLITTER="$(which splitter)"
+
+#hmmm: another reusable chunk here, getting terminal size.
+ # calculate the number of columsn in the terminal.
+ cols=$(stty size | awk '{print $2}')
+ TO_SPLITTER+=" --maxcol $(($cols - 1))"
else
TO_SPLITTER=cat
fi
else
TO_SPLITTER=cat
fi
@@
-261,6
+266,11
@@
function check_branch_state()
{
local branch="$1"; shift
{
local branch="$1"; shift
+ if [ -z "$branch" ]; then
+ echo "No branch was passed to check branch state."
+ return 1
+ fi
+
local to_return=120 # unknown issue.
local local_branch=$(git rev-parse @)
local to_return=120 # unknown issue.
local local_branch=$(git rev-parse @)
@@
-295,16
+305,18
@@
function do_careful_git_update()
return 0
fi
return 0
fi
+ local this_branch="$(my_branch_name)"
+
+ state=$(check_branch_state "$this_branch")
+ echo "=> branch '$this_branch' state prior to remote update is: $state"
+
# first update all our remote branches to their current state from the repos.
git remote update | $TO_SPLITTER
promote_pipe_return 0
test_or_die "git remote update"
# first update all our remote branches to their current state from the repos.
git remote update | $TO_SPLITTER
promote_pipe_return 0
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:
-#hmmm: trying it out again now that things are better elsewhere. let's see what it says.
state=$(check_branch_state "$this_branch")
state=$(check_branch_state "$this_branch")
- echo "=> branch '$this_branch' state is: $state"
+ echo "=> branch '$this_branch' state
after remote update
is: $state"
# 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)
# 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)
@@
-323,6
+335,8
@@
function do_careful_git_update()
# we are pretty sure the remote branch does exist.
git pull --no-ff origin "$bran" | $TO_SPLITTER
promote_pipe_return 0
# we are pretty sure the remote branch does exist.
git pull --no-ff origin "$bran" | $TO_SPLITTER
promote_pipe_return 0
+
+ echo "=> branch '$bran' state after pull is: $state"
fi
test_or_die "git pull of remote branch: $bran"
done
fi
test_or_die "git pull of remote branch: $bran"
done
@@
-445,7
+459,7
@@
function generate_rev_ctrl_filelist()
local sortfile=$(mktemp /tmp/zz_checkin_sort.XXXXXX)
sort <"$tempfile" >"$sortfile"
echo "$sortfile"
local sortfile=$(mktemp /tmp/zz_checkin_sort.XXXXXX)
sort <"$tempfile" >"$sortfile"
echo "$sortfile"
- \rm "$tempfile"
"$sortfile"
+ \rm "$tempfile"
}
# iterates across a list of directories contained in a file (first parameter).
}
# iterates across a list of directories contained in a file (first parameter).
@@
-480,6
+494,6
@@
function perform_revctrl_action_on_file()
restore_terminal_title
restore_terminal_title
- rm
$tempfile
+ rm
"$tempfile"
}
}