# 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
[ "$TAG" ] && BRANCH="`sed 's/^T//' $TAG`" || BRANCH="HEAD"
echo "CVS: Branch $BRANCH" >> $TMP
fi
- echo "CVS: did you update the ChangeLog for a bug fix?" >> $TMP
- echo "CVS: did you update the hours spent in Bugzilla?" >> $TMP
- echo "CVS: b=<bug>" >> $TMP
- echo "CVS: r=<reviewed_by>" >> $TMP
+ # 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