From f9328b9b72a5ea4e035c02a130575515a730edc3 Mon Sep 17 00:00:00 2001
From: "nsylvain@chromium.org"
 <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Wed, 25 May 2011 02:03:58 +0000
Subject: [PATCH] Revert 86501: Make git-cl and update_depot_tools
 msys-compatible. Review URL: http://codereview.chromium.org/7008006

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@86552 0039d316-1c4b-4281-b951-d872f2087c98
---
 git-cl             | 14 ++------------
 update_depot_tools | 27 ++++++---------------------
 2 files changed, 8 insertions(+), 33 deletions(-)

diff --git a/git-cl b/git-cl
index 3c5457bbd9..afeef95d3a 100755
--- a/git-cl
+++ b/git-cl
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (c) 2011 The Chromium Authors. All rights reserved.
+# Copyright (c) 2010 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.
 
@@ -9,14 +9,4 @@
 base_dir=$(dirname "$0")
 
 "$base_dir"/update_depot_tools
-
-# Test if this script is running under a MSys install.  If it is, we will
-# hardcode the path to Python where possible.
-OUTPUT="$(uname | grep 'MINGW')"
-MINGW=$?
-
-if [ -d "$base_dir/python_bin" -a $MINGW = 0 ]; then
-  exec "$base_dir/python_bin/python.exe" "$base_dir"/git_cl.py "$@"
-else
-  exec "$base_dir/git_cl.py" "$@"
-fi
+"$base_dir"/git_cl.py "$@"
diff --git a/update_depot_tools b/update_depot_tools
index 42d02a3590..b4e6089bbf 100755
--- a/update_depot_tools
+++ b/update_depot_tools
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright (c) 2011 The Chromium Authors. All rights reserved.
+# Copyright (c) 2010 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.
 
@@ -17,24 +17,9 @@ then
     base_dir=`cd "$base_dir" && pwd -P`
 fi
 
-# Test if this script is running under a MSys install.  If it is, we will
-# hardcode the paths to SVN and Git where possible.
-OUTPUT="$(uname | grep 'MINGW')"
-MINGW=$?
-
-SVN="svn"
-if [ -d "$base_dir/svn_bin" -a $MINGW = 0 ]; then
-  SVN="$base_dir/svn_bin/svn.exe"
-fi
-
-GIT="git"
-if [ -d "$base_dir/git_bin" -a $MINGW = 0 ]; then
-  GIT="$base_dir/git_bin/bin/git.exe"
-fi
-
 # Test git and git --version.
 function test_git {
-  local GITV="$("$GIT" --version)" || {
+  local GITV="$(git --version)" || {
     echo "git isn't installed, please install it"
     exit 1
   }
@@ -49,7 +34,7 @@ function test_git {
 
 # Test git svn and git svn --version.
 function test_git_svn {
-  local GITV="$("$GIT" svn --version)" || {
+  local GITV="$(git svn --version)" || {
     echo "git-svn isn't installed, please install it"
     exit 1
   }
@@ -65,7 +50,7 @@ function test_git_svn {
 
 # Get the current SVN revision.
 get_svn_revision() {
-  LANGUAGE=C "$SVN" info "$base_dir" | \
+  LANGUAGE=C svn info "$base_dir" | \
       awk -F': ' '{ if ($1 == "Last Changed Rev") { print $2 }}'
 }
 
@@ -75,7 +60,7 @@ then
   cd $base_dir
   test_git_svn
   # work around a git-svn --quiet bug
-  OUTPUT=`"$GIT" svn rebase -q -q`
+  OUTPUT=`git svn rebase -q -q`
   if [[ ! "$OUTPUT" == *Current.branch* ]]; then
     echo $OUTPUT 1>&2
   fi
@@ -88,7 +73,7 @@ then
   # Update the bootstrap directory to stay up-to-date with the latest
   # depot_tools.
   BEFORE_REVISION=$(get_svn_revision)
-  "$SVN" -q up "$base_dir"
+  svn -q up "$base_dir"
   AFTER_REVISION=$(get_svn_revision)
   if [[ "$BEFORE_REVISION" != "$AFTER_REVISION" ]]; then
     echo "Depot Tools has been updated to revision $AFTER_REVISION." 1>&2