#!/usr/bin/env bash # 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. # # Determine if the git diff patch file has prefixes. # These files are generated via "git diff" *without* the --no-prefix option. # # We can apply these patches more easily because we know that the a/ and b/ # prefixes in the "diff" lines stands for the project root directory. # So we don't have to hunt for the project root. # And of course, we know that the patch file was generated using git, so we # know git apply can handle it properly. # # Arguments: git diff file name. # Return: 0 if it is a git diff with prefix; 1 otherwise. # has_prefix() { awk '/^diff --git / { if ($3 !~ "^a/" || $4 !~ "^b/") { exit 1 } } /^\+{3}|-{3} / { if ($2 !~ "^[ab]/" && $2 !~ "^/dev/null") { exit 1 } }' "$1" return $? } PATCH_FILE=$1 DRY_RUN=$2 if [ -z "$PATCH_FILE" ]; then echo usage: $0 patch-file exit 1 fi TMPDIR=${TMPDIR:-/tmp} PATCH=${PATCH:-patch} # allow overriding patch binary # Cleanup handler for temporary files TOCLEAN="" cleanup() { rm $TOCLEAN exit $1 } trap "cleanup 1" HUP INT QUIT TERM # Allow passing "-" for stdin patches if [ "$PATCH_FILE" == "-" ]; then PATCH_FILE="$TMPDIR/smart-apply.in.$RANDOM" cat /dev/fd/0 > $PATCH_FILE TOCLEAN="$TOCLEAN $PATCH_FILE" fi ISSUE_RE='^(HADOOP|YARN|MAPREDUCE|HDFS)-[0-9]+$' if [[ ${PATCH_FILE} =~ ^http || ${PATCH_FILE} =~ ${ISSUE_RE} ]]; then # Allow downloading of patches PFILE="$TMPDIR/smart-apply.in.$RANDOM" TOCLEAN="$TOCLEAN $PFILE" if [[ ${PATCH_FILE} =~ ^http ]]; then patchURL="${PATCH_FILE}" else # Get URL of patch from JIRA wget -q -O "${PFILE}" "http://issues.apache.org/jira/browse/${PATCH_FILE}" if [[ $? != 0 ]]; then echo "Unable to determine what ${PATCH_FILE} may reference." 1>&2 cleanup 1 elif [[ $(grep -c 'Patch Available' "${PFILE}") == 0 ]]; then echo "${PATCH_FILE} is not \"Patch Available\". Exiting." 1>&2 cleanup 1 fi relativePatchURL=$(grep -o '"/jira/secure/attachment/[0-9]*/[^"]*' "${PFILE}" | grep -v -e 'htm[l]*$' | sort | tail -1 | grep -o '/jira/secure/attachment/[0-9]*/[^"]*') patchURL="http://issues.apache.org${relativePatchURL}" fi if [[ -n $DRY_RUN ]]; then echo "Downloading ${patchURL}" fi wget -q -O "${PFILE}" "${patchURL}" if [[ $? != 0 ]]; then echo "${PATCH_FILE} could not be downloaded." 1>&2 cleanup 1 fi PATCH_FILE="${PFILE}" fi # Case for git-diff patches if grep -q "^diff --git" "${PATCH_FILE}"; then GIT_FLAGS="--binary -v" if has_prefix "$PATCH_FILE"; then GIT_FLAGS="$GIT_FLAGS -p1" else GIT_FLAGS="$GIT_FLAGS -p0" fi if [[ -z $DRY_RUN ]]; then GIT_FLAGS="$GIT_FLAGS --stat --apply" echo Going to apply git patch with: git apply "${GIT_FLAGS}" else GIT_FLAGS="$GIT_FLAGS --check" fi # shellcheck disable=SC2086 git apply ${GIT_FLAGS} "${PATCH_FILE}" if [[ $? == 0 ]]; then cleanup 0 fi echo "git apply failed. Going to apply the patch with: ${PATCH}" fi # Come up with a list of changed files into $TMP TMP="$TMPDIR/smart-apply.paths.$RANDOM" TOCLEAN="$TOCLEAN $TMP" if $PATCH -p0 -E --dry-run < $PATCH_FILE 2>&1 > $TMP; then PLEVEL=0 #if the patch applied at P0 there is the possability that all we are doing # is adding new files and they would apply anywhere. So try to guess the # correct place to put those files. TMP2="$TMPDIR/smart-apply.paths.2.$RANDOM" TOCLEAN="$TOCLEAN $TMP2" egrep '^patching file |^checking file ' $TMP | awk '{print $3}' | grep -v /dev/null | sort -u > $TMP2 if [ ! -s $TMP2 ]; then echo "Error: Patch dryrun couldn't detect changes the patch would make. Exiting." cleanup 1 fi #first off check that all of the files do not exist FOUND_ANY=0 for CHECK_FILE in $(cat $TMP2) do if [[ -f $CHECK_FILE ]]; then FOUND_ANY=1 fi done if [[ "$FOUND_ANY" = "0" ]]; then #all of the files are new files so we have to guess where the correct place to put it is. # if all of the lines start with a/ or b/, then this is a git patch that # was generated without --no-prefix if ! grep -qv '^a/\|^b/' $TMP2 ; then echo Looks like this is a git patch. Stripping a/ and b/ prefixes echo and incrementing PLEVEL PLEVEL=$[$PLEVEL + 1] sed -i -e 's,^[ab]/,,' $TMP2 fi PREFIX_DIRS_AND_FILES=$(cut -d '/' -f 1 $TMP2 | sort -u) # if we are at the project root then nothing more to do if [[ -d hadoop-common-project ]]; then echo Looks like this is being run at project root # if all of the lines start with hadoop-common/, hadoop-hdfs/, hadoop-yarn/ or hadoop-mapreduce/, this is # relative to the hadoop root instead of the subproject root, so we need # to chop off another layer elif [[ "$PREFIX_DIRS_AND_FILES" =~ ^(hadoop-common-project|hadoop-hdfs-project|hadoop-yarn-project|hadoop-mapreduce-project)$ ]]; then echo Looks like this is relative to project root. Increasing PLEVEL PLEVEL=$[$PLEVEL + 1] elif ! echo "$PREFIX_DIRS_AND_FILES" | grep -vxq 'hadoop-common-project\|hadoop-hdfs-project\|hadoop-yarn-project\|hadoop-mapreduce-project' ; then echo Looks like this is a cross-subproject patch. Try applying from the project root cleanup 1 fi fi elif $PATCH -p1 -E --dry-run < $PATCH_FILE 2>&1 > /dev/null; then PLEVEL=1 elif $PATCH -p2 -E --dry-run < $PATCH_FILE 2>&1 > /dev/null; then PLEVEL=2 else echo "The patch does not appear to apply with p0 to p2"; cleanup 1; fi # If this is a dry run then exit instead of applying the patch if [[ -n $DRY_RUN ]]; then cleanup 0; fi echo Going to apply patch with: $PATCH -p$PLEVEL $PATCH -p$PLEVEL -E < $PATCH_FILE cleanup $?