2005-01-29 [paul] 1.0.0cvs23.2

[claws.git] / commitHelper

diff --git a/commitHelper b/commitHelper
index d1715e93bea9e348abf16850260e27b984f40f59..cb6cde3158ad2a83b6dd175b12d903e8a42f73f5 100644 (file)
--- a/commitHelper
+++ b/commitHelper
@@ -8,8 +8,9 @@ if [ "$1" == "--syncgtk2" ]; then
        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
+head -n 16 configure.ac | grep VERSION= > /tmp/commitTool.tmp
 source /tmp/commitTool.tmp
 if [ -z "$EXTRA_GTK2_VERSION" ]; then
        EXTRA_VERSION=`echo $EXTRA_VERSION | awk -F'.' '{for (i=1;i<NF;i++){printf $i"."};printf $NF+1}'`
@@ -26,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`
@@ -43,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
@@ -53,8 +53,11 @@ fi;
 if [ "$name" == "reboot" ]; then
        name="christoph";
 fi;
+if [ "$name" == "leroyc" ]; then
+       name="colin";
+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`
@@ -68,15 +71,19 @@ for line in $files; do
 "
 done;
 patchset="$patchset ) > $nextsversion.patchset"
-echo -e -n $log
 
 if [ "$EDITOR" == "" ]; then
        EDITOR=vi
 fi;
 
-echo -e "\n#please type in the changelog entry" > /tmp/logentry
+
+echo -e "#please complete the changelog entry below" > /tmp/logentry
+echo -e -n $log >> /tmp/logentry
+
 $EDITOR /tmp/logentry
-grep -v "^#" /tmp/logentry |grep -v "^$" | sed "s/^/           /" > /tmp/log.tmp.$$ \
+
+echo "--8<----------"
+grep -v "^#" /tmp/logentry > /tmp/log.tmp.$$ \
 && mv /tmp/log.tmp.$$ /tmp/logentry
 echo >> /tmp/logentry
 cat /tmp/logentry
@@ -93,8 +100,7 @@ echo -n "Is it ok (write to $chlog and update configure.ac) [y/N]?"
 read ans
 if [ "$ans" == "y" ]; then
        mv $chlog $chlog.old
-       echo -e -n $log > $chlog
-       cat /tmp/logentry >> $chlog
+       cat /tmp/logentry > $chlog
        cat $chlog.old >> $chlog
        rm $chlog.old
 
@@ -108,12 +114,12 @@ if [ "$ans" == "y" ]; then
        
        echo "$patchset" >> PATCHSETS
 
-       if [ "$@" != "" ]; then
+       if [ "$args" != "" ]; then
                echo commiting $@ PATCHSETS $chlog configure.ac
                cvs commit -m "`cat /tmp/logentry`" $@ PATCHSETS $chlog configure.ac
        else
                echo commiting recursively
                cvs commit -m "`cat /tmp/logentry` "
        fi;
+       rm -f /tmp/logentry
 fi
-rm -f /tmp/logentry