Author: adam-guest
Date: 2008-03-13 23:14:22 +0000 (Thu, 13 Mar 2008)
New Revision: 1129
Modified:
trunk/debian/changelog
trunk/scripts/debcommit.pl
Log:
debcommit:
+ If there are uncommitted changes to the changelog when --release is
used, use them as the commit message. Otherwise use the message passed
with --message or "releasing version X.Y" as currently
(Closes: #470366)
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2008-03-13 20:16:31 UTC (rev 1128)
+++ trunk/debian/changelog 2008-03-13 23:14:22 UTC (rev 1129)
@@ -39,7 +39,12 @@
* bts:
+ Allow the sendmail command to begin with a ~ (Closes: #469207)
+ Don't treat "userblah" as an alias for "users" in "select"
- * debcommit: Set $SVKDIFF before calling "svk diff" (Closes: #469238)
+ * debcommit:
+ + Set $SVKDIFF before calling "svk diff" (Closes: #469238)
+ + If there are uncommitted changes to the changelog when --release is
+ used, use them as the commit message. Otherwise use the message passed
+ with --message or "releasing version X.Y" as currently
+ (Closes: #470366)
* deb[ci]:
+ Allow either package names or filenames to be passed on the
command line (Closes: #469663)
Modified: trunk/scripts/debcommit.pl
===================================================================
--- trunk/scripts/debcommit.pl 2008-03-13 20:16:31 UTC (rev 1128)
+++ trunk/scripts/debcommit.pl 2008-03-13 23:14:22 UTC (rev 1129)
@@ -263,6 +263,8 @@
die "debcommit: cannot find $changelog\n";
}
+$message=getmessage() if ! defined $message;
+
if ($release) {
open (C, "<$changelog" ) || die "debcommit: cannot read $changelog: $!";
my $top=<C>;
@@ -279,8 +281,6 @@
tag($version);
}
else {
- $message=getmessage() if ! defined $message;
-
if ($edit) {
$message = edit($message);
}
@@ -542,11 +542,15 @@
}
if (! length $ret) {
- my $info='';
- if ($prog eq 'git') {
- $info = ' (do you mean "debcommit -a" or did you forget to run
"git add"?)';
+ if ($release) {
+ return;
+ } else {
+ my $info='';
+ if ($prog eq 'git') {
+ $info = ' (do you mean "debcommit -a" or did you forget to
run "git add"?)';
+ }
+ die "debcommit: unable to determine commit message using
$prog$info\nTry using the -m flag.\n";
}
- die "debcommit: unable to determine commit message using
$prog$info\nTry using the -m flag.\n";
} else {
if ($stripmessage) {
my $count = () = $ret =~ /^\* /mg;
--
To unsubscribe, send mail to [EMAIL PROTECTED]
