This commit was manufactured by cvs2svn to create branch 'gtk2'.
[claws.git] / commitHelper
index 2bc0cb39d86dd3cbf7a51b8bd855626e6af58f72..14f7518e3de0cd54fce274ed33c6956375b86c6a 100644 (file)
@@ -1,4 +1,15 @@
-#!/bin/sh
+#!/bin/bash
+if [ "$1" == "--syncgtk2" ]; then
+       shift
+       echo -n "sync with EXTRA_VERSION ? [xx] "
+       read newmicro
+       cat configure.ac | sed "s/^EXTRA_VERSION=.*/EXTRA_VERSION=$newmicro/" > configure.ac.new \
+               && mv configure.ac.new configure.ac ;   
+       cat configure.ac | sed "s/^EXTRA_GTK2_VERSION=.*/EXTRA_GTK2_VERSION=.0/" > configure.ac.new \
+               && mv configure.ac.new configure.ac ;   
+fi;
+args=`echo $@`
+
 head -16 configure.ac | grep VERSION= > /tmp/commitTool.tmp
 source /tmp/commitTool.tmp
 if [ -z "$EXTRA_GTK2_VERSION" ]; then
@@ -16,7 +27,7 @@ rm /tmp/commitTool.tmp
 
 IFS='
 '
-filelist=`cvs status $@ 2>/dev/null |grep ^File`
+filelist=`cvs status $@ configure.ac 2>/dev/null |grep ^File`
 
 for file in $filelist; do
        merge=`echo $file | grep Merge`
@@ -33,8 +44,7 @@ for file in $filelist; do
 done;
 patchset="("
 log=""
-files=`cvs diff -u $@ 2>/dev/null |grep ^Index`
-echo "--8<----------"
+files=`cvs diff -uN $@ 2>/dev/null |grep ^Index`
 name=`whoami`
 #change if your login isn't your name
 if [ "$name" == "claws" ]; then
@@ -44,7 +54,7 @@ if [ "$name" == "reboot" ]; then
        name="christoph";
 fi;
 
-log="`date +%Y-%m-%d` [$name]\t$nextsversion\n\n"
+log="`date --utc +%Y-%m-%d` [$name]\t$nextsversion\n\n"
 for line in $files; do
        file=`echo $line | cut -d' ' -f2`
        dir=`dirname $file`
@@ -58,8 +68,23 @@ for line in $files; do
 "
 done;
 patchset="$patchset ) > $nextsversion.patchset"
-log="$log\n"
+
+if [ "$EDITOR" == "" ]; then
+       EDITOR=vi
+fi;
+
+if [ -n "/tmp/logentry" ]; then
+       echo -e "\n#please type in the changelog entry" > /tmp/logentry
+fi;
+$EDITOR /tmp/logentry
+
+echo "--8<----------"
 echo -e -n $log
+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 +98,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 +111,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
+
+       if [ "$args" != "" ]; then
+               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;
+       rm -f /tmp/logentry
 fi