Your message dated Fri, 4 Jul 2008 03:38:55 -0500
with message-id <[EMAIL PROTECTED]>
and subject line commit-email.pl supports --diff=n
has caused the Debian Bug report #217133,
regarding subversion-tools: Please allow commit-email.pl to not send diffs
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [EMAIL PROTECTED]
immediately.)
--
217133: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=217133
Debian Bug Tracking System
Contact [EMAIL PROTECTED] with problems
--- Begin Message ---
Package: subversion-tools
Version: 0.29.0-1
Severity: wishlist
I'm sending you a patch to allow a --diff option in commit-email.pl
With this no diff will be included in the report, only a summary of the
changes (the author, revision and log). This is useful for those
situations where you only want a brief summary of all commits but not
the actual changes.
Thanks
boti
-- System Information:
Debian Release: testing/unstable
Architecture: i386
Kernel: Linux sanmarcos 2.4.21-5-386 #1 Sun Aug 24 13:14:58 EST 2003 i686
Locale: LANG=es_CO.UTF-8, LC_CTYPE=es_CO.UTF-8
Versions of packages subversion-tools depends on:
ii courier-mta [mail-transport-a 0.42.2-7 Courier Mail Server - ESMTP daemon
ii libconfig-inifiles-perl 2.38-2 A module for reading .ini-style co
ii liburi-perl 1.23-1 Manipulates and accesses URI strin
ii perl 5.8.1-2 Larry Wall's Practical Extraction
ii python2.3 2.3.2-2 An interactive high-level object-o
ii python2.3-subversion 0.29.0-1 Python modules for Subversion inte
ii rcs 5.7-13.1 The GNU Revision Control System
ii subversion 0.29.0-1 Advanced version control system -
-- no debconf information
--- /usr/lib/subversion/hook-scripts/commit-email.pl 2003-09-05
18:20:07.000000000 -0500
+++ commit-email.pl 2003-10-22 14:51:46.000000000 -0500
@@ -44,6 +44,13 @@
# $no_diff_deleted to 1.
my $no_diff_deleted = 0;
+# If include_diff is set to 0, no diff will be included in the report,
+# only a summary of the changes (the author, revision and log). This
+# is useful for those situations where you only want a brief summary
+# of all commits but not the actual changes.
+# This is handle in command line by using --diff n
+my $include_diff = 1;
+
# Since the path to svnlook depends upon the local installation
# preferences, check that the required programs exist to insure that
# the administrator has set up the script properly.
@@ -95,7 +102,8 @@
'-l' => 'log_file',
'-m' => '',
'-r' => 'reply_to',
- '-s' => 'subject_prefix');
+ '-s' => 'subject_prefix',
+ '--diff' => '');
while (@ARGV)
{
@@ -120,14 +128,24 @@
}
else
{
- # Here handle -m.
- unless ($arg eq '-m')
+ # Here handle -m and --diff
+ unless ($arg eq '-m' or $arg eq '--diff')
{
- die "$0: internal error: should only handle -m here.\n";
+ die "$0: internal error: should only handle -m or --diff
here.\n";
}
- $current_project = &new_project;
- $current_project->{match_regex} = $value;
- push(@project_settings_list, $current_project);
+ if ($arg eq '-m')
+ {
+ $current_project = &new_project;
+ $current_project->{match_regex} = $value;
+ push(@project_settings_list, $current_project);
+ }
+ else
+ {
+ if ($value eq 'n')
+ {
+ $include_diff = 0;
+ }
+ }
}
}
elsif ($arg =~ /^-/)
@@ -268,9 +286,13 @@
}
# Get the diff from svnlook.
-my @no_diff_deleted = $no_diff_deleted ? ('--no-diff-deleted') : ();
-my @difflines = &read_from_process($svnlook, 'diff', $repos,
- '-r', $rev, @no_diff_deleted);
+my @difflines;
+if ($include_diff)
+ {
+ my @no_diff_deleted = $no_diff_deleted ? ('--no-diff-deleted') : ();
+ my @difflines = &read_from_process($svnlook, 'diff', $repos,
+ '-r', $rev, @no_diff_deleted);
+ }
######################################################################
# Modified directory name collapsing.
@@ -351,7 +373,7 @@
push(@body, "Log:\n");
push(@body, @log);
push(@body, "\n");
-push(@body, map { /[\r\n]+$/ ? $_ : "$_\n" } @difflines);
+push(@body, map { /[\r\n]+$/ ? $_ : "$_\n" } @difflines) if $include_diff;
# Go through each project and see if there are any matches for this
# project. If so, send the log out.
@@ -483,6 +505,7 @@
" -m regex Regular expression to match committed path\n",
" -r email_address Email address for 'Reply-To:'\n",
" -s subject_prefix Subject line prefix\n",
+ " --diff [y|n] Shows the diff of the commit (defaults to y)\n",
"\n",
"This script supports a single repository with multiple projects,\n",
"where each project receives email only for commits that modify that\n",
--- End Message ---
--- Begin Message ---
Version: 1.4.0dfsg1-1
This bug was fixed well before etch but never got closed. The
commit-email.pl script supports --diff=n if you don't want it to send
diffs.
--
Peter Samuelson | org-tld!p12n!peter | http://p12n.org/
--- End Message ---
