InTheForest/chromium_depot_tools
1
0
Fork 0
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools.git synced 2026-01-11 10:41:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,990 Commits 6 Branches 0 Tags
main
Commit Graph

58 Commits

Author SHA1 Message Date
Josip Sokcevic
bcf85af334 [gclient] Add gcs to known ignore dep type 
Bug: b/336344786
Change-Id: I5f2078b4693000d4d28dd4ab9783dcd2324c5aaf
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/5472454
Auto-Submit: Josip Sokcevic <sokcevic@chromium.org>
Reviewed-by: Joanna Wang <jojwang@chromium.org>
Commit-Queue: Joanna Wang <jojwang@chromium.org>
 2024-04-22 20:54:54 +00:00
Josip Sokcevic
35ab564e9f Trigger recipe roller 
To pick up new python version.

Bug: 41493440
Change-Id: I8ca5319715cd8e7891654f4e17ba7f6cd80e9d6d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/5273825
Commit-Queue: Gavin Mak <gavinmak@google.com>
Reviewed-by: Gavin Mak <gavinmak@google.com>
Auto-Submit: Josip Sokcevic <sokcevic@chromium.org>
 2024-02-07 17:40:51 +00:00
Josip Sokcevic
e5c5b2664c [git_cache] Check if HEAD still points to existing ref 
It's possible that HEAD points to a different branch, and old one was
deleted. This ensures that cache still has the correct HEAD information.

Change-Id: Iab0b6badfd1f3e2c0e09fe542ee603b78d4a0041
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/5218257
Commit-Queue: Josip Sokcevic <sokcevic@chromium.org>
Reviewed-by: Gavin Mak <gavinmak@google.com>
 2024-01-23 18:02:47 +00:00
Josip Sokcevic
6c1a07d48a [git_number] Improve error message on parse_commitrefs 
We are observing "binascii.Error: Non-hexadecimal digit found" on LUCI,
but it's not reproducible on local env.

This change also triggers the recipe roller.

R=gavinmak@google.com

Bug: 1514645
Change-Id: I4b97c4593b117d145f8304069d569607033babbe
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/5160257
Commit-Queue: Josip Sokcevic <sokcevic@chromium.org>
Reviewed-by: Gavin Mak <gavinmak@google.com>
 2024-01-03 19:48:48 +00:00
Josip Sokcevic
f2f8be1ca8 [pylint] Use correct variable name 
pylintrc should have been used instead of pylint.

R=ddoman@google.com

Change-Id: Ia1cef7645119af0e938714acfca17b8b69d2cad8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/5066856
Commit-Queue: Scott Lee <ddoman@chromium.org>
Reviewed-by: Scott Lee <ddoman@chromium.org>
Auto-Submit: Josip Sokcevic <sokcevic@chromium.org>
 2023-11-28 17:53:00 +00:00
Josip Sokcevic
0acc468d8b Trigger recipe roller 
To pick up pylint-2.17

R=ddoman@google.com

Change-Id: I49f9d7b50b0a0edd477f2ac75bd097535d3d54bc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/5065009
Auto-Submit: Josip Sokcevic <sokcevic@chromium.org>
Commit-Queue: Scott Lee <ddoman@chromium.org>
Reviewed-by: Scott Lee <ddoman@chromium.org>
 2023-11-28 01:09:26 +00:00
Josip Sokcevic
f078723bf4 [recipes] Trigger recipe roller 
To pick up pylint-2.13 fix

Change-Id: Ie1710a4bc54a7ee6144bc09da719ce1e7db1fa5d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/5046548
Auto-Submit: Josip Sokcevic <sokcevic@chromium.org>
Commit-Queue: Scott Lee <ddoman@chromium.org>
Reviewed-by: Scott Lee <ddoman@chromium.org>
 2023-11-20 23:29:25 +00:00
Josip Sokcevic
74ed6becbf Trigger recipe roller 
This is to pick up pylint change

Change-Id: I89ad02336f84eff9b7b3d7d99eedac9bca896b16
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/5037334
Auto-Submit: Josip Sokcevic <sokcevic@chromium.org>
Commit-Queue: Garrett Beaty <gbeaty@google.com>
Reviewed-by: Garrett Beaty <gbeaty@google.com>
 2023-11-16 18:19:48 +00:00
Josip Sokcevic
df30961664 Trigger recipe roll 
This is to pick up https://crrev.com/c/4914238

R=jojwang@google.com

Bug: 1486677
Change-Id: I024a7a0dd6b6613987e6ded88b62db37aef16409
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4916209
Auto-Submit: Josip Sokcevic <sokcevic@chromium.org>
Commit-Queue: Fabian Sommer <fabiansommer@chromium.org>
Reviewed-by: Fabian Sommer <fabiansommer@chromium.org>
 2023-10-06 14:52:19 +00:00
Josip Sokcevic
d6d024303c Trigger recipe roller 
R=jojwang

Change-Id: I613127663ce90d74012b7a58d4a98fa3232fdf4a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4795119
Auto-Submit: Josip Sokcevic <sokcevic@chromium.org>
Reviewed-by: Joanna Wang <jojwang@chromium.org>
Commit-Queue: Joanna Wang <jojwang@chromium.org>
 2023-08-18 21:24:57 +00:00
Josip Sokcevic
a59c3eb470 Revert "trigger recipe roller" 
This reverts commit a0630a9420.

Reason for revert: need a reroll, https://crrev.com/c/4635526

Original change's description:
> trigger recipe roller
>
> R=gavinmak@google.com
>
> Change-Id: I9c51fddc42fc4b7cb5b106f82224d039929c9ce4
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4633187
> Commit-Queue: Gavin Mak <gavinmak@google.com>
> Reviewed-by: Gavin Mak <gavinmak@google.com>
> Auto-Submit: Josip Sokcevic <sokcevic@chromium.org>

Change-Id: I434cc9801eade0abb09095eef403d51510d7fa2d
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4635527
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Auto-Submit: Josip Sokcevic <sokcevic@chromium.org>
 2023-06-22 05:15:10 +00:00
Josip Sokcevic
a0630a9420 trigger recipe roller 
R=gavinmak@google.com

Change-Id: I9c51fddc42fc4b7cb5b106f82224d039929c9ce4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4633187
Commit-Queue: Gavin Mak <gavinmak@google.com>
Reviewed-by: Gavin Mak <gavinmak@google.com>
Auto-Submit: Josip Sokcevic <sokcevic@chromium.org>
 2023-06-21 22:33:49 +00:00
Josip Sokcevic
3f3e2f789e Trigger recipe autoroller 
This is to pick up: https://crrev.com/c/4348792

R=gavinmak@google.com

Change-Id: I5d96ce5ca453155a159d5e27a593b61d41de4b35
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4347774
Commit-Queue: Gavin Mak <gavinmak@google.com>
Reviewed-by: Aravind Vasudevan <aravindvasudev@google.com>
Reviewed-by: Gavin Mak <gavinmak@google.com>
Auto-Submit: Josip Sokcevic <sokcevic@chromium.org>
 2023-03-17 00:28:11 +00:00
Josip Sokcevic
0be20a4f76 Trigger recipe roller 
R=gavinmak@google.com

Change-Id: I25434f24a41ab42f9d0279b8f5b713e9e310fa80
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3153684
Auto-Submit: Josip Sokcevic <sokcevic@google.com>
Reviewed-by: Gavin Mak <gavinmak@google.com>
Commit-Queue: Gavin Mak <gavinmak@google.com>
 2021-09-10 16:45:55 +00:00
Josip Sokcevic
8550570b46 Trigger recipe roller 
Bug: 3082645, b/195975120
Change-Id: I85c54159cd902b9d131befb8c2ac4e82a40db0f1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3084004
Reviewed-by: Scott Lee <ddoman@chromium.org>
Commit-Queue: Scott Lee <ddoman@chromium.org>
Auto-Submit: Josip Sokcevic <sokcevic@google.com>
 2021-08-10 01:13:58 +00:00
Michael Moss
120b2e4f26 Add gerrit retries for HTTP 409 Conflict responses. 
BUG=crbug.com/854886,b/110032771
R=tandrii@google.com

Change-Id: Iabd67f8042ab3bc7c6ef15101effeeebf39d4500
Reviewed-on: https://chromium-review.googlesource.com/1111007
Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>
Commit-Queue: Michael Moss <mmoss@chromium.org>
 2018-06-21 23:53:42 +00:00
Michael Moss
d683d7ced4 Revert "gclient: Don't allow None URLs (except in .gclient files)" 
This reverts commit 0c91147d50.

Reason for revert: This is causing 'gclient revinfo' to fail on the release builders, and appears to be somehow related to the "--output-json" flag.

Original change's description:
> gclient: Don't allow None URLs (except in .gclient files)
> 
> This reverts commit crrev.com/4e9b50ab86b9b9f8ebf0b9ba6bd4954217ebeff9
> and thus relands the following commits:
> 
>   ebdd0db493: "gclient: Remove URLs from hierarchy."
>   54a5c2ba8a: "gclient: Refactor PrintRevInfo"
>   083eb25f9a: "gclient: Don't allow URL to be None."
> 
> When a None URL is specified in a .gclient file, and a DEPS file is
> given, the DEPS file is treated as a .gclient file and its dependencies
> are added.
> 
> Bug: 839925
> 
> Change-Id: I1068b66487874bfa0a788bf9da5273714b6ad39e
> Reviewed-on: https://chromium-review.googlesource.com/1083340
> Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
> Reviewed-by: Aaron Gable <agable@chromium.org>
> Reviewed-by: Michael Moss <mmoss@chromium.org>

TBR=agable@chromium.org,mmoss@chromium.org,ehmaldonado@chromium.org

Change-Id: I46785bd272b16b3672e553b6443cee6d6b370ec1
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 839925, 853093
Reviewed-on: https://chromium-review.googlesource.com/1101978
Reviewed-by: Michael Moss <mmoss@chromium.org>
Commit-Queue: Michael Moss <mmoss@chromium.org>
 2018-06-15 05:05:17 +00:00
Andrii Shyshkalov
690d8d437b Revert "gclient_scm: Use cherry-picking instead of rebasing." 
This reverts commit c912114140.

Reason for revert: broke patch application on infra/config https://crbug.com/853032

Original change's description:
> gclient_scm: Use cherry-picking instead of rebasing.
> 
> We have a problem when in this situation, we checkout |patch| and rebase it on
> top of |base|, thus including an |extra commit| that we shouldn't.
> 
> o master
> |
> . o patch
> |/
> o extra commit
> |
> o base (what gclient synced src at)
> 
> This does merge-base between |patch| and |master|, and cherry-picks only the
> changes belonging to the patch.
> 
> Bug: 850812
> Change-Id: Id09ae1682e53b69ed49b2fb649310de6a6a8a29e
> Reviewed-on: https://chromium-review.googlesource.com/1098228
> Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
> Reviewed-by: Aaron Gable <agable@chromium.org>

TBR=agable@chromium.org,ehmaldonado@chromium.org

Change-Id: Ib3feeee2f44f5441713383f1dbf08db16fae4717
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 850812, 853032
Reviewed-on: https://chromium-review.googlesource.com/1101977
Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>
Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>
 2018-06-14 22:57:17 +00:00
Edward Lemur
c912114140 gclient_scm: Use cherry-picking instead of rebasing. 
We have a problem when in this situation, we checkout |patch| and rebase it on
top of |base|, thus including an |extra commit| that we shouldn't.

o master
|
. o patch
|/
o extra commit
|
o base (what gclient synced src at)

This does merge-base between |patch| and |master|, and cherry-picks only the
changes belonging to the patch.

Bug: 850812
Change-Id: Id09ae1682e53b69ed49b2fb649310de6a6a8a29e
Reviewed-on: https://chromium-review.googlesource.com/1098228
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: Aaron Gable <agable@chromium.org>
 2018-06-14 22:09:46 +00:00
Edward Lemur
0c91147d50 gclient: Don't allow None URLs (except in .gclient files) 
This reverts commit crrev.com/4e9b50ab86b9b9f8ebf0b9ba6bd4954217ebeff9
and thus relands the following commits:

  ebdd0db493: "gclient: Remove URLs from hierarchy."
  54a5c2ba8a: "gclient: Refactor PrintRevInfo"
  083eb25f9a: "gclient: Don't allow URL to be None."

When a None URL is specified in a .gclient file, and a DEPS file is
given, the DEPS file is treated as a .gclient file and its dependencies
are added.

Bug: 839925

Change-Id: I1068b66487874bfa0a788bf9da5273714b6ad39e
Reviewed-on: https://chromium-review.googlesource.com/1083340
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: Aaron Gable <agable@chromium.org>
Reviewed-by: Michael Moss <mmoss@chromium.org>
 2018-06-14 19:39:52 +00:00
Edward Lemur
b63c4663d4 gclient: Use only recursedeps to decide whether to process a dependency (Trigger recipe roller) 
Tbr: agable@chromium.org
Bug: 839925
Change-Id: Ie1dab7cfaa831af65fd9f8d2962161a729fb7a36
Reviewed-on: https://chromium-review.googlesource.com/1096121
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
 2018-06-11 20:56:16 +00:00
Edward Lemur
e05f18d477 Reland "Reland "Expand variables in gclient flattened output."" 
This is a reland of ff62224443
should_process was set to None in the previous attempt, so CIPD dependencies were not processed.
This CL fixed that.

Original change's description:
> Reland "Expand variables in gclient flattened output."
>
> This is a reland of a32f98e652
>
> Original change's description:
> > Expand variables in gclient flattened output.
> >
> > Bug: 848990
> > Change-Id: I0ad7e4f965973edbc5a335bd30f9cbd7b04abff2
> > Reviewed-on: https://chromium-review.googlesource.com/1085996
> > Reviewed-by: Michael Moss <mmoss@chromium.org>
> > Reviewed-by: Aaron Gable <agable@chromium.org>
> > Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
>
> Tbr: agable@chromium.org
> Bug: 848990
> Change-Id: I7843544b79b2ab7e2046c187d13ea3eb65fc1b7d
> Reviewed-on: https://chromium-review.googlesource.com/1085975
> Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
> Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>

Bug: 848990
Change-Id: Ic804be1b84bf8402a741a4189b60372075dfb6f3
Reviewed-on: https://chromium-review.googlesource.com/1087368
Reviewed-by: Aaron Gable <agable@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
 2018-06-08 17:36:53 +00:00
John Budorick
b990770386 Revert "Reland "Expand variables in gclient flattened output."" 
This reverts commit ff62224443.

Reason for revert: spec revert for crbug.com/849374

Original change's description:
> Reland "Expand variables in gclient flattened output."
> 
> This is a reland of a32f98e652
> 
> Original change's description:
> > Expand variables in gclient flattened output.
> >
> > Bug: 848990
> > Change-Id: I0ad7e4f965973edbc5a335bd30f9cbd7b04abff2
> > Reviewed-on: https://chromium-review.googlesource.com/1085996
> > Reviewed-by: Michael Moss <mmoss@chromium.org>
> > Reviewed-by: Aaron Gable <agable@chromium.org>
> > Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
> 
> Tbr: agable@chromium.org
> Bug: 848990
> Change-Id: I7843544b79b2ab7e2046c187d13ea3eb65fc1b7d
> Reviewed-on: https://chromium-review.googlesource.com/1085975
> Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
> Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>

TBR=agable@chromium.org,mmoss@chromium.org,ehmaldonado@chromium.org

Change-Id: I89ffb80893be72f60043e8a6e02f6c0fb6fe5cc1
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 848990
Reviewed-on: https://chromium-review.googlesource.com/1086747
Reviewed-by: John Budorick <jbudorick@chromium.org>
Commit-Queue: John Budorick <jbudorick@chromium.org>
 2018-06-05 05:05:16 +00:00
Edward Lemur
ff62224443 Reland "Expand variables in gclient flattened output." 
This is a reland of a32f98e652

Original change's description:
> Expand variables in gclient flattened output.
>
> Bug: 848990
> Change-Id: I0ad7e4f965973edbc5a335bd30f9cbd7b04abff2
> Reviewed-on: https://chromium-review.googlesource.com/1085996
> Reviewed-by: Michael Moss <mmoss@chromium.org>
> Reviewed-by: Aaron Gable <agable@chromium.org>
> Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>

Tbr: agable@chromium.org
Bug: 848990
Change-Id: I7843544b79b2ab7e2046c187d13ea3eb65fc1b7d
Reviewed-on: https://chromium-review.googlesource.com/1085975
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
 2018-06-05 01:34:45 +00:00
Edward Lesmes
01cb51055e Revert "Expand variables in gclient flattened output." 
This reverts commit a32f98e652.

Reason for revert:
Doesn't work when there are variables which definition includes other variables, e.g.:

'cros_download_vm': '"{cros_board}" == "amd64_generic"',

Original change's description:
> Expand variables in gclient flattened output.
> 
> Bug: 848990
> Change-Id: I0ad7e4f965973edbc5a335bd30f9cbd7b04abff2
> Reviewed-on: https://chromium-review.googlesource.com/1085996
> Reviewed-by: Michael Moss <mmoss@chromium.org>
> Reviewed-by: Aaron Gable <agable@chromium.org>
> Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>

TBR=agable@chromium.org,mmoss@chromium.org,ehmaldonado@chromium.org

Change-Id: I7e81000e92aa352e45b420845bb1dcc8572f1962
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 848990
Reviewed-on: https://chromium-review.googlesource.com/1085974
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
 2018-06-05 00:46:05 +00:00
Edward Lemur
a32f98e652 Expand variables in gclient flattened output. 
Bug: 848990
Change-Id: I0ad7e4f965973edbc5a335bd30f9cbd7b04abff2
Reviewed-on: https://chromium-review.googlesource.com/1085996
Reviewed-by: Michael Moss <mmoss@chromium.org>
Reviewed-by: Aaron Gable <agable@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
 2018-06-05 00:32:35 +00:00
Michael Moss
4e9b50ab86 Revert recent gclient.py changes to fix Chrome releases. 
Reason for revert: This is breaking official release scripts, which have long
used "None" URL functionality to allow gclient commands to run against
"local" DEPS (buildspec) files. Please do not remove this behavior.

This reverts the following commits:
  ebdd0db493: "gclient: Remove URLs from hierarchy."
  54a5c2ba8a: "gclient: Refactor PrintRevInfo"
  083eb25f9a: "gclient: Don't allow URL to be None."

BUG=846194

TBR=agable@chromium.org,ehmaldonado@chromium.org

Change-Id: Ibdd5581889bd4afd86474199c7b64555f01bbbca
Reviewed-on: https://chromium-review.googlesource.com/1070893
Commit-Queue: Michael Moss <mmoss@chromium.org>
Reviewed-by: Michael Moss <mmoss@chromium.org>
 2018-05-24 05:44:49 +00:00
Edward Lemur
8fe4d8cbef gclient: Actually fix roll-dep. 
Bug: 839925
Change-Id: I5cb6655309d6aa8dada7e6bd245d859593fb055f
Reviewed-on: https://chromium-review.googlesource.com/1064809
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: Aaron Gable <agable@chromium.org>
 2018-05-17 20:27:43 +00:00
Edward Lemur
b496b6a057 gclient: Fix roll-dep. 
Bug: 839925
Change-Id: I5a56ad03866bd0b8f7d43bb3a643372d7b66343c
Reviewed-on: https://chromium-review.googlesource.com/1064692
Reviewed-by: Aaron Gable <agable@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
 2018-05-17 18:11:03 +00:00
Edward Lemur
4727c64750 gclient: Fix getdep and setdep and add tests. 
Bug: 843917, 839925
Change-Id: I84e52c95fc91d67375d4d954018f057561896914
Reviewed-on: https://chromium-review.googlesource.com/1064005
Reviewed-by: Aaron Gable <agable@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
 2018-05-17 15:52:23 +00:00
Edward Lemur
23a358764d gclient: Fix for extra custom_deps. 
Custom deps not present in DEPS files cause errors when syncing, since
we add them as strings in postprocess_deps, but deps_to_objects expects
a dictionary.

TBR=agable@chromium.org

Bug: 839925
Change-Id: Ic08a83e8692f1bf90d4456c72fe99493363ba747
Reviewed-on: https://chromium-review.googlesource.com/1063326
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
 2018-05-17 06:17:29 +00:00
John Budorick
d1de725e0b gclient: Prevent unprocessed deps from overriding processed ones in sync output. 
Bug: 842235
Change-Id: Ie1a00b19a7ebb99dbac4a86562d4eb31493c216d
Reviewed-on: https://chromium-review.googlesource.com/1055683
Commit-Queue: John Budorick <jbudorick@chromium.org>
Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>
Reviewed-by: Michael Moss <mmoss@chromium.org>
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
 2018-05-11 19:36:55 +00:00
Edward Lemur
e7273d2501 Reland "gclient: Get rid of parsed_url." 
This is a reland of e877b1776a

Original change's description:
> gclient: Get rid of parsed_url.
>
> There is no reason I can see to set parsed_url so late.
> Also, the tests are misleading, since relative URLs don't behave the way
> the tests led you to believe.
>
> Bug: 839925
> Change-Id: I08d92b7b7847bdc406f003d4a4139d968cc662b1
> Reviewed-on: https://chromium-review.googlesource.com/1047797
> Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
> Reviewed-by: Marc-Antoine Ruel <maruel@chromium.org>

TBR=agable@chromium.org

Bug: 839925
Change-Id: I9200ec5fbe7289022e9754f0c78676dc931fcaeb
Reviewed-on: https://chromium-review.googlesource.com/1054567
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: John Budorick <jbudorick@chromium.org>
 2018-05-11 01:26:52 +00:00
John Budorick
2191308678 Revert "gclient: Get rid of parsed_url." 
Suspected of breaking the world.

This reverts commit e877b1776a.

TBR=ehmaldonado@chromium.org,tandrii@chromium.org
Bug: 841936
Change-Id: Iad2b55a2235d8d0b1a3d7681cbd577f795cb89dd
Reviewed-on: https://chromium-review.googlesource.com/1054440
Reviewed-by: John Budorick <jbudorick@chromium.org>
Commit-Queue: John Budorick <jbudorick@chromium.org>
 2018-05-10 20:28:28 +00:00
Andrii Shyshkalov
6f3c1c82d4 Update windows git to 2.17.0 
R=jchinlee@chromium.org

Bug: 811681
Change-Id: Ic09fe7c90690a26f35e71f6313d17097de7553e9
Reviewed-on: https://chromium-review.googlesource.com/1044661
Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>
Reviewed-by: Jao-ke Chin-Lee <jchinlee@chromium.org>
 2018-05-07 17:58:06 +00:00
Michael Moss
848c86e3e8 Make 'gclient_gn_args*' handling consistent between sync and flatten. 
Previously, 'gclient sync' would process "gn_args" settings in any
recursed DEPS files, potentially producing multiple output files or
conflicting output files, but 'gclient flatten' would only ever include
one set of "gn_args" settings in the flattened output, and only if they
occurred in the top-level DEPS file.

This makes 'gclient sync' and 'gclient flatten' more consistent by
restricting them both to a single instance of those setting, and
requiring those setting to be defined either in the top-level DEPS file,
or in a recursedeps file specificed by the new 'gclient_gn_args_from'
setting.

R=dpranke@google.com, ehmaldonado@google.com

Bug: 825063
Change-Id: If90d952e47367c50b36daade16a26b29aec0c9db
Reviewed-on: https://chromium-review.googlesource.com/1039870
Reviewed-by: Michael Moss <mmoss@chromium.org>
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Commit-Queue: Michael Moss <mmoss@chromium.org>
 2018-05-03 23:13:38 +00:00
Stephen Martinis
43d72759fe Revert "bot_update: Set user.{name,email} when applying patch refs." 
This reverts commit e86fe982e8.

Reason for revert: Probably causing outages on win7_chromium_rel_ng.

Original change's description:
> bot_update: Set user.{name,email} when applying patch refs.
> 
> git rebase complains when user name/email has not been configured, as was
> the case for the Chromium trybot.
> 
> Bug: 643346
> Change-Id: Iab7dac0a98608e09b63a53d5bacb98925701fbfd
> Reviewed-on: https://chromium-review.googlesource.com/1031524
> Reviewed-by: Aaron Gable <agable@chromium.org>
> Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>

TBR=agable@chromium.org,ehmaldonado@chromium.org

Change-Id: Ic57398323476fccef34f766270d760c3975630a6
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 643346
Reviewed-on: https://chromium-review.googlesource.com/1036308
Reviewed-by: Stephen Martinis <martiniss@chromium.org>
Commit-Queue: Stephen Martinis <martiniss@chromium.org>
 2018-04-30 23:00:38 +00:00
Edward Lesmes
e86fe982e8 bot_update: Set user.{name,email} when applying patch refs. 
git rebase complains when user name/email has not been configured, as was
the case for the Chromium trybot.

Bug: 643346
Change-Id: Iab7dac0a98608e09b63a53d5bacb98925701fbfd
Reviewed-on: https://chromium-review.googlesource.com/1031524
Reviewed-by: Aaron Gable <agable@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
 2018-04-30 22:42:08 +00:00
Edward Lesmes
97ce05851c gclient_scm: Try to rebase after printing what was wrong. 
So we know why did git fail on the Chromium Windows trybots.

R=agable@chromium.org

Bug: 643346
Change-Id: Iac0abd9202fb56fbed6f3edf382b755e96fed3bf
Reviewed-on: https://chromium-review.googlesource.com/1031128
Reviewed-by: Aaron Gable <agable@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
 2018-04-26 22:12:04 +00:00
Edward Lesmes
990148ed24 gclient: Fix logic to match --patch-ref with dependencies. 
Accept cases when the origin in --patch-ref ends in .git but the URL in
.gclient or DEPS doesn't.

R=agable@chromium.org

Bug: 643346
Change-Id: I25e6fd8400b09c7e249578cfbd7e9485bab9ea85
Reviewed-on: https://chromium-review.googlesource.com/1030893
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: Aaron Gable <agable@chromium.org>
 2018-04-26 19:03:17 +00:00
Andrii Shyshkalov
94580ab035 [auth] Fix typo introduced in https://crrev.com/c/1018488/13/auth.py#514 
TBR=vadimsh@google.com

Change-Id: I96c4039d12ba3570d828b24009a2446fba44c14d
Reviewed-on: https://chromium-review.googlesource.com/1020539
Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>
Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>
 2018-04-20 01:12:14 +00:00
Andrii Shyshkalov
733d4ec8e3 [gerrit_util] learn about and use LUCI_CONTEXT when available. 
Unfortunately, w/o rewrite of gerrit_util, one can't take advantage
of existing auth.Authenticator (which also doesn't know about ~/.netrc
or .gitcookies, but that's fixable). This rewrite, however, will likely
cause issues for nasty scripts outside of depot_tools which use
gerrit_util as a Python library. So, I followed outdated way of
gerrit_util :(

Also contains refactoring of auth library, which was kept backwards
compatible for the same reasons as above.

R=vadimsh@chromium.org

Test-with: led tool
Test-artifact: https://ci.chromium.org/swarming/task/3cf4687dfd26ca10?server=chromium-swarm.appspot.com
Bug: 834536
Change-Id: I6b84b8b5732aee5d345e2b2ba44f47aaecc0f6c5
Reviewed-on: https://chromium-review.googlesource.com/1018488
Reviewed-by: Vadim Shtayura <vadimsh@chromium.org>
Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>
 2018-04-19 21:10:14 +00:00
Edward Lesmes
67b3faa8f2 git-cl: Add parallel option to git-cl land. 
It is used by CMDland but it was not declared and is causing failures.

TBR=agable@chromium.org

Bug: 832566
Change-Id: Ia8ba5df458f9a39e415b7a9495dc338def0b16a5
Reviewed-on: https://chromium-review.googlesource.com/1013056
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: Michael Moss <mmoss@chromium.org>
 2018-04-13 21:56:50 +00:00
Michael Moss
b8f33bef55 Poke depot_tools recipe roller for git-cl fixes. 
TBR=agable@google.com

Change-Id: I680ab9441acffc91fae7500eb369e85d989f7443
Reviewed-on: https://chromium-review.googlesource.com/1012929
Reviewed-by: Michael Moss <mmoss@chromium.org>
Commit-Queue: Michael Moss <mmoss@chromium.org>
 2018-04-13 20:20:01 +00:00
Michael Moss
da55cdc03c Apply parent vars to recursedeps. 
This fixes an issue where cumulative conditions would fail to evaluate
if the recursed DEP (or custom_var overrides) didn't happen to redeclare
all the variables used by the parent conditions.

TBR=dpranke@google.com, ehmaldonado@google.com

Bug: 825063
Change-Id: Icb53f04928f914dfacc2c3035d01be103d9f8247
Reviewed-on: https://chromium-review.googlesource.com/1000836
Commit-Queue: Michael Moss <mmoss@chromium.org>
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: Michael Moss <mmoss@chromium.org>
 2018-04-08 16:14:23 +00:00
Edward Lesmes
3f277fc747 roll-dep: Add support for gclient root various levels above. 
In some cases, gclient root is not the parent directory, it might be two
levels above.

This fixes it by asking gclient for the real root directory.

Bug: 760633
Change-Id: I82d754f1c53259a111a74628f784d1bc461c18ef
Reviewed-on: https://chromium-review.googlesource.com/999971
Reviewed-by: Aaron Gable <agable@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
 2018-04-06 19:50:41 +00:00
Edward Lesmes
8d6265766b gclient_eval: Add more support when adding new variables. 
Now we respect comments before the first variable.

Bug: 760633
Change-Id: Ibe60d719429c033415bfb1c99942c9d04601d967
Reviewed-on: https://chromium-review.googlesource.com/998683
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: Michael Moss <mmoss@chromium.org>
Reviewed-by: Aaron Gable <agable@chromium.org>
 2018-04-05 23:28:09 +00:00
Vadim Shtayura
2a5f70cc06 Kick the recipe roller to pick up the revert. 
This one: 1ad681eca2

TBR=iannucci@chromium.org, maruel@chromium.org

Change-Id: If08d49500b604928fd565262264598a4ae0c3a4c
Reviewed-on: https://chromium-review.googlesource.com/996643
Reviewed-by: Vadim Shtayura <vadimsh@chromium.org>
Commit-Queue: Vadim Shtayura <vadimsh@chromium.org>
 2018-04-04 23:16:42 +00:00
Aaron Gable
adcf030f69 Continue the story 
TBR=jchinlee

Bug: 828154
Change-Id: I677acea5d4e32455fd2846c3ad9d61e43786b8d4
Reviewed-on: https://chromium-review.googlesource.com/993452
Reviewed-by: Aaron Gable <agable@chromium.org>
Commit-Queue: Aaron Gable <agable@chromium.org>
 2018-04-03 18:56:38 +00:00
Aaron Gable
a6bee0ad16 Kick recipe roller 
TBR=tandrii

Bug: 828154
Change-Id: Ib720922da0907b3a650db1d6255cc91aea320832
Reviewed-on: https://chromium-review.googlesource.com/991161
Reviewed-by: Aaron Gable <agable@chromium.org>
Commit-Queue: Aaron Gable <agable@chromium.org>
 2018-04-02 23:22:16 +00:00