Changes like crrev.com/c/1752507, where a file that was previously in
.gitignore becomes part of the repo, makes update_depot_tools fail
to rebase.
Use git checkout origin/master instead.
Bug: 996359
Change-Id: Ib1a43b8842cebce96ab1fabaedc8e5653b9a708e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1764708
Auto-Submit: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
Commit-Queue: Robbie Iannucci <iannucci@chromium.org>
The `find` utility does not support iname option. Use grep to work
around this limitation.
Change-Id: Iee16def0e4eea8b868c4f3aad164caa0bd7e9d5d
Reviewed-on: https://chromium-review.googlesource.com/1106651
Commit-Queue: Dirk Pranke <dpranke@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
This reverts commit bfa05c838c.
Reason for revert: breaks bot bootstrap
Original change's description:
> update_depot_tools: make cipd_bin_setup failures fatal
>
> This should make them more noticeable.
>
> Bug: 762568
> Change-Id: Ibd4ca4dc34d36aec5773d28454d134c909cc78dc
> Reviewed-on: https://chromium-review.googlesource.com/653157
> Reviewed-by: Daniel Jacques <dnj@chromium.org>
> Commit-Queue: Paweł Hajdan Jr. <phajdan.jr@chromium.org>
TBR=phajdan.jr@chromium.org,dnj@chromium.org
Change-Id: I14e8aae77beca52ebbd21567e2ea20954e2b34d8
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 762894, 762568
Reviewed-on: https://chromium-review.googlesource.com/654977
Reviewed-by: Paweł Hajdan Jr. <phajdan.jr@chromium.org>
Commit-Queue: Paweł Hajdan Jr. <phajdan.jr@chromium.org>
This should make them more noticeable.
Bug: 762568
Change-Id: Ibd4ca4dc34d36aec5773d28454d134c909cc78dc
Reviewed-on: https://chromium-review.googlesource.com/653157
Reviewed-by: Daniel Jacques <dnj@chromium.org>
Commit-Queue: Paweł Hajdan Jr. <phajdan.jr@chromium.org>
The update_depot_tools script had a line where a call out
to the test operator ([]) wasn't quoting all of the arguments,
leading to errors if a directory had spaces in the name.
R=dnj@chromium.org, phajdan.jr@chromium.org
Bug:
Change-Id: Ie1f5f51891a2582614ed3d9b16375d2ad522360b
Reviewed-on: https://chromium-review.googlesource.com/598427
Reviewed-by: Daniel Jacques <dnj@chromium.org>
Commit-Queue: Daniel Jacques <dnj@chromium.org>
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>
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>
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>
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>
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>
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
Without this I get prompted if I really want to remote the file.
BUG=none
TEST=none
Review URL: https://codereview.chromium.org/1332303003
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@296651 0039d316-1c4b-4281-b951-d872f2087c98
This is needed to prevent auto_deploy.py in CQ send alert each time depot_tools
get's updated as cron job will send alert on any output.
R=stip@chromium.orgCC=akuegel@chromium.org
BUG=475049
Review URL: https://codereview.chromium.org/1073113004
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@294778 0039d316-1c4b-4281-b951-d872f2087c98
This uses grep instead. Note that just grepping for "--force" matches other
things, e.g. "foo--force--foo", but that's a problem with the original code as
well, I think.
BUG=435729
TEST=Run gclient under msysgit bash. No error should occur.
Review URL: https://codereview.chromium.org/789353002
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@293340 0039d316-1c4b-4281-b951-d872f2087c98
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
The git path is based on the git version, so it might change whenever git is
updated. Run git.bat instead, since that's updated with new git installs and
should always point to the right path.
The mingw logic is based on similar handling of python.bat in git-cl.
Review URL: https://codereview.chromium.org/166273024
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@252584 0039d316-1c4b-4281-b951-d872f2087c98
This is necessary so that Cygwin users have a python directory in depot_tools/,
which will soon be used by gyp_chromium.
BUG=335180
Review URL: https://codereview.chromium.org/141523009
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@245704 0039d316-1c4b-4281-b951-d872f2087c98
Reason for revert:
This broke auto-updating depot_tools on Cygwin due to use of exec
Original issue's description:
> Fetch Windows tools on Cygwin and use that Python for some scripts
>
> Tested by running gclient sync a couple of times from a Cygwin shell.
>
> R=dpranke@chromium.org
> CC=scottmg@chromium.org,thakis@chromium.org,maruel@chromium.org
> BUG=335180
>
> Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=245315TBR=dpranke@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=335180
Review URL: https://codereview.chromium.org/132883007
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@245330 0039d316-1c4b-4281-b951-d872f2087c98
Tested by running gclient sync a couple of times from a Cygwin shell.
R=dpranke@chromium.org
CC=scottmg@chromium.org,thakis@chromium.org,maruel@chromium.org
BUG=335180
Review URL: https://codereview.chromium.org/140843004
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@245315 0039d316-1c4b-4281-b951-d872f2087c98
Previous code checked the exit status of 'echo' instead of 'read' to
determine if the 'read' command had timed out.
TEST=Create a mirror of depot_tools.git, git clone it, then run
./update_depot_tools, see prompt for changing the URL, wait at
least 60 seconds and verify that you get the timeout message.
R=maruel@chromium.org
BUG=
Review URL: https://codereview.chromium.org/25110004
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@227427 0039d316-1c4b-4281-b951-d872f2087c98
The bash command "local myvar=$(mycommand)" has the exit status of the
bash builtin "local" rather than the exit status of mycommand. To get
the exit status of mycommand, "local myvar" should be run separately
on a previous line.
Review URL: https://chromiumcodereview.appspot.com/11308129
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@169446 0039d316-1c4b-4281-b951-d872f2087c98
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
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.orgR=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
Take two at r102841.
Forgot to use $base_dir, so the .pyc files in the checkout were deleted, instead
of the ones in depot_tools. Since some slaves have very large checkouts, they
appeared as hung.
R=cmp@chromium.org
BUG=
TEST=
Review URL: http://codereview.chromium.org/8059001
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@103056 0039d316-1c4b-4281-b951-d872f2087c98
Last change exhibited issues with stale .pyc files. Let's leave that bake in a
little to cleanup old .pyc files.
TBR=asvitkine@chromium.org
BUG=
TEST=
Review URL: http://codereview.chromium.org/8048014
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@102841 0039d316-1c4b-4281-b951-d872f2087c98
This change makes it possible to run 'git cl' from
a Command Prompt using only the auto-installed git
from depot_tools. It is needed because in MSysGit,
'git cl' invokes 'git' which calls 'git-cl'. While
'git-cl' is pulled from depot_tools (since it's in
PATH), depot_tools/python_bin is not in PATH, and
so we execute git_cl.py through our auto-installed
python.exe directly.
update_depot_tools is fixed so that if we find
the auto-installed svn and git in depot_tools, we
execute those directly, otherwise falling back to
calling them based on PATH.
In both git-cl and update_depot_tools, we only enable
this new behavior if uname in PATH reports a 'MINGW'
environment. This should not trigger on any other
environment where uname exists, including Cygwin which
should report 'CYGWIN'.
Review URL: http://codereview.chromium.org/7020035
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@87510 0039d316-1c4b-4281-b951-d872f2087c98
This is causing a failure with dash interpreters.
Will revert this change and do testing in that
environment before next landing.
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@86211 0039d316-1c4b-4281-b951-d872f2087c98
On at least one platform /usr/bin/env is actually not
a guaranteed method to get to bash. Fall back to using
/bin/bash for this script.
Review URL: http://codereview.chromium.org/7039045
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@86185 0039d316-1c4b-4281-b951-d872f2087c98
Edward Lemur
John Barboza
Paweł Hajdan Jr.
Dirk Pranke
Dan Jacques
Dan Jacques
Aaron Gable
iannucci@chromium.org
sergiyb@chromium.org
sky@chromium.org
pkasting@chromium.org
akuegel@chromium.org
szager@chromium.org
mmoss@chromium.org
pkasting@chromium.org
rnk@chromium.org
stuart@fivemicro.com
newt@chromium.org
ilevy@chromium.org
maruel@chromium.org
cmp@chromium.org
dpranke@chromium.org
thestig@chromium.org
nsylvain@chromium.org