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 'release-2.140.136' 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 dcde45c6fcc6468eac2ef38cf1d4be1fa9c356ae..34d51f284443e4140cd859b231070cc40c61a5a0 100644
(file)
--- a/
scripts/rev_control/version_control.sh
+++ b/
scripts/rev_control/version_control.sh
@@
-14,6
+14,9
@@
source "$FEISTY_MEOW_SCRIPTS/tty/terminal_titler.sh"
# the maximum depth that the recursive functions will try to go below the starting directory.
export MAX_DEPTH=5
# 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 "$(whichable splitter)" ]; then
TO_SPLITTER="$(whichable splitter)"
# use our splitter tool for lengthy output if it's available.
if [ ! -z "$(whichable splitter)" ]; then
TO_SPLITTER="$(whichable splitter)"
@@
-58,10
+61,11
@@
function do_revctrl_checkin()
# make a nice echoer since we want to use it inside conditions below.
local nicedir="$directory"
if [ $nicedir == "." ]; then
# make a nice echoer since we want to use it inside conditions below.
local nicedir="$directory"
if [ $nicedir == "." ]; then
- nicedir=$(\pwd)
+ nicedir="$( \cd . && /bin/pwd )"
+#echo "calculated nicedir as '$nicedir'"
fi
local blatt_report="echo -ne \nchecking in '$nicedir'... "
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.
pushd "$directory" &>/dev/null
#hmmm: overly elaborate sections below here, but we do want precise handling for git case.
@@
-69,8
+73,8
@@
function do_revctrl_checkin()
if test_writeable "CVS"; then
do_revctrl_simple_update "$directory"
exit_on_error "updating repository; this issue should be fixed before check-in."
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"
+ 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
$tell_no_checkin
else
$blatt_report
@@
-82,8
+86,8
@@
function do_revctrl_checkin()
if test_writeable ".svn"; then
do_revctrl_simple_update "$directory"
exit_on_error "updating repository; this issue should be fixed before check-in."
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"
+ 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
$tell_no_checkin
else
$blatt_report
@@
-97,8
+101,8
@@
function do_revctrl_checkin()
# take steps to make sure the branch integrity is good and we're up to date against remote repos.
do_revctrl_careful_update "$(\pwd)"
# 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"
+ 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
$tell_no_checkin
else
$blatt_report
@@
-176,8
+180,8
@@
function do_revctrl_report_new
pushd "$directory" &>/dev/null
# only update if we see a repository living there.
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
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
@@
-280,19
+284,26
@@
function check_branch_state()
return $to_return
}
return $to_return
}
-# show
e
s the branch currently active in the repository.
+# shows the branch currently active in the repository.
function show_active_branch()
{
function show_active_branch()
{
-#hmmm: if no args, assume current dir!
+#hmmm: if no args, assume current dir!
?
for directory in "$@"; do
for directory in "$@"; do
- echo -n "active branch for '$directory': "
+ if [ $directory == "." ]; then
+ directory="$( \cd . && /bin/pwd )"
+#echo "calculated directory as '$directory'"
+ fi
+
+ echo -n -e "$(basename $directory) => branch "
pushd "$directory" &>/dev/null
#hmmm: if git...
git rev-parse --abbrev-ref HEAD
#hmmm: else OTHERS!!!
pushd "$directory" &>/dev/null
#hmmm: if git...
git rev-parse --abbrev-ref HEAD
#hmmm: else OTHERS!!!
+ echo
+
popd &>/dev/null
done
}
popd &>/dev/null
done
}
@@
-532,7
+543,7
@@
function perform_revctrl_action_on_file()
fi
did_anything=yes
pushd "$dirname" &>/dev/null
fi
did_anything=yes
pushd "$dirname" &>/dev/null
- echo
"[$(pwd)]
"
+ echo
-n "[$(pwd)]
"
# pass the current directory plus the remaining parameters from function invocation.
$action .
exit_on_error "performing action $action on: $(pwd)"
# pass the current directory plus the remaining parameters from function invocation.
$action .
exit_on_error "performing action $action on: $(pwd)"