X-Git-Url: http://git.shiar.net/git-grep-footer.git/blobdiff_plain/bd2d128ff40122f786010a9dd5a184cd2bc2de89..d1939a281787a94f5694cdb119baabdf2889ac3f:/git-grep-footer

diff --git a/git-grep-footer b/git-grep-footer
index 8ac3a03..c5d9440 100755
--- a/git-grep-footer
+++ b/git-grep-footer
@@ -12,6 +12,8 @@ GetOptions(\my %opt,
 	'count|c!',
 	'simplify|s:s',
 	'ignore-case|i!',
+	'fuzzy!',
+	'grep|S=s',
 	'min|min-count|unique|u:i',
 	'max|max-count|show|n:i',
 	'version|V'  => sub { Getopt::Long::VersionMessage() },
@@ -22,12 +24,12 @@ GetOptions(\my %opt,
 local $| = 1;
 local $/ = "\0";
 
-my $HEADERMATCH = qr/ [a-z]+ (?: (?:-\w+)+ | \ by ) /ix;
+my $HEADERMATCH = qr/ [a-z]+ (?: (?:-\w+)+ | \ by ) | cc | reference /ix;
 
 my (%headercount, @headercache);
 
 while (readline) {
-	s/(.+)\n//m;
+	s/^([0-9a-f]{4,40})\n//m and
 	my $hash = $1;
 
 	# strip commit seperator
@@ -39,12 +41,12 @@ while (readline) {
 	# if invalid, assume it's latin1
 	       $_ = decode(cp1252 => $_) if $@;
 
-	my $prefix = 0;
 	my %attr;
 
 	BLOCK:
 	for (reverse split /\n\n/) {
 		my @headers;
+		my $prefix = 0;
 
 		LINE:
 		for (split /\n/) {
@@ -62,6 +64,22 @@ while (readline) {
 
 			push @header, $_ if defined $opt{max};
 
+			if ($opt{fuzzy}) {
+				for ($header[0]) {
+					tr/ _/-/;
+
+					state $BY = qr{ (?: -? b[yu] )? \Z }ix;
+					s{^ si (?:ge?n|n?g) (?:e?[dt])? -? (?:of+)? $BY}{Signed-off-by}ix;
+					s{^ ack (?:ed|de)?  $BY}{Acked-by}ix;
+					s{^ review (?:e?d)? $BY}{Reviewed-by}ix;
+					s{^ teste[dt]       $BY}{Tested-by}ix;
+				}
+			}
+
+			if (defined $opt{grep}) {
+				$_ ~~ qr/$opt{grep}/i or next LINE;
+			}
+
 			given ($opt{simplify} // 'none') {
 				when (['email', 'authors']) {
 					$header[1] =~ s{
@@ -72,14 +90,15 @@ while (readline) {
 					}{<...>}imsx;
 				}
 				when (['var', 'vars', '']) {
-					when ($header[0] =~ /[ _-] (?: by | to ) $/imsx) {
+					when ($header[0] =~ /[ _-] (?: by | to ) $ | ^cc$/imsx) {
 						$header[1] = undef;
 					}
 					for ($header[1]) {
 						s{\b (https?)://\S+ }{[$1]}gmsx;  # url
 						s{(?: < | \A ) [^@>\s]+ @ [^>]+ (?: > | \Z )}{<...>}igmsx;  # address
 						s{\b [0-9]+ \b}{[num]}gmsx;  # number
-						s{\b I? [0-9a-f]{40} \b}{[sha1]}gmsx;  # hash
+						s{\b [Ig]? [0-9a-f]{  40} \b}{[sha1]}gmsx;  # hash
+						s{\b [Ig]? [0-9a-f]{6,40} \b}{[hash]}gmsx;  # abbrev
 					}
 				}
 				when (['all', 'contents']) {
@@ -104,12 +123,14 @@ while (readline) {
 		next BLOCK if not @headers;
 
 		if ($opt{debug} and $prefix) {
-			say "infix junk in commit $hash";
+			say sprintf ': invalid lines in %s (%s)', $hash // 'block', $prefix;
 		}
 
 		for (@headers) {
 			my $line = $_->[2] // join(': ', @$_);
-			if (defined $opt{min} or $opt{max}) {
+			$line =~ s/^/$hash / if defined $hash;
+
+			if (defined $opt{min} or $opt{max} or $opt{count}) {
 				my $counter = \$headercount{ $_->[0] }->{ $_->[1] // '' };
 				my $excess = $$counter++ - ($opt{min} // 0);
 				next if $excess >= ($opt{max} || 1);
@@ -147,6 +168,7 @@ a common convention to list custom metadata such as
 C<Signed-off-by> and C<Acked-by>.
 
 Sections are identified by at least one leading keyword containing a dash
+(or exceptionally recognised)
 followed by a colon.
 
 =head1 OPTIONS
@@ -183,6 +205,11 @@ Values will be hidden entirely, so only attribute names remain.
 
 =back
 
+=item --grep=<pattern>
+
+Only include lines matching the specified regular expression.
+Case insensitivity can be disabled by prepending C<(?-i)>.
+
 =item -u, --unique[=<threshold>]
 
 Each match is only shown once,
@@ -194,6 +221,11 @@ The original line is given for each match,
 but simplifications still apply for duplicate determination.
 Additional samples are optionally given upto the given maximum.
 
+=item -c, --count
+
+Prefixes (unique) lines by the number of occurrences.
+Causes output to be buffered until all input has been read (obviously).
+
 =back
 
 =head1 AUTHOR