Caused by crrev.com/210695

TBR=maruel@chromium.org

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

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

Git introduced a --3way argument to `apply` in version 1.7.12 [1]. This
provides a much nicer way to apply issues from Rietveld.

After this change, `git cl patch` will add --3way after checking the git
version for support.

[1] https://github.com/git/git/commit/f247b10aa0f75727f1b4bdd67b060720b8219b29

BUG=None
TEST=Ran `git cl patch <issue>` with both clean and unclean patches,
also checked behaviour of --reject is preserved.
R=maruel@chromium.org

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

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

Forcing function for developers to create a .netrc file.
BUG=

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

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

Sometimes we wish to pull in a complicated dependency but want to
suppress or replace one or more of the hooks rules.  Say for example
we want to use a different way of generating the projects, or
have a different set of landmine expectations.

Here we add a custom_hooks section mirroring custom_deps to allow us to
override sections we have identified in the DEPS file.  To do so,
we add an optional name to the elements of the hooks list, and overwrite
those whose name matches.

Conventions between included DEPS and the .gclient as to the meanings of the
name are equivalent to the meaning of the customized deps, and so do not
benefit from further structure or definition.

BUG=None
TEST=local unit test

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

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

--no-pager looks ugly in logs and output and makes commands harder to
read. Setting an environment variable is better.

This is a followup to https://chromiumcodereview.appspot.com/14104005/
which added --no-pager.

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

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

Fix identification of shas that contain capitalized
hexadecimal characters.  Addresses comments from
http://crrev.com/18262002/

R=maruel@chromium.org

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

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

This is especially useful when you want to do something like:

git try -s third_party/WebKit

from the chromium root checkout.

R=dpranke@chromium.org
BUG=

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

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

TBR=maruel@chromium.org

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

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

See bug.

TBR=szager@chromium.org
BUG=257299

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

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

Test breakage introduced by f10ffa90.

TBR=joi@chromium.org
BUG=

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

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

timer, i.e. ~900 seconds.

This should at least help make 'fetch chromium' slightly more reliable
over somewhat slow connections.

BUG=230691,247173
R=rogerta@chromium.org

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

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

This enables significant time savings, especially since file_list only exists to
enable file-specific hooks (which, AFAIK, nothing actually uses). On a z620
(linux) using the cached git repos, a first-time `gclient sync --nohooks` takes:
  * (with)    131.06s user 14.10s  system 117% cpu 2:03.89 total
  * (without) 482.13s user 189.35s system 144% cpu 7:45.63 total

This change makes nohooks cause file_list to be None if we don't need to
accumulate it, and updates GitWrapper and SvnWrapper appropriately.

R=szager@chromium.org
BUG=

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

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

Instead of cloning straight into place, clones are made to a global cache dir,
and then local (using --shared) clones are made from the cache to the final
resting place. This means the 'final' clones are full repos with no shenanigans,
meaning that branches, commits, etc. all work, which should allow the rest of
the gclient ecosystem to work without change as well.

The primary benefit is, of course, reduced network IO, and a much lower cost for
'clobber' operations (assuming we don't clobber the cache). It also means that
a given bot can have a greater number of checkouts, since the entire git history
will only be stored once per machine, instead of once per checkout.

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

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

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

- Use config --local for properties that should be local.
- Remove git fetch retry logic, it should not be necessary
  with the googlesource hosts.
- Include .strip() in GIT.Capture, simplifying other calls.
- Safer testing of whether dep revision is a sha.
- Fix refs/remotes/ DEPS branch detection

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

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

R=dpranke@chromium.org
BUG=

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

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

Able to pull internal tools, but distinct from the source that
those tools may eventually build.

TBR=cmp@chromium.org
BUG=252226
TEST=local buildslave

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

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

This will be used on the bots when calling apply_patch, which commits to git
repos.

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

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

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

R=hinoka@chromium.org,maruel@chromium.org
BUG=254817

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

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

Previously if one or both of these values were unset, the tests would simply fail
because `git config` returns 1.

R=dpranke@chromium.org
BUG=

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

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

In order to support both developer workflow and not breaking bots, if the script
fails on a 403 in a bucket, it'll print a message asking developers to run
"download_from_google_storage --config" in order to create a new boto file.

This is not done automatically because it would break bots (Imagine hitting a 403,
and then gsutil wiping the .boto file, waiting for input, then dying).

BUG=231699,176331

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

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

This reverts commit 012dc07c.

Revert "Partially revert r208574 to get the CQ working again (hopefully)."

This reverts commit 74105cd2.

Pull the --no-commit change out completely.

TBR=dpranke@chromium.org
BUG=254556

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

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

basic.sh expects "work: None", but "work: " is printed instead, which breaks
presubmit.  This fixes it.

BUG=
R=dpranke@chromium.org

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

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

TBR=iannucci@chromium.org, cmp@chromium.org
BUG=254556

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

R=dpranke@chromium.org
BUG=

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

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

It appears to be parsed and ignored, seems like a bug to me.

BUG=None
TEST=local/manual.

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

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

This will speed up main waterfall sync.  We can
remove this hack tomorrow if svn load is still OK.

TBR=cmp

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

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

TBR=iannucci@chromium.org

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

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

R=maruel@chromium.org
BUG=none
TEST=none

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

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

Look for either a unique prefix or for an approximation of the shortest
Levenshtein distance. So all of these will resolve to 'git cl upload':
  git cl upl
  git cl uplaod

These won't resolve:
  git cl up     # it shares prefix with 'upstream'
  git cl uplao  # not similar enough

Also align help against longest command instead of hard coded '10'. The help
page was distorded.

R=iannucci@chromium.org
BUG=

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

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

This pulls r1084 from the chromium on upstream rietveld.

R=jparent@chromium.org, maruel@chromium.org
BUG=247791

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

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

BUG=248384

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

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

src/base/hash_tables.h has moved to src/base/containers/hash_tables.h in r205241.

R=maruel@chromium.org

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

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

I have a large rename change and it's impossible to upload because the size of the CC field is above the maximum 2000 characters in Reitveld.

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

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

If (hypothetically) you pointed your WebKit repo environment variable to
Blink and not WebKit, then the change_re will not find anything in the
log and the script will explode on changes[0] because changes=[].

Fix this by being robust to not being able to parse anything out of the
log in process_git_commits.

R=szager@chromium.org
BUG=none

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

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

presubmit_support: Call git once per change, to get a diff for all files. Parse this result to generate per-file diffs, which go into a cache that's shared between the AffectedFile instances.

Greatly improves presubmit performance on Blink where there may be rule violations (my test case went from 50s to 5s).

BUG=236206
TEST=new test in presubmit_unittest.py; manual performance test on Mac and Windows after touching hundreds of files in webkit; testing included add/move/edit/delete on both binary and text files.

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

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

> Default to using --3way when using `git cl patch`.
> 
> Resolving conflicts is much more fun this way.
> 
> BUG=None
> TEST=Ran `git cl patch <issue>` with both clean and unclean patches, also checked behaviour of --reject is preserved.
> R=maruel@chromium.org
> 
> Review URL: https://codereview.chromium.org/16211005

TBR=tapted@chromium.org

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

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

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

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

Resolving conflicts is much more fun this way.

BUG=None
TEST=Ran `git cl patch <issue>` with both clean and unclean patches, also checked behaviour of --reject is preserved.
R=maruel@chromium.org

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

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

BUG=None
TBR=laforge@chromium.org, kerz

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

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

Suppress alt_urls when a drover.properties file is present (otherwise it breaks branch reverts for Blink, etc...)

TBR=kerz

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