projects
/
feisty_meow.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
f979dec
)
made .no-checkin flag => variable in verctl script
author
Chris Koeritz
<fred@gruntose.com>
Wed, 3 Nov 2021 13:55:07 +0000
(09:55 -0400)
committer
Chris Koeritz
<fred@gruntose.com>
Wed, 3 Nov 2021 13:55:07 +0000
(09:55 -0400)
scripts/rev_control/version_control.sh
patch
|
blob
|
history
diff --git
a/scripts/rev_control/version_control.sh
b/scripts/rev_control/version_control.sh
index dcde45c6fcc6468eac2ef38cf1d4be1fa9c356ae..96a8558e8a1d7fa20864e18d5b4b58be38dfeeeb 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)"
@@
-61,7
+64,7
@@
function do_revctrl_checkin()
nicedir=$(\pwd)
fi
local blatt_report="echo -ne \nchecking in '$nicedir'... "
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.
pushd "$directory" &>/dev/null
#hmmm: overly elaborate sections below here, but we do want precise handling for git case.
@@
-69,8
+72,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
+85,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
+100,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
+179,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