aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2010-10-26 17:22:57 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-26 19:52:17 -0400
commit47abc7225761faf28be52b3ac4dc26ffeac7b750 (patch)
tree21636d0c360cfdd57f576ce1590ab5d165105012 /scripts
parent7fa8ff2e0c0f326cdaaa4ae7d00f5d021e43ffa2 (diff)
scripts/get_maintainer.pl: correct indentation in a few places
And a miscellaneous conversion of You to you in a help message Signed-off-by: Joe Perches <joe@perches.com> Cc: Florian Mickler <florian@mickler.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/get_maintainer.pl156
1 files changed, 78 insertions, 78 deletions
diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl
index faeace4e1fd0..0abfdbc5cdff 100755
--- a/scripts/get_maintainer.pl
+++ b/scripts/get_maintainer.pl
@@ -306,7 +306,7 @@ sub read_mailmap {
306 my $mailmap = { 306 my $mailmap = {
307 names => {}, 307 names => {},
308 addresses => {} 308 addresses => {}
309 }; 309 };
310 310
311 if (!$email_remove_duplicates) { 311 if (!$email_remove_duplicates) {
312 return $mailmap; 312 return $mailmap;
@@ -327,39 +327,39 @@ sub read_mailmap {
327 # name1 <mail1> name2 <mail2> 327 # name1 <mail1> name2 <mail2>
328 # (see man git-shortlog) 328 # (see man git-shortlog)
329 if (/^(.+)<(.+)>$/) { 329 if (/^(.+)<(.+)>$/) {
330 my $real_name = $1; 330 my $real_name = $1;
331 my $address = $2; 331 my $address = $2;
332 332
333 $real_name =~ s/\s+$//; 333 $real_name =~ s/\s+$//;
334 $mailmap->{names}->{$address} = $real_name; 334 $mailmap->{names}->{$address} = $real_name;
335 335
336 } elsif (/^<([^\s]+)>\s*<([^\s]+)>$/) { 336 } elsif (/^<([^\s]+)>\s*<([^\s]+)>$/) {
337 my $real_address = $1; 337 my $real_address = $1;
338 my $wrong_address = $2; 338 my $wrong_address = $2;
339 339
340 $mailmap->{addresses}->{$wrong_address} = $real_address; 340 $mailmap->{addresses}->{$wrong_address} = $real_address;
341 341
342 } elsif (/^(.+)<([^\s]+)>\s*<([^\s]+)>$/) { 342 } elsif (/^(.+)<([^\s]+)>\s*<([^\s]+)>$/) {
343 my $real_name= $1; 343 my $real_name= $1;
344 my $real_address = $2; 344 my $real_address = $2;
345 my $wrong_address = $3; 345 my $wrong_address = $3;
346 346
347 $real_name =~ s/\s+$//; 347 $real_name =~ s/\s+$//;
348 348
349 $mailmap->{names}->{$wrong_address} = $real_name; 349 $mailmap->{names}->{$wrong_address} = $real_name;
350 $mailmap->{addresses}->{$wrong_address} = $real_address; 350 $mailmap->{addresses}->{$wrong_address} = $real_address;
351 351
352 } elsif (/^(.+)<([^\s]+)>\s*([^\s].*)<([^\s]+)>$/) { 352 } elsif (/^(.+)<([^\s]+)>\s*([^\s].*)<([^\s]+)>$/) {
353 my $real_name = $1; 353 my $real_name = $1;
354 my $real_address = $2; 354 my $real_address = $2;
355 my $wrong_name = $3; 355 my $wrong_name = $3;
356 my $wrong_address = $4; 356 my $wrong_address = $4;
357 357
358 $real_name =~ s/\s+$//; 358 $real_name =~ s/\s+$//;
359 $wrong_name =~ s/\s+$//; 359 $wrong_name =~ s/\s+$//;
360 360
361 $mailmap->{names}->{format_email($wrong_name,$wrong_address,1)} = $real_name; 361 $mailmap->{names}->{format_email($wrong_name,$wrong_address,1)} = $real_name;
362 $mailmap->{addresses}->{format_email($wrong_name,$wrong_address,1)} = $real_address; 362 $mailmap->{addresses}->{format_email($wrong_name,$wrong_address,1)} = $real_address;
363 } 363 }
364 } 364 }
365 close($mailmap_file); 365 close($mailmap_file);
@@ -743,30 +743,30 @@ EOT
743} 743}
744 744
745sub top_of_kernel_tree { 745sub top_of_kernel_tree {
746 my ($lk_path) = @_; 746 my ($lk_path) = @_;
747 747
748 if ($lk_path ne "" && substr($lk_path,length($lk_path)-1,1) ne "/") { 748 if ($lk_path ne "" && substr($lk_path,length($lk_path)-1,1) ne "/") {
749 $lk_path .= "/"; 749 $lk_path .= "/";
750 } 750 }
751 if ( (-f "${lk_path}COPYING") 751 if ( (-f "${lk_path}COPYING")
752 && (-f "${lk_path}CREDITS") 752 && (-f "${lk_path}CREDITS")
753 && (-f "${lk_path}Kbuild") 753 && (-f "${lk_path}Kbuild")
754 && (-f "${lk_path}MAINTAINERS") 754 && (-f "${lk_path}MAINTAINERS")
755 && (-f "${lk_path}Makefile") 755 && (-f "${lk_path}Makefile")
756 && (-f "${lk_path}README") 756 && (-f "${lk_path}README")
757 && (-d "${lk_path}Documentation") 757 && (-d "${lk_path}Documentation")
758 && (-d "${lk_path}arch") 758 && (-d "${lk_path}arch")
759 && (-d "${lk_path}include") 759 && (-d "${lk_path}include")
760 && (-d "${lk_path}drivers") 760 && (-d "${lk_path}drivers")
761 && (-d "${lk_path}fs") 761 && (-d "${lk_path}fs")
762 && (-d "${lk_path}init") 762 && (-d "${lk_path}init")
763 && (-d "${lk_path}ipc") 763 && (-d "${lk_path}ipc")
764 && (-d "${lk_path}kernel") 764 && (-d "${lk_path}kernel")
765 && (-d "${lk_path}lib") 765 && (-d "${lk_path}lib")
766 && (-d "${lk_path}scripts")) { 766 && (-d "${lk_path}scripts")) {
767 return 1; 767 return 1;
768 } 768 }
769 return 0; 769 return 0;
770} 770}
771 771
772sub parse_email { 772sub parse_email {
@@ -1107,29 +1107,30 @@ sub which_conf {
1107} 1107}
1108 1108
1109sub mailmap_email { 1109sub mailmap_email {
1110 my $line = shift; 1110 my $line = shift;
1111 1111
1112 my ($name, $address) = parse_email($line); 1112 my ($name, $address) = parse_email($line);
1113 my $email = format_email($name, $address, 1); 1113 my $email = format_email($name, $address, 1);
1114 my $real_name = $name; 1114 my $real_name = $name;
1115 my $real_address = $address; 1115 my $real_address = $address;
1116 1116
1117 if (exists $mailmap->{names}->{$email} || exists $mailmap->{addresses}->{$email}) { 1117 if (exists $mailmap->{names}->{$email} ||
1118 if (exists $mailmap->{names}->{$email}) { 1118 exists $mailmap->{addresses}->{$email}) {
1119 $real_name = $mailmap->{names}->{$email}; 1119 if (exists $mailmap->{names}->{$email}) {
1120 } 1120 $real_name = $mailmap->{names}->{$email};
1121 if (exists $mailmap->{addresses}->{$email}) { 1121 }
1122 $real_address = $mailmap->{addresses}->{$email}; 1122 if (exists $mailmap->{addresses}->{$email}) {
1123 } 1123 $real_address = $mailmap->{addresses}->{$email};
1124 } else { 1124 }
1125 if (exists $mailmap->{names}->{$address}) { 1125 } else {
1126 $real_name = $mailmap->{names}->{$address}; 1126 if (exists $mailmap->{names}->{$address}) {
1127 } 1127 $real_name = $mailmap->{names}->{$address};
1128 if (exists $mailmap->{addresses}->{$address}) { 1128 }
1129 $real_address = $mailmap->{addresses}->{$address}; 1129 if (exists $mailmap->{addresses}->{$address}) {
1130 } 1130 $real_address = $mailmap->{addresses}->{$address};
1131 } 1131 }
1132 return format_email($real_name, $real_address, 1); 1132 }
1133 return format_email($real_name, $real_address, 1);
1133} 1134}
1134 1135
1135sub mailmap { 1136sub mailmap {
@@ -1146,18 +1147,17 @@ sub mailmap {
1146} 1147}
1147 1148
1148sub merge_by_realname { 1149sub merge_by_realname {
1149 my %address_map; 1150 my %address_map;
1150 my (@emails) = @_; 1151 my (@emails) = @_;
1151 foreach my $email (@emails) { 1152 foreach my $email (@emails) {
1152 my ($name, $address) = parse_email($email); 1153 my ($name, $address) = parse_email($email);
1153 if (!exists $address_map{$name}) { 1154 if (!exists $address_map{$name}) {
1154 $address_map{$name} = $address; 1155 $address_map{$name} = $address;
1155 } else { 1156 } else {
1156 $address = $address_map{$name}; 1157 $address = $address_map{$name};
1157 $email = format_email($name,$address,1); 1158 $email = format_email($name,$address,1);
1158 }
1159 } 1159 }
1160 1160 }
1161} 1161}
1162 1162
1163sub git_execute_cmd { 1163sub git_execute_cmd {
@@ -1555,7 +1555,7 @@ commit signers and mailing lists that could be CC'd on a patch.
1555 1555
1556Any *'d entry is selected. 1556Any *'d entry is selected.
1557 1557
1558If you have git or hg installed, You can choose to summarize the commit 1558If you have git or hg installed, you can choose to summarize the commit
1559history of files in the patch. Also, each line of the current file can 1559history of files in the patch. Also, each line of the current file can
1560be matched to its commit author and that commits signers with blame. 1560be matched to its commit author and that commits signers with blame.
1561 1561