Branch HEAD

[fs/lustre-release.git] / build / cvsdiffclient

diff --git a/build/cvsdiffclient b/build/cvsdiffclient
index 91b777b..ca09609 100644 (file)
--- a/build/cvsdiffclient
+++ b/build/cvsdiffclient
@@ -6,16 +6,27 @@
 # in your .bashrc and you will get a nice bunch of CVS commit reminders:
 # <merge/land tag information>
 # b=<bug_number>
-# r=<reviewed by>
+# i=<inspected_by>
+# i=<inspected_by>
 #
 # Remember to remove the leading "CVS: " part of the comment before saving
 # your commit comment if you want those entries to be saved.
 
 [ -f .mergeinfo ] && . ./.mergeinfo
 
-FILES=`cvs-modified-files.pl $1`
+CVS_MODIFIED_FILES_PL=$(which cvs-modified-files.pl 2>/dev/null)
+if [ -z "$CVS_MODIFIED_FILES_PL" ]; then
+    CVS_MODIFIED_FILES_PL=$(dirname $0)/cvs-modified-files.pl
+fi
+FILES=$($CVS_MODIFIED_FILES_PL $1)
 TMP=`mktemp /tmp/cvslog-XXXXXXXX`
 if [ -f $TMP ]; then
+       cat - >> $TMP <<- EOH
+               CVS: did you test your fix properly (acc-sm.sh, or as needed)?
+               CVS: did you update the ChangeLog for a bug fix?
+               CVS: did you verify/update affected user documentation?
+               CVS: Remove "CVS:" from lines below to include in commit message
+       EOH
        [ -f .mergeinfo ] && . .mergeinfo
        [ -z "$PARENT" -a -f lustre/.mergeinfo ] && . lustre/.mergeinfo
        if [ "$PARENT" ]; then
@@ -28,14 +39,15 @@ if [ -f $TMP ]; then
                [ "$TAG" ] && BRANCH="`sed 's/^T//' $TAG`" || BRANCH="HEAD"
                echo "CVS: Branch $BRANCH" >> $TMP
        fi
-cat - >> $TMP <<- EOF
-       CVS: Remove "CVS:" from start of lines that should be in commit message
-       CVS: did you update the ChangeLog for a bug fix?
-       CVS: did you update the hours spent in Bugzilla?
-       CVS: did you verify/update the HLD/DLD in CVS?
-       CVS: b=<bug>
-       CVS: r=<reviewed_by>
-EOF
+       # We can't just put these into the commit template without the leading
+       # "CVS: ", otherwise exiting the commend edit would still leave a valid
+       # comment in the file and the commit will still be done.  We need to
+       # make a file without valid comments to allow the commit to be aborted.
+       cat - >> $TMP <<- EOB
+               CVS: b=<bug>
+               CVS: i=<inspected_by>
+               CVS: i=<inspected_by>
+       EOB
 
        cat $1 >> $TMP
        cp $TMP $1