lkml.org 
[lkml]   [2009]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: [PATCH 1/3] scripts/get_maintainer.pl: Add patch/file search for keywords
Hi Joe,

On Fri, Oct 09, 2009 at 11:05:02PM -0700, Joe Perches wrote:
> Based on an idea from Wolfram Sang <w.sang@pengutronix.de>
>
> Add search for MAINTAINERS line "K:" regex pattern match in a patch or file
> Matches are added after file pattern matches
> Add --keywords command line switch (default 1, on)
> Change version to 0.21
>
> Signed-off-by: Joe Perches <joe@perches.com>

I tested the patches and they work. Some comments below:

> ---
> scripts/get_maintainer.pl | 37 +++++++++++++++++++++++++++++++++++--
> 1 files changed, 35 insertions(+), 2 deletions(-)
>
> diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl
> index cdb44b6..102b766 100755
> --- a/scripts/get_maintainer.pl
> +++ b/scripts/get_maintainer.pl
> @@ -13,7 +13,7 @@
> use strict;
>
> my $P = $0;
> -my $V = '0.20';
> +my $V = '0.21';
>
> use Getopt::Long qw(:config no_auto_abbrev);
>
> @@ -37,6 +37,7 @@ my $scm = 0;
> my $web = 0;
> my $subsystem = 0;
> my $status = 0;
> +my $keywords = 1;
> my $from_filename = 0;
> my $pattern_depth = 0;
> my $version = 0;
> @@ -84,6 +85,7 @@ if (!GetOptions(
> 'scm!' => \$scm,
> 'web!' => \$web,
> 'pattern-depth=i' => \$pattern_depth,
> + 'k|keywords!' => \$keywords,
> 'f|file' => \$from_filename,
> 'v|version' => \$version,
> 'h|help' => \$help,
> @@ -132,6 +134,8 @@ if (!top_of_kernel_tree($lk_path)) {
> ## Read MAINTAINERS for type/value pairs
>
> my @typevalue = ();
> +my %keyword_hash;
> +
> open(MAINT, "<${lk_path}MAINTAINERS") || die "$P: Can't open MAINTAINERS\n";
> while (<MAINT>) {
> my $line = $_;
> @@ -149,6 +153,8 @@ while (<MAINT>) {
> if ((-d $value)) {
> $value =~ s@([^/])$@$1/@;
> }
> + } elsif ($type eq "K") {
> + $keyword_hash{@typevalue} = $value;

It matches the way how the current implementation works, but I guess somewhen
this @typevalue-array should be converted into a hash like

$types{$type} = $value;

or similar unless I missed something.

> }
> push(@typevalue, "$type:$value");
> } elsif (!/^(\s)*$/) {
> @@ -188,6 +194,7 @@ if ($email_remove_duplicates) {
>
> my @files = ();
> my @range = ();
> +my @keyword_tvi = ();
>
> foreach my $file (@ARGV) {
> ##if $file is a directory and it lacks a trailing slash, add one
> @@ -198,11 +205,24 @@ foreach my $file (@ARGV) {
> }
> if ($from_filename) {
> push(@files, $file);
> + if (-f $file && $keywords) {
> + open(FILE, "<$file") or die "$P: Can't open ${file}\n";
> + while (<FILE>) {

Maybe the file should be read completely to save the loop.

> + my $patch_line = $_;
> + foreach my $line (keys %keyword_hash) {

This variable should be named $key instead of $line IMHO.

> + if ($patch_line =~ m/^.*$keyword_hash{$line}/x) {
> + push(@keyword_tvi, $line);
> + }
> + }
> + }
> + close(FILE);
> + }
> } else {
> my $file_cnt = @files;
> my $lastfile;
> open(PATCH, "<$file") or die "$P: Can't open ${file}\n";
> while (<PATCH>) {
> + my $patch_line = $_;
> if (m/^\+\+\+\s+(\S+)/) {
> my $filename = $1;
> $filename =~ s@^[^/]*/@@;
> @@ -213,6 +233,12 @@ foreach my $file (@ARGV) {
> if ($email_git_blame) {
> push(@range, "$lastfile:$1:$2");
> }
> + } elsif ($keywords) {
> + foreach my $line (keys %keyword_hash) {

ditto

> + if ($patch_line =~ m/^[+-].*$keyword_hash{$line}/x) {
> + push(@keyword_tvi, $line);
> + }
> + }
> }
> }
> close(PATCH);
> @@ -286,6 +312,13 @@ foreach my $file (@files) {
> }
> }
>
> +if ($keywords) {
> + @keyword_tvi = sort_and_uniq(@keyword_tvi);
> + foreach my $line (@keyword_tvi) {
> + add_categories($line);
> + }
> +}
> +

A bit unrelated: I noticed that lkml gets always added due to "F: *". Maybe
this list should be skipped if there has been another mailing list found?

> if ($email) {
> foreach my $chief (@penguin_chief) {
> if ($chief =~ m/^(.*):(.*)/) {
> @@ -384,6 +417,7 @@ Output type options:
>
> Other options:
> --pattern-depth => Number of pattern directory traversals (default: 0 (all))
> + --keywords => scan patch for keywords (default: 1 (on))
> --version => show version
> --help => show this help information
>
> @@ -486,7 +520,6 @@ sub format_email {
> }
>
> sub find_starting_index {
> -
> my ($index) = @_;
>
> while ($index > 0) {
> --
> 1.6.5.rc3.dirty
>

--
Pengutronix e.K. | Wolfram Sang |
Industrial Linux Solutions | http://www.pengutronix.de/ |
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2009-10-19 11:43    [W:0.088 / U:6.280 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site