Revert of Generalize python_git_runner for use in non-git scripts. (patchset...

Revert of Generalize python_git_runner for use in non-git scripts. (patchset #1 id:1 of https://codereview.chromium.org/1415993003/ )

Reason for revert:
Speculative revert in case this caused the bots to fail bot_update.

Original issue's description:
> Generalize python_git_runner for use in non-git scripts.
> 
> Also fixes an msys (git-bash) incompatibility, similar to the one
> fixed in crrev.com/4845f0ed.
> 
> This change doesn't actually use the wrapper in any new places, but
> subsequent changes will be made to use it in places where
> 'exec python' is called directly, like gclient and fetch.
> 
> BUG=411518
> R=iannucci@google.com
> 
> Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=297357

TBR=iannucci@google.com,iannucci@chromium.org,mmoss@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=411518

Review URL: https://codereview.chromium.org/1414923008

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297358 0039d316-1c4b-4281-b951-d872f2087c98

git-auto-svn

@@ -3,4 +3,4 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-. $(type -P python_runner.sh)
+. $(type -P python_git_runner.sh)

git-cache

@@ -3,4 +3,4 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-. $(type -P python_runner.sh)
+. $(type -P python_git_runner.sh)

git-cherry-pick-upload

@@ -3,4 +3,4 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-. $(type -P python_runner.sh)
+. $(type -P python_git_runner.sh)

git-cl

@@ -3,4 +3,4 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-. $(type -P python_runner.sh)
+. $(type -P python_git_runner.sh)

git-drover

@@ -3,4 +3,4 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-. $(type -P python_runner.sh)
+. $(type -P python_git_runner.sh)

git-find-releases

@@ -3,4 +3,4 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-. $(type -P python_runner.sh)
+. $(type -P python_git_runner.sh)

git-footers

@@ -3,4 +3,4 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-. $(type -P python_runner.sh)
+. $(type -P python_git_runner.sh)

git-freeze

@@ -5,4 +5,4 @@
 
 SCRIPT=git_freezer.py
 set -- freeze "$@"
-. $(type -P python_runner.sh)
+. $(type -P python_git_runner.sh)

git-map

@@ -3,4 +3,4 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-. $(type -P python_runner.sh) | less -R
+. $(type -P python_git_runner.sh) | less -R

git-map-branches

@@ -3,4 +3,4 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-. $(type -P python_runner.sh)
+. $(type -P python_git_runner.sh)

git-mark-merge-base

@@ -3,4 +3,4 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-. $(type -P python_runner.sh)
+. $(type -P python_git_runner.sh)

git-nav-downstream

@@ -3,4 +3,4 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-. $(type -P python_runner.sh)
+. $(type -P python_git_runner.sh)

git-new-branch

@@ -3,4 +3,4 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-. $(type -P python_runner.sh)
+. $(type -P python_git_runner.sh)

git-number

@@ -3,4 +3,4 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-. $(type -P python_runner.sh)
+. $(type -P python_git_runner.sh)

git-rebase-update

@@ -3,4 +3,4 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-. $(type -P python_runner.sh)
+. $(type -P python_git_runner.sh)

git-rename-branch

@@ -3,4 +3,4 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-. $(type -P python_runner.sh)
+. $(type -P python_git_runner.sh)

git-reparent-branch

@@ -3,4 +3,4 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-. $(type -P python_runner.sh)
+. $(type -P python_git_runner.sh)

git-retry

@@ -5,4 +5,4 @@
 
 SCRIPT=git_retry.py
 set -- retry "$@"
-. $(type -P python_runner.sh)
+. $(type -P python_git_runner.sh)

git-squash-branch

@@ -3,4 +3,4 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-. $(type -P python_runner.sh)
+. $(type -P python_git_runner.sh)

git-thaw

@@ -10,4 +10,4 @@
 
 SCRIPT=git_freezer.py
 set -- thaw "$@"
-. $(type -P python_runner.sh)
+. $(type -P python_git_runner.sh)

git-try

@@ -6,4 +6,4 @@
 # git_try.py - Commits a patch to the SVN try patch repo.
 #              It is highly recommended to use `git cl try` instead.
 
-. $(type -P python_runner.sh)
+. $(type -P python_git_runner.sh)

git-upstream-diff

@@ -6,4 +6,4 @@
 # git_upstream_diff.py -- Provide the diff between the current branch and its
 # upstream.
 
-. $(type -P python_runner.sh)
+. $(type -P python_git_runner.sh)

python_runner.sh → python_git_runner.sh

-# Copyright 2015 The Chromium Authors. All rights reserved.
+# Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 ## This file is designed to be sourced from a bash script whose name takes the
-## form 'command-name'. This script will then instead invoke
-## '[depot_tools]/command_name.py' correctly under mingw as well
+## form 'git-sub-command'. This script will then instead invoke
+## '[depot_tools]/git_sub_command.py' correctly under mingw as well
 ## as posix-ey systems, passing along all other command line flags.
 
 ## Example:
-## echo ". python_runner.sh" > git-foo-command
+## echo ". python_git_runner.sh" > git-foo-command
 ## ./git-foo-command  #=> runs `python git_foo_command.py`
 
 ## Constants
@@ -19,14 +19,14 @@ PYTHONDONTWRITEBYTECODE=1
 #
 # SCRIPT defaults to the basename of $0, with dashes replaced with underscores
 
-DEPOT_TOOLS="${0%/*}"
-# Sometimes commands will run with no path (e.g. a git command run from within
-# the depot_tools dir itself). In that case, treat it like it was run like:
-# "./command"
-if [[ "$DEPOT_TOOLS" = "$0" ]]; then
-  DEPOT_TOOLS="."
+if [[ $OSTYPE = msys ]]
+then
+  DEPOT_TOOLS="${0%\\*}"
+  BASENAME="${0##*\\}"
+else
+  DEPOT_TOOLS="${0%/*}"
+  BASENAME="${0##*/}"
 fi
-BASENAME="${0##*/}"
 SCRIPT="${SCRIPT-${BASENAME//-/_}.py}"
 
 if [[ -e "$DEPOT_TOOLS/python.bat" && $OSTYPE = msys ]]; then