diff mbox

get_maintainer.pl: Remove the --git-chief-penguins option

Message ID 1413980918-6130-1-git-send-email-thuth@linux.vnet.ibm.com
State New
Headers show

Commit Message

Thomas Huth Oct. 22, 2014, 12:28 p.m. UTC
Linus likely does not want to get e-mails about QEMU, so let's
just remove this option.

Suggested-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Thomas Huth <thuth@linux.vnet.ibm.com>
---
 scripts/get_maintainer.pl |   45 +--------------------------------------------
 1 files changed, 1 insertions(+), 44 deletions(-)

Comments

Don Slutz Oct. 22, 2014, 7:16 p.m. UTC | #1
On 10/22/14 08:28, Thomas Huth wrote:
> Linus likely does not want to get e-mails about QEMU, so let's
> just remove this option.
>
> Suggested-by: Michael S. Tsirkin <mst@redhat.com>
> Signed-off-by: Thomas Huth <thuth@linux.vnet.ibm.com>

Looks good to me.

Reviewed-by: Don Slutz <dslutz@verizon.com>

    -Don Slutz


> ---
>   scripts/get_maintainer.pl |   45 +--------------------------------------------
>   1 files changed, 1 insertions(+), 44 deletions(-)
>
> diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl
> index 38334de..4034997 100755
> --- a/scripts/get_maintainer.pl
> +++ b/scripts/get_maintainer.pl
> @@ -23,7 +23,6 @@ my $email_usename = 1;
>   my $email_maintainer = 1;
>   my $email_list = 1;
>   my $email_subscriber_list = 0;
> -my $email_git_penguin_chiefs = 0;
>   my $email_git = 0;
>   my $email_git_all_signature_types = 0;
>   my $email_git_blame = 0;
> @@ -60,21 +59,6 @@ my $exit = 0;
>   my %commit_author_hash;
>   my %commit_signer_hash;
>   
> -my @penguin_chief = ();
> -push(@penguin_chief, "Linus Torvalds:torvalds\@linux-foundation.org");
> -#Andrew wants in on most everything - 2009/01/14
> -#push(@penguin_chief, "Andrew Morton:akpm\@linux-foundation.org");
> -
> -my @penguin_chief_names = ();
> -foreach my $chief (@penguin_chief) {
> -    if ($chief =~ m/^(.*):(.*)/) {
> -	my $chief_name = $1;
> -	my $chief_addr = $2;
> -	push(@penguin_chief_names, $chief_name);
> -    }
> -}
> -my $penguin_chiefs = "\(" . join("|", @penguin_chief_names) . "\)";
> -
>   # Signature types of people who are either
>   # 	a) responsible for the code in question, or
>   # 	b) familiar enough with it to give relevant feedback
> @@ -187,7 +171,6 @@ if (!GetOptions(
>   		'git-blame!' => \$email_git_blame,
>   		'git-blame-signatures!' => \$email_git_blame_signatures,
>   		'git-fallback!' => \$email_git_fallback,
> -		'git-chief-penguins!' => \$email_git_penguin_chiefs,
>   		'git-min-signatures=i' => \$email_git_min_signatures,
>   		'git-max-maintainers=i' => \$email_git_max_maintainers,
>   		'git-min-percent=i' => \$email_git_min_percent,
> @@ -256,7 +239,7 @@ if ($sections) {
>   
>   if ($email &&
>       ($email_maintainer + $email_list + $email_subscriber_list +
> -     $email_git + $email_git_penguin_chiefs + $email_git_blame) == 0) {
> +     $email_git + $email_git_blame) == 0) {
>       die "$P: Please select at least 1 email option\n";
>   }
>   
> @@ -663,19 +646,6 @@ sub get_maintainers {
>       }
>   
>       if ($email) {
> -	foreach my $chief (@penguin_chief) {
> -	    if ($chief =~ m/^(.*):(.*)/) {
> -		my $email_address;
> -
> -		$email_address = format_email($1, $2, $email_usename);
> -		if ($email_git_penguin_chiefs) {
> -		    push(@email_to, [$email_address, 'chief penguin']);
> -		} else {
> -		    @email_to = grep($_->[0] !~ /${email_address}/, @email_to);
> -		}
> -	    }
> -	}
> -
>   	foreach my $email (@file_emails) {
>   	    my ($name, $address) = parse_email($email);
>   
> @@ -732,7 +702,6 @@ MAINTAINER field selection options:
>       --git-all-signature-types => include signers regardless of signature type
>           or use only ${signature_pattern} signers (default: $email_git_all_signature_types)
>       --git-fallback => use git when no exact MAINTAINERS pattern (default: $email_git_fallback)
> -    --git-chief-penguins => include ${penguin_chiefs}
>       --git-min-signatures => number of signatures required (default: $email_git_min_signatures)
>       --git-max-maintainers => maximum maintainers to add (default: $email_git_max_maintainers)
>       --git-min-percent => minimum percentage of commits required (default: $email_git_min_percent)
> @@ -1273,10 +1242,6 @@ sub vcs_find_signers {
>       save_commits_by_author(@lines) if ($interactive);
>       save_commits_by_signer(@lines) if ($interactive);
>   
> -    if (!$email_git_penguin_chiefs) {
> -	@signatures = grep(!/${penguin_chiefs}/i, @signatures);
> -    }
> -
>       my ($types_ref, $signers_ref) = extract_formatted_signatures(@signatures);
>   
>       return ($commits, @$signers_ref);
> @@ -1288,10 +1253,6 @@ sub vcs_find_author {
>   
>       @lines = &{$VCS_cmds{"execute_cmd"}}($cmd);
>   
> -    if (!$email_git_penguin_chiefs) {
> -	@lines = grep(!/${penguin_chiefs}/i, @lines);
> -    }
> -
>       return @lines if !@lines;
>   
>       my @authors = ();
> @@ -1917,10 +1878,6 @@ sub vcs_file_blame {
>   
>   		@lines = &{$VCS_cmds{"execute_cmd"}}($cmd);
>   
> -		if (!$email_git_penguin_chiefs) {
> -		    @lines = grep(!/${penguin_chiefs}/i, @lines);
> -		}
> -
>   		last if !@lines;
>   
>   		my @authors = ();
Thomas Huth Nov. 3, 2014, 12:50 p.m. UTC | #2
On Wed, 22 Oct 2014 15:16:29 -0400
Don Slutz <dslutz@verizon.com> wrote:

> On 10/22/14 08:28, Thomas Huth wrote:
> > Linus likely does not want to get e-mails about QEMU, so let's
> > just remove this option.
> >
> > Suggested-by: Michael S. Tsirkin <mst@redhat.com>
> > Signed-off-by: Thomas Huth <thuth@linux.vnet.ibm.com>
> 
> Looks good to me.
> 
> Reviewed-by: Don Slutz <dslutz@verizon.com>


Ping?


> > ---
> >   scripts/get_maintainer.pl |   45 +--------------------------------------------
> >   1 files changed, 1 insertions(+), 44 deletions(-)
> >
> > diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl
> > index 38334de..4034997 100755
> > --- a/scripts/get_maintainer.pl
> > +++ b/scripts/get_maintainer.pl
> > @@ -23,7 +23,6 @@ my $email_usename = 1;
> >   my $email_maintainer = 1;
> >   my $email_list = 1;
> >   my $email_subscriber_list = 0;
> > -my $email_git_penguin_chiefs = 0;
> >   my $email_git = 0;
> >   my $email_git_all_signature_types = 0;
> >   my $email_git_blame = 0;
> > @@ -60,21 +59,6 @@ my $exit = 0;
> >   my %commit_author_hash;
> >   my %commit_signer_hash;
> >   
> > -my @penguin_chief = ();
> > -push(@penguin_chief, "Linus Torvalds:torvalds\@linux-foundation.org");
> > -#Andrew wants in on most everything - 2009/01/14
> > -#push(@penguin_chief, "Andrew Morton:akpm\@linux-foundation.org");
> > -
> > -my @penguin_chief_names = ();
> > -foreach my $chief (@penguin_chief) {
> > -    if ($chief =~ m/^(.*):(.*)/) {
> > -	my $chief_name = $1;
> > -	my $chief_addr = $2;
> > -	push(@penguin_chief_names, $chief_name);
> > -    }
> > -}
> > -my $penguin_chiefs = "\(" . join("|", @penguin_chief_names) . "\)";
> > -
> >   # Signature types of people who are either
> >   # 	a) responsible for the code in question, or
> >   # 	b) familiar enough with it to give relevant feedback
> > @@ -187,7 +171,6 @@ if (!GetOptions(
> >   		'git-blame!' => \$email_git_blame,
> >   		'git-blame-signatures!' => \$email_git_blame_signatures,
> >   		'git-fallback!' => \$email_git_fallback,
> > -		'git-chief-penguins!' => \$email_git_penguin_chiefs,
> >   		'git-min-signatures=i' => \$email_git_min_signatures,
> >   		'git-max-maintainers=i' => \$email_git_max_maintainers,
> >   		'git-min-percent=i' => \$email_git_min_percent,
> > @@ -256,7 +239,7 @@ if ($sections) {
> >   
> >   if ($email &&
> >       ($email_maintainer + $email_list + $email_subscriber_list +
> > -     $email_git + $email_git_penguin_chiefs + $email_git_blame) == 0) {
> > +     $email_git + $email_git_blame) == 0) {
> >       die "$P: Please select at least 1 email option\n";
> >   }
> >   
> > @@ -663,19 +646,6 @@ sub get_maintainers {
> >       }
> >   
> >       if ($email) {
> > -	foreach my $chief (@penguin_chief) {
> > -	    if ($chief =~ m/^(.*):(.*)/) {
> > -		my $email_address;
> > -
> > -		$email_address = format_email($1, $2, $email_usename);
> > -		if ($email_git_penguin_chiefs) {
> > -		    push(@email_to, [$email_address, 'chief penguin']);
> > -		} else {
> > -		    @email_to = grep($_->[0] !~ /${email_address}/, @email_to);
> > -		}
> > -	    }
> > -	}
> > -
> >   	foreach my $email (@file_emails) {
> >   	    my ($name, $address) = parse_email($email);
> >   
> > @@ -732,7 +702,6 @@ MAINTAINER field selection options:
> >       --git-all-signature-types => include signers regardless of signature type
> >           or use only ${signature_pattern} signers (default: $email_git_all_signature_types)
> >       --git-fallback => use git when no exact MAINTAINERS pattern (default: $email_git_fallback)
> > -    --git-chief-penguins => include ${penguin_chiefs}
> >       --git-min-signatures => number of signatures required (default: $email_git_min_signatures)
> >       --git-max-maintainers => maximum maintainers to add (default: $email_git_max_maintainers)
> >       --git-min-percent => minimum percentage of commits required (default: $email_git_min_percent)
> > @@ -1273,10 +1242,6 @@ sub vcs_find_signers {
> >       save_commits_by_author(@lines) if ($interactive);
> >       save_commits_by_signer(@lines) if ($interactive);
> >   
> > -    if (!$email_git_penguin_chiefs) {
> > -	@signatures = grep(!/${penguin_chiefs}/i, @signatures);
> > -    }
> > -
> >       my ($types_ref, $signers_ref) = extract_formatted_signatures(@signatures);
> >   
> >       return ($commits, @$signers_ref);
> > @@ -1288,10 +1253,6 @@ sub vcs_find_author {
> >   
> >       @lines = &{$VCS_cmds{"execute_cmd"}}($cmd);
> >   
> > -    if (!$email_git_penguin_chiefs) {
> > -	@lines = grep(!/${penguin_chiefs}/i, @lines);
> > -    }
> > -
> >       return @lines if !@lines;
> >   
> >       my @authors = ();
> > @@ -1917,10 +1878,6 @@ sub vcs_file_blame {
> >   
> >   		@lines = &{$VCS_cmds{"execute_cmd"}}($cmd);
> >   
> > -		if (!$email_git_penguin_chiefs) {
> > -		    @lines = grep(!/${penguin_chiefs}/i, @lines);
> > -		}
> > -
> >   		last if !@lines;
> >   
> >   		my @authors = ();
>
Thomas Huth Dec. 4, 2014, 11:59 a.m. UTC | #3
On Mon, 3 Nov 2014 13:50:24 +0100
Thomas Huth <thuth@linux.vnet.ibm.com> wrote:

> On Wed, 22 Oct 2014 15:16:29 -0400
> Don Slutz <dslutz@verizon.com> wrote:
> 
> > On 10/22/14 08:28, Thomas Huth wrote:
> > > Linus likely does not want to get e-mails about QEMU, so let's
> > > just remove this option.
> > >
> > > Suggested-by: Michael S. Tsirkin <mst@redhat.com>
> > > Signed-off-by: Thomas Huth <thuth@linux.vnet.ibm.com>
> > 
> > Looks good to me.
> > 
> > Reviewed-by: Don Slutz <dslutz@verizon.com>
> 
> 
> Ping?

Ping again


> > > ---
> > >   scripts/get_maintainer.pl |   45 +--------------------------------------------
> > >   1 files changed, 1 insertions(+), 44 deletions(-)
> > >
> > > diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl
> > > index 38334de..4034997 100755
> > > --- a/scripts/get_maintainer.pl
> > > +++ b/scripts/get_maintainer.pl
> > > @@ -23,7 +23,6 @@ my $email_usename = 1;
> > >   my $email_maintainer = 1;
> > >   my $email_list = 1;
> > >   my $email_subscriber_list = 0;
> > > -my $email_git_penguin_chiefs = 0;
> > >   my $email_git = 0;
> > >   my $email_git_all_signature_types = 0;
> > >   my $email_git_blame = 0;
> > > @@ -60,21 +59,6 @@ my $exit = 0;
> > >   my %commit_author_hash;
> > >   my %commit_signer_hash;
> > >   
> > > -my @penguin_chief = ();
> > > -push(@penguin_chief, "Linus Torvalds:torvalds\@linux-foundation.org");
> > > -#Andrew wants in on most everything - 2009/01/14
> > > -#push(@penguin_chief, "Andrew Morton:akpm\@linux-foundation.org");
> > > -
> > > -my @penguin_chief_names = ();
> > > -foreach my $chief (@penguin_chief) {
> > > -    if ($chief =~ m/^(.*):(.*)/) {
> > > -	my $chief_name = $1;
> > > -	my $chief_addr = $2;
> > > -	push(@penguin_chief_names, $chief_name);
> > > -    }
> > > -}
> > > -my $penguin_chiefs = "\(" . join("|", @penguin_chief_names) . "\)";
> > > -
> > >   # Signature types of people who are either
> > >   # 	a) responsible for the code in question, or
> > >   # 	b) familiar enough with it to give relevant feedback
> > > @@ -187,7 +171,6 @@ if (!GetOptions(
> > >   		'git-blame!' => \$email_git_blame,
> > >   		'git-blame-signatures!' => \$email_git_blame_signatures,
> > >   		'git-fallback!' => \$email_git_fallback,
> > > -		'git-chief-penguins!' => \$email_git_penguin_chiefs,
> > >   		'git-min-signatures=i' => \$email_git_min_signatures,
> > >   		'git-max-maintainers=i' => \$email_git_max_maintainers,
> > >   		'git-min-percent=i' => \$email_git_min_percent,
> > > @@ -256,7 +239,7 @@ if ($sections) {
> > >   
> > >   if ($email &&
> > >       ($email_maintainer + $email_list + $email_subscriber_list +
> > > -     $email_git + $email_git_penguin_chiefs + $email_git_blame) == 0) {
> > > +     $email_git + $email_git_blame) == 0) {
> > >       die "$P: Please select at least 1 email option\n";
> > >   }
> > >   
> > > @@ -663,19 +646,6 @@ sub get_maintainers {
> > >       }
> > >   
> > >       if ($email) {
> > > -	foreach my $chief (@penguin_chief) {
> > > -	    if ($chief =~ m/^(.*):(.*)/) {
> > > -		my $email_address;
> > > -
> > > -		$email_address = format_email($1, $2, $email_usename);
> > > -		if ($email_git_penguin_chiefs) {
> > > -		    push(@email_to, [$email_address, 'chief penguin']);
> > > -		} else {
> > > -		    @email_to = grep($_->[0] !~ /${email_address}/, @email_to);
> > > -		}
> > > -	    }
> > > -	}
> > > -
> > >   	foreach my $email (@file_emails) {
> > >   	    my ($name, $address) = parse_email($email);
> > >   
> > > @@ -732,7 +702,6 @@ MAINTAINER field selection options:
> > >       --git-all-signature-types => include signers regardless of signature type
> > >           or use only ${signature_pattern} signers (default: $email_git_all_signature_types)
> > >       --git-fallback => use git when no exact MAINTAINERS pattern (default: $email_git_fallback)
> > > -    --git-chief-penguins => include ${penguin_chiefs}
> > >       --git-min-signatures => number of signatures required (default: $email_git_min_signatures)
> > >       --git-max-maintainers => maximum maintainers to add (default: $email_git_max_maintainers)
> > >       --git-min-percent => minimum percentage of commits required (default: $email_git_min_percent)
> > > @@ -1273,10 +1242,6 @@ sub vcs_find_signers {
> > >       save_commits_by_author(@lines) if ($interactive);
> > >       save_commits_by_signer(@lines) if ($interactive);
> > >   
> > > -    if (!$email_git_penguin_chiefs) {
> > > -	@signatures = grep(!/${penguin_chiefs}/i, @signatures);
> > > -    }
> > > -
> > >       my ($types_ref, $signers_ref) = extract_formatted_signatures(@signatures);
> > >   
> > >       return ($commits, @$signers_ref);
> > > @@ -1288,10 +1253,6 @@ sub vcs_find_author {
> > >   
> > >       @lines = &{$VCS_cmds{"execute_cmd"}}($cmd);
> > >   
> > > -    if (!$email_git_penguin_chiefs) {
> > > -	@lines = grep(!/${penguin_chiefs}/i, @lines);
> > > -    }
> > > -
> > >       return @lines if !@lines;
> > >   
> > >       my @authors = ();
> > > @@ -1917,10 +1878,6 @@ sub vcs_file_blame {
> > >   
> > >   		@lines = &{$VCS_cmds{"execute_cmd"}}($cmd);
> > >   
> > > -		if (!$email_git_penguin_chiefs) {
> > > -		    @lines = grep(!/${penguin_chiefs}/i, @lines);
> > > -		}
> > > -
> > >   		last if !@lines;
> > >   
> > >   		my @authors = ();
> > 
> 
>
Michael Tokarev Dec. 10, 2014, 8:47 a.m. UTC | #4
04.12.2014 14:59, Thomas Huth wrote:
>>
>> Ping?
> 
> Ping again

Thomas, we was in freeze trying to get 2.2 out of the door.
During this time I didn't process -trivial patches, to not
pollute incoming changes stream even further.

Your patch for some reason does not apply to current
state of get_maintainer.pl script, failing this hunk:

>>>> -	foreach my $chief (@penguin_chief) {
>>>> -	    if ($chief =~ m/^(.*):(.*)/) {
>>>> -		my $email_address;
>>>> -
>>>> -		$email_address = format_email($1, $2, $email_usename);
>>>> -		if ($email_git_penguin_chiefs) {
>>>> -		    push(@email_to, [$email_address, 'chief penguin']);
>>>> -		} else {
>>>> -		    @email_to = grep($_->[0] !~ /${email_address}/, @email_to);
>>>> -		}
>>>> -	    }
>>>> -	}
>>>> -

I didn't look at the details, because this is
a trivial delete of a block of code, so I just
deleted it manually.

So I applied your patch now.

Note there's one more reference to penguin chief
left in the code, in get_maintainer_role function.
I don't think it is wrong.

Thanks,

/mjt
diff mbox

Patch

diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl
index 38334de..4034997 100755
--- a/scripts/get_maintainer.pl
+++ b/scripts/get_maintainer.pl
@@ -23,7 +23,6 @@  my $email_usename = 1;
 my $email_maintainer = 1;
 my $email_list = 1;
 my $email_subscriber_list = 0;
-my $email_git_penguin_chiefs = 0;
 my $email_git = 0;
 my $email_git_all_signature_types = 0;
 my $email_git_blame = 0;
@@ -60,21 +59,6 @@  my $exit = 0;
 my %commit_author_hash;
 my %commit_signer_hash;
 
-my @penguin_chief = ();
-push(@penguin_chief, "Linus Torvalds:torvalds\@linux-foundation.org");
-#Andrew wants in on most everything - 2009/01/14
-#push(@penguin_chief, "Andrew Morton:akpm\@linux-foundation.org");
-
-my @penguin_chief_names = ();
-foreach my $chief (@penguin_chief) {
-    if ($chief =~ m/^(.*):(.*)/) {
-	my $chief_name = $1;
-	my $chief_addr = $2;
-	push(@penguin_chief_names, $chief_name);
-    }
-}
-my $penguin_chiefs = "\(" . join("|", @penguin_chief_names) . "\)";
-
 # Signature types of people who are either
 # 	a) responsible for the code in question, or
 # 	b) familiar enough with it to give relevant feedback
@@ -187,7 +171,6 @@  if (!GetOptions(
 		'git-blame!' => \$email_git_blame,
 		'git-blame-signatures!' => \$email_git_blame_signatures,
 		'git-fallback!' => \$email_git_fallback,
-		'git-chief-penguins!' => \$email_git_penguin_chiefs,
 		'git-min-signatures=i' => \$email_git_min_signatures,
 		'git-max-maintainers=i' => \$email_git_max_maintainers,
 		'git-min-percent=i' => \$email_git_min_percent,
@@ -256,7 +239,7 @@  if ($sections) {
 
 if ($email &&
     ($email_maintainer + $email_list + $email_subscriber_list +
-     $email_git + $email_git_penguin_chiefs + $email_git_blame) == 0) {
+     $email_git + $email_git_blame) == 0) {
     die "$P: Please select at least 1 email option\n";
 }
 
@@ -663,19 +646,6 @@  sub get_maintainers {
     }
 
     if ($email) {
-	foreach my $chief (@penguin_chief) {
-	    if ($chief =~ m/^(.*):(.*)/) {
-		my $email_address;
-
-		$email_address = format_email($1, $2, $email_usename);
-		if ($email_git_penguin_chiefs) {
-		    push(@email_to, [$email_address, 'chief penguin']);
-		} else {
-		    @email_to = grep($_->[0] !~ /${email_address}/, @email_to);
-		}
-	    }
-	}
-
 	foreach my $email (@file_emails) {
 	    my ($name, $address) = parse_email($email);
 
@@ -732,7 +702,6 @@  MAINTAINER field selection options:
     --git-all-signature-types => include signers regardless of signature type
         or use only ${signature_pattern} signers (default: $email_git_all_signature_types)
     --git-fallback => use git when no exact MAINTAINERS pattern (default: $email_git_fallback)
-    --git-chief-penguins => include ${penguin_chiefs}
     --git-min-signatures => number of signatures required (default: $email_git_min_signatures)
     --git-max-maintainers => maximum maintainers to add (default: $email_git_max_maintainers)
     --git-min-percent => minimum percentage of commits required (default: $email_git_min_percent)
@@ -1273,10 +1242,6 @@  sub vcs_find_signers {
     save_commits_by_author(@lines) if ($interactive);
     save_commits_by_signer(@lines) if ($interactive);
 
-    if (!$email_git_penguin_chiefs) {
-	@signatures = grep(!/${penguin_chiefs}/i, @signatures);
-    }
-
     my ($types_ref, $signers_ref) = extract_formatted_signatures(@signatures);
 
     return ($commits, @$signers_ref);
@@ -1288,10 +1253,6 @@  sub vcs_find_author {
 
     @lines = &{$VCS_cmds{"execute_cmd"}}($cmd);
 
-    if (!$email_git_penguin_chiefs) {
-	@lines = grep(!/${penguin_chiefs}/i, @lines);
-    }
-
     return @lines if !@lines;
 
     my @authors = ();
@@ -1917,10 +1878,6 @@  sub vcs_file_blame {
 
 		@lines = &{$VCS_cmds{"execute_cmd"}}($cmd);
 
-		if (!$email_git_penguin_chiefs) {
-		    @lines = grep(!/${penguin_chiefs}/i, @lines);
-		}
-
 		last if !@lines;
 
 		my @authors = ();