[Cvs-cvs] ccvs/contrib ChangeLog log_accum.pl

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         
Changes by:     Derek Robert Price <address@hidden>     06/05/14 04:03:47

Modified files:
        contrib        : ChangeLog log_accum.pl 

Log message:
        * log_accum.pl (parse_config): Add header comment block.
        (process_argv): Remove TODO asterisks in header comment block.
        (build_message_body): Don't require $config.
        (main): Don't pass $config to build_message_body.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/contrib/ChangeLog.diff?tr1=1.193&tr2=1.194&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/contrib/log_accum.pl.diff?tr1=1.29&tr2=1.30&r1=text&r2=text

Patches:
Index: ccvs/contrib/ChangeLog
diff -u ccvs/contrib/ChangeLog:1.193 ccvs/contrib/ChangeLog:1.194
--- ccvs/contrib/ChangeLog:1.193        Sun May 14 03:46:41 2006
+++ ccvs/contrib/ChangeLog      Sun May 14 04:03:47 2006
@@ -1,3 +1,10 @@
+2006-05-14  Derek Price  <address@hidden>
+
+       * log_accum.pl (parse_config): Add header comment block.
+       (process_argv): Remove TODO asterisks in header comment block.
+       (build_message_body): Don't require $config.
+       (main): Don't pass $config to build_message_body.
+
 2006-05-13  Derek Price  <address@hidden>
 
        * commit_prep.pl: Sync comments with recent changes.
Index: ccvs/contrib/log_accum.pl
diff -u ccvs/contrib/log_accum.pl:1.29 ccvs/contrib/log_accum.pl:1.30
--- ccvs/contrib/log_accum.pl:1.29      Sun May 14 03:46:41 2006
+++ ccvs/contrib/log_accum.pl   Sun May 14 04:03:47 2006
@@ -354,6 +354,17 @@
                   "empty-diffs|e!",
                   "separate-diffs|S!");
 
+# Parse a config file.  Any long command line option is valid in the config
+# file, one option/argument pair per line.  Lines /^\s*#/, empty lines,
+# and lines containing only white space are ignored.  For example:
+#
+#     # This is a sample log_accum config file.
+#     config /etc/log_accum_defaults.conf
+#     mail-to address@hidden
+#     send-diff
+#
+# Nested configs are priortized in the order you'd expect, with parent options
+# overriding any options from included files.
 sub parse_config
 {
     my ($parsed_configs, $files) = @_;
@@ -437,10 +448,10 @@
 # * -G DB      - Interface to Gnats.
 #
 # cvsweb URL support:
-# * -U URL
+#   -U URL
 #   --cvsweb URL
 #   --url URL  - Send URLs to diffs in email, using base URL for cvsweb.
-# * -C CVSROOT
+#   -C CVSROOT
 #   --cvsroot CVSROOT
 #              - Use CVSROOT in cvsweb URLs instead of $CVSROOT.
 #
@@ -1015,7 +1026,7 @@
 
 sub build_message_body
 {
-    my ($config, $toplevel, $branch,
+    my ($toplevel, $branch,
        $changed_file, $added_file, $removed_file, $log_file, $url_file) = @_;
     my ($subject, @body, @log_text);
     my @subject_files;
@@ -1294,7 +1305,7 @@
        last if !-e "$LOG_BASE.$i";
 
        my ($subject, $body, $log_text) =
-           build_message_body $config, $toplevel, $branch_lines->[0],
+           build_message_body $toplevel, $branch_lines->[0],
                               "$CHANGED_BASE.$i", "$ADDED_BASE.$i",
                               "$REMOVED_BASE.$i", "$LOG_BASE.$i",
                               "$URL_BASE.$i";