Reland "depot_tools: Run using Python 3 by default."
This reverts commit e2ac022f0bdfbb36ddf355eb4da0151081b02130.
git-cache issues were solved by https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2120966
Original change's description:
> Reland "depot_tools: Run using Python 3 by default."
>
> This is a reland of 01ed358917aa9f9f6314414ba3bb5e808bdedca2
>
> * python_runner.sh, gclient, roll-dep and fetch will call vpython
> (instead of vpython3) when running on Windows under git-bash.
> * vpython3 now detects when running on Windows under git-bash and
> executes vpython3.bat instead.
> * vpython3.bat calls python3.exe directly instead of calling python3.bat.
>
> Original change's description:
> > depot_tools: Run using Python 3 by default.
> >
> > Run gclient, roll-dep, fetch and custom git commands (i.e. git-cl, git-rebase-update, git-new-branch, etc.)
> > using vpython3 by default.
> >
> > Change-Id: I4eecddafa6ca4c5f82ec097615c79d2a741613e7
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2113550
> > Reviewed-by: Anthony Polito <apolito@google.com>
> > Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
>
> Change-Id: I9829141d7ea26a67e655264430151f493e73a930
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2118418
> Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
> Reviewed-by: Anthony Polito <apolito@google.com>
Change-Id: Iff02533f0a11062f335a010c074043c720d5b2ba
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2121304
Reviewed-by: Josip Sokcevic <sokcevic@google.com>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
diff --git a/python_runner.sh b/python_runner.sh
index 2199666..50deb20 100755
--- a/python_runner.sh
+++ b/python_runner.sh
@@ -48,17 +48,19 @@
# standalone, but allow other PATH manipulations to take priority.
PATH=$PATH:$DEPOT_TOOLS
-if [[ $PYTHON_DIRECT = 1 ]]; then
- python.exe "$DEPOT_TOOLS\\$SCRIPT" "$@"
-elif [[ -e "$DEPOT_TOOLS/python.bat" && $OSTYPE = msys ]]; then
- cmd.exe //c "$DEPOT_TOOLS\\vpython.bat" "$DEPOT_TOOLS\\$SCRIPT" "$@"
-elif [[ $GCLIENT_PY3 = 1 ]]; then
+# MINGW will equal 0 if we're running on Windows under MinGW.
+MINGW=$(uname -s | grep MINGW > /dev/null; echo $?)
+
+if [[ $GCLIENT_PY3 = 1 ]]; then
# Explicitly run on Python 3
vpython3 "$DEPOT_TOOLS/$SCRIPT" "$@"
elif [[ $GCLIENT_PY3 = 0 ]]; then
# Explicitly run on Python 2
vpython "$DEPOT_TOOLS/$SCRIPT" "$@"
-else
- # Run on Python 2 for now, allows default to be flipped.
+elif [[ $MINGW = 0 ]]; then
+ # Run on Python 2 on Windows for now, allows default to be flipped.
vpython "$DEPOT_TOOLS/$SCRIPT" "$@"
+else
+ # Run on Python 3, allows default to be flipped.
+ vpython3 "$DEPOT_TOOLS/$SCRIPT" "$@"
fi