Commit Graph

2126 Commits (c3553743cfe71c4f8fa1a1d5ad471baf72635b3e)
 

Author SHA1 Message Date
agable@chromium.org c3553743cf Remove --update-shallow from git-cache.
R=hinoka@chromium.org
BUG=339171

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@253887 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
scottmg@chromium.org bd4dafb963 Make git non-interactive when checking for src-internal access
git sometimes blocks asking for a password. On a random machine that
didn't know anything about google/chromium, it failed immediately with

"fatal: could not read Username for 'https://chrome-internal.googlesource.com': No such file or directory"

but on my real machine w/o _netrc it blocks and wants this:

Username for 'https://chrome-internal.googlesource.com':
Password for 'https://chrome-internal.googlesource.com':

There's no --non-interactive unfortunately, it's supposed to magically
decide if it's connected to a tty and behave appropriately. It does
not, perhaps because of being wrapped in depot_tools .bat files,
perhaps an msysgit-port bug, perhaps being called from python. Anyway
https://github.com/bower/bower/issues/1009 had a magic incantation
that works for this case: 'true' is available in the msys
distribution.

R=iannucci@chromium.org
BUG=323300

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@253844 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
szager@chromium.org 6c2b49d392 Revert "Re-re-land gclient deletion of mismatching checkouts again"
This reverts commit 6ff5448534.

'fetch --nohooks chromium' is broken with this change.

BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@253640 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
borenet@google.com 6ff5448534 Re-re-land gclient deletion of mismatching checkouts again
Review URL: https://codereview.chromium.org/164053003

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@253616 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
scottmg@chromium.org 28974af759 Add some missing setlocals from various .bat files
Shell PATH was growing quite long in some cases.

R=gab@chromium.org, iannucci@chromium.org, johnw@chromium.org, maruel@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@253347 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
sergeyberezin@chromium.org 04bd6b16bd Incorrect SSLError attribute.
ssl.SSLError does NOT have 'reason' attribute. Use str() to get a
reliable string.

Fixed the silly bug in another CL: https://codereview.chromium.org/180273003/

The ssl.SSLError does NOT have attribute 'reason', and must use the
generic 'strerror' instead. This is what happens when I submit a CL
too fast...

BUG=346845
R=stip@chromium.org,maruel@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@253317 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
nick@chromium.org 8ca1aa3cd5 clang-format: Allow .proto files to be formatted (supported by an upcoming binary/script; this change is safe if you are running an older binary); remove warnings.
BUG=344916

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@253295 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
sergeyberezin@chromium.org 36bc38406a Handle SSL timeouts in Rietveld requests.
BUG=346845
R=maruel@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@253271 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
agable@chromium.org 5a306a2aa6 Create "git cache" command.
The git cache command is a central place to manage a machine's git cache.

It provides two subcommands:
* populate -- creates or updates the cache of a given repository
* exists -- prints the path to the cache of a repo, if it exists

Gclient, deps2git, bot_update, and any other tools that touch the cache will
be able to use this command to make sure that everyone is interacting with
the cache in the same way.

R=hinoka@chromium.org, iannucci@chromium.org
BUG=339168

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@253007 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
scottmg@chromium.org b460ebe723 Don't have svn ls block waiting for password
If user is unauthenticated, svn ls would just hang waiting at
"Password for 'User':", now it'll correctly fail with
"svn: Can't get password".

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

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@253004 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
scottmg@chromium.org 4a56efe4a5 Add some missing parts from MFC to toolchain
TBR=iannucci@chromium.org
BUG=345993

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@252757 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
scottmg@chromium.org 360f032356 Move data.json to win_toolchain to its abs paths aren't hashed
TBR=iannucci@chromium.org
BUG=323300

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@252737 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
hinoka@google.com be6b308fa8 Instead of passing --author, lets just set the name/email for the repo temporarily.
BUG=339171

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@252729 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
hinoka@google.com 998deaf360 Pass in "--author 'name <email@somewhere.com>" when doing git patches in apply_issue.py
This is to tackle the issue that slaves don't have global git vars set up.

BUG=339171

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@252705 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
mmoss@chromium.org 3b16a28565 More fixes for hardcoded git directory paths.
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
11 years ago
agable@chromium.org 0211dcb161 Add agable@ to OWNERS
R=iannucci@chromium.org, maurel@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@252474 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
hinoka@google.com d067d81657 Apply Issue changes for disabling checkout when bot update ran.
This add --force to ignore the flag file.
This also passes --base_ref so we can specify which ref we're basing off of so that it does not incorrectly assert that it is basing off origin/master

BUG=339171

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@252464 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
sergeyberezin@chromium.org e0faffa486 Added a default timeout to rietveld requests.
BUG=345117

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@252452 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
mmoss@chromium.org cc2b6a11fe Don't hardcode git directory path.
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.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@252299 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
mmoss@chromium.org 43fb90241b Ignore all the versioned git directories.
R=maruel@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@252297 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
iannucci@chromium.org 9a8b066e52 Make gclient reset use GetUsableRev.
One line for the fix, 30 lines for the test :)

R=kbr@chromium.org, mmoss@chromium.org, stip@chromium.org, szager@chromium.org
BUG=345073

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@252138 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
davidjames@chromium.org 0d0001140b Revert "Support Gerrit snapshot versions"
This reverts commit cdd9690946, which
broke gerrit_unittest.py within the chroot, which has Java 6.

Original-Review URL: https://codereview.chromium.org/164023005

TBR=szager
BUG=344786
TEST=Run the unit tests before and after. Confirm this CL fixes them.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@251976 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
dborowitz@google.com cdd9690946 Support Gerrit snapshot versions
These may be named git-snapshot-VERSION.war, where VERSION is the long
format defined in git-describe(1). In particular, this may include a
number of commits after the given tag name; treat more commits since
the tag as a higher version number. This is arguably not always
strictly correct due to non-linear history, but the maintainers expect
the total number of such snapshot versions to be low, and can remove
old snapshot versions that don't sort correctly.

Slightly de-obfuscate some of the variable names and logic while we're
at it.

R=szager@chromium.org
BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@251888 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
scottmg@chromium.org 40167ed584 win_toolchain: Add DIA SDK to extracted pieces
The goal of this change is to include the DIA SDK (and strip out
a bit extra that was unnecessary).

Unfortunately, the msi that includes the DIA SDK includes a file with an
extraordinarily long path, 241 characters long. When prepended with
"C:\Program Files (x86)\" it extracts OK, however, when we extract to
%TEMP% it's not hard for it to exceed _MAX_PATH and have the msi tool
fail. So, when extracting MSIs, also do the equivalent of
"subst X: temp_dir" and use X:\ as the path given to msiexec. (sigh)

R=maruel@chromium.org
BUG=323300

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@251085 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
scottmg@chromium.org 69629867c9 win_toolchain: add timeout before nuke, hide taskkill output
It's somewhat annoying to have the script delete your toolchain
directory (at least during testing) and it necessitates downloading
3-4G to restore, so add a short timeout before doing so.

Also, hide the output of taskkill'ing mspdbsrv so that the first message
isn't '''ERROR: The process "..." not found.'''.

R=maruel@chromium.org
BUG=323300

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@251084 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
zty@chromium.org 6279e8a389 Log gclient revert exceptions
BUG=336460

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@250904 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
mmoss@chromium.org 50fd47f55f Revert 250482 "Re-reland r245404 ("If the destination directory ..."
> Re-reland r245404 ("If the destination directory doesn't contain the desired repo, delete it")
> 
> BUG=
> 
> Review URL: https://codereview.chromium.org/133073015

TBR=borenet@google.com

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@250878 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
mmoss@chromium.org 82439aabdc Revert 250524 "gclient: Use the correct bot hostnames to enable ..."
> gclient: Use the correct bot hostnames to enable experimental deletion behavior
> 
> BUG=skia:1638
> 
> Review URL: https://codereview.chromium.org/132313017

TBR=borenet@google.com

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@250877 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
wtc@chromium.org 38e9461ce6 Fix a typo for "--dry-run" in the usage message.
This typo was introduced in https://codereview.chromium.org/106403003.

Rename options.dryrun to options.dry_run.

R=agable@chromium.org,dpranke@chromium.org
BUG=none
TEST=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@250802 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
hinoka@google.com 78d78f3c61 Change --mirror to --bare in gclient_scm.py for cache directories
BUG=339168

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@250547 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
borenet@google.com 7bfa4d8d84 gclient: Use the correct bot hostnames to enable experimental deletion behavior
BUG=skia:1638

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@250524 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
borenet@google.com 255b5d97da Re-reland r245404 ("If the destination directory doesn't contain the desired repo, delete it")
BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@250482 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
thestig@chromium.org 7a54e8183a git_cl: Do not cache the relative root in Settings.
Relative root no longer makes sense after an os.chdir().
This is effectively a partial revert of r250248.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@250478 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
thestig@chromium.org 8b0553c1f9 Cleanup: Merge a bunch of redundent env['GIT_PAGER'] = 'cat' statements.
Additionally:
- replace some RunCommand(['git', ...]) calls with RunGit().
- replace Settings._GetConfig('rietveld.foo') _GetRietveldConfig('foo').
- merge and cache calls to git rev-parse --show-cdup.
- merge some calls to git merge-base.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@250248 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
akeshet@google.com 3bdfbeb0fe Update to repo version v1.12.13-cr1
We've synced our fork of repo to upstream. This change copies the new
version into depot_tools.

BUG=chromium:339665
TEST=repo sync works

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@249277 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
borenet@google.com 3dce24f8bb Revert of Reland r245404 ("If the destination directory doesn't contain the desired repo, delete it") (https://codereview.chromium.org/131743022/)
Reason for revert:
This is still failing third_party DEPS for git-svn...

Original issue's description:
> Reland r245404 ("If the destination directory doesn't contain the desired repo, delete it")
> 
> BUG=
> 
> Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=249143

TBR=iannucci@chromium.org,maruel@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@249216 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
borenet@google.com 8456c48528 Reland r245404 ("If the destination directory doesn't contain the desired repo, delete it")
BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@249143 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
mariakhomenko@chromium.org a2ede5cb04 Consider sso:// repos to be git-managed.
This allows gclient to manage sso:// git repositories.

BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@249130 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
rdsmith@chromium.org d9591f03f5 Warn if --gclientfile= specifies a with separators.
Given that we search for the gclient root in ancestor directories based on the file name, specifying a file with separators doesn't make a lot of sense.

BUG=336946
R=iannucci@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@249077 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
petermayo@chromium.org 130a5c4cb3 Add retries to downloading the gerrit war file(s).
BUG=337921
TEST=local

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

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