Author: adam-guest
Date: 2008-03-21 00:13:26 +0000 (Fri, 21 Mar 2008)
New Revision: 1177
Modified:
trunk/conf.default.in
trunk/debian/changelog
trunk/scripts/debcommit.pl
Log:
+ Make --strip-message also strip leading spaces from continuation lines
+ Strip single change commit messages by default
Modified: trunk/conf.default.in
===================================================================
--- trunk/conf.default.in 2008-03-20 21:55:57 UTC (rev 1176)
+++ trunk/conf.default.in 2008-03-21 00:13:26 UTC (rev 1177)
@@ -178,7 +178,7 @@
##### debcommit
#
# Strip a leading "* " from commit messages taken from changelogs?
-# DEBCOMMIT_STRIP_MESSAGE=no
+# DEBCOMMIT_STRIP_MESSAGE=yes
#
# Sign created tags using gnupg?
# DEBCOMMIT_SIGN_TAGS=no
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2008-03-20 21:55:57 UTC (rev 1176)
+++ trunk/debian/changelog 2008-03-21 00:13:26 UTC (rev 1177)
@@ -24,6 +24,8 @@
(i.e. lines indented by more than two spaces and starting with *, +
or -)
+ Add documentation to the manpage of the current VCS-specific features
+ + Make --strip-message also strip leading spaces from continuation lines
+ + Strip single change commit messages by default
* debdiff: Escape package names when normalising path names
(Closes: #471282)
* uscan: Correctly handle an explicit upstream-version of 0
Modified: trunk/scripts/debcommit.pl
===================================================================
--- trunk/scripts/debcommit.pl 2008-03-20 21:55:57 UTC (rev 1176)
+++ trunk/scripts/debcommit.pl 2008-03-21 00:13:26 UTC (rev 1177)
@@ -84,8 +84,8 @@
changelog, the characters "* " will be stripped from the beginning of
the message.
-This option is ignored if more than one line of the message
-begins with "* ".
+This option is set by default and ignored if more than one line of
+the message begins with "* ".
=item B<--sign-tags>, B<--no-sign-tags>
@@ -106,8 +106,8 @@
=item B<DEBCOMMIT_STRIP_MESSAGE>
-If this is set to I<yes>, then it is the same as the --strip-message
-command line parameter being used. The default is I<no>.
+If this is set to I<no>, then it is the same as the --no-strip-message
+command line parameter being used. The default is I<yes>.
=item B<DEBCOMMIT_SIGN_TAGS>
@@ -224,7 +224,7 @@
my $confirm=0;
my $edit=0;
my $all=0;
-my $stripmessage=0;
+my $stripmessage=1;
my $signtags=0;
my $changelog="debian/changelog";
my $keyid;
@@ -238,7 +238,7 @@
} else {
my @config_files = ('/etc/devscripts.conf', '~/.devscripts');
my %config_vars = (
- 'DEBCOMMIT_STRIP_MESSAGE' => 'no',
+ 'DEBCOMMIT_STRIP_MESSAGE' => 'yes',
'DEBCOMMIT_SIGN_TAGS' => 'no',
'DEBCOMMIT_RELEASE_USE_CHANGELOG' => 'no',
'DEBSIGN_KEYID' => '',
@@ -259,7 +259,7 @@
# Check validity
$config_vars{'DEBCOMMIT_STRIP_MESSAGE'} =~ /^(yes|no)$/
- or $config_vars{'DEBCOMMIT_STRIP_MESSAGE'}='no';
+ or $config_vars{'DEBCOMMIT_STRIP_MESSAGE'}='yes';
$config_vars{'DEBCOMMIT_SIGN_TAGS'} =~ /^(yes|no)$/
or $config_vars{'DEBCOMMIT_SIGN_TAGS'}='no';
$config_vars{'DEBCOMMIT_RELEASE_USE_CHANGELOG'} =~ /^(yes|no)$/
@@ -638,6 +638,7 @@
my $count = () = $ret =~ /^\* /mg;
if ($count == 1) {
$ret =~ s/^\* //;
+ $ret =~ s/^\s+//mg;
}
}
}
--
To unsubscribe, send mail to [EMAIL PROTECTED]
