The following commit has been merged in the jessie branch:
commit fc67a802e8b5838363c13a478ff0f3e7ea5328d8
Author: James McCoy <[email protected]>
Date: Sun Nov 25 11:48:24 2012 -0500
debcommit: Add changelog info support for hg
Signed-off-by: James McCoy <[email protected]>
diff --git a/debian/changelog b/debian/changelog
index 5638869..841aab6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,9 +9,11 @@ devscripts (2.12.6+exp1) UNRELEASED; urgency=low
* licensecheck: Recognize MPL 2.0 licenses. Thanks to Ryan Pavlik for the
patch. (Closes: #687664)
* namecheck: Check Apache's projects page for names. (Closes: #686862)
- * debcommit: Drop checks for old dpkg versions and always use the necessary
- Perl modules (Dpkg::Changelog::Parse, Dpkg::Vendor::Ubuntu,
- Dpkg::Changelog::Entry::Debian).
+ * debcommit:
+ + Drop checks for old dpkg versions and always use the necessary Perl
+ modules (Dpkg::Changelog::Parse, Dpkg::Vendor::Ubuntu,
+ Dpkg::Changelog::Entry::Debian).
+ + Add changelog info support for hg.
[ Dmitry Smirnov ]
* licensecheck: Remove any regular comments pattern. (Closes: #526698)
diff --git a/scripts/debcommit.pl b/scripts/debcommit.pl
index bc98fb2..563d221 100755
--- a/scripts/debcommit.pl
+++ b/scripts/debcommit.pl
@@ -504,9 +504,13 @@ sub commit {
if (!@files_to_commit && $onlydebian) {
@files_to_commit = ("debian");
}
+ my @extra_args;
+ if ($changelog_info && $prog eq 'hg') {
+ push(@extra_args, '-u', $maintainer, '-d', $date);
+ }
$action_rc = $diffmode
? action($prog, "diff", @files_to_commit)
- : action($prog, "commit", "-m", $message, @files_to_commit);
+ : action($prog, "commit", "-m", $message, @extra_args,
@files_to_commit);
}
elsif ($prog eq 'git') {
if (! @files_to_commit && ($all || $release)) {
@@ -525,7 +529,7 @@ sub commit {
@files_to_commit=("-a")
}
my @extra_args = ();
- if ($changelog_info and $prog eq 'git') { # --use-author
+ if ($changelog_info) {
@extra_args = ("--author=$maintainer", "--date=$date");
}
$action_rc = action($prog, "commit", "-m", $message, @extra_args,
@files_to_commit);
--
Git repository for devscripts
_______________________________________________
devscripts-devel mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel
