[Demudi-commits] r456 - in demudi-cfengine/trunk: chunks debian

[Free Ekanayaka]

Author: free-guest
Date: 2005-03-11 01:42:21 +0100 (Fri, 11 Mar 2005)
New Revision: 456

Modified:
   demudi-cfengine/trunk/chunks/bash-etc_bash.bashrc
   demudi-cfengine/trunk/debian/changelog
Log:
  * Better message formatting for the svn-commit function

Modified: demudi-cfengine/trunk/chunks/bash-etc_bash.bashrc
===================================================================
--- demudi-cfengine/trunk/chunks/bash-etc_bash.bashrc	2005-03-10 16:52:28 UTC (rev 455)
+++ demudi-cfengine/trunk/chunks/bash-etc_bash.bashrc	2005-03-11 00:42:21 UTC (rev 456)
@@ -44,7 +44,20 @@
 	alias svn-build="svn-buildpackage --svn-tag --svn-move -rfakeroot"
 
 	function svn-commit () {
-		message=$(svn diff --no-diff-deleted debian/changelog | grep -v -e "^++" | grep -e "^+.*" | cut -b 2- | grep -e "^  \* " | sed -e "s/\* /\n * /g")
-		svn commit -m "$(basename $(pwd)): $message"
+	    if [ "$1" = "release" ] && [ -e debian/changelog ]; then
+		if head -1 debian/changelog | grep -q UNRELEASED; then
+		    echo "Changelog says it's UNRELEASED, bud."
+		    exit 1
+		fi
+		version=`dpkg-parsechangelog | grep Version: | cut -f 2 -d ' '`
+		svn commit -m "releasing version $version"
+	    else
+		msg=$(svn diff debian/changelog | grep '^\+  ' | sed 's/^+//')
+		if [ -n "$msg" ]; then
+		    svn commit -m "$(svn diff debian/changelog | grep '^\+  ' | sed 's/^+//')"
+		else
+		    svn commit -m "`dpkg-parsechangelog | grep '^  '`"
+		fi
+	    fi
 	}
 fi

Modified: demudi-cfengine/trunk/debian/changelog
===================================================================
--- demudi-cfengine/trunk/debian/changelog	2005-03-10 16:52:28 UTC (rev 455)
+++ demudi-cfengine/trunk/debian/changelog	2005-03-11 00:42:21 UTC (rev 456)
@@ -1,3 +1,9 @@
+demudi-cfengine (0.19) UNRELEASED; urgency=low
+
+  * Better message formatting for the svn-commit function
+
+ -- Free Ekanayaka <free@agnula.org>  Thu, 10 Mar 2005 15:27:16 +0100
+
 demudi-cfengine (0.18) unstable; urgency=low
 
   * Removed the apt script, now handled with base-config