Fix git depot_tools update flow.

bootstrap/gclient.bat

Index: bootstrap/gclient.bat
diff --git a/bootstrap/gclient.bat b/bootstrap/gclient.bat
index aff14dc5623858fa662f1f2cce4d1862a5f2247c..e64319f1b4508a32103c990bc85c20ea088b934c 100644
--- a/bootstrap/gclient.bat
+++ b/bootstrap/gclient.bat
@@ -1,10 +1,22 @@
 @echo off
-:: Copyright (c) 2009 The Chromium Authors. All rights reserved.
+:: Copyright (c) 2010 The Chromium Authors. All rights reserved.

[M-A Ruel, 2012/03/21 01:57:09]

2012

 :: Use of this source code is governed by a BSD-style license that can be
 :: found in the LICENSE file.
 
-:: Synchronize the root directory before deferring control back up to it.
-call "%~dp0\update_depot_tools.bat"
+:: IMPORTANT NOTE:
+:: The bootstrap flow has been removed. This file's only purpose is to make the
+:: transition smooth as the previous update script called bootstrap\gclient.bat
+:: The current flow took place on March 20, 2012. This file should be removed
+:: when it is believed everyone has updated since then.
 
-:: Defer control.
-python "%~dp0\..\gclient.py" %*
+:: At this point we know %DEPOT_TOOLS_UPDATE% != 0 as in the previous script
+:: bootstrap\gclient.bat was only called if this was the case.
+
+:: Update the root directory. The previous version only supported svn so there
+:: is no need looking for git here (i.e. if someone has git they can't get to
+:: this point where the bootstrap dir is gone during the update anyways...)
+IF NOT EXIST "%~dp0..\.svn\." GOTO :EOF
+call svn up -q "%~dp0.."
+
+:: Call the updated gclient.bat in the root directory to wrap the update.
+call "%~dp0..\gclient.bat"