Add a bleeding-edge git version mode to depot_tools.

Add a bleeding-edge git version mode to depot_tools.

R=mmoss@google.com, mmoss@chromium.org
BUG=238428
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=263544

[iannucci, 2014-04-12 02:52:26]

PTAL

[mmoss, 2014-04-12 03:01:03]

On 2014/04/12 02:52:26, iannucci wrote:
> PTAL

LGTM with nits.

[mmoss, 2014-04-12 03:01:10]

https://codereview.chromium.org/236303002/diff/1/bootstrap/win/win_tools.bat
File bootstrap/win/win_tools.bat (right):

https://codereview.chromium.org/236303002/diff/1/bootstrap/win/win_tools.bat#...
bootstrap/win/win_tools.bat:70: goto :GIT_190_CHECK_REST
Should this stuff just go into :GIT_CHECK? I'm not really sure why we have that
label that just jumps to another label, but as long as it's there ...

https://codereview.chromium.org/236303002/diff/1/bootstrap/win/win_tools.bat#...
bootstrap/win/win_tools.bat:71: :GIT_190_BLEEDING
Nit: blank space above this makes it a little easier to scan for the labels.

[iannucci, 2014-04-12 03:48:55]

not sure what you were getting at in the first comment.

https://codereview.chromium.org/236303002/diff/1/bootstrap/win/win_tools.bat
File bootstrap/win/win_tools.bat (right):

https://codereview.chromium.org/236303002/diff/1/bootstrap/win/win_tools.bat#...
bootstrap/win/win_tools.bat:70: goto :GIT_190_CHECK_REST
On 2014/04/12 03:01:10, mmoss wrote:
> Should this stuff just go into :GIT_CHECK? I'm not really sure why we have
that
> label that just jumps to another label, but as long as it's there ...

It's setting the version and the erase_top variables, unless you're meaning
something else?

https://codereview.chromium.org/236303002/diff/1/bootstrap/win/win_tools.bat#...
bootstrap/win/win_tools.bat:71: :GIT_190_BLEEDING
On 2014/04/12 03:01:10, mmoss wrote:
> Nit: blank space above this makes it a little easier to scan for the labels.

Done.

[mmoss, 2014-04-12 04:00:04]

https://codereview.chromium.org/236303002/diff/1/bootstrap/win/win_tools.bat
File bootstrap/win/win_tools.bat (right):

https://codereview.chromium.org/236303002/diff/1/bootstrap/win/win_tools.bat#...
bootstrap/win/win_tools.bat:70: goto :GIT_190_CHECK_REST
On 2014/04/12 03:48:56, iannucci wrote:
> On 2014/04/12 03:01:10, mmoss wrote:
> > Should this stuff just go into :GIT_CHECK? I'm not really sure why we have
> that
> > label that just jumps to another label, but as long as it's there ...
> 
> It's setting the version and the erase_top variables, unless you're meaning
> something else?

I just meant we have:
:GIT_CHECK
goto :GIT_190_CHECK

That basically does nothing but say ":GIT_190_CHECK" is the default. Maybe your
BLEEDING check should go there, since it kind of serves the same purpose.

[mmoss, 2014-04-12 04:13:03]

lgtm

[iannucci, 2014-04-12 08:44:24]

The CQ bit was checked by iannucci@chromium.org

[commit-bot: I haz the power, 2014-04-12 08:44:32]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/iannucci@chromium.org/236303002/30001

[commit-bot: I haz the power, 2014-04-12 08:44:34]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-04-12 08:44:34]

Failed to apply patch for depot_tools/bootstrap/win/win_tools.bat:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file depot_tools/bootstrap/win/win_tools.bat
  Hunk #1 FAILED at 64.
  1 out of 1 hunk FAILED -- saving rejects to file
depot_tools/bootstrap/win/win_tools.bat.rej

Patch:       depot_tools/bootstrap/win/win_tools.bat
Index: bootstrap/win/win_tools.bat
diff --git depot_tools/bootstrap/win/win_tools.bat
depot_tools/bootstrap/win/win_tools.bat
index
43f38a47b093beeaee20e9b3427acba6ecf65ffd..5c34435926dc73144848ccba1ef8b9afa609aff5
100644
--- a/depot_tools/bootstrap/win/win_tools.bat
+++ b/depot_tools/bootstrap/win/win_tools.bat
@@ -64,16 +64,23 @@ goto :GIT_190_CHECK
 
 
 :GIT_190_CHECK
+set GIT_ERASE_TOP=2
+set GIT_VERSION=1.9.0.chromium.3
+
+if "%DEPOT_TOOLS_GIT_BLEEDING%" != "1" goto :GIT_190_CHECK_REST
+set GIT_ERASE_TOP=3
+set GIT_VERSION=1.9.0.chromium.4
+
+:GIT_190_CHECK_REST
 if "%DEPOT_TOOLS_GIT_190%" == "0" goto :GIT_1852_CHECK
 :: Clean up a couple of known broken releases
-for /l %%i in (1,1,2) do if exist
"%WIN_TOOLS_ROOT_DIR%\git-1.9.0.chromium.%%i_bin" (
+for /l %%i in (1,1,%GIT_ERASE_TOP%) do if exist
"%WIN_TOOLS_ROOT_DIR%\git-1.9.0.chromium.%%i_bin" (
   rmdir /s /q "%WIN_TOOLS_ROOT_DIR%\git-1.9.0.chromium.%%i_bin"
 )
-set GIT_VERSION=1.9.0.chromium.3
 for /f "tokens=2 delims=[]" %%i in ('ver') do set VERSTR=%%i
 for /f "tokens=2,3 delims=. " %%i in ("%VERSTR%") do (set VERMAJOR=%%i & set
VERMINOR=%%j)
-if %VERMAJOR% lss 5 set GIT_VERSION=1.9.0.chromium.3-xp
-if %VERMAJOR% equ 5 if %VERMINOR% lss 2 set GIT_VERSION=1.9.0.chromium.3-xp
+if %VERMAJOR% lss 5 set GIT_VERSION=%GIT_VERSION%-xp
+if %VERMAJOR% equ 5 if %VERMINOR% lss 2 set GIT_VERSION=%GIT_VERSION%-xp
 set GIT_BIN_DIR=git-%GIT_VERSION%_bin
 set GIT_ZIP_FILE=%GIT_BIN_DIR%.zip
 set
GIT_ZIP_URL=https://commondatastorage.googleapis.com/chrome-infra/%GIT_ZIP_FILE%

[iannucci, 2014-04-12 20:01:53]

Committed patchset #3 manually as r263544 (presubmit successful).