diff options
| -rwxr-xr-x | extras/checkpatch.pl | 10 | ||||
| -rwxr-xr-x | rfc.sh | 10 |
2 files changed, 11 insertions, 9 deletions
diff --git a/extras/checkpatch.pl b/extras/checkpatch.pl index 7402e2a6556..5a314258142 100755 --- a/extras/checkpatch.pl +++ b/extras/checkpatch.pl @@ -44,7 +44,7 @@ my $configuration_file = ".checkpatch.conf"; my $max_line_length = 80; my $ignore_perl_version = 0; my $minimum_perl_version = 5.10.0; -my $jenkins_url = $ENV{JENKINS_URL}; +my $gerrit_url = $ENV{GERRIT_URL}; sub help { my ($exitcode) = @_; @@ -57,7 +57,7 @@ Options: -q, --quiet quiet --patch treat FILE as patchfile (default) --emacs emacs compile window format - --jenkins-url=STRING provide URL patch was reviewed on + --gerrit-url=STRING URL the patch was reviewed at --terse one line per report -f, --file treat FILE as regular source file --subjective, --strict enable more subjective tests @@ -121,7 +121,7 @@ GetOptions( 'q|quiet+' => \$quiet, 'patch!' => \$chk_patch, 'emacs!' => \$emacs, - 'jenkins-url=s' => \$jenkins_url, + 'gerrit-url=s' => \$gerrit_url, 'terse!' => \$terse, 'f|file!' => \$file, 'subjective!' => \$check, @@ -1951,11 +1951,11 @@ sub process { } } - # Check if email is really Jenkins URL + # Check if email is really Gerrit URL if ($email =~ /^($url_tags)(.*)/) { my $uri = $1; my $url = $2; - if ($uri && $url !~ /$jenkins_url/) { + if ($uri && $url !~ /$gerrit_url/) { ERROR("BAD_URL", "Unrecognized url address: '$email'\n" . $herecurr); } @@ -82,6 +82,7 @@ assert_diverge() git diff origin/$branch..HEAD | grep -q .; } + check_patches_for_coding_style() { git fetch origin; @@ -92,8 +93,8 @@ check_patches_for_coding_style() exit 1 fi - ## Set this to known value once Jenkins URL changes - export JENKINS_URL="review.gluster.org" + # The URL of our Gerrit server + export GERRIT_URL="review.gluster.org" echo "Running coding guidelines check ..." head=$(git rev-parse --abbrev-ref HEAD) @@ -104,13 +105,13 @@ check_patches_for_coding_style() if [ "$RES" -eq 1 ] ; then echo "Errors caught, get details by:" echo " git format-patch --stdout origin/${branch}..${head} \\" - echo " | ./extras/checkpatch.pl --jenkins-url ${JENKINS_URL} -" + echo " | ./extras/checkpatch.pl --gerrit-url ${GERRIT_URL} -" echo "and correct errors" exit 1 elif [ "$RES" -eq 2 ] ; then echo "Warnings caught, get details by:" echo " git format-patch --stdout origin/${branch}..${head} \\" - echo " | ./extras/checkpatch.pl --jenkins-url ${JENKINS_URL} -" + echo " | ./extras/checkpatch.pl --gerrit-url ${GERRIT_URL} -" echo -n "Do you want to continue anyway [no/yes]: " read yesno if [ "${yesno}" != "yes" ] ; then @@ -120,6 +121,7 @@ check_patches_for_coding_style() fi } + main() { set_hooks_commit_msg; |