-
Notifications
You must be signed in to change notification settings - Fork 15
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add a module to run pgindent --show-diff
The module extracts the commits since the last run and passes those to pgindent with the --commit option, so it only checks files affected by those commits. It might be that we don't want to be restricted to that, but want the whole tree indented. Let's see. It would be trivial to change. (some) Discussion: https://postgr.es/m/582c503b-cd98-1891-ff87-9c8e8ce73ee5@dunslane.net
- Loading branch information
Showing
1 changed file
with
127 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,127 @@ | ||
|
||
# Package Namespace is hardcoded. Modules must live in | ||
# PGBuild::Modules | ||
|
||
=comment | ||
Copyright (c) 2003-2022, Andrew Dunstan | ||
See accompanying License file for license details | ||
=cut | ||
|
||
package PGBuild::Modules::CheckIndent; | ||
|
||
use PGBuild::Options; | ||
use PGBuild::SCM; | ||
use PGBuild::Utils; | ||
use PGBuild::Log; | ||
|
||
use Cwd qw(abs_path getcwd); | ||
|
||
use strict; | ||
use warnings; | ||
|
||
our ($VERSION); $VERSION = 'REL_16'; | ||
|
||
my $hooks = { 'build' => \&build, }; | ||
|
||
sub setup | ||
{ | ||
my $class = __PACKAGE__; | ||
|
||
my $buildroot = shift; # where we're building | ||
my $branch = shift; # The branch of Postgres that's being built. | ||
my $conf = shift; # ref to the whole config object | ||
my $pgsql = shift; # postgres build dir | ||
|
||
return unless $branch eq 'HEAD'; | ||
|
||
# could even set up several of these (e.g. for different branches) | ||
my $self = { | ||
buildroot => $buildroot, | ||
pgbranch => $branch, | ||
bfconf => $conf, | ||
pgsql => $pgsql | ||
}; | ||
bless($self, $class); | ||
|
||
|
||
# need to fetch the old git ref before the log directory is wiped out | ||
|
||
my $animal = $conf->{animal}; | ||
|
||
my $gitreffile = "$buildroot/$branch/$animal.lastrun-logs/githead.log"; | ||
if (-e $gitreffile) | ||
{ | ||
my $oldref = file_contents($gitreffile); | ||
chomp $oldref; | ||
$self->{oldref} = $oldref; | ||
} | ||
|
||
register_module_hooks($self, $hooks); | ||
return; | ||
} | ||
|
||
|
||
|
||
sub build | ||
{ | ||
# note - we run this in the source directory, not the build directory | ||
# even if it's a vpath build | ||
|
||
my $self = shift; | ||
|
||
return unless step_wanted('indent-check'); | ||
|
||
print time_str(), "checking for pgindent diffs ...\n" if $verbose; | ||
|
||
my $pgsql = abs_path($self->{pgsql}); | ||
|
||
local $ENV{PATH} = "$pgsql/src/tools/pg_bsd_indent:$ENV{PATH}"; | ||
|
||
my $gitref; | ||
my $commits = ""; | ||
|
||
# we're just going to look at the set of files changed since the last run | ||
# if we know what they are | ||
if ($gitref = $self->{oldref}) | ||
{ | ||
my @commits = `cd pgsql && git log --pretty=format:\%h $gitref..`; | ||
chomp @commits; | ||
$commits .= " --commit=$_" foreach @commits; | ||
} | ||
|
||
my $status; | ||
my @diffs; | ||
|
||
if ($commits) | ||
{ | ||
my $cmd = "src/tools/pgindent/pgindent --show-diff $commits"; | ||
|
||
@diffs = run_log("cd pgsql && $cmd"); | ||
$status = $? >> 8; | ||
|
||
my $log = PGBuild::Log->new("indent-check"); | ||
$log->add_log_lines("indent.diff",\@diffs); | ||
|
||
# --show-diff doesn't exit with error, unlike --silent-diff | ||
$status ||= 1 if @diffs; | ||
|
||
@diffs = ("============ pgindent check since $gitref ======\n", | ||
$log->log_string); | ||
|
||
} | ||
else | ||
{ | ||
@diffs = ("============ pgindent check ======\n", | ||
"no new commits to check\n"); | ||
} | ||
|
||
writelog("indent-check", \@diffs); | ||
print @diffs if ($verbose > 1); | ||
send_result("indent-check", $status, \@diffs) if $status; | ||
return; | ||
} | ||
|
||
1; |