BUG=chromium:602906

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

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

This is needed for https://codereview.chromium.org/1896113002

BUG=chromium:585401, chromium:593999

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

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

Before, for the common case that the actual_merge_base was already set
as base, the check for is_ancestor(base, actual_merge_base) would have
caused the base to be re-set.
This is a writing operation, which causes trouble e.g. for the parallel
operation of 'git cl status'.

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

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

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

Gerrit doesn't allow arbitrary non-member emails for now,
thus removign this feature until either Gerrit allows it,
or we have a per-repo opt-in way.

TBR=andybons@chromium.org
BUG=604377

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

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

This is an automated CL created by the recipe roller. This CL rolls recipe
changes from upstream projects (e.g. depot_tools) into downstream projects
(e.g. tools/build).


More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug
(or complain)

recipe_engine:
  https://crrev.com/8fc2d5cb0acb4680fe7175d88af87ef4f6659139 recipe engine: add generic cache directory path (phajdan.jr@chromium.org)

R=phajdan.jr@chromium.org
BUG=chromium:585401

TBR=martiniss@chromium.org,phajdan.jr@chromium.org

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

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

This is an automated CL created by the recipe roller. This CL rolls recipe
changes from upstream projects (e.g. depot_tools) into downstream projects
(e.g. tools/build).


More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug
(or complain)

recipe_engine:
  https://crrev.com/0fae6ef419bab953b5520eaeab0858d1e8ccf39c recipe engine: use local recipes.py when doing rolls (phajdan.jr@chromium.org)

R=phajdan.jr@chromium.org
BUG=chromium:583303

TBR=martiniss@chromium.org,phajdan.jr@chromium.org

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

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

git config key should consist of alphanumeric characters and '-'.
The underscore '_' is not allowed. So we're getting 'invalid key' error
when GERRIT_SKIP_ENSURE_AUTHENTICATED is set.

Let's use '-' instead of '_'.

BUG=603378

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

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

Adding this line to codereview.settings should do the trick:
  GERRIT_SKIP_ENSURE_AUTHENTICATED: true

And I also cleaned up tests so they don't spill too much to stdout.

BUG=603378
R=machenbach@chromium.org,andybons@chromium.org
CC=shinyak@chromium.org

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

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

Reason: so I can not lgtm/revert anything which doesn't come with
more tests.

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

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

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

This is an automated CL created by the recipe roller. This CL rolls recipe
changes from upstream projects (e.g. depot_tools) into downstream projects
(e.g. tools/build).


More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug
(or complain)

recipe_engine:
  https://crrev.com/86dfd541045ff43443161327b88e8074fc9a55c0 Fix deps_path not being absolute. (martiniss@chromium.org)

R=martiniss@chromium.org
BUG=

TBR=martiniss@chromium.org,phajdan.jr@chromium.org

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

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

Based on review of https://codereview.chromium.org/1889483002.

R=sergiyb@chromium.org
BUG=599931

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

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

This makes it possible to override the codereview set in:
 * repository codereview.settings
 * cached/set in local .git/config, either repo-wide or
   current branch only.

Examples:

    cd $SOME_RIETVELD_USING_REPO
    # Enable Gerrit codereview on it. Contact Infra-Git admin:
    # https://bugs.chromium.org/p/chromium/issues/entry?template=Infra-Git

    # Uploading
    git cl upload --gerrit --squash
    # Hack, hack, re-upload uses Gerrit automatically.
    git cl upload --squash

    # Patching
    git new-branch patched-in-issue
    git cl patch --gerrit XXXXXX

    # (Re-)setting issue
    git cl issue --gerrit 0
    git cl issue --gerrit XXXXXX

R=andybons@chromium.org,sergiyb@chromium.org
BUG=598681

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

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

This provides workaround for not functioning git cl try.

R=sergiyb@chromium.org,andybons@chromium.org,phajdan.jr@chromium.org
BUG=599931

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

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

R=andybons@chromium.org
BUG=579160

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

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

R=machenbach@chromium.org,andybons@chromium.org
BUG=323819

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

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

R=machenbach@chromium.org,andybons@chromium.org
BUG=579178

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

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

TBR=andybons@chromium.org
BUG=

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

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

Checks creds before uploading and running presubmit, generalizing
the case of Rietveld. If they are missing, suggests a URL to
generate them.

R=andybons@chromium.org,phajdan.jr@chromium.org
BUG=583153

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

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

R=agable@chromium.org
BUG=

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

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

R=sergiyb@chromium.org
BUG=

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

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

R=sergiyb@chromium.org,andybons@chromium.org,machenbach@chromium.org
BUG=579160,597638

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

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

No functionality changes.

R=machenbach@chromium.org,andybons@chromium.org
BUG=579160,597638

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

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

TBR=machenbach@chromium.org
BUG=579182

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

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

Namely these errors when applying patch:

  <urlopen error [Errno 10060] A connection attempt failed
  because the connected party did not properly respond after
  a period of time, or established connection failed because
  connected host has failed to respond>

  <urlopen error [Errno 104] Connection reset by peer>

R=sergiyb@chromium.org,phajdan.jr@chromium.org
BUG=601260

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

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

R=sergiyb@chromium.org,andybons@chromium.org
BUG=579182

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

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

This is an automated CL created by the recipe roller. This CL rolls recipe
changes from upstream projects (e.g. depot_tools) into downstream projects
(e.g. tools/build).


More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug
(or complain)

R=
BUG=
TBR=martiniss@chromium.org

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

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

TBR=machenbach@chromium.org,andybons@chromium.org
BUG=579182

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

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

TBR=machenbach@chromium.org,andybons@chromium.org
BUG=579182

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

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

This is an automated CL created by the recipe roller. This CL rolls recipe
changes from upstream projects (e.g. depot_tools) into downstream projects
(e.g. tools/build).


More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug
(or complain)

R=
BUG=
TBR=martiniss@chromium.org

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

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

CMDupdate and CMDsync have different option parsers, which means they pass 
different options objects to the same underlying code!

R=agable@chromium.org, dnj@chromium.org, smut@chromium.org
BUG=601564

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

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

Revert of Revert "Add (another) argument to break git locks in gclient." (patchset #1 id:1 of https://codereview.chromium.org/1865403003/ )

Reason for revert:
This revert breaks /everything/

Original issue's description:
> Revert "Add (another) argument to break git locks in gclient."
> 
> This reverts commit 51797b1d.
> 
> BUG=601564
> TBR=iannucci,dpranke,estaab,pgervais
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=299771

TBR=dpranke@google.com,estaab@chromium.org,pgervais@chromium.org,smut@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=601564

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

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

This reverts commit 51797b1d.

BUG=601564
TBR=iannucci,dpranke,estaab,pgervais

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

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

R=machenbach@chromium.org
BUG=

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

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

Reported in https://codereview.chromium.org/1852803002/#msg5.
Also some cleanup in nearby code AND fix of the git cl diff's previous behavior that actually updated local branch config with latest *uploaded* CL values. 

BUG=579182
R=machenbach@chromium.org,andybons@chromium.org
CC=servolk@chromium.org

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

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

BUG=

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

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

This is an automated CL created by the recipe roller. This CL rolls recipe
changes from upstream projects (e.g. depot_tools) into downstream projects
(e.g. tools/build).


More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug
(or complain)

R=
BUG=
TBR=martiniss@chromium.org

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

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

This will clean up index.lock and refs/heads/master.lock-style locks when
invoked as part of the update_scripts step on the bots.

R=dpranke@chromium.org, estaab@chromium.org, pgervais@chromium.org
BUG=421769

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

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

This is an automated CL created by the recipe roller. This CL rolls recipe
changes from upstream projects (e.g. depot_tools) into downstream projects
(e.g. tools/build).


More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug
(or complain)

R=
BUG=
TBR=martiniss@chromium.org

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

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

Avoid to call git reset --soft to preserve current revision to
FETCH_HEAD.  'got_revision' property would also be that from
FETCH_HEAD.

BUG=596787

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

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

In theory this shouldn't fire if gsutil is running without a tty (ie, in a subprocess).
In practice we're still seeing processes hang because it still thinks it's in a tty
This should in theory disable the prompt for good

BUG=577325,576979

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

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