Commit ecbd86c9 authored by Kevin J. McCarthy's avatar Kevin J. McCarthy

Remove hg-commit and Makefile commit target.

I haven't ever used this script, and we only update the ChangeLog
during releases now.

doc/devel-notes already mentions running check_sec.sh.  Add a mention
of the 'make validate' target too.
parent a4d08d25
...@@ -188,9 +188,6 @@ pclean: ...@@ -188,9 +188,6 @@ pclean:
check-security: check-security:
(cd $(top_srcdir) && ./check_sec.sh) (cd $(top_srcdir) && ./check_sec.sh)
commit:
@echo "make commit is obsolete; use hg-commit"; false
update-changelog: update-changelog:
(cd $(top_srcdir); \ (cd $(top_srcdir); \
sh ./mkchangelog.sh | cat - ChangeLog > ChangeLog.$$$$ && mv ChangeLog.$$$$ ChangeLog; \ sh ./mkchangelog.sh | cat - ChangeLog > ChangeLog.$$$$ && mv ChangeLog.$$$$ ChangeLog; \
......
...@@ -156,6 +156,8 @@ should be avoided. ...@@ -156,6 +156,8 @@ should be avoided.
Before submitting patches, please make sure the check_sec.sh script Before submitting patches, please make sure the check_sec.sh script
in the top-level source directory reports no errors/warnings. in the top-level source directory reports no errors/warnings.
Documentation changes should be validated by running 'make validate'
in the doc subdirectory.
A word about warnings A word about warnings
--------------------- ---------------------
......
#!/bin/bash
MUTTDIR=$(dirname $0)
(cd $MUTTDIR && ./check_sec.sh) || exit 1
if [ -f $MUTTDIR/doc/manual.xml ] ; then
( cd $MUTTDIR/doc/ && make validate ) || exit 1
fi
lrev=$(hg log --limit 1 --template '{rev}' $MUTTDIR/ChangeLog)
trev=$(hg tip --template '{rev}')
if [ $lrev = $trev ]
then
exec hg commit "[email protected]"
fi
# Include ChangeLog if given any explicit file names
i=0
while [[ $i -lt $# ]]
do
i=$((i+1))
case "${!i}" in
# no-argument options
-A) continue ;;
# one-argument options
-?) i=$((i+1)); continue ;;
# one-argument options with no space
-*) continue ;;
*) cl=$MUTTDIR/ChangeLog ;;
esac
done
{
hg log --no-merges --style=$MUTTDIR/hg-changelog-map -r tip:$lrev | sed 's#ChangeLog, ##'
hg cat $MUTTDIR/ChangeLog
} > $MUTTDIR/ChangeLog
${VISUAL:-${EDITOR:-vi}} $MUTTDIR/ChangeLog
hg commit "[email protected]" $cl
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment