ask for changelog entry, use it in changelog and commit message

[claws.git] / commitHelper

diff --git a/commitHelper b/commitHelper
index 2bc0cb39d86dd3cbf7a51b8bd855626e6af58f72..96cef8002e281cf2e16959f14045c25b9eea34f6 100644 (file)
--- a/commitHelper
+++ b/commitHelper
@@ -58,8 +58,19 @@ for line in $files; do
 "
 done;
 patchset="$patchset ) > $nextsversion.patchset"
-log="$log\n"
 echo -e -n $log
+
+if [ "$EDITOR" == "" ]; then
+       EDITOR=vi
+fi;
+
+echo -e "\n#please type in the changelog entry" > /tmp/logentry.$$
+$EDITOR /tmp/logentry.$$
+grep -v "^#" /tmp/logentry.$$ |grep -v "^$" | sed "s/^/                /" > /tmp/log.tmp.$$ \
+&& mv /tmp/log.tmp.$$ /tmp/logentry.$$
+echo >> /tmp/logentry.$$ 
+cat /tmp/logentry.$$
+
 echo "--8<----------"
 if [ -f ChangeLog-gtk2.claws ]; then
        chlog="ChangeLog-gtk2.claws"
@@ -73,6 +84,7 @@ read ans
 if [ "$ans" == "y" ]; then
        mv $chlog $chlog.old
        echo -e -n $log > $chlog
+       cat /tmp/logentry.$$ >> $chlog
        cat $chlog.old >> $chlog
        rm $chlog.old
 
@@ -85,16 +97,13 @@ if [ "$ans" == "y" ]; then
        fi;
        
        echo "$patchset" >> PATCHSETS
-       echo "editing $chlog ..."
-       if [ "$EDITOR" == "" ]; then
-               EDITOR=vi
-       fi;
-       $EDITOR $chlog 
+
        if [ "$@" != "" ]; then
-               echo running cvs commit $@ PATCHSETS $chlog configure.ac
-               cvs commit $@ PATCHSETS $chlog configure.ac
+               echo commiting $@ PATCHSETS $chlog configure.ac
+               cvs commit -m "`cat /tmp/logentry.$$`" $@ PATCHSETS $chlog configure.ac
        else
-               echo running cvs commit
-               cvs commit
+               echo commiting recursively
+               cvs commit -m "`cat /tmp/logentry.$$` "
        fi;
 fi
+rm -f /tmp/logentry.$$