From 25a8081d370276aeea3c40c1dc1e1de64c82e1cc Mon Sep 17 00:00:00 2001
From: "maruel@chromium.org"
 <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Wed, 17 Jun 2009 17:59:38 +0000
Subject: [PATCH] Now update git depot_tools checkouts, also add automatic
 update for git-cl-repo and git-try-repo.

TEST=none
BUG=none

Review URL: http://codereview.chromium.org/125259

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@18633 0039d316-1c4b-4281-b951-d872f2087c98
---
 bootstrap/gclient.sh | 17 -----------------
 gclient              | 29 ++++++++++++++++++++++-------
 2 files changed, 22 insertions(+), 24 deletions(-)
 delete mode 100755 bootstrap/gclient.sh

diff --git a/bootstrap/gclient.sh b/bootstrap/gclient.sh
deleted file mode 100755
index 7223bd86f..000000000
--- a/bootstrap/gclient.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-# Copyright (c) 2009 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 script will try to sync the root and bootstrap directories.
-
-base_dir=$(dirname "$0")
-
-# Skip if $DEPOT_TOOLS_UPDATE==0 or ../.svn/. doesn't exist.
-if [ "X$DEPOT_TOOLS_UPDATE" != "X0" -a -e "$base_dir/../.svn" ]
-then
-  # Update the root directory.
-  svn -q up "$base_dir/.."
-fi
-
-exec python "$base_dir/../gclient.py" "$@"
diff --git a/gclient b/gclient
index 639ecfbbe..3705f0b39 100755
--- a/gclient
+++ b/gclient
@@ -6,7 +6,24 @@
 # This script will try to sync the bootstrap directories and then defer control.
 
 base_dir=$(dirname "$0")
- 
+
+# Update git checkouts prior the cygwin check, we don't want to use msysgit.
+if [ "X$DEPOT_TOOLS_UPDATE" != "X0" -a -e "$base_dir/.git" ]
+then
+  (cd "$base_dir"; git svn fetch -q; git merge trunk -q)
+fi
+
+if [ "X$DEPOT_TOOLS_UPDATE" != "X0" -a -e "$base_dir/git-cl-repo/.git" ]
+then
+  (cd "$base_dir/git-cl-repo"; git pull -q)
+fi
+
+if [ "X$DEPOT_TOOLS_UPDATE" != "X0" -a -e "$base_dir/git-try-repo/.git" ]
+then
+  (cd "$base_dir/git-try-repo"; git pull -q)
+fi
+
+
 # Use the batch file as an entry point if on cygwin.
 if [ "${OSTYPE}" = "cygwin" -a "${TERM}" = "cygwin" ]; then
    ${base_dir}/gclient.bat "$@"
@@ -14,14 +31,12 @@ if [ "${OSTYPE}" = "cygwin" -a "${TERM}" = "cygwin" ]; then
 fi
 
 
+# We're on POSIX (not cygwin). We can now safely look for svn checkout.
 if [ "X$DEPOT_TOOLS_UPDATE" != "X0" -a -e "$base_dir/.svn" ]
 then
   # Update the bootstrap directory to stay up-to-date with the latest
   # depot_tools.
-  svn -q up "$base_dir/bootstrap"
-
-  # Then defer the control to the bootstrapper.
-  exec "$base_dir/bootstrap/gclient.sh" "$@"
-else
-  exec python "$base_dir/gclient.py" "$@"
+  svn -q up "$base_dir"
 fi
+
+exec python "$base_dir/gclient.py" "$@"