projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
smoot-tastic with the .no-checkin
[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 b6ab0217f6f3c7f1001723841c27e4e0cbad9417..9bf195c1b9221c6fff9d364966372f07b49bb097 100644
(file)
--- a/
scripts/rev_control/version_control.sh
+++ b/
scripts/rev_control/version_control.sh
@@
-112,8
+112,10
@@
function do_checkin()
return 1
fi
pushd "$directory" &>/dev/null
return 1
fi
pushd "$directory" &>/dev/null
- retval=0 # normally successful.
- if [ -d "CVS" ]; then
+ local retval=0 # normally successful.
+ if [ -f ".no-checkin" ]; then
+ echo "Not checking in because found .no-checkin sentinel file."
+ elif [ -d "CVS" ]; then
cvs ci .
retval=$?
elif [ -d ".svn" ]; then
cvs ci .
retval=$?
elif [ -d ".svn" ]; then
@@
-141,7
+143,7
@@
function do_diff
{
local directory="$1"; shift
pushd "$directory" &>/dev/null
{
local directory="$1"; shift
pushd "$directory" &>/dev/null
- retval=0 # normally successful.
+
local
retval=0 # normally successful.
# only update if we see a repository living there.
if [ -d ".svn" ]; then
# only update if we see a repository living there.
if [ -d ".svn" ]; then
@@
-160,12
+162,18
@@
function do_report_new
{
local directory="$1"; shift
pushd "$directory" &>/dev/null
{
local directory="$1"; shift
pushd "$directory" &>/dev/null
- retval=0 # normally successful.
+
local
retval=0 # normally successful.
# only update if we see a repository living there.
# only update if we see a repository living there.
- if [ -d ".svn" ]; then
+ if [ -f ".no-checkin" ]; then
+ echo "Not reporting mods because found .no-checkin sentinel file."
+ 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
# this action so far only makes sense and is needed for svn.
bash $FEISTY_MEOW_SCRIPTS/rev_control/svnapply.sh \? echo
+ retval=$?
+ elif [ -d ".git" ]; then
+ git status -u
+ retval=$?
fi
popd &>/dev/null
fi
popd &>/dev/null
@@
-211,8
+219,7
@@
function squash_first_few_crs()
function do_update()
{
directory="$1"; shift
function do_update()
{
directory="$1"; shift
- # plan on success for now.
- retval=0
+ local retval=0 # plan on success for now.
pushd "$directory" &>/dev/null
if [ -d "CVS" ]; then
cvs update . | squash_first_few_crs
pushd "$directory" &>/dev/null
if [ -d "CVS" ]; then
cvs update . | squash_first_few_crs