check-release.pl: also list the commit total

ctrueden · ctrueden · commit 4b6a85e0a39d · 2015-08-26T11:16:40.000-05:00
When filtering the commits to only those relevant, it is still nice to
know the total number of commits since the last release, even if some of
them got filtered out. So let's list the commits as "x/y" where x is the
number of relevant commits, and y is the total since last release.

Requested by Mark Hiner.
diff --git a/check-release.pl b/check-release.pl
@@ -195,5 +195,7 @@ ($$$)
 
 if ($verbose || $commitCount > 0) {
   # new commits on master; a release is potentially needed
-  print "$ga: $commitCount commits on master since $release_version\n";
+  my @allCommits = `git rev-list $releaseRef...origin/master`;
+  my $totalCommits = @allCommits;
+  print "$ga: $commitCount/$totalCommits commits on master since $release_version\n";
 }
diff --git a/prettify-status.pl b/prettify-status.pl
@@ -33,12 +33,13 @@ ($$)
 
 for my $line (sort @lines) {
   chomp $line;
-  if ($line =~ /([^:]+):([^:]+): (\d+) commits on (\w+) since (.*)/) {
+  if ($line =~ /([^:]+):([^:]+): (\d+)\/(\d+) commits on (\w+) since (.*)/) {
     my $groupId = $1;
     my $artifactId = $2;
     my $commitCount = $3;
-    my $branch = $4;
-    my $version = $5;
+    my $totalCommits = $4;
+    my $branch = $5;
+    my $version = $6;
     my $tag = $version ? "$artifactId-$version" : "";
     my $org = $orgs{$groupId};
     if (!$org) { $org = $groupId; }
@@ -47,14 +48,15 @@ ($$)
     my $link = "https://github.com/$orgs{$groupId}/$repo";
 
     my $data = {
-      groupId     => $groupId,
-      artifactId  => $artifactId,
-      commitCount => $commitCount,
-      branch      => $branch,
-      version     => $version,
-      tag         => $tag,
-      org         => $org,
-      repo        => $repo,
+      groupId      => $groupId,
+      artifactId   => $artifactId,
+      commitCount  => $commitCount,
+      totalCommits => $totalCommits,
+      branch       => $branch,
+      version      => $version,
+      tag          => $tag,
+      org          => $org,
+      repo         => $repo,
     };
 
     if (not $org) {
@@ -73,7 +75,7 @@ ($$)
       # a release is needed
       $data->{line} = "<td class=\"first\"></td>\n" .
         "<td><a href=\"$link\">$artifactId</a></td>\n" .
-        "<td><a href=\"$link/compare/$tag...$branch\">$commitCount</a></td>\n" .
+        "<td><a href=\"$link/compare/$tag...$branch\">$commitCount/$totalCommits</a></td>\n" .
         "<td><a href=\"$link/tree/$tag\">$version</a></td>\n";
       push @ahead, $data;
     }

Original file line number	Diff line number	Diff line change
`@@ -195,5 +195,7 @@ ($$$)`
`195`	`195`
`196`	`196`	`if ($verbose \|\| $commitCount > 0) {`
`197`	`197`	`# new commits on master; a release is potentially needed`
`198`		`- print "$ga: $commitCount commits on master since $release_version\n";`
	`198`	+ my @allCommits = `git rev-list $releaseRef...origin/master`;
	`199`	`+ my $totalCommits = @allCommits;`
	`200`	`+ print "$ga: $commitCount/$totalCommits commits on master since $release_version\n";`
`199`	`201`	`}`