X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/3c88ae74e34006744f0ac847cf4c4b624b9dd902..f2260f48b09bc32ae620f26e797b85165152baf8:/lib-src/grep-changelog

diff --git a/lib-src/grep-changelog b/lib-src/grep-changelog
index bfd21c3f93..38fce879c7 100755
--- a/lib-src/grep-changelog
+++ b/lib-src/grep-changelog
@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 
-# Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2004 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
@@ -23,7 +23,7 @@
 # Extract entries from ChangeLogs matching specified criteria.
 # Optionally format the resulting output to a form suitable for RCS
 # logs, like they are used in Emacs, for example.  In this format,
-# author lines leading spaces, and file names are removed.
+# author lines, leading spaces, and file names are removed.
 
 require 5;
 use strict;
@@ -31,7 +31,8 @@ use strict;
 # Parse command line options.
 
 use vars qw($author $regexp $exclude $from_date $to_date
-            $rcs_log $with_date $version $help);
+            $rcs_log $with_date $version $help $reverse
+            @entries);
 
 use Getopt::Long;
 my $result = GetOptions ("author=s" => \$author,
@@ -41,6 +42,7 @@ my $result = GetOptions ("author=s" => \$author,
                          "to-date=s" => \$to_date,
                          "rcs-log" => \$rcs_log,
                          "with-date" => \$with_date,
+                         "reverse!" => \$reverse,
                          "version" => \$version,
                          "help"    => \$help);
 
@@ -54,33 +56,36 @@ $result = 0 if $to_date && $to_date !~ /^\d\d\d\d-\d\d-\d\d$/;
 
 if ($result == 0 || $help) {
     print <<USAGE;
+
 Usage: $0 [options] [CHANGELOG...]
-Print entries in ChangeLogs matching various criteria.  Valid options
-are
 
-  --author=AUTHOR         match entries whose author line matches
+Print entries in ChangeLogs matching various criteria.
+Valid options are:
+
+  --author=AUTHOR         Match entries whose author line matches
 			  regular expression AUTHOR
-  --text=TEXT             match entries whose text matches regular
-			  expression TEXT.
-  --exclude=TEXT	  exclude entries matching TEXT.
-  --from-date=YYYY-MM-DD  match entries not older than given date
-  --to-date=YYYY-MM-DD    match entries not younger than given date
-  --rcs-log		  format output suitable for RCS log entries.
-  --with-date		  print short date line in RCS log
-  --version		  print version info
-  --help		  print this help
+  --text=TEXT             Match entries whose text matches regular
+			  expression TEXT
+  --exclude=TEXT	  Exclude entries matching TEXT
+  --from-date=YYYY-MM-DD  Match entries not older than given date
+  --to-date=YYYY-MM-DD    Match entries not younger than given date
+  --rcs-log		  Format output suitable for RCS log entries
+  --with-date		  Print short date line in RCS log
+  --reverse               Show entries in reverse (chronological) order
+  --version		  Print version info
+  --help		  Print this help
 
 If no CHANGELOG is specified scan the files "ChangeLog" and
-"ChangeLog.[9-1]" in the current directory.  Old-style dates in ChangeLogs
+"ChangeLog.1+" in the current directory.  Old-style dates in ChangeLogs
 are not recognized.
 USAGE
-    exit $help ? 0 : 1;
+    exit !$help;
 }
 
 # Print version info and exit if `--version' was specified.
 
 if ($version) {
-    print "0.1\n";
+    print "0.2\n";
     exit 0;
 }
 
@@ -89,7 +94,7 @@ if ($version) {
 # options specified, i.e. it matches $author, and its date is in
 # the range $from_date <= date <= $to_date.
 
-sub header_match_p ($) {
+sub header_match_p {
     my $header = shift;
 
     return 0 unless $header;
@@ -119,7 +124,7 @@ sub header_match_p ($) {
 # command line, i.e. it matches $regexp, and it doesn't match
 # $exclude.
 
-sub entry_match_p ($) {
+sub entry_match_p {
     my $entry = shift;
 
     return 0 unless $entry;
@@ -140,8 +145,9 @@ sub entry_match_p ($) {
 # lines are not printed, and leading spaces and file names are removed
 # from ChangeLog entries.
 
-sub print_log ($$) {
+sub print_log {
     my ($header, $entry) = @_;
+    my $output = '';
 
     if ($rcs_log) {
 	# Remove leading whitespace from entry.
@@ -152,21 +158,28 @@ sub print_log ($$) {
 	$entry =~ s/^\*.*://mg;
         if ($with_date) {
 	    $header =~ /(\d\d\d\d-\d\d-\d\d)/;
-	    print "!changelog-date $1\n";
+	    $output = "!changelog-date $1\n";
 	}
-	print $entry;
+	$output .= $entry;
     } else {
-	print $header, $entry;
+	$output .= $header . $entry;
+    }
+
+    if ($reverse) {
+        push @entries, $output;
+    } else {
+        print $output;
     }
 }
 
 # Scan LOG for matching entries, and print them to standard output.
 
-sub parse_changelog ($) {
+sub parse_changelog {
     my $log = shift;
     my $entry = undef;
     my $header = undef;
-    my $match;
+
+    @entries = () if $reverse;
 
     # Open the ChangeLog.
     open (IN, "< $log") || die "Cannot open $log: $!";
@@ -206,25 +219,39 @@ sub parse_changelog ($) {
 	if header_match_p ($header) && entry_match_p ($entry);
 
     close IN;
+
+    if ($reverse) {
+        for (my $entry = @entries; $entry; $entry--) {
+            print $entries[$entry-1];
+        }
+    }
 }
 
 
 # Main program.  Process ChangeLogs.
 
-if (@ARGV > 0) {
-    # If files were specified on the command line, parse those files.
-    while (defined(my $log = shift @ARGV)) {
-	parse_changelog ($log);
-    }
-} else {
-    # Parse default files ChangeLog and ChangeLog.9...ChangeLog.1 in
-    # that order.
-    parse_changelog ("ChangeLog");
-    for (my $i = 9; $i >= 1; --$i) {
-	my $log = "ChangeLog.$i";
-	parse_changelog ($log) if -f $log;
-    }
+# If files were specified on the command line, parse those files in the
+# order supplied by the user; otherwise parse default files ChangeLog and
+# ChangeLog.1+ according to $reverse.
+unless (@ARGV > 0) {
+    @ARGV = ("ChangeLog");
+
+    push @ARGV,
+      map {"ChangeLog.$_"}
+        sort {$b <=> $a}
+          map {/\.(\d+)$/; $1}
+            do {
+                opendir D, '.';
+                grep /^ChangeLog\.\d+$/, readdir D;
+            };
+
+    @ARGV = reverse @ARGV if $reverse;
+}
+
+while (defined (my $log = shift @ARGV)) {
+    parse_changelog ($log) if -f $log;
 }
 
 
+# arch-tag: 9e4f6749-e053-4bb7-b3ad-11947318418e
 # grep-changelog ends here.