Instead just do a git checkout --force, since there are some states that reset cannot fix.
BUG=606420
Review URL: https://codereview.chromium.org/1916973002
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@300176 0039d316-1c4b-4281-b951-d872f2087c98
Reason for revert:
Broke presubmit
Original issue's description:
> Make `git cl description` work for Gerrit
>
> This works in that it actually changes the description, but after
> multiple changes, there's multiple footers added. I'm not sure if they
> should be stripped in setting the description? Or is the problem in
> FetchDescription() where it shouldn't be returning
> 'commit_with_footers', but rather something else?
>
> Example change at https://chromium-review.googlesource.com/c/340430/.
>
> R=tandrii@chromium.org
> BUG=603207
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=300169
TBR=tandrii@chromium.org,scottmg@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=603207
Review URL: https://codereview.chromium.org/1922733002
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@300175 0039d316-1c4b-4281-b951-d872f2087c98
This works in that it actually changes the description, but after
multiple changes, there's multiple footers added. I'm not sure if they
should be stripped in setting the description? Or is the problem in
FetchDescription() where it shouldn't be returning
'commit_with_footers', but rather something else?
Example change at https://chromium-review.googlesource.com/c/340430/.
R=tandrii@chromium.org
BUG=603207
Review URL: https://codereview.chromium.org/1917473002 .
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@300169 0039d316-1c4b-4281-b951-d872f2087c98
Reason for revert:
I believe this is mostly likely to have broken Angle, but this is speculative.
http://crbug.com/606150
Original issue's description:
> bot_update: call gclient sync after checking out a gerrit ref
>
> BUG=chromium:602906
>
> Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=300109
TBR=hinoka@chromium.org,yyanagisawa@chromium.org,hinoka@google.com,phajdan.jr@chromium.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=chromium:602906
Review URL: https://codereview.chromium.org/1918903003
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@300159 0039d316-1c4b-4281-b951-d872f2087c98
Removes deprecated patch_project_roots in bot_update,
and the TODOs used for migration.
Depends: https://codereview.chromium.org/1913863002
R=phajdan.jr@chromium.org,machenbach@chromium.org
BUG=605563
Review URL: https://codereview.chromium.org/1920933002
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@300153 0039d316-1c4b-4281-b951-d872f2087c98
IMPORTANT: See bug http://crbug.com/605563#c3 for deployment and emergency roll-back plan.
This patch is first of a series. It provides a cleaner and generic way to apply patches to non-root of first solution.
R=phajdan.jr@chromium.org,machenbach@chromium.org
BUG=605563
Review URL: https://codereview.chromium.org/1917433002
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@300141 0039d316-1c4b-4281-b951-d872f2087c98
Reason for revert:
This breaks WebRTC presubmit on the buildbots (due to /b/build being a Git repo, which in turn contains the checkout). See https://bugs.chromium.org/p/webrtc/issues/detail?id=5818 for more details.
It seems it also broke other projects (rakuco's comment #15).
Original issue's description:
> Convert cpplint.py to work with nested git repositories.
>
> Chrome on iOS downstream repository tracks Chromium via DEPS and wants
> to use cpplint canned presubmit check but the cpplint.py errors due at
> the include guard as it stops at the inner most git repository.
>
> Change cpplint.py to look for the outermost git repository when looking
> for the repository root.
>
> BUG=598090
>
> Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=300085
TBR=iannucci@chromium.org,skym@chromium.org,sdefresne@chromium.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=598090
Review URL: https://codereview.chromium.org/1919483002
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@300119 0039d316-1c4b-4281-b951-d872f2087c98
Chrome on iOS downstream repository tracks Chromium via DEPS and wants
to use cpplint canned presubmit check but the cpplint.py errors due at
the include guard as it stops at the inner most git repository.
Change cpplint.py to look for the outermost git repository when looking
for the repository root.
BUG=598090
Review URL: https://codereview.chromium.org/1897153003
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@300085 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/4194868d9f0bf2e8f8fc86198a01ebfbfe0f6164 Fix gerrit tryproperties to be more realistic. (tandrii@chromium.org)
R=phajdan@chromium.org,martiniss@chromium.org,tandrii@chromium.org
BUG=604735
TBR=martiniss@chromium.org,phajdan.jr@chromium.org
Review URL: https://codereview.chromium.org/1910753003
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@300078 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/ecf8b481c75c1b1d43a2d7c80ea57c38cca6e9a7 Fix Gerrit tryserver properties test_data. (tandrii@chromium.org)
R=phajdan@chromium.org,tandrii@chromium.org
BUG=604735
TBR=martiniss@chromium.org,phajdan.jr@chromium.org
Review URL: https://codereview.chromium.org/1912663002
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@300076 0039d316-1c4b-4281-b951-d872f2087c98
Without this change, the extracted directory could be missing but
the downloaded file could match the hash, and in turn
download_from_google_storage will not download the file and will
not extract it, and any tools depending on the extracted
directory will fail.
Review URL: https://codereview.chromium.org/1904483002
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@300051 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/c55462b5c2458036648d53e6a4d923a63ed8b7cc Add tryserver_gerrit test properties. (tandrii@chromium.org)
R=phajdan.jr@chromium.org,martiniss@chromium.org,tandrii@chromium.org
BUG=604735
TBR=martiniss@chromium.org,phajdan.jr@chromium.org
Review URL: https://codereview.chromium.org/1907473002
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@300038 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
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
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
tandrii@chromium.org
phajdan.jr@chromium.org
scottmg@chromium.org
hinoka@chromium.org
clemensh@chromium.org
kjellander@chromium.org
recipe-roller@chromium.org
iannucci@chromium.org
sdefresne@chromium.org
pauljensen@chromium.org
gab@chromium.org
techtonik@gmail.com
shinyak@chromium.org