andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Give instructions instead of broken 2to3 for clang-format-diff.py (#7603)

Browse Source 
Summary:
My previous change to use lib2to3 to migrate clang-format-diff.py
for Python 2 only works if there's nothing to reformat. Instead, give
instructions to download to REPO_ROOT.

Pull Request resolved: https://github.com/facebook/rocksdb/pull/7603

Test Plan: Try the instructions on a fresh CentOS 8 devserver

Reviewed By: riversand963

Differential Revision: D24569608

Pulled By: pdillinger

fbshipit-source-id: 1410ba163e016b226e883dec93fae3df9ed0eab2
This commit is contained in:
Peter Dillinger 2020-10-27 11:56:51 -07:00 committed by Facebook GitHub Bot
parent f35f7f2704
commit 0e2e67562f
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
build_tools/format-diff.sh
View File

@ -75,17 +75,15 @@ else
exit 129 exit 129
fi fi
# Unfortunately, some machines have a Python2 clang-format-diff.py # Unfortunately, some machines have a Python2 clang-format-diff.py
# installed but only a Python3 interpreter installed. Rather than trying # installed but only a Python3 interpreter installed. Unfortunately,
# different Python versions that might be installed, we can try migrating # automatic 2to3 migration is insufficient, so suggest downloading latest.
# the code to Python3 if it looks like Python2
if grep -q "print '" "$CFD_PATH" && \ if grep -q "print '" "$CFD_PATH" && \
${PYTHON:-python3} --version | grep -q 'ython 3'; then ${PYTHON:-python3} --version | grep -q 'ython 3'; then
if [ ! -f "$REPO_ROOT/.py3/clang-format-diff.py" ]; then echo "You have clang-format-diff.py for Python 2 but are using a Python 3"
echo "Migrating $CFD_PATH to Python3 in a hidden file" echo "interpreter (${PYTHON:-python3})."
mkdir -p "$REPO_ROOT/.py3" echo "You can download clang-format-diff.py for Python 3 by running: "
${PYTHON:-python3} -m lib2to3 -w -n -o "$REPO_ROOT/.py3" "$CFD_PATH" > /dev/null || exit 128 echo " curl --location http://goo.gl/iUW1u2 -o ${REPO_ROOT}/clang-format-diff.py"
fi exit 130
CFD_PATH="$REPO_ROOT/.py3/clang-format-diff.py"
fi fi
CLANG_FORMAT_DIFF="${PYTHON:-python3} $CFD_PATH" CLANG_FORMAT_DIFF="${PYTHON:-python3} $CFD_PATH"
# This had better work after all those checks # This had better work after all those checks