qapi: Simplify builtin type handling

[qemu.git] / scripts / get_maintainer.pl

diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl
index 38334de8751f6e10291b19e10a25a7ffa1f55419..f39630eb3da96f8f2bcc63a7b73d6f0955cd9b2d 100755 (executable)
--- 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";
 }
 
@@ -651,28 +634,23 @@ sub get_maintainers {
        $email->[0] = deduplicate_email($email->[0]);
     }
 
-    foreach my $file (@files) {
-       if ($email &&
-           ($email_git || ($email_git_fallback &&
-                           !$exact_pattern_match_hash{$file}))) {
-           vcs_file_signoffs($file);
-       }
-       if ($email && $email_git_blame) {
-           vcs_file_blame($file);
-       }
-    }
-
     if ($email) {
-       foreach my $chief (@penguin_chief) {
-           if ($chief =~ m/^(.*):(.*)/) {
-               my $email_address;
+       if (! $interactive) {
+           $email_git_fallback = 0 if @email_to > 0 || @list_to > 0 || $email_git || $email_git_blame;
+           if ($email_git_fallback) {
+               print STDERR "get_maintainer.pl: No maintainers found, printing recent contributors.\n";
+               print STDERR "get_maintainer.pl: Do not blindly cc: them on patches!  Use common sense.\n";
+               print STDERR "\n";
+            }
+        }
 
-               $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 $file (@files) {
+           if ($email_git || ($email_git_fallback &&
+                              !$exact_pattern_match_hash{$file})) {
+               vcs_file_signoffs($file);
+           }
+           if ($email_git_blame) {
+               vcs_file_blame($file);
            }
        }
 
@@ -732,7 +710,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 +1250,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 +1261,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 +1886,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 = ();