Commit Graph

87 Commits (2d29261e94edb6870b8c2575a335545c0f4f670f)

Author SHA1 Message Date
Dan Jacques eb1feb9090 [cipd] Bump version, log at warning (#2).
Bump the CIPD client version to
b482bfa19d3fa79b4b40dd5ac7a34479052e3df1. This version inculdes support
for the "-log-level" flag.

Update CIPD bootstrap scripts and tool installation scripts to log at
warning level, so that standard operation doesn't produce any logs.

This version differs from the previous CL in that the "selfupdate"
command no longer uses "-log-level". This fixes an issue where the
current CIPD, which doesn't support "-log-level", is given the flag
prior to actually updating to a version that does.

BUG=chromium:748651
TEST=canary
  - Tested this CIPD version on canary waterfall successfully.

Change-Id: I69dfe522d890eb307214f18d0467ce921a766446
Reviewed-on: https://chromium-review.googlesource.com/589568
Commit-Queue: Daniel Jacques <dnj@chromium.org>
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
8 years ago
Daniel Jacques 9f9d82ac94 Revert "[cipd] Bump version, log at warning."
This reverts commit 18aa2d93ed.

Reason for revert: <INSERT REASONING HERE>

Original change's description:
> [cipd] Bump version, log at warning.
> 
> Bump the CIPD client version to
> e2a98b41adb3403b5b7771c4101b42a55dc2dd9e. This version inculdes support
> for the "-log-level" flag.
> 
> Update CIPD bootstrap scripts and tool installation scripts to log at
> warning level, so that standard operation doesn't produce any logs.
> 
> BUG=chromium:748651
> TEST=canary
>   - Tested this CIPD version on canary waterfall successfully.
>   - Tested "gclient" bootstrap and "vpython" / "led" on Windows system,
>     no output and works.
>   - Tested "vpython" / "led" on OSX system, no output and works.
> 
> Change-Id: Iae316908283c43c504f293aafdf897df83dccf8d
> Reviewed-on: https://chromium-review.googlesource.com/588889
> Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
> Commit-Queue: Daniel Jacques <dnj@chromium.org>

TBR=iannucci@chromium.org,dnj@chromium.org

Change-Id: Ia611c1aeb204c609ff3469076b8256c54e702230
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: chromium:748651
Reviewed-on: https://chromium-review.googlesource.com/589527
Reviewed-by: Daniel Jacques <dnj@chromium.org>
Commit-Queue: Daniel Jacques <dnj@chromium.org>
8 years ago
Dan Jacques 18aa2d93ed [cipd] Bump version, log at warning.
Bump the CIPD client version to
e2a98b41adb3403b5b7771c4101b42a55dc2dd9e. This version inculdes support
for the "-log-level" flag.

Update CIPD bootstrap scripts and tool installation scripts to log at
warning level, so that standard operation doesn't produce any logs.

BUG=chromium:748651
TEST=canary
  - Tested this CIPD version on canary waterfall successfully.
  - Tested "gclient" bootstrap and "vpython" / "led" on Windows system,
    no output and works.
  - Tested "vpython" / "led" on OSX system, no output and works.

Change-Id: Iae316908283c43c504f293aafdf897df83dccf8d
Reviewed-on: https://chromium-review.googlesource.com/588889
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
Commit-Queue: Daniel Jacques <dnj@chromium.org>
8 years ago
Dan Jacques c4dd3e8264 [bootstrap/win] Remove support for legacy installs
Migrate CIPD bundle installations to stable and remove support in
Windows bootstrap code for legacy (non-Windows) bootstrap installations.

This includes removal of support for
- ZIP installation paths - everything through CIPD now.
- Python legacy code (though cleanup logic still exists).
- JavaScript downloads.
- Separate Git package versioning.

This is a push from "bleeding edge" to production.

BUG=chromium:740171
TEST=local, prod-exemplar
  - Tested cold and warm upgrade and downgrade.
  - Tested upgrade and downgrade step via "update_scripts".

Change-Id: I3dc4392ef2eaa2d7cf829d560128b74e4dbd2cba
Reviewed-on: https://chromium-review.googlesource.com/567767
Commit-Queue: Daniel Jacques <dnj@chromium.org>
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
8 years ago
Dan Jacques 68f6f279b4 [bootstrap/win] Always use "cipd.bat".
CIPD flags change, and using "cipd.exe" directly skips the selfupdate
step. Remove the optimization and always call "cipd.bat".

BUG=chromium:742448
TEST=None
R=iannucci@chromium.org, sergeyberezin@chromium.org

Change-Id: Ieb353c695a8ef58a51d046f102266d4926a3447c
Reviewed-on: https://chromium-review.googlesource.com/570682
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
Reviewed-by: Sergey Berezin <sergeyberezin@chromium.org>
Commit-Queue: Robbie Iannucci <iannucci@chromium.org>
8 years ago
Dan Jacques 3d9b58819b [win_tools] Use bundled Python CIPD packages (#2).
Re-land of bf1446791e.

Enable bundled Python CIPD packages in bleeding-edge mode. This
replaces the ZIP unpacking approach used before, and introduces
validation and management through the CIPD tool. The bleeding edge
version will only install if a sentinel file is present in the
"depot_tools" root; otherwise, default behavior will continue.

This method adds a upgrade and downgrade path to/from ZIP and
CIPD installations. This is done by rewriting the "win_tools.bat"
process:

1) Ensure that a bootstrap Python is present.
2) Use it to run "win_tools.py", which has the functionality of
    "git_bootstrap.py" plus Python installation.
3) Run "win_tools.py" with appropriate flags.

Some tricks were employed to handle cases where there is an
already-running Python instance that uses the current Python
installation and executable. This happens on bots because the
system uses the same "depot_tools" checkout at multiple launch
layers. To this end, we use the "python.bat" as the "current Python"
authority and refrain from cleaning up old Python directories if their
"python.exe" binaries are currently in use.

We change the Git bleeding edge file to share the same
sentinel file as Python, ".bleeding_edge".

The new Python should have the same facilities as the original Python
bundle.

BUG=chromium:740171
TEST=local

Change-Id: I51ba6415c60b95c2aaba94b6e21bd9b3fc82f35d
Reviewed-on: https://chromium-review.googlesource.com/568524
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
Commit-Queue: Robbie Iannucci <iannucci@chromium.org>
8 years ago
Dan Jacques e8eed65fec Always copy "python.bat".
This change should be safe, since batch files are not generally
write-contended, and "gclient" is run atomically (other things depend on
this).

The mechanism to detect whether we're downgrading is broken by
"bot_update". While future syncs should not encounter this issue,
current syncs still have no way to resolve it, and are left with a
broken "python.bat" setup.

We remedy this by always installing "python.bat", even if it's already
there. This is safe, since the intended state of HEAD is for this file
to be present at all times.

BUG=chromium:741650
TEST=None

Change-Id: Ief28217bf89d201d830c46b31e0b4040c51cb322
Reviewed-on: https://chromium-review.googlesource.com/568588
Reviewed-by: Sergey Berezin <sergeyberezin@chromium.org>
8 years ago
Andrii Shyshkalov af5c20f5a4 Revert "[win_tools] Use bundled Python CIPD packages."
This reverts commit bf1446791e.

Reason for revert: broke win bots http://o/410053

Original change's description:
> [win_tools] Use bundled Python CIPD packages.
> 
> Enable bundled Python CIPD packages in bleeding-edge mode. This
> replaces the ZIP unpacking approach used before, and introduces
> validation and management through the CIPD tool. The bleeding edge
> version will only install if a sentinel file is present in the
> "depot_tools" root; otherwise, default behavior will continue.
> 
> This method adds a upgrade and downgrade path to/from ZIP and
> CIPD installations. This is done by rewriting the "win_tools.bat"
> process:
> 
> 1) Ensure that a bootstrap Python is present.
> 2) Use it to run "win_tools.py", which has the functionality of
>     "git_bootstrap.py" plus Python installation.
> 3) Run "win_tools.py" with appropriate flags.
> 
> Some tricks were employed to handle cases where there is an
> already-running Python instance that uses the current Python
> installation and executable. This happens on bots because the
> system uses the same "depot_tools" checkout at multiple launch
> layers. To this end, we use the "python.bat" as the "current Python"
> authority and refrain from cleaning up old Python directories if their
> "python.exe" binaries are currently in use.
> 
> We change the Git bleeding edge file to share the same
> sentinel file as Python, ".bleeding_edge".
> 
> The new Python should have the same facilities as the original Python
> bundle.
> 
> BUG=chromium:740171
> TEST=local
> 
> Change-Id: I1b3b7d31d47d1a37a9dba9114d31681bec558736
> Reviewed-on: https://chromium-review.googlesource.com/563036
> Commit-Queue: Daniel Jacques <dnj@chromium.org>
> Reviewed-by: Robbie Iannucci <iannucci@chromium.org>

TBR=iannucci@chromium.org,dnj@chromium.org

Change-Id: I84574a01bbad6596912e4aaa34f019d24720b638
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: chromium:740171
Reviewed-on: https://chromium-review.googlesource.com/567009
Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>
Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>
8 years ago
Dan Jacques bf1446791e [win_tools] Use bundled Python CIPD packages.
Enable bundled Python CIPD packages in bleeding-edge mode. This
replaces the ZIP unpacking approach used before, and introduces
validation and management through the CIPD tool. The bleeding edge
version will only install if a sentinel file is present in the
"depot_tools" root; otherwise, default behavior will continue.

This method adds a upgrade and downgrade path to/from ZIP and
CIPD installations. This is done by rewriting the "win_tools.bat"
process:

1) Ensure that a bootstrap Python is present.
2) Use it to run "win_tools.py", which has the functionality of
    "git_bootstrap.py" plus Python installation.
3) Run "win_tools.py" with appropriate flags.

Some tricks were employed to handle cases where there is an
already-running Python instance that uses the current Python
installation and executable. This happens on bots because the
system uses the same "depot_tools" checkout at multiple launch
layers. To this end, we use the "python.bat" as the "current Python"
authority and refrain from cleaning up old Python directories if their
"python.exe" binaries are currently in use.

We change the Git bleeding edge file to share the same
sentinel file as Python, ".bleeding_edge".

The new Python should have the same facilities as the original Python
bundle.

BUG=chromium:740171
TEST=local

Change-Id: I1b3b7d31d47d1a37a9dba9114d31681bec558736
Reviewed-on: https://chromium-review.googlesource.com/563036
Commit-Queue: Daniel Jacques <dnj@chromium.org>
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
8 years ago
Dan Jacques 265255f501 [bootstrap/win] Replace "python.bat" only on downgrade.
We're implementing a bootstrap downgrade for potential revert of
https://chromium-review.googlesource.com/c/563036

Currently, the downgrade sees the presence of the landed patch
as a sign to completely reinstall Python. However, this causes
the "python276_bin" directory to be deleted, which both ruins
any running process (notably "service manager" and BuildBot)
and fails due to those running processes, leaving the system in
a broken state.

Instead, we'll view the revert path as a signal to swap in the
old "python.bat" specifically, then fall through to standard
installation detection. Since the upgrade will not actually
delete "python276_bin", the expected revert case will leave it
alone, preserving existing execution environments.

BUG=chromium:740966, chromium:740171
TEST=local
  - Ran simulation of revert path with this change, observed
    better outcome.

Change-Id: I0dfa5924a27bcaba49134272a344f7b9f1d475c5
Reviewed-on: https://chromium-review.googlesource.com/567167
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
Commit-Queue: Daniel Jacques <dnj@chromium.org>
8 years ago
Dan Jacques 4cb9d7422d [bootstrap/win] Enable revert from upcoming patch.
The upcoming CL, https://chromium-review.googlesource.com/c/563036,
updates "bootstrap/win"'s mechanism. However, if that patch needs to be
reverted, its "python.bat" stub may still exist in the reverted
repository, and will continue to point to the reverted toolchain.

We don't have a good way to detect whether we should revert "python.bat".
Instead, we will look a file generated by the CL,
"//python_bin_reldir.txt". If we find it, we will assume that the updated
"python.bat" is in use, and reinstall.

Note that if that CL lands and does not require a revert, this logic
will be deleted. It's just there as a safety mechanism to allow a safe
revert.

BUG=chromium:740171
TEST=local

Change-Id: Ifc638cf0512d2a889c37fbf6b8e3f7a3269331b1
Reviewed-on: https://chromium-review.googlesource.com/566073
Commit-Queue: Daniel Jacques <dnj@chromium.org>
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
8 years ago
Dan Jacques 13f258bf05 Remove SVN bootstrapping and some tooling.
Remove Windows SVN bootstrapping and some SVN tooling. Since
"depot_tools" is no longer sync'd to SVN, and we have been committed to
Git for years now, this is obsolete. Any transition code will never
reach SVN users, and any remaining code should not be used by Chromium
developers.

BUG=chromium:630904
TEST=unit

Change-Id: Ie984e8400a748702b125eaeed8157719ef4b88cc
Reviewed-on: https://chromium-review.googlesource.com/562748
Commit-Queue: Daniel Jacques <dnj@chromium.org>
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
Reviewed-by: Aaron Gable <agable@chromium.org>
8 years ago
anatoly techtonik a5bec84569 [bootstrap] Move bitness detection logic into Python
Bug: 703064

Change-Id: I319e89a43533b86c0eedff56fec2665fa13e728c
Reviewed-on: https://chromium-review.googlesource.com/466006
Commit-Queue: Robbie Iannucci <iannucci@chromium.org>
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
8 years ago
Paweł Hajdan, Jr 42ffe773c3 win_tools.bat: call git_bootstrap.py, remove deprecated svn bootstrap
BUG=635421, 629679
R=tandrii@chromium.org

Review URL: https://codereview.chromium.org/2286333002 .
9 years ago
Robert Iannucci ed7d0e3804 Make git version numbers external to batch script.
R=stip@chromium.org, phajdan.jr@chromium.org
BUG=635421

Review URL: https://codereview.chromium.org/2249163005 .
9 years ago
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