[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Cvs-cvs] Changes to ccvs/contrib/log_accum.in
From: |
Derek Robert Price |
Subject: |
[Cvs-cvs] Changes to ccvs/contrib/log_accum.in |
Date: |
Thu, 06 Oct 2005 13:03:43 -0400 |
Index: ccvs/contrib/log_accum.in
diff -u ccvs/contrib/log_accum.in:1.12 ccvs/contrib/log_accum.in:1.13
--- ccvs/contrib/log_accum.in:1.12 Thu Oct 6 16:38:51 2005
+++ ccvs/contrib/log_accum.in Thu Oct 6 17:03:42 2005
@@ -123,7 +123,6 @@
$REMOVED_FILE = "$TMPDIR/${FILE_PREFIX}files.removed";
$LOG_FILE = "$TMPDIR/${FILE_PREFIX}files.log";
$BRANCH_FILE = "$TMPDIR/${FILE_PREFIX}files.branch";
-$MLIST_FILE = "$TMPDIR/${FILE_PREFIX}files.mlist";
$SUMMARY_FILE = "$TMPDIR/${FILE_PREFIX}files.summary";
$CVSROOT = $ENV{'CVSROOT'};
@@ -401,19 +400,6 @@
# $hour, $min, $sec);
}
-# !!! Destination Mailing-list and history file mappings here !!!
-
-#sub mlist_map
-#{
-# local($path) = @_;
-# my $domain = "nongnu.org";
-#
-# if ($path =~ /^([^\/]+)/) {
-# return "address@hidden";
-# } else {
-# return "address@hidden";
-# }
-#}
sub derive_subject_from_changes_file ()
{
@@ -551,6 +537,8 @@
$arg = shift @argv;
if ($arg eq '-u' && !defined($cvs_user)) {
$cvs_user = shift @argv;
+ } elsif ($arg eq '-m') {
+ push @mailto, split (/[ ,]+/, shift @argv);
} elsif ($arg eq '-r') {
$have_r_opt = 1;
$onlytag = shift @argv;
@@ -569,6 +557,9 @@
}
}
+ # Sanity checks.
+ die "No email destination specified.\n" unless @mailto;
+
return @files;
}
@@ -598,6 +589,7 @@
$onlytag = ""; # With $have_r_opt, only send mail for changes
# on this branch.
$branch = ""; # The branch being processed.
address@hidden = (); # Email addresses to send mail to.
@files = process_argv(@ARGV);
@path = split('/', $files[0]);
if ($#path == 0) {
@@ -612,11 +604,6 @@
#print("dir - ", $dir, "\n");
#print("id - ", $id, "\n");
-#
-# Map the repository directory to an email address for commitlogs to be sent
-# to.
-#
-#$mlist = &mlist_map($files[0]);
##########################
#
@@ -629,7 +616,7 @@
push(@text, $header);
push(@text, "");
push(@text, " ".$files[0]." - New directory");
- &mail_notification([ $mlist ], @text);
+ &mail_notification (address@hidden, @text);
exit 0;
}
@@ -712,7 +699,6 @@
&append_to_file("$ADDED_FILE.$i.$id.$cvs_user", $dir, @added_files);
&append_to_file("$CHANGED_FILE.$i.$id.$cvs_user", $dir, @changed_files);
&append_to_file("$REMOVED_FILE.$i.$id.$cvs_user", $dir, @removed_files);
-&append_line("$MLIST_FILE.$i.$id.$cvs_user", $mlist);
if ($rcsidinfo) {
&change_summary("$SUMMARY_FILE.$i.$id.$cvs_user", (@changed_files,
@added_files));
}
@@ -741,7 +727,6 @@
# Produce the final compilation of the log messages
#
@text = ();
address@hidden = ();
push(@text, $header);
push(@text, "");
for ($i = 0; ; $i++) {
@@ -752,7 +737,6 @@
push(@text, &read_file("$REMOVED_FILE.$i.$id.$cvs_user", "Removed:"));
push(@text, " Log:");
push(@text, &read_logfile("$LOG_FILE.$i.$id.$cvs_user", " "));
- push(@mlist_list, &read_file_lines("$MLIST_FILE.$i.$id.$cvs_user"));
if ($rcsidinfo == 2) {
if (-e "$SUMMARY_FILE.$i.$id.$cvs_user") {
push(@text, " ");
@@ -782,15 +766,13 @@
}
}
-%mlist_hash = ();
-foreach (@mlist_list) { $mlist_hash{ $_ } = 1; }
#
# Mail out the notification.
#
-if (! $have_r_opt || $onlytag eq $branch) {
- &mail_notification([ keys(%mlist_hash) ], @text);
+if (!$have_r_opt || $onlytag eq $branch) {
+ &mail_notification (address@hidden, @text);
}
&cleanup_tmpfiles;
exit 0;