Commit Graph

27 Commits (d3ba72bbc646aa52dea83a299b18620d29c36051)

Author SHA1 Message Date
Dan Jacques 5aeeb72c33 [bootstraps] Sync at gclient, suppress output (#2)
Have the "update_depot_tools" script also do a CIPD tool sync. This will
ensure that users and systems have access to tooling at sync-time rather
than just-in-time loading them at execution time.

Update the tool boostraps to suppress any sort of syncing logs, if it
does happen. This will ensure that users who execute the tools don't see
unexpected output.

BUG=chromium:748651
TEST=local
  - Tested on Mac and Windows.

Change-Id: I1aad897d885a07beeac40a372a658681720efd2a
Reviewed-on: https://chromium-review.googlesource.com/591229
Commit-Queue: Daniel Jacques <dnj@chromium.org>
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
8 years ago
Dirk Pranke 44855b9498 Revert "[bootstraps] Sync at gclient, suppress output."
This reverts commit 4d92fe4300.

Reason for revert: This moved the logging from invoking `led` or `vpython` to whenever someone would run something that would end up invoking `update_depot_tools`. It's good that we are calling this when we run update_depot_tools, but we probably should've suppressed the logging there in at least the success case, because now things are even more confusing. See crbug.com/748651.

Original change's description:
> [bootstraps] Sync at gclient, suppress output.
> 
> Have the "update_depot_tools" script also do a CIPD tool sync. This will
> ensure that users and systems have access to tooling at sync-time rather
> than just-in-time loading them at execution time.
> 
> Update the tool boostraps to suppress any sort of syncing logic, if it
> does happen. This will ensure that users who execute the tools don't se
> unexpected output.
> 
> BUG=None
> TEST=local
>   - Tested on Mac and Windows.
> 
> R=​dpranke@chromium.org, iannucci@chromium.org
> 
> Change-Id: I8efce8c73cc4e82ffdf5067ba9b917119a81e843
> Reviewed-on: https://chromium-review.googlesource.com/581494
> Commit-Queue: Daniel Jacques <dnj@chromium.org>
> Reviewed-by: Robbie Iannucci <iannucci@chromium.org>

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

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: None
Change-Id: I2485c9dd2e48a8dbdeebfff5da9d4c708e0edcb7
Reviewed-on: https://chromium-review.googlesource.com/585867
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Commit-Queue: Dirk Pranke <dpranke@chromium.org>
8 years ago
Dan Jacques 4d92fe4300 [bootstraps] Sync at gclient, suppress output.
Have the "update_depot_tools" script also do a CIPD tool sync. This will
ensure that users and systems have access to tooling at sync-time rather
than just-in-time loading them at execution time.

Update the tool boostraps to suppress any sort of syncing logic, if it
does happen. This will ensure that users who execute the tools don't se
unexpected output.

BUG=None
TEST=local
  - Tested on Mac and Windows.

R=dpranke@chromium.org, iannucci@chromium.org

Change-Id: I8efce8c73cc4e82ffdf5067ba9b917119a81e843
Reviewed-on: https://chromium-review.googlesource.com/581494
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
Dan Jacques 74d7e13315 [auto_update] Add control script, allow disable.
Enable a sentinel file to enable/disable "depot_tools" auto-updating.
This file, if present, indicates that automatic updating should not
occur.

Add a simple control script to enable/disable automatic updating.

BUG=chromium:727917
TEST=local
  - Ran locally, --enable, --disable.

R=iannucci@chromium.org, maruel@chromium.org, nodir@chromium.org

Change-Id: Id30a17586248228849d046f79d7e0bc445d97f97
Reviewed-on: https://chromium-review.googlesource.com/521884
Commit-Queue: Daniel Jacques <dnj@chromium.org>
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
Reviewed-by: Marc-Antoine Ruel <maruel@chromium.org>
8 years ago
Aaron Gable a0e5cc40f0 Remove SVN code from update_depot_tools
R=maruel@chromium.org
BUG=600446

Review URL: https://codereview.chromium.org/2088653003 .
9 years ago
agable@chromium.org 17c4771ea6 Add warnings to SVN update_depot_tools
R=iannucci@chromium.org
BUG=600446

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@300660 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
sergiyb@chromium.org 150aa7b955 Re-land: Removed virtualenv from depot_tools
Original CL: https://codereview.chromium.org/1437483002/.

R=dnj@google.com, tandrii@chromium.org, dnj@chromium.org, pgervais@chromium.org
BUG=542922, 503067

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297494 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
sergiyb@chromium.org af0b79e758 Restore depot_tools autoupdate in Windows.
Original CL: https://codereview.chromium.org/1242013003/

Executing a bat file from another bat file will replace
that first bat file with the second one. To call the
second one and then return and execute the rest of the
first one, you have to do "call second.bat"

"python" is really "python.bat" so that this happened
was not obvious. More obvious now.

R=bratell@opera.com
TBR=pgervais@chromium.org
BUG=511926

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@296063 0039d316-1c4b-4281-b951-d872f2087c98
10 years ago
sergiyb@chromium.org 568dbd8440 Re-land: Added virtualenv for depot_tools
Original CL: https://chromiumcodereview.appspot.com/1200843003/

R=pgervais@chromium.org
BUG=503067
TEST=tested on Mac, Windows and Linux bots

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@295842 0039d316-1c4b-4281-b951-d872f2087c98
10 years ago
akuegel@chromium.org 39a23508dc Revert of Added virtualenv for depot_tools (patchset #10 id:180001 of https://chromiumcodereview.appspot.com/1200843003/)
Reason for revert:
Doesn't work, virtualenv is missing in depot_tools checkout.

Original issue's description:
> Added virtualenv for depot_tools
>
> R=pgervais@chromium.org
> BUG=503067
> TEST=tested on Mac, Windows and Linux bots
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=295811

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

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@295813 0039d316-1c4b-4281-b951-d872f2087c98
10 years ago
sergiyb@chromium.org b3bae3748a Added virtualenv for depot_tools
R=pgervais@chromium.org
BUG=503067
TEST=tested on Mac, Windows and Linux bots

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@295811 0039d316-1c4b-4281-b951-d872f2087c98
10 years ago
agable@chromium.org 69b67588c4 Run "svn revert" in update_depot_tools --force
R=iannucci@chromium.org, szager@chromium.org, pdr@chromium.org
BUG=435729

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@293112 0039d316-1c4b-4281-b951-d872f2087c98
10 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
scottmg@chromium.org 5d17b921db Move toolchain update control into src, but keep download logic in depot_tools
Moves the update functionality out of update_depot_tools into src/ in https://codereview.chromium.org/175573004 .

get_toolchain_if_required.py now expects a list of hashes on the
command line, and makes sure that it gets one of those.

toolchain2013.py saves a .json which contains information relevant to the
interests of the caller, so that it can set up the parent environment. This
is returned via the --output-json command line argument to get_...py

R=iannucci@chromium.org
BUG=323300

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@252725 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
scottmg@chromium.org 805133df83 Revert 252633 "Switch to opt-out for toolchain"
> Switch to opt-out for toolchain
> 
> R=maruel@chromium.org
> BUG=323300
> 
> Review URL: https://codereview.chromium.org/174663005

TBR=scottmg@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@252634 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
scottmg@chromium.org e604eafd83 Switch to opt-out for toolchain
R=maruel@chromium.org
BUG=323300

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@252633 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
scottmg@chromium.org 7cc7a1c5dc Automatic Windows toolchain
Per comments in linked bug, this is simply moved from chromium. The
only new thing is hooking it into update_depot_tools.bat, and
updating a few paths in the scripts.

This is currently opt-in via "set DEPOT_TOOLS_WIN_TOOLCHAIN=1" but
that will be removed once it's ready for deployment.

R=iannucci@chromium.org, maruel@chromium.org
BUG=323300

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@244983 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
szager@chromium.org 86c497d8db Indicate when depot_tools can't be updated on Windows.
When depot_tools fail to update right now all you get is
    Cannot rebase: You have unstaged changes.
    Please commit or stash them.
As that is typically in a call to gclient it's far from obvious what
could not be updated so add a line saying
    Failed to update depot_tools.
to that. Linux and Mac already have a similar error message in their
script file.

BUG=
R=szager@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@226002 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
szager@chromium.org aa574c6a22 Execute a temp copy of update_depot_tools.bat
Windows will sometimes freak out if a file is rewritten while
it's being executed.  That can happen when update_depot_tools.bat
runs.

R=iannucci@chromium.org,maruel@chromium.org
BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@189429 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
szager@chromium.org 9f36c3891b Add prompt for updating remote URL to git-on-borg.
Review URL: https://codereview.chromium.org/11778024

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@175419 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
maruel@chromium.org 495e57b6bb Rebase explicitly origin/master instead of guessing from the remote.
Not sure this code worked.

R=cmp@chromium.org
BUG=

Review URL: https://chromiumcodereview.appspot.com/10913193

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@156059 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
cmp@chromium.org b9d08cece4 Handle updating depot_tools repos that are git cloned.
Until recently, no proper Git clone of depot_tools existed.
All Git clones were set up locally via git svn clone.  The
way repos of that type are updated is via 'git svn rebase'.

Now, a supported Git clone of depot_tools exists.  The
update process for repos of this type is via 'git fetch'
and 'git rebase'.

Modify the update_depot_tools* scripts so they can update
depot_tools for git cloned or git svn cloned methods.  This
also means that git svn is no longer required, so move that
test after we check for git cloned repos.

R=maruel@chromium.org

TEST=Linux + git clone: on Linux, git clone
https://git.chromium.org/chromium/tools/depot_tools.git.  Apply
and commit this patch locally.  Note commit hash of HEAD.  Run
'git reset --hard "HEAD^^^"'.  Run
'git cherry-pick HASH_OF_UPDATE_CHANGE'.  Run './update_depot_tools'.
Verify depot_tools is updated to latest available revision + this
change.

TEST=Linux + git svn clone: on Linux, git svn clone
svn://svn.chromium.org/chrome/trunk/tools/depot_tools.
Apply and commit this patch locally.  Note commit hash
of HEAD.  Run 'git reset --hard "HEAD^^^"'.  Run 'git cherry-pick
HASH_OF_UPDATE_CHANGE'.  Run './update_depot_tools'.  Verify
depot_tools is updated to latest available revision + this change.

TEST=Windows command prompt + git clone: on Windows command prompt,
run Linux+git clone test, except use update_depot_tools.bat.  Verify
depot_tools is updated to latest available revision + this change.

TEST=Windows command prompt + git svn clone: on Windows command
prompt, run Linux+git svn clone test, except use
update_depot_tools.bat.  Verify depot_tools is updated to latest
available revision + this change.

TEST=Windows cygwin + git clone: on Windows command prompt,
run Linux+git clone test.  Verify depot_tools is updated to latest
available revision + this change.

TEST=Windows cygwin + git svn clone: on Windows command
prompt, run Linux+git svn clone test.  Verify depot_tools is updated
to latest available revision + this change.

Review URL: https://chromiumcodereview.appspot.com/10263004

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@134732 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org e6c00f3f6f Fix git depot_tools update flow.
In Windows (already worked correctly in posix): gclient wouldn't correctly update depot_tools when called.

Refactored away the bootstrap depot_tools update flow which only still existed in Windows.

Patch contributed by gab@chromium.org

R=maruel@chromium.org
BUG=
TEST=Running `gclient sync` from src/ and see depot_tools being correctly updated under a git depot_tools checkout.

Review URL: https://chromiumcodereview.appspot.com/9751009

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