mirror of
https://github.com/google/nomulus.git
synced 2025-04-29 19:47:51 +02:00
4c089b1694
* Only apply Google Java format to changed lines * Only apply Google Java format to changed lines * Only apply Google Java format to changed regions Diffs are relative to origin/master. Three tasks are added: - javaIncrementalFormatCheck is added to the build workflow, and will abort build if format violations are found. - javaIncrementalFormatApply needs to be manually invoked to correct format violations, the same behavior as spotlessApply. - javaIncrementalFormatDryRun shows the changes that would happen if javaIncrementalFormatApply is invoked. These tasks work from the root directory and process the buildSrc directory too. The Spotless Java config is removed. * Only apply Google Java format to changed regions Diffs are relative to origin/master. Three tasks are added: - javaIncrementalFormatCheck is added to the build workflow, and will abort build if format violations are found. - javaIncrementalFormatApply needs to be manually invoked to correct format violations, the same behavior as spotlessApply. - javaIncrementalFormatDryRun shows the changes that would happen if javaIncrementalFormatApply is invoked. These tasks work from the root directory and process the buildSrc directory too. The Spotless Java config is removed. * Only apply Google Java format to changed regions Diffs are relative to origin/master. Three tasks are added: - javaIncrementalFormatCheck is added to the build workflow, and will abort build if format violations are found. - javaIncrementalFormatApply needs to be manually invoked to correct format violations, the same behavior as spotlessApply. - javaIncrementalFormatDryRun shows the changes that would happen if javaIncrementalFormatApply is invoked. These tasks work from the root directory and process the buildSrc directory too. The Spotless Java config is removed. * Only apply Google Java format to changed regions Diffs are relative to origin/master. Three tasks are added: - javaIncrementalFormatCheck is added to the build workflow, and will abort build if format violations are found. - javaIncrementalFormatApply needs to be manually invoked to correct format violations, the same behavior as spotlessApply. - javaIncrementalFormatDryRun shows the changes that would happen if javaIncrementalFormatApply is invoked. These tasks work from the root directory and process the buildSrc directory too. The Spotless Java config is removed.
88 lines
2.7 KiB
Bash
Executable file
88 lines
2.7 KiB
Bash
Executable file
#!/bin/bash
|
|
# Copyright 2019 The Nomulus Authors. All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
#
|
|
# This script applies Google Java format to modified regions in Java source
|
|
# files in a Git repository. It assumes that the repository has a 'master'
|
|
# branch that is only used for merging and is never directly worked on.
|
|
#
|
|
# If invoked on the master branch, this script will format the modified lines
|
|
# relative to HEAD. Otherwise, it uses the
|
|
# 'git merge-base --fork-point origin/master' command to find the latest
|
|
# fork point from origin/master, and formats the modified lines between
|
|
# the fork point and the HEAD of the current branch.
|
|
#
|
|
# Background: existing code base does not conform to Google Java format. Since
|
|
# the team wants to keep the 'blame' feature (find last modifier of a line)
|
|
# usable, we do not want to reformat existing code.
|
|
|
|
set -e
|
|
|
|
USAGE="
|
|
$(basename "$0") [--help] check|format|show
|
|
Incrementally format modified java lines in Git.
|
|
|
|
where:
|
|
--help show this help text
|
|
check check if formatting is necessary
|
|
format format files in place
|
|
show show the effect of the formatting as unified diff"
|
|
|
|
SCRIPT_DIR="$(realpath $(dirname $0))"
|
|
|
|
function callGoogleJavaFormatDiff() {
|
|
local forkPoint
|
|
forkPoint=$(git merge-base --fork-point origin/master)
|
|
|
|
local callResult
|
|
case "$1" in
|
|
"check")
|
|
callResult=$(git diff -U0 ${forkPoint} | \
|
|
${SCRIPT_DIR}/google-java-format-diff.py -p1 | wc -l)
|
|
;;
|
|
"format")
|
|
callResult=$(git diff -U0 ${forkPoint} | \
|
|
${SCRIPT_DIR}/google-java-format-diff.py -p1 -i)
|
|
;;
|
|
"show")
|
|
callResult=$(git diff -U0 ${forkPoint} | \
|
|
${SCRIPT_DIR}/google-java-format-diff.py -p1)
|
|
;;
|
|
esac
|
|
echo "${callResult}"
|
|
exit 0
|
|
}
|
|
|
|
function isJavaFormatNeededOnDiffs() {
|
|
local modifiedLineCount
|
|
modifiedLineCount=$(callGoogleJavaFormatDiff "check")
|
|
|
|
if [[ ${modifiedLineCount} -ne 0 ]]; then
|
|
echo "true"
|
|
else
|
|
echo "false"
|
|
fi
|
|
exit 0
|
|
}
|
|
|
|
# The main function of this script:
|
|
if [[ $# -eq 1 && $1 == "check" ]]; then
|
|
isJavaFormatNeededOnDiffs
|
|
elif [[ $# -eq 1 && $1 == "format" ]]; then
|
|
callGoogleJavaFormatDiff "format"
|
|
elif [[ $# -eq 1 && $1 == "show" ]]; then
|
|
callGoogleJavaFormatDiff "show"
|
|
else
|
|
echo "${USAGE}"
|
|
fi
|