summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2013-07-08 16:00:43 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-07-09 10:33:25 -0700
commitc707a81de71a27a499fde60fbb963f60602c1a94 (patch)
tree38f6a128f256ba3d2e95b470e83d8ac88c60b2cb
parentdcb6b45254e2281b6f99ea7f2d51343954aa3ba8 (diff)
downloadlinux-c707a81de71a27a499fde60fbb963f60602c1a94.tar.bz2
checkpatch: make the CamelCase cache work for non-git trees too
Might as well check include timestamps and cache the include file CamelCase uses for the non-git case too. The camelcase cache file is now named: for git: .checkpatch-camelcase.git.<commit_id> for non-git: .checkpatch-camelcase.date.<YYYYMMDDhhmm> All .checkpatch-camelcase* files are deleted if not current. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rwxr-xr-xscripts/checkpatch.pl54
1 files changed, 35 insertions, 19 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 6afcd1239ca5..2ee9eb750560 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -6,6 +6,7 @@
# Licensed under the terms of the GNU GPL License version 2
use strict;
+use POSIX;
my $P = $0;
$P =~ s@.*/@@g;
@@ -399,37 +400,52 @@ sub seed_camelcase_includes {
return if ($camelcase_seeded);
my $files;
- my $camelcase_git_file = "";
+ my $camelcase_cache = "";
+ my @include_files = ();
+
+ $camelcase_seeded = 1;
if (-d ".git") {
my $git_last_include_commit = `git log --no-merges --pretty=format:"%h%n" -1 -- include`;
chomp $git_last_include_commit;
- $camelcase_git_file = ".checkpatch-camelcase.$git_last_include_commit";
- if (-f $camelcase_git_file) {
- open(my $camelcase_file, '<', "$camelcase_git_file")
- or warn "$P: Can't read '$camelcase_git_file' $!\n";
- while (<$camelcase_file>) {
- chomp;
- $camelcase{$_} = 1;
- }
- close($camelcase_file);
-
- return;
- }
- $files = `git ls-files include`;
+ $camelcase_cache = ".checkpatch-camelcase.git.$git_last_include_commit";
} else {
+ my $last_mod_date = 0;
$files = `find $root/include -name "*.h"`;
+ @include_files = split('\n', $files);
+ foreach my $file (@include_files) {
+ my $date = POSIX::strftime("%Y%m%d%H%M",
+ localtime((stat $file)[9]));
+ $last_mod_date = $date if ($last_mod_date < $date);
+ }
+ $camelcase_cache = ".checkpatch-camelcase.date.$last_mod_date";
+ }
+
+ if ($camelcase_cache ne "" && -f $camelcase_cache) {
+ open(my $camelcase_file, '<', "$camelcase_cache")
+ or warn "$P: Can't read '$camelcase_cache' $!\n";
+ while (<$camelcase_file>) {
+ chomp;
+ $camelcase{$_} = 1;
+ }
+ close($camelcase_file);
+
+ return;
+ }
+
+ if (-d ".git") {
+ $files = `git ls-files "include/*.h"`;
+ @include_files = split('\n', $files);
}
- my @include_files = split('\n', $files);
+
foreach my $file (@include_files) {
seed_camelcase_file($file);
}
- $camelcase_seeded = 1;
- if ($camelcase_git_file ne "") {
+ if ($camelcase_cache ne "") {
unlink glob ".checkpatch-camelcase.*";
- open(my $camelcase_file, '>', "$camelcase_git_file")
- or warn "$P: Can't write '$camelcase_git_file' $!\n";
+ open(my $camelcase_file, '>', "$camelcase_cache")
+ or warn "$P: Can't write '$camelcase_cache' $!\n";
foreach (sort { lc($a) cmp lc($b) } keys(%camelcase)) {
print $camelcase_file ("$_\n");
}