Commit Graph

72 Commits (99d3017946e02465e04c557e0c1b1201ada85a58)

Author SHA1 Message Date
iannucci@chromium.org 56d7e058ba Update windows git to 2.8.3
R=sheyang@chromium.org
BUG=600028

Review URL: https://codereview.chromium.org/2015423002 .

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@300669 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
iannucci@chromium.org 1a85b3c9a2 Update bleeding edge version of git on windows to 2.8.3.
TBR=nodir@chromium.org
BUG=600028

Review URL: https://codereview.chromium.org/2010573004 .

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@300664 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
iannucci@chromium.org 3f39df005e Do not use viewvc to grab python/svn.
R=benhenry@google.com, agable@chromium.org, benhenry@chromium.org
BUG=609891

Review URL: https://codereview.chromium.org/1981143002 .

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@300608 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
iannucci@chromium.org ae430379db Fix git help on 32-bit Windows
BUG=604018

Review URL: https://codereview.chromium.org/1894803002 .

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@300104 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
iannucci@chromium.org 3af17b9928 Bump Windows bleeding edge git to 2.8.1
R=dnj@chromium.org
BUG=600028

Review URL: https://codereview.chromium.org/1858083002 .

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@299704 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
iannucci@chromium.org a218d7e915 Add bash shell function to make python work like it should.
This uses the virtual /proc filesystem to identify when the user runs
`python` without redirecting stdout/stdin. If this is the case, we run
`python -i` instead. Otherwise, or if there are arguments, we run it
verbatim.

R=dnj@chromium.org
BUG=598956

Review URL: https://codereview.chromium.org/1851113003 .

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@299681 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
iannucci@chromium.org 3466b0d6a6 Make msys depot_tools upgrade process smoother.
R=agable@chromium.org, dnj@chromium.org, mmoss@chromium.org
BUG=600028

Review URL: https://codereview.chromium.org/1848353003 .

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@299677 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
iannucci@chromium.org 2d22423c01 Add git rolling instructions directly to depot_tools.
Also switches the download url to the non-deprecated gs direct download URL, and
remove an ancient README.google that talked about software that's no longer
distributed.

R=dnj@chromium.org, agable@chromium.org, maruel@chromium.org, mmoss@chromium.org
BUG=598958

Review URL: https://codereview.chromium.org/1851433005 .

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@299622 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
iannucci@chromium.org 0703ea2cc6 Multiple improvements to windows bash integration.
* `git bash` helper now will either:
    * launch an interactive bash prompt in the MinGW Terminal Emulator
    * launch a non-interactive bash shell if arguments are provided
  * `git bash` now includes python, python/Scripts and svn binaries in
    the PATH.
  * depot_tools' colorization now works in MinGW Terminal Emulator
  * batch scripts are now regenerated if any of them is missing.

R=agable@chromium.org, dnj@chromium.org, mmoss@chromium.org
BUG=598956

Review URL: https://codereview.chromium.org/1847783002 .

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@299616 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
iannucci@chromium.org c0f8642119 Revert "Better tooling"
This reverts commit eed06d620f.

Accidental dcommit

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@299615 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
iannucci@chromium.org eed06d620f Better tooling
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@299614 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
iannucci@chromium.org 10379b88cb Escape slashes in paths in windows tool bootstrapping.
Otherwise the 7zip extraction process will interpret them as escape
chars.

BUG=595883
R=martiniss@chromium.org, mmoss@chromium.org

Review URL: https://codereview.chromium.org/1848153002 .

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@299611 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
iannucci@chromium.org 534b85903c Make git 2.7.4 the default version
R=mmoss@chromium.org, dnj@chromium.org
BUG=595883

Review URL: https://codereview.chromium.org/1843363002 .

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@299580 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
iannucci@chromium.org 0478d63bcc Achieve feature pairity with pre 2.7.4
XCopy the docs from depot_tools. It's pretty fast and doesn't require
reinventing the world right now. CIPD will be a better long-term strategy
anyway.

R=dnj@google.com, dnj@chromium.org
BUG=598959

Review URL: https://codereview.chromium.org/1844043004 .

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@299577 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
iannucci@chromium.org 18209cbb99 Fix extra space on 32bit platforms
R=seanmccullough@google.com, seanmccullough@chromium.org
BUG=599145

Review URL: https://codereview.chromium.org/1846633003 .

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@299571 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
iannucci@chromium.org 02ef57e288 Make git binary tools auto update on mingw
R=dnj@chromium.org, pkasting@chromium.org
BUG=598941

Review URL: https://codereview.chromium.org/1845493003 .

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@299556 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
iannucci@chromium.org 305b8b57ce Add logic for git 2.7.4 upgrade.
R=dnj@chromium.org, mmoss@chromium.org, vadimsh@chromium.org
BUG=595883

Review URL: https://codereview.chromium.org/1827403003 .

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@299520 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
dnj@google.com 16ab651b2d Revert of Removed virtualenv from depot_tools (patchset #1 id:1 of https://codereview.chromium.org/1437483002/ )
Reason for revert:
This CL over-aggressively removed the Windows bootstrap code used by /gclient.bat, which in turn downloads/installs the Windows toolchain, including Python. Labs can no longer provision Windows bots because of this.

update_depot_tools.bat did more than initialize the virtualenv. It also downloaded and installed Python, Git, and Subversion on Windows systems.

I'm reverting to restore the toolchain so we can create new Windows bots.

Original issue's description:
> Removed virtualenv from depot_tools
>
> This effectively reverts http://crrev.com/1195423002 and
> http://crrev.com/1205873002.
>
> R=pgervais@chromium.org, tandrii@chromium.org
> TBR=pgervais@chromium.org  # i wanna get my Fixit credit today :-)
> BUG=542922,503067
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=297491

TBR=pgervais@chromium.org,tandrii@chromium.org,sergiyb@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=542922,503067

Review URL: https://codereview.chromium.org/1431173002 .

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297493 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
sergiyb@chromium.org 9ca2fc13f9 Removed virtualenv from depot_tools
This effectively reverts http://crrev.com/1195423002 and
http://crrev.com/1205873002.

R=pgervais@chromium.org, tandrii@chromium.org
TBR=pgervais@chromium.org  # i wanna get my Fixit credit today :-)
BUG=542922,503067

Review URL: https://codereview.chromium.org/1437483002 .

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297491 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
maruel@chromium.org 851c8291a3 Fix gclient to work on a path containing space characters
Patch contributed by Leung Wing Chung <lwchkg@gmail.com>.
Committed on his behalf due to Commit Queue's mishandling of
CRLF files.

Here is my procedure for testing for a new install

1. Download and unzip
   https://src.chromium.org/svn/trunk/tools/depot_tools.zip
   Note that the path should include a space character,
   e.g. "with a space"

2. Copy the three modified files to the unzipped folder

3. Convert the unzipped files into Windows CRLF.

4. REMOVE the following lines from update_depot_tools.bat
   (Should I file a separate bug for this?)

:: Initialize/update virtualenv.
cd /d "%DEPOT_TOOLS_DIR%."
python -u bootstrap\bootstrap.py --deps_file bootstrap\deps.pyl --quiet ENV
if errorlevel 1 goto :EOF

5. Run gclient. Installation should be okay until
   "git rebase" is run.

R=maruel@chromium.org
BUG=507301

Review URL: https://codereview.chromium.org/1232023004 .

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@296275 0039d316-1c4b-4281-b951-d872f2087c98
10 years ago
mmoss@chromium.org 3ed897431e Set default Windows git to 1.9.5-chromium.6 build.
R=iannucci@chromium.org, iannucci@google.com
BUG=444470

Review URL: https://codereview.chromium.org/887563004

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@293909 0039d316-1c4b-4281-b951-d872f2087c98
10 years ago
scottmg@chromium.org 8300952635 Bump bleeding edge git to 1.9.5-chromium.6 build.
BUG=444470
R=scottmg@chromium.org, iannucci@google.com

Review URL: https://codereview.chromium.org/888923002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@293889 0039d316-1c4b-4281-b951-d872f2087c98
10 years ago
iannucci@chromium.org 4fe8a47477 Switch default windows git version to 1.9.5.
R=pgervais@chromium.org, agable@chromium.org, friedman@chromium.org
BUG=

Review URL: https://codereview.chromium.org/800003004

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@293482 0039d316-1c4b-4281-b951-d872f2087c98
10 years ago
iannucci@chromium.org 50df5e236b Greatly clean up depot_tools handling of git binaries, add bleeding edge support for 1.9.5
R=agable@chromium.org, friedman@google.com, maruel@chromium.org, pgervais@chromium.org, friedman@chromium.org, mmoss@chromium.org, szager@chromium.org, vadimsh@chromium.org
BUG=

Review URL: https://codereview.chromium.org/816173002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@293480 0039d316-1c4b-4281-b951-d872f2087c98
10 years ago
iannucci@chromium.org 0c85206992 Roll windows git binary package up to v6 everywhere.
Thus solving the sh.exe problem once and for all...

R=hinoka@google.com, hinoka@chromium.org
BUG=383455, 241556, 389361, 380958

Review URL: https://codereview.chromium.org/372413002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@281844 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
iannucci@chromium.org 590f243b13 Bump git bleeding edge up to 6.
This includes the new (fast) custom sh.exe/bash.exe/msys-1.0.dll.

R=hinoka@google.com, hinoka@chromium.org
BUG=383455,241556,389361,380958

Review URL: https://codereview.chromium.org/364133003

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@281645 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
iannucci@chromium.org d6c8be8e51 Bump version to 5 to clear out slow win7 git rollout.
The previous rollout pushed the xp version of chromium git v4 to windows7. This rollout pushes the correct windows 7 version.

R=mmoss@chromium.org, szager@chromium.org
BUG=

Review URL: https://codereview.chromium.org/311713002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@274363 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
iannucci@chromium.org 3f802b8b1f Roll windows git to include htmlpathalt.
This will allow e.g. `git help rebase-update` to work.

R=agable@chromium.org
BUG=238428

Review URL: https://codereview.chromium.org/253243002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@267038 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
iannucci@chromium.org e722300a14 Add a bleeding-edge git version mode to depot_tools.
R=mmoss@google.com, mmoss@chromium.org
BUG=238428

Review URL: https://codereview.chromium.org/236303002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@263544 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
szager@chromium.org d9f405d4da Re-enable git-1.9.0
There is now a separate XP-compatible release which doesn't have
the performance fix for index-pack.

BUG=
NOTRY=true
R=mmoss@google.com

Review URL: https://codereview.chromium.org/215133002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@260010 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
szager@chromium.org b000c1cdb2 Revert git-1.9.0.
I've received a few reports of:

error: inflate: data stream error (incorrect header check)
fatal: serious inflate inconsistency
fatal: index-pack failed
error: Could not fetch origin

TBR=mmoss@chromium.org
BUG=

Review URL: https://codereview.chromium.org/205443003

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@258147 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
szager@chromium.org 83f4767a60 Update to git-1.9.0.
Also, allow multiple git installations to exist side-by-side.
This makes it easier to revert back to an old version quickly.

BUG=
R=maruel@chromium.org

Review URL: https://codereview.chromium.org/203463004

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@258058 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
iannucci@chromium.org c64d3765a0 Windows: Bootstrap Python first and get rid of Python 2.6 legacy
If loaded first, Python can then be used to replace JS bootstrapping
logic if appropriate libs are already present in depot_tools.

BUG=328453
AUTHOR=techtonik@gmail.com
R=iannucci@chromium.org, maruel@chromium.org

Review URL: https://codereview.chromium.org/140183007

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@257248 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
mmoss@chromium.org f41d791ae5 Make new Windows git the default again.
To force revert to the old git, and uninstall the new one, set:
DEPOT_TOOLS_GIT_1852=0

BUG=341967
R=maruel@chromium.org

Review URL: https://codereview.chromium.org/156713005

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@250622 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
mmoss@chromium.org d9839e8e7a Better restriction to prevent Windows git install on XP or older.
This is in preparation for once again making 1.8.5.2 the default Windows git.

Also remove the CHROME_HEADLESS condition, which confuses bot setup because the
same bot will sometimes run without that set (e.g. at slave startup) and with
it set (e.g. during a build), leading to the wrong, or even no, git installed.

R=maruel@chromium.org

Review URL: https://codereview.chromium.org/160033002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@250486 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
mmoss@chromium.org 2504f2ed7c Revert default Windows git to the old version.
There are several bot failures, some understood, some not. This will revert
bots to the old git until all the failures can be investigated.

Users who want the new git can still install it with an explicit:
set DEPOT_TOOLS_GIT_1852=1

R=hinoka@google.com

Review URL: https://codereview.chromium.org/150203005

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@250239 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
mmoss@chromium.org 91dadb3ff7 Don't install new Windows git on XP machines.
The new git broke then XP bots because it relies on WinAPIs that are newer than
XP.

R=szager@chromium.org

Review URL: https://codereview.chromium.org/137213011

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@250211 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
mmoss@chromium.org 5021f93373 Make new Windows git the default.
This can be overridden, and the old git installed, with:

set DEPOT_TOOLS_GIT_1852=0
rd /s /q git-1.8.5.2.chromium.1_bin git-1.8.0_bin
gclient

R=maruel@chromium.org

Review URL: https://codereview.chromium.org/136693024

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@250132 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
mmoss@chromium.org a638c2de6d Download git package via https.
R=cmp@chromium.org

Review URL: https://codereview.chromium.org/139733003

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@249612 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
mmoss@chromium.org ea60d18f09 Add custom Windows git 1.8.5.2, disabled by default.
The new git will only be installed when DEPOT_TOOLS_GIT_1852=1, otherwise the
previous version will be installed.

BUG=322954
R=iannucci@chromium.org

Review URL: https://codereview.chromium.org/152043005

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@249609 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
maruel@chromium.org 181ddcec35 Update the python auto-install on Windows to 2.7.6.
2.7.5 has bug http://bugs.python.org/issue17998 in re package that is affecting
the chromium team so it can't be used. The bug is fixed in 2.7.6.

This update still respects DEPOT_TOOLS_PYTHON_275=0. Since the name doesn't
represent what is being installed, it also respects
DEPOT_TOOLS_PYTHON_27=0.

R=iannucci@chromium.org
BUG=241769

Review URL: https://codereview.chromium.org/73013003

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@235384 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
maruel@chromium.org aecf9d11b4 Change the windows bootstrap code to download zips in %TEMP%.
It may help when the directory is created at high integrity level.
This hypothesis is unconfirmed.

TBR=iannucci@chromium.org
BUG=241769,314257

Review URL: https://codereview.chromium.org/72803002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@235149 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
maruel@chromium.org 741cf9bb60 Enable implicit auto-upgrade to python 2.7.5.
This will automatically upgrade python to 2.7.5 unless
set DEPOT_TOOLS_PYTHON_275=0
is used.

R=iannucci@chromium.org
BUG=241769

Review URL: https://codereview.chromium.org/53313002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@235140 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
maruel@chromium.org 4d3ed59ab7 Redo the python check to look for the directories too.
This way, DEPOT_TOOLS_PYTHON_275=1 will properly upgrade an installation
still running 2.6. Otherwise the user had to "del python.bat" to force
the upgrade.

Stop calling python to verify it works, this is slow.

Upgrade url to https.

R=iannucci@chromium.org
BUG=241769

Review URL: https://codereview.chromium.org/26901003

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@228179 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
maruel@chromium.org ca4fdfd874 Add python 2.7.5 support on Windows. Not enabled by default.
- Python2.7.5 will be installed only if DEPOT_TOOLS_PYTHON_275=1,
  otherwise 2.6 is installed.
- Eventually the default will be changed to install python 2.7.5
  for new users.
- Afterward, python 2.7.5 will be always installed when not detected
  and 2.6 will be ignored.

README.chromium contains the exact instructions how to recreate
python275_bin.zip that was committed independently.

I tested it on a vanilla Windows XP image and documented how to
install the VC90 CRT redistributable in that specific case in
README.chromium.

R=iannucci@chromium.org
BUG=241769,257696

Review URL: https://codereview.chromium.org/26326002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@227961 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
maruel@chromium.org 1561be960e Revert partially r200799, it would break the official builders.
Until r200514 is merged into every active branches on Windows, python can't be
upgraded to 2.7.x.

TBR=iannucci@chromium.org,joi@chromium.org
BUG=241769

Review URL: https://codereview.chromium.org/15294005

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@200800 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
maruel@chromium.org 9e6dd687c9 Switch depot_tools python to 2.7.4.
TBR=joi@chromium.org
BUG=

Review URL: https://codereview.chromium.org/14972010

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@200799 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
szager@google.com e700bcb096 Force a new download/install of git-1.8.0 to pick up:
https://codereview.chromium.org/11312153/
Review URL: https://codereview.chromium.org/11275218

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@166804 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
szager@google.com 32fbac6b1f git-1.8.0 requires TERM to be set appropriately for commands that
page output.  Rather than recreate the entire msysgit zip file and
for everyone to download it again, just modify git.bat in place.

TBR=maruel@chromium.org,cmp@chromium.org
Review URL: https://codereview.chromium.org/11358128

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@166295 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
szager@google.com 6a12660bc6 Fix logic for checking whether git is installed.
TBR=maruel@chromium.org
Review URL: https://codereview.chromium.org/11377002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@166259 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago