Re: [PATCH] Remove duplicate filenames

"Martyn J. Pearce" <fluffy@inpharmatica.co.uk> writes:

>> Perhaps the defaults should be set up to
>> generate ChangeLog's according to the FSF Coding Standard. I.e., make
>> --no-times --no-common-dir the default.
>
> You certainly have a point; and the help even states <quote>
>
> Generate GNU-style ChangeLogs in CVS working copies
>
> </quote>. However, I hesitate to amend the existing defaults, at least during
> minor version upgrades. Perhaps a --FSF flag to trigger more FSF-like style
> could be used, possibly with a view to making that the default at the next
> major version change.

Sounds fine. Actually, I started using the current --fsf flag because
I thought it was this --FSF but later found out it wasn't (although I
have never understood technically exactly what --fsf does, but kept
using it anyway).

> Thanks very much for the patches. I'll try to get them integrated with the
> core soon.

Thanks.

Here's another patch: it removes some trailing whitespace on lines in
the ChangeLog, which is quite annoying if you use an emacs mode which
highlights trailing whitespace. Hopefully it will apply even though
the line numbers are fuzzy.

Index: cvs2cl.pl
===================================================================
RCS file: /usr/local/cvs/cvs2cl/cvs2cl.pl,v
retrieving revision 2.46
diff -u -p -u -w -r2.46 cvs2cl.pl
--- cvs2cl.pl 18 Jan 2003 13:14:52 -0000 2.46
+++ cvs2cl.pl 10 Feb 2003 11:19:36 -0000
@@ -874,6 +877,7 @@ sub derive_change_log ()
           if ($XML_Output)
           {
             $msg = &preprocess_msg_text ($msg);
+ $msg =~ s/ +\n/\n/g;
             $body = $files . $msg;
           }
           elsif ($No_Wrap)
@@ -884,6 +888,7 @@ sub derive_change_log ()
             unless ($After_Header eq " ") {
               $msg =~ s/^(.*)/\t$1/g;
             }
+ $msg =~ s/ +\n/\n/g;
             $body = $files . $After_Header . $msg;
           }
           else # do wrapping, either FSF-style or regular
@@ -901,11 +906,13 @@ sub derive_change_log ()
 
               $msg = &wrap_log_entry
                   ($msg, "\t", 69 - $files_last_line_len, 69);
+ $msg =~ s/ +\n/\n/g;
               $body = $files . $After_Header . $msg;
             }
             else # not FSF-style
             {
               $msg = &preprocess_msg_text ($msg);
+ $msg =~ s/ +\n/\n/g;
               $body = $files . $After_Header . $msg;
               $body = wrap ("\t", " ", "$body");
             }
Received on Mon Feb 10 11:23:37 2003