Issue 888923002: Bump bleeding edge git to 1.9.5-chromium.6 build.

Michael Moss

5 years, 10 months ago (2015-01-30 19:17:35 UTC) #1

scottmg

scottmg@chromium.org changed reviewers: + scottmg@chromium.org

5 years, 10 months ago (2015-01-30 21:46:10 UTC) #2

commit-bot: I haz the power

CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/888923002/1

5 years, 10 months ago (2015-01-30 21:47:07 UTC) #5

commit-bot: I haz the power

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

5 years, 10 months ago (2015-01-30 21:47:10 UTC) #6

commit-bot: I haz the power

Failed to apply patch for depot_tools/bootstrap/win/win_tools.bat: While running patch -p1 --forward --force --no-backup-if-mismatch; patching file ...

5 years, 10 months ago (2015-01-30 21:47:11 UTC) #7

iannucci

On 2015/01/30 at 21:47:11, commit-bot wrote: > Failed to apply patch for depot_tools/bootstrap/win/win_tools.bat: > While ...

5 years, 10 months ago (2015-01-30 22:07:34 UTC) #8

Michael Moss

On 2015/01/30 22:07:34, iannucci wrote: > On 2015/01/30 at 21:47:11, commit-bot wrote: > > Failed ...

5 years, 10 months ago (2015-01-30 22:15:52 UTC) #9

iannucci

On 2015/01/30 at 22:15:52, mmoss wrote: > On 2015/01/30 22:07:34, iannucci wrote: > > On ...

5 years, 10 months ago (2015-01-30 22:17:14 UTC) #10

iannucci

On 2015/01/30 at 22:17:14, iannucci wrote: > On 2015/01/30 at 22:15:52, mmoss wrote: > > ...

5 years, 10 months ago (2015-01-30 22:18:01 UTC) #11

iannucci

On 2015/01/30 at 22:18:01, iannucci wrote: > On 2015/01/30 at 22:17:14, iannucci wrote: > > ...

5 years, 10 months ago (2015-01-30 22:19:02 UTC) #12

On 2015/01/30 at 22:18:01, iannucci wrote:
> On 2015/01/30 at 22:17:14, iannucci wrote:
> > On 2015/01/30 at 22:15:52, mmoss wrote:
> > > On 2015/01/30 22:07:34, iannucci wrote:
> > > > On 2015/01/30 at 21:47:11, commit-bot wrote:
> > > > > 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 58 (different line endings).
> > > > >   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
> > > >
8ffda386c5bb67f5b6eef91c3bd86086fa4a0aca..fb521ceaaaf67e232b0ffdbc97e4d26c88945163
> > > > 100644
> > > > > --- a/depot_tools/bootstrap/win/win_tools.bat
> > > > > +++ b/depot_tools/bootstrap/win/win_tools.bat
> > > > > @@ -58,7 +58,7 @@ goto :END
> > > > >  
> > > > >  :GIT_CHECK
> > > > >  if "%DEPOT_TOOLS_GIT_BLEEDING%" == "1" (
> > > > > -  set GIT_VERSION=1.9.5.chromium.5
> > > > > +  set GIT_VERSION=1.9.5.chromium.6
> > > > >  ) else (
> > > > >    set GIT_VERSION=1.9.5.chromium.5
> > > > >  )
> > > > 
> > > > Oh, yeah. Line endings. You gotz to dcommit from windows. Cool, right?
> > > > 
> > > > LGTM anyway :)
> > > 
> > > Ugh. Isn't there some magic incantation of autocrlf or something that just
does the right thing?
> > 
> > You mean on CQ? I think rietveld actually normalizes the line endings ("for
science") so by the time CQ gets it the information is gone.
> 
> Actually I lied a bit, you can definitely do it from not-windows, but just be
sure that it's keeping line endings the same. Otherwise fireworks.

(but, of course, you need to dos2unix, then apply the patch from rietveld, and
then unix2dos afterwards, otherwise the patch will fail)

commit-bot: I haz the power

CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/888923002/20001

5 years, 10 months ago (2015-01-30 22:37:15 UTC) #14

commit-bot: I haz the power

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

5 years, 10 months ago (2015-01-30 22:37:19 UTC) #15

commit-bot: I haz the power

Failed to apply patch for depot_tools/bootstrap/win/win_tools.bat: While running patch -p1 --forward --force --no-backup-if-mismatch; patching file ...

5 years, 10 months ago (2015-01-30 22:37:19 UTC) #16

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 1 (different line endings).
  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
8ffda386c5bb67f5b6eef91c3bd86086fa4a0aca..6c2fe534009f61203dec530d6af365b1f091bd49
100644
--- a/depot_tools/bootstrap/win/win_tools.bat
+++ b/depot_tools/bootstrap/win/win_tools.bat
@@ -1,173 +1,173 @@
-@echo off
-:: Copyright (c) 2012 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 find if svn and python are accessible and it not,
-:: it will try to download it and 'install' it in depot_tools.
-
-:: Sadly, we can't use SETLOCAL here otherwise it ERRORLEVEL is not correctly
-:: returned.
-
-set WIN_TOOLS_ROOT_URL=https://src.chromium.org/svn/trunk/tools
-:: It used to be %~dp0 but ADODB.Stream may fail to write to this directory if
-:: the directory DACL is set to elevated integrity level.
-set ZIP_DIR=%TEMP%
-
-:: Get absolute root directory (.js scripts don't handle relative paths well).
-pushd %~dp0..\..
-set WIN_TOOLS_ROOT_DIR=%CD%
-popd
-
-if "%1" == "force" (
-  set WIN_TOOLS_FORCE=1
-  shift /1
-)
-
-
-:PYTHON_CHECK
-if not exist "%WIN_TOOLS_ROOT_DIR%\python276_bin" goto :PY27_INSTALL
-if not exist "%WIN_TOOLS_ROOT_DIR%\python.bat" goto :PY27_INSTALL
-set ERRORLEVEL=0
-goto :GIT_CHECK
-
-
-:PY27_INSTALL
-echo Installing python 2.7.6...
-:: Cleanup python directory if it was existing.
-if exist "%WIN_TOOLS_ROOT_DIR%\python276_bin\." rd /q /s
"%WIN_TOOLS_ROOT_DIR%\python276_bin"
-if exist "%ZIP_DIR%\python276.zip" del "%ZIP_DIR%\python276.zip"
-echo Fetching from %WIN_TOOLS_ROOT_URL%/third_party/python276_bin.zip
-cscript //nologo //e:jscript "%~dp0get_file.js"
%WIN_TOOLS_ROOT_URL%/third_party/python276_bin.zip "%ZIP_DIR%\python276_bin.zip"
-if errorlevel 1 goto :PYTHON_FAIL
-:: Will create python276_bin\...
-cscript //nologo //e:jscript "%~dp0unzip.js" "%ZIP_DIR%\python276_bin.zip"
"%WIN_TOOLS_ROOT_DIR%"
-:: Create the batch files.
-call copy /y "%~dp0python276.new.bat" "%WIN_TOOLS_ROOT_DIR%\python.bat" 1>nul
-call copy /y "%~dp0pylint.new.bat" "%WIN_TOOLS_ROOT_DIR%\pylint.bat" 1>nul
-del "%ZIP_DIR%\python276_bin.zip"
-set ERRORLEVEL=0
-goto :GIT_CHECK
-
-
-:PYTHON_FAIL
-echo ... Failed to checkout python automatically.
-echo You should get the "prebaked" version at %WIN_TOOLS_ROOT_URL%/third_party/
-set ERRORLEVEL=1
-goto :END
-
-:GIT_CHECK
-if "%DEPOT_TOOLS_GIT_BLEEDING%" == "1" (
-  set GIT_VERSION=1.9.5.chromium.5
-) else (
-  set GIT_VERSION=1.9.5.chromium.5
-)
-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=%GIT_VERSION%-xp
-if %VERMAJOR% equ 5 if %VERMINOR% lss 2 set GIT_VERSION=%GIT_VERSION%-xp
-
-:: Clean up any release which doesn't match the one we want.
-for /d %%i in (%WIN_TOOLS_ROOT_DIR%\git-*_bin) do (
-  if not %%i == %WIN_TOOLS_ROOT_DIR%\git-%GIT_VERSION%_bin (
-    rmdir /s /q "%%i"
-  )
-)
-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%
-
-if "%WIN_TOOLS_FORCE%" == "1" goto :GIT_INSTALL
-if exist "%WIN_TOOLS_ROOT_DIR%\%GIT_BIN_DIR%\cmd\git.cmd" (
-  call "%WIN_TOOLS_ROOT_DIR%\%GIT_BIN_DIR%\cmd\git.cmd" --version 2>nul 1>nul
-  if errorlevel 1 goto :GIT_INSTALL
-  rem Several git versions can live side-by-side; check the top-level
-  rem batch script to make sure it points to the desired version.
-  find "%GIT_BIN_DIR%" "%WIN_TOOLS_ROOT_DIR%\git.bat" 2>nul 1>nul
-  if errorlevel 1 goto :GIT_COPY_BATCH_FILES
-  goto :SVN_CHECK
-)
-goto :GIT_INSTALL
-
-
-:GIT_INSTALL
-echo Installing git %GIT_VERSION% (avg 1-2 min download) ...
-:: git is not accessible; check it out and create 'proxy' files.
-if exist "%ZIP_DIR%\git.zip" del "%ZIP_DIR%\git.zip"
-echo Fetching from %GIT_ZIP_URL%
-cscript //nologo //e:jscript "%~dp0get_file.js" %GIT_ZIP_URL%
"%ZIP_DIR%\git.zip"
-if errorlevel 1 goto :GIT_FAIL
-:: Cleanup svn directory if it was existing.
-if exist "%WIN_TOOLS_ROOT_DIR%\%GIT_BIN_DIR%\." rd /q /s
"%WIN_TOOLS_ROOT_DIR%\%GIT_BIN_DIR%"
-:: Will create %GIT_BIN_DIR%\...
-cscript //nologo //e:jscript "%~dp0unzip.js" "%ZIP_DIR%\git.zip"
"%WIN_TOOLS_ROOT_DIR%"
-if errorlevel 1 goto :GIT_FAIL
-if not exist "%WIN_TOOLS_ROOT_DIR%\%GIT_BIN_DIR%\." goto :GIT_FAIL
-del "%ZIP_DIR%\git.zip"
-goto :GIT_COPY_BATCH_FILES
-
-
-:GIT_COPY_BATCH_FILES
-:: Create the batch files.
-call copy /y "%WIN_TOOLS_ROOT_DIR%\%GIT_BIN_DIR%\git.bat"
"%WIN_TOOLS_ROOT_DIR%\git.bat" 1>nul
-call copy /y "%WIN_TOOLS_ROOT_DIR%\%GIT_BIN_DIR%\gitk.bat"
"%WIN_TOOLS_ROOT_DIR%\gitk.bat" 1>nul
-call copy /y "%WIN_TOOLS_ROOT_DIR%\%GIT_BIN_DIR%\ssh.bat"
"%WIN_TOOLS_ROOT_DIR%\ssh.bat" 1>nul
-call copy /y "%WIN_TOOLS_ROOT_DIR%\%GIT_BIN_DIR%\ssh-keygen.bat"
"%WIN_TOOLS_ROOT_DIR%\ssh-keygen.bat" 1>nul
-
-:: Ensure autocrlf and filemode are set correctly.
-call "%WIN_TOOLS_ROOT_DIR%\git.bat" config --system core.autocrlf false
-call "%WIN_TOOLS_ROOT_DIR%\git.bat" config --system core.filemode false
-goto :SVN_CHECK
-
-
-:GIT_FAIL
-echo ... Failed to checkout git automatically.
-echo You should get the "prebaked" version used at %GIT_ZIP_URL%
-set ERRORLEVEL=1
-goto :END
-
-
-:SVN_CHECK
-:: If the batch file exists, skip the svn check.
-if exist "%WIN_TOOLS_ROOT_DIR%\svn.bat" goto :END
-if "%WIN_TOOLS_FORCE%" == "1" goto :SVN_INSTALL
-call svn --version 2>nul 1>nul
-if errorlevel 1 goto :SVN_INSTALL
-goto :END
-
-
-:SVN_INSTALL
-echo Installing subversion ...
-:: svn is not accessible; check it out and create 'proxy' files.
-if exist "%ZIP_DIR%\svn.zip" del "%ZIP_DIR%\svn.zip"
-echo Fetching from %WIN_TOOLS_ROOT_URL%/third_party/svn_bin.zip
-cscript //nologo //e:jscript "%~dp0get_file.js"
%WIN_TOOLS_ROOT_URL%/third_party/svn_bin.zip "%ZIP_DIR%\svn.zip"
-if errorlevel 1 goto :SVN_FAIL
-:: Cleanup svn directory if it was existing.
-if exist "%WIN_TOOLS_ROOT_DIR%\svn\." rd /q /s "%WIN_TOOLS_ROOT_DIR%\svn"
-if exist "%WIN_TOOLS_ROOT_DIR%\svn_bin\." rd /q /s
"%WIN_TOOLS_ROOT_DIR%\svn_bin"
-:: Will create svn_bin\...
-cscript //nologo //e:jscript "%~dp0unzip.js" "%ZIP_DIR%\svn.zip"
"%WIN_TOOLS_ROOT_DIR%"
-if errorlevel 1 goto :SVN_FAIL
-if not exist "%WIN_TOOLS_ROOT_DIR%\svn_bin\." goto :SVN_FAIL
-del "%ZIP_DIR%\svn.zip"
-:: Create the batch file.
-call copy /y "%~dp0svn.new.bat" "%WIN_TOOLS_ROOT_DIR%\svn.bat" 1>nul
-call copy /y "%~dp0svnversion.new.bat" "%WIN_TOOLS_ROOT_DIR%\svnversion.bat"
1>nul
-goto :END
-
-
-:SVN_FAIL
-echo ... Failed to checkout svn automatically.
-echo You should get the "prebaked" version at %WIN_TOOLS_ROOT_URL%/third_party/
-set ERRORLEVEL=1
-goto :END
-
-
-:returncode
-set WIN_TOOLS_ROOT_URL=
-set WIN_TOOLS_ROOT_DIR=
-exit /b %ERRORLEVEL%
-
-:END
-call :returncode %ERRORLEVEL%
+@echo off
+:: Copyright (c) 2012 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 find if svn and python are accessible and it not,
+:: it will try to download it and 'install' it in depot_tools.
+
+:: Sadly, we can't use SETLOCAL here otherwise it ERRORLEVEL is not correctly
+:: returned.
+
+set WIN_TOOLS_ROOT_URL=https://src.chromium.org/svn/trunk/tools
+:: It used to be %~dp0 but ADODB.Stream may fail to write to this directory if
+:: the directory DACL is set to elevated integrity level.
+set ZIP_DIR=%TEMP%
+
+:: Get absolute root directory (.js scripts don't handle relative paths well).
+pushd %~dp0..\..
+set WIN_TOOLS_ROOT_DIR=%CD%
+popd
+
+if "%1" == "force" (
+  set WIN_TOOLS_FORCE=1
+  shift /1
+)
+
+
+:PYTHON_CHECK
+if not exist "%WIN_TOOLS_ROOT_DIR%\python276_bin" goto :PY27_INSTALL
+if not exist "%WIN_TOOLS_ROOT_DIR%\python.bat" goto :PY27_INSTALL
+set ERRORLEVEL=0
+goto :GIT_CHECK
+
+
+:PY27_INSTALL
+echo Installing python 2.7.6...
+:: Cleanup python directory if it was existing.
+if exist "%WIN_TOOLS_ROOT_DIR%\python276_bin\." rd /q /s
"%WIN_TOOLS_ROOT_DIR%\python276_bin"
+if exist "%ZIP_DIR%\python276.zip" del "%ZIP_DIR%\python276.zip"
+echo Fetching from %WIN_TOOLS_ROOT_URL%/third_party/python276_bin.zip
+cscript //nologo //e:jscript "%~dp0get_file.js"
%WIN_TOOLS_ROOT_URL%/third_party/python276_bin.zip "%ZIP_DIR%\python276_bin.zip"
+if errorlevel 1 goto :PYTHON_FAIL
+:: Will create python276_bin\...
+cscript //nologo //e:jscript "%~dp0unzip.js" "%ZIP_DIR%\python276_bin.zip"
"%WIN_TOOLS_ROOT_DIR%"
+:: Create the batch files.
+call copy /y "%~dp0python276.new.bat" "%WIN_TOOLS_ROOT_DIR%\python.bat" 1>nul
+call copy /y "%~dp0pylint.new.bat" "%WIN_TOOLS_ROOT_DIR%\pylint.bat" 1>nul
+del "%ZIP_DIR%\python276_bin.zip"
+set ERRORLEVEL=0
+goto :GIT_CHECK
+
+
+:PYTHON_FAIL
+echo ... Failed to checkout python automatically.
+echo You should get the "prebaked" version at %WIN_TOOLS_ROOT_URL%/third_party/
+set ERRORLEVEL=1
+goto :END
+
+:GIT_CHECK
+if "%DEPOT_TOOLS_GIT_BLEEDING%" == "1" (
+  set GIT_VERSION=1.9.5.chromium.6
+) else (
+  set GIT_VERSION=1.9.5.chromium.5
+)
+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=%GIT_VERSION%-xp
+if %VERMAJOR% equ 5 if %VERMINOR% lss 2 set GIT_VERSION=%GIT_VERSION%-xp
+
+:: Clean up any release which doesn't match the one we want.
+for /d %%i in (%WIN_TOOLS_ROOT_DIR%\git-*_bin) do (
+  if not %%i == %WIN_TOOLS_ROOT_DIR%\git-%GIT…
(message too large)

scottmg

5 years, 10 months ago (2015-01-30 22:47:46 UTC) #18

Message was sent while issue was closed.

Committed patchset #2 (id:20001) manually as 293889 (presubmit successful).

Issue 888923002: Bump bleeding edge git to 1.9.5-chromium.6 build. (Closed)

Description

Patch Set 1 #

Patch Set 2 : #

Messages