2006-02-23 [wwp] 2.0.0cvs75

	* commitHelper
		improved error detection (Colin, me).

diff --git a/ChangeLog b/ChangeLog
index c60db04e410aa01aa507b5c9a3f2b7e59d98b97b..8c79b988eb9844b9781b8391b232f0256670c904 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-23 [wwp]       2.0.0cvs75
+
+       * commitHelper
+               improved error detection (Colin, me).
+

 2006-02-23 [wwp]       2.0.0cvs74
 
        * src/prefs_toolbar.c
 2006-02-23 [wwp]       2.0.0cvs74
 
        * src/prefs_toolbar.c

diff --git a/PATCHSETS b/PATCHSETS
index 8feafca7903cfcacd935ded243119d2ba0927cdd..961bddcfa0299f78670ea31abfab13732b67efaf 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1258,3 +1258,4 @@
 ( cvs diff -u -r 1.382.2.244 -r 1.382.2.245 src/compose.c;  ) > 2.0.0cvs72.patchset
 ( ) > 2.0.0cvs73.patchset
 ( cvs diff -u -r 1.30.2.24 -r 1.30.2.25 src/prefs_toolbar.c;  ) > 2.0.0cvs74.patchset
 ( cvs diff -u -r 1.382.2.244 -r 1.382.2.245 src/compose.c;  ) > 2.0.0cvs72.patchset
 ( ) > 2.0.0cvs73.patchset
 ( cvs diff -u -r 1.30.2.24 -r 1.30.2.25 src/prefs_toolbar.c;  ) > 2.0.0cvs74.patchset

+( cvs diff -u -r 1.1.2.29 -r 1.1.2.30 commitHelper;  ) > 2.0.0cvs75.patchset

diff --git a/commitHelper b/commitHelper
index 5833f6b165d781e6eb0a196a73ed8414d7915f84..71a6a9f8e7a67e189442780bc1927f3338cc155d 100644 (file)
--- a/commitHelper
+++ b/commitHelper
@@ -1,13 +1,14 @@
 #!/bin/bash
 args=`echo $@`
 #!/bin/bash
 args=`echo $@`

+tmpfile=${0##*/}.tmp

 
 

-head -n 16 configure.ac | grep VERSION= > /tmp/commitTool.tmp
-source /tmp/commitTool.tmp
+head -n 16 configure.ac | grep VERSION= > $tmpfile
+source $tmpfile

 EXTRA_VERSION=`echo $EXTRA_VERSION | awk -F'.' '{for (i=1;i<NF;i++){printf $i"."};printf $NF+1}'`
 nextsversion="${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}cvs${EXTRA_VERSION}"
 nextextra="$EXTRA_VERSION"
 nextextratype="head"
 EXTRA_VERSION=`echo $EXTRA_VERSION | awk -F'.' '{for (i=1;i<NF;i++){printf $i"."};printf $NF+1}'`
 nextsversion="${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}cvs${EXTRA_VERSION}"
 nextextra="$EXTRA_VERSION"
 nextextratype="head"

-rm /tmp/commitTool.tmp
+rm -f $tmpfile

 
 IFS='
 '
 
 IFS='
 '


@@ -33,7 +34,17 @@ for file in $filelist; do
 done;
 patchset="("
 log=""
 done;
 patchset="("
 log=""

-files=`cvs diff -uN $@ 2>/dev/null |grep ^Index`
+files=`cvs diff -uN $@ 2>$tmpfile |grep ^Index`
+if [ "$files" == "" ]; then
+       echo Nothing to commit\!
+       if [ -s $tmpfile ]
+       then
+               echo See possible reason below:
+               cat $tmpfile
+       fi
+       exit
+fi
+rm -f $tmpfile

 name=`whoami`
 #change if your login isn't your name
 if [ "$name" == "claws" ]; then
 name=`whoami`
 #change if your login isn't your name
 if [ "$name" == "claws" ]; then

diff --git a/configure.ac b/configure.ac
index 4e2c35085f7baca1362fb67ef3f5cd6554a4487b..73089b26d443bde8562c38bca53741fb03afbf66 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=74
+EXTRA_VERSION=75

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=