Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1385942 > unrolled thread

[PATCH] checkpatch: Add support to check already applied git commits

Back to article view | Back to linux.kernel

Contents

  [PATCH] checkpatch: Add support to check already applied git commits Joe Perches <joe@perches.com> - 2016-04-25 01:20 +0200
    RE: [PATCH] checkpatch: Add support to check already applied git  commits "Du, Changbin" <changbin.du@intel.com> - 2016-04-25 04:30 +0200

#1385942 — [PATCH] checkpatch: Add support to check already applied git commits

It's sometimes useful to scan already committed patches.

Add --git <revision range> to scan specific or multiple commits.

Single commits are scanned with
	--git <rev>
Multiple commits are scanned with
	--git <range>
	--git <commit>-<count>

Signed-off-by: "Du, Changbin" <changbin.du@intel.com>
Signed-off-by: Joe Perches <joe@perches.com>
---

A few miscellaneous improvements to Changbin's original patch:

o Don't exec git for each <commit>-<count>,
  use a single "git log -<count> <commit>"
o Consolidate the git exec for the <range> and <commit>-<count> variants
o Output 12 character commit hash ids
o Don't scan git commit merges
o Use -M to reduce the size of rename commits

 scripts/checkpatch.pl | 48 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 47 insertions(+), 1 deletion(-)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index e3d9c34..1bba191 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -27,6 +27,7 @@ my $emacs = 0;
 my $terse = 0;
 my $showfile = 0;
 my $file = 0;
+my $git = 0;
 my $check = 0;
 my $check_orig = 0;
 my $summary = 1;
@@ -68,6 +69,16 @@ Options:
   --emacs                    emacs compile window format
   --terse                    one line per report
   --showfile                 emit diffed file position, not input file position
+  -g, --git                  treat FILE as a single commit or git revision range
+                             single git commit with:
+                               <rev>
+                               <rev>^
+                               <rev>~n
+                             multiple git commits with:
+                               <rev1>..<rev2>
+                               <rev1>...<rev2>
+                               <rev>-<count>
+                             git merges are ignored
   -f, --file                 treat FILE as regular source file
   --subjective, --strict     enable more subjective tests
   --types TYPE(,TYPE2...)    show only these comma separated message types
@@ -141,6 +152,7 @@ GetOptions(
 	'terse!'	=> \$terse,
 	'showfile!'	=> \$showfile,
 	'f|file!'	=> \$file,
+	'g|git!'	=> \$git,
 	'subjective!'	=> \$check,
 	'strict!'	=> \$check,
 	'ignore=s'	=> \@ignore,
@@ -752,10 +764,42 @@ my @fixed_inserted = ();
 my @fixed_deleted = ();
 my $fixlinenr = -1;
 
+# If input is git commits, extract all commits from the commit expressions.
+# For example, HEAD-3 means we need check 'HEAD, HEAD~1, HEAD~2'.
+die "$P: No git repository found\n" if ($git && !-e ".git");
+
+if ($git) {
+	my @commits = ();
+	for my $commit_expr (@ARGV) {
+		my $git_range;
+		if ($commit_expr =~ m/-/) {
+			my @tmp = split(/-/, $commit_expr);
+			die "$P: incorrect git commits expression $commit_expr$!\n"
+			    if (@tmp != 2);
+			$git_range = "-$tmp[1] $tmp[0]";
+		} elsif ($commit_expr =~ m/\.\./) {
+			$git_range = "$commit_expr";
+		}
+		if (defined $git_range) {
+			my $lines = `git log --no-merges --pretty=format:'%H' $git_range`;
+			foreach my $line (split(/\n/, $lines)) {
+				unshift(@commits, $line);
+			}
+		} else {
+			unshift(@commits, $commit_expr);
+		}
+	}
+	die "$P: no git commits after extraction!\n" if (@commits == 0);
+	@ARGV = @commits;
+}
+
 my $vname;
 for my $filename (@ARGV) {
 	my $FILE;
-	if ($file) {
+	if ($git) {
+		open($FILE, '-|', "git format-patch -M --stdout -1 $filename") ||
+			die "$P: $filename: git format-patch failed - $!\n";
+	} elsif ($file) {
 		open($FILE, '-|', "diff -u /dev/null $filename") ||
 			die "$P: $filename: diff failed - $!\n";
 	} elsif ($filename eq '-') {
@@ -766,6 +810,8 @@ for my $filename (@ARGV) {
 	}
 	if ($filename eq '-') {
 		$vname = 'Your patch';
+	} elsif ($git) {
+		$vname = "Commit " . substr($filename, 0, 12) . `git log -1 --pretty=format:' ("%s")' $filename`;
 	} else {
 		$vname = $filename;
 	}
-- 
2.8.0.rc4.16.g56331f8

[toc] | [next] | [standalone]

#1385980 — RE: [PATCH] checkpatch: Add support to check already applied git commits

Hi,

> From: Joe Perches [mailto:joe@perches.com]
> Sent: Monday, April 25, 2016 7:12 AM
> To: Andrew Morton <akpm@linux-foundation.org>; Andy Whitcroft
> <apw@canonical.com>
> Cc: Du, Changbin <changbin.du@intel.com>; linux-kernel@vger.kernel.org
> Subject: [PATCH] checkpatch: Add support to check already applied git
> commits
> 
> It's sometimes useful to scan already committed patches.
> 
> Add --git <revision range> to scan specific or multiple commits.
> 
> Single commits are scanned with
> 	--git <rev>
> Multiple commits are scanned with
> 	--git <range>
> 	--git <commit>-<count>
> 
> Signed-off-by: "Du, Changbin" <changbin.du@intel.com>
> Signed-off-by: Joe Perches <joe@perches.com>
> ---
> 
> A few miscellaneous improvements to Changbin's original patch:
> 
> o Don't exec git for each <commit>-<count>,
>   use a single "git log -<count> <commit>"
> o Consolidate the git exec for the <range> and <commit>-<count> variants
> o Output 12 character commit hash ids
> o Don't scan git commit merges
> o Use -M to reduce the size of rename commits
> 

Thanks, it has been much more better now. I like this new one. 
This is my first time write a Perl script. :)

Also thanks for Sebastian's explanation, I got this idea just
because I had the same use case with you.

Best Regards,
Du, Changbin

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web