Fix git depot_tools update flow.

gclient.bat

Index: gclient.bat
diff --git a/gclient.bat b/gclient.bat
index 6860903962b65e0e1ae629cb50b2431e2f9b6f8b..4b8f38f06a3e466e45635e6b9631c7c34e12746b 100755
--- a/gclient.bat
+++ b/gclient.bat
@@ -19,25 +19,36 @@ call "%~dp0bootstrap\win\win_tools.bat" force
 if errorlevel 1 goto :EOF
 
 :: Shall skip automatic update?
-IF "%DEPOT_TOOLS_UPDATE%" == "0" GOTO :SKIP_UPDATE
-:: We can't sync if .\.svn\. doesn't exist.
-IF NOT EXIST "%~dp0.svn\." GOTO :SKIP_UPDATE
-
+IF "%DEPOT_TOOLS_UPDATE%" == "0" GOTO :POST_UPDATE
+:: We need either .\.svn\. or .\.git\. to be able to sync.
+IF EXIST "%~dp0.svn\." GOTO :SVN_BOOTSTRAP
+IF EXIST "%~dp0.git\." GOTO :GIT_UPDATE

[M-A Ruel, 2012/03/20 15:19:13]

IF EXIST "%~dp0.git\." GOTO :<line 35>

+echo Error syncing depot_tools, no revision tool found
+goto :POST_UPDATE
+
+:SVN_BOOTSTRAP
 :: Sync the bootstrap directory.
+echo Updating depot_tools with SVN...
 call svn up -q "%~dp0bootstrap"
 :: still continue even in case of error.
-goto :UPDATE
-
-
-:SKIP_UPDATE
-:: Don't bother to try to update any thing.
-python "%~dp0\gclient.py" %*
-goto :EOF
-
 
-:UPDATE
 :: Transfer control to ease the update process. The following lines won't be
 :: executed so don't add any! Specifically, don't use 'call' in the following
 :: line.
 "%~dp0bootstrap\gclient.bat" %*
 goto :EOF
+
+
+:GIT_UPDATE
+echo Updating depot_tools with Git...
+:: The git workflow doesn't require a bootstrap.
+set UPDATED_DIR=%CD%
+cd %~dp0
+call git svn rebase -q -q

[gab, 2012/03/20 14:52:19]

I noticed update_depot_tools uses -q -q for extra quietness, but wasn't sure why
we are doing that as the rest of the sync process is fairly verbose.

(I added echos above to let the user know what is happening, let me know should
I need to proceed otherwise)

[M-A Ruel, 2012/03/20 15:19:13]

What,s the rest of the sync process? You mean the initial one? This one is
verbose because it's much slower and it is a one-time process.
It should do the same than update_depot_tools, it hadn't been updated here when
update_depot_tools verbosity was adjusted.


Overall, I'd prefer this code to be in update_depot_tools.bat

+cd %UPDATED_DIR%
+goto :POST_UPDATE
+
+
+:POST_UPDATE
+python "%~dp0\gclient.py" %*
+goto :EOF