New issue
Advanced search Search tips

Issue 760633 link

Starred by 4 users

Issue metadata

Status: Fixed
Owner:
Closed: Apr 2018
Cc:
Components:
EstimatedDays: ----
NextAction: ----
OS: All
Pri: 2
Type: Feature

Blocked on:
issue 784569

Blocking:
issue 807318
issue 810188
issue skia:7628



Sign in to add a comment

Add various DEPS editing operations to gclient

Project Member Reported by mmoss@chromium.org, Aug 30 2017

Issue description

It would be handy if gclient had options to perform some common DEPS file manipulations in a consistent and non-destructive (AST-based?) manner. I'm thinking specifically in the context of buildspec creation, but it could be useful for other automated processes as well, or even for regular developer work.

Types of edits could include:

- Pinning or unpinning entries, something like:
  gclient pin 'deps:some/dep/entry' 'ABCD1234'
or:
  gclient pin 'deps:some/dep/entry' 'refs/heads/1234'
or for a deps_os entry:
  gclient pin 'deps_os:android:some/android/entry' 'refs/heads/456'

Unpinning would be the same process, but with no revision specified, or maybe a special revision like "None".

Or maybe pinning could be part of an even more generic deps editing option, which could create, delete, or update entries, like:
  # add or update a complete entry (and maybe intelligently substitute vars, like for the host name, if there's a matching one)
  gclient setdep 'deps:some/dep/entry' 'https://example.com@ABCD1234'

  # update just revision, keep existing url (i.e. pinning)
  gclient setdep 'deps:some/dep/entry' '@refs/heads/1234'

  # unpin an entry
  gclient setdep 'deps:some/dep/entry' '@None'

  # delete an entry
  gclient setdep 'deps_os:android:some/android/entry' None


- Editing vars:
  gclient setvar 'git_url' 'https://example.com'

 
These seem like good suggestions. We've been talking about improving our support for auto_rollers as well, and there's probably a fair amount of overlap between this and what you'd want there.
Do we care about preserving comments in the resulting DEPS file?

Doing so would be a hard problem, as most AST tools don't capture comments. If it's needed though, I'd likely have to pull one of the heavy libraries like redbaron or astunparse.

For buildspecs, I wonder if extending gclient flatten would help, or introducing yet another DEPS-rewriting tool (which does not need to care much about original FST). The more specific scenarios (say branching all DEPS, pinning everything, etc), the easier it may be to create tools, rather than supporting a very generic set of operations, especially if we had to preserve comments.

Either way, please make sure to indicate if it's nice to have (which I'd agree), or actually blocking something.

Comment 3 by mmoss@chromium.org, Sep 1 2017

The changes this makes would ideally look like a typical human edit, leaving everything but the desired values untouched, and producing a minimal diff. I think the old "roll-dep" tool used to behave like this, and was AST-based, but I don't know the details of how it worked.


Labels: -Restrict-View-Google
Good question. I think it would probably have to preserve comments; if it didn't, that would be equivalent to saying that comment weren't supported in the file, and that wouldn't be good.

Also, -R-V-G, there's no need for that ...
+1 yeah this is a great idea, and also yeah it would definitely need to preserve comments.

Comment 6 by mmoss@chromium.org, Nov 16 2017

Cc: aga...@chromium.org
Owner: ----
Status: Available (was: Assigned)
A little follow-up to AST mention in #3, from phajdan in an email thread:

roll_dep_svn.py uses ast, although it still makes some assumptions - seems to use line numbers of affected code and change just these lines in text, which may be prone to breakage, although in scenarios that shouldn't occur in practice. https://codereview.chromium.org/318153003 where it was introduced admits it won't handle arbitrary python syntax. While the validation logic I added earlier restricts DEPS to a subset of python, I'd be worried about different line-breaking styles and other edge cases.

Comment 7 by aga...@chromium.org, Nov 20 2017

Blockedon: 784569
Owner: ehmaldonado@chromium.org
Status: Started (was: Available)

Comment 9 by mmoss@chromium.org, Feb 7 2018

Blocking: 807318
Blocking: 810188

Comment 11 by mmoss@chromium.org, Feb 14 2018

FWIW, Issue 812366 is another example of where this common handling would be useful. omahaproxy is doing it's own DEPS processing (the old exec() way) and failed miserably when it finally encountered the newer {"url": "..."} syntax. We should make sure that gets updated when this work is done.

Comment 12 by bore...@google.com, Feb 15 2018

Blocking: skia:7628
Project Member

Comment 13 by bugdroid1@chromium.org, Mar 19 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/tools/depot_tools/+/7f4c905fc53e7cbcc3277074c6a339ade8bc0f66

commit 7f4c905fc53e7cbcc3277074c6a339ade8bc0f66
Author: Edward Lesmes <ehmaldonado@chromium.org>
Date: Mon Mar 19 21:19:43 2018

gclient: Add commands to edit dependencies and variables in DEPS

Adds 'gclient setvar' and 'gclient setdep' commands to edit variables
and dependencies in a DEPS file.

Bug:  760633 
Change-Id: I6c0712cc079dbbbaee6541b7eda71f4b4813b77b
Reviewed-on: https://chromium-review.googlesource.com/950405
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: Aaron Gable <agable@chromium.org>

[modify] https://crrev.com/7f4c905fc53e7cbcc3277074c6a339ade8bc0f66/gclient_eval.py
[modify] https://crrev.com/7f4c905fc53e7cbcc3277074c6a339ade8bc0f66/gclient.py
[modify] https://crrev.com/7f4c905fc53e7cbcc3277074c6a339ade8bc0f66/tests/gclient_eval_unittest.py

Project Member

Comment 14 by bugdroid1@chromium.org, Mar 19 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/tools/depot_tools/+/0b89935ad6fee0109212969cbaccdce822a7632c

commit 0b89935ad6fee0109212969cbaccdce822a7632c
Author: Edward Lesmes <ehmaldonado@chromium.org>
Date: Mon Mar 19 22:00:04 2018

Revert "gclient: Add commands to edit dependencies and variables in DEPS"

This reverts commit 7f4c905fc53e7cbcc3277074c6a339ade8bc0f66.

Reason for revert:
When running "gclient sync" on a V8 checkout, it says:

  File "/work/chrome/depot_tools/gclient.py", line 995, in run
   self.ParseDepsFile()
 File "/work/chrome/depot_tools/gclient.py", line 874, in ParseDepsFile
   self._postprocess_deps(deps, rel_prefix), use_relative_paths)
 File "/work/chrome/depot_tools/gclient.py", line 660, in _postprocess_deps
   dval['condition'], self.condition)
TypeError: '_NodeDict' object does not support item assignment

on the recursive descent into third_party/android_tools/DEPS. Any chance that's related to https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/950405 ?

Original change's description:
> gclient: Add commands to edit dependencies and variables in DEPS
> 
> Adds 'gclient setvar' and 'gclient setdep' commands to edit variables
> and dependencies in a DEPS file.
> 
> Bug:  760633 
> Change-Id: I6c0712cc079dbbbaee6541b7eda71f4b4813b77b
> Reviewed-on: https://chromium-review.googlesource.com/950405
> Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
> Reviewed-by: Aaron Gable <agable@chromium.org>

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

Change-Id: If58f6b15d31b19fc53294f1e41d26b4e684a2cf9
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug:  760633 
Reviewed-on: https://chromium-review.googlesource.com/969165
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>

[modify] https://crrev.com/0b89935ad6fee0109212969cbaccdce822a7632c/gclient_eval.py
[modify] https://crrev.com/0b89935ad6fee0109212969cbaccdce822a7632c/gclient.py
[modify] https://crrev.com/0b89935ad6fee0109212969cbaccdce822a7632c/tests/gclient_eval_unittest.py

Project Member

Comment 15 by bugdroid1@chromium.org, Mar 20 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/3cb6c259ba3d417608b7f91fd19652cbb23ac86d

commit 3cb6c259ba3d417608b7f91fd19652cbb23ac86d
Author: depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Date: Tue Mar 20 01:06:22 2018

Roll src/third_party/depot_tools/ 544b74462..0b89935ad (2 commits)

https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/544b744621b7..0b89935ad6fe

$ git log 544b74462..0b89935ad --date=short --no-merges --format='%ad %ae %s'
2018-03-19 ehmaldonado Revert "gclient: Add commands to edit dependencies and variables in DEPS"
2018-03-19 ehmaldonado gclient: Add commands to edit dependencies and variables in DEPS

Created with:
  roll-dep src/third_party/depot_tools
BUG= chromium:760633 , chromium:760633 


The AutoRoll server is located here: https://depot-tools-chromium-roll.skia.org

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.


TBR=agable@chromium.org

Change-Id: Ic468d8ba95e139b32b63562ba07a866ec3b8343c
Reviewed-on: https://chromium-review.googlesource.com/969659
Reviewed-by: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Commit-Queue: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Cr-Commit-Position: refs/heads/master@{#544242}
[modify] https://crrev.com/3cb6c259ba3d417608b7f91fd19652cbb23ac86d/DEPS

Project Member

Comment 16 by bugdroid1@chromium.org, Mar 20 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/tools/depot_tools/+/6f64a0522bb8b6d20686028768024ebce5cfbba9

commit 6f64a0522bb8b6d20686028768024ebce5cfbba9
Author: Edward Lesmes <ehmaldonado@chromium.org>
Date: Tue Mar 20 21:51:04 2018

Reland "gclient: Add commands to edit dependencies and variables in DEPS"

This is a reland of 7f4c905fc53e7cbcc3277074c6a339ade8bc0f66

Original change's description:
> gclient: Add commands to edit dependencies and variables in DEPS
> 
> Adds 'gclient setvar' and 'gclient setdep' commands to edit variables
> and dependencies in a DEPS file.
> 
> Bug:  760633 
> Change-Id: I6c0712cc079dbbbaee6541b7eda71f4b4813b77b
> Reviewed-on: https://chromium-review.googlesource.com/950405
> Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
> Reviewed-by: Aaron Gable <agable@chromium.org>

Bug:  760633 
Change-Id: Ia46c74d02e5cc3b67517dfa248f597cb3d98ef3d
Reviewed-on: https://chromium-review.googlesource.com/969457
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: Aaron Gable <agable@chromium.org>

[modify] https://crrev.com/6f64a0522bb8b6d20686028768024ebce5cfbba9/gclient_utils.py
[modify] https://crrev.com/6f64a0522bb8b6d20686028768024ebce5cfbba9/gclient_eval.py
[modify] https://crrev.com/6f64a0522bb8b6d20686028768024ebce5cfbba9/gclient.py
[modify] https://crrev.com/6f64a0522bb8b6d20686028768024ebce5cfbba9/tests/gclient_test.py
[modify] https://crrev.com/6f64a0522bb8b6d20686028768024ebce5cfbba9/tests/gclient_eval_unittest.py

Project Member

Comment 17 by bugdroid1@chromium.org, Mar 21 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/a22f1657cd9c991d47fbfa5b72689c93b0311a81

commit a22f1657cd9c991d47fbfa5b72689c93b0311a81
Author: depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Date: Wed Mar 21 02:36:11 2018

Roll src/third_party/depot_tools/ 0b89935ad..6f64a0522 (4 commits)

https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/0b89935ad6fe..6f64a0522bb8

$ git log 0b89935ad..6f64a0522 --date=short --no-merges --format='%ad %ae %s'
2018-03-20 ehmaldonado Reland "gclient: Add commands to edit dependencies and variables in DEPS"
2018-03-20 jbudorick [gclient] Use a single CIPD root for an entire gclient checkout.
2018-03-19 thestig Add debugging info when gclient deletes an old DEPS entry.
2018-03-19 thestig Remove nested ifs in GClientSmokeBase.splitBlock().

Created with:
  roll-dep src/third_party/depot_tools
BUG= chromium:760633 ,chromium:755920, chromium:823586 


The AutoRoll server is located here: https://depot-tools-chromium-roll.skia.org

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.


TBR=agable@chromium.org

Change-Id: I4a24b063813215bfa046139f4241bd8723063137
Reviewed-on: https://chromium-review.googlesource.com/972434
Commit-Queue: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Reviewed-by: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Cr-Commit-Position: refs/heads/master@{#544622}
[modify] https://crrev.com/a22f1657cd9c991d47fbfa5b72689c93b0311a81/DEPS

Project Member

Comment 18 by bugdroid1@chromium.org, Mar 21 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/tools/depot_tools/+/9f531298e1a38ccd52b4bd8c47593ccc8f514e04

commit 9f531298e1a38ccd52b4bd8c47593ccc8f514e04
Author: Edward Lesmes <ehmaldonado@chromium.org>
Date: Wed Mar 21 23:15:06 2018

gclient eval: Get rid of global_scope, local_scope and functions other than Var.

Since we only support Var, and Var only does one thing, we hard code that
into the parser. Then, we don't need global_scope.

local_scope hasn't been needed for a while.

Bug:  760633 
Change-Id: I21b171a8b71e7dcaf8e29c780ca88b9f46f368e8
Reviewed-on: https://chromium-review.googlesource.com/972611
Reviewed-by: Aaron Gable <agable@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>

[modify] https://crrev.com/9f531298e1a38ccd52b4bd8c47593ccc8f514e04/gclient_eval.py
[modify] https://crrev.com/9f531298e1a38ccd52b4bd8c47593ccc8f514e04/gclient.py
[modify] https://crrev.com/9f531298e1a38ccd52b4bd8c47593ccc8f514e04/tests/gclient_eval_unittest.py

Project Member

Comment 19 by bugdroid1@chromium.org, Mar 22 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/573f82bc04e0922516930d1b395554b1153eb98d

commit 573f82bc04e0922516930d1b395554b1153eb98d
Author: depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Date: Thu Mar 22 01:36:59 2018

Roll src/third_party/depot_tools/ b3065fb6a..9f531298e (1 commit)

https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/b3065fb6a19f..9f531298e1a3

$ git log b3065fb6a..9f531298e --date=short --no-merges --format='%ad %ae %s'
2018-03-20 ehmaldonado gclient eval: Get rid of global_scope, local_scope and functions other than Var.

Created with:
  roll-dep src/third_party/depot_tools
BUG= chromium:760633 


The AutoRoll server is located here: https://depot-tools-chromium-roll.skia.org

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.


TBR=agable@chromium.org

Change-Id: I23d275808726efddfe477e6f61ff43d2365607a5
Reviewed-on: https://chromium-review.googlesource.com/974502
Reviewed-by: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Commit-Queue: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Cr-Commit-Position: refs/heads/master@{#544937}
[modify] https://crrev.com/573f82bc04e0922516930d1b395554b1153eb98d/DEPS

Comment 20 by mmoss@chromium.org, Mar 23 2018

I was just testing out the setdeps functionality and have a few comments (apologies if some of this is stuff that you're aware of and are still working on):

- Nit: the 'setdeps' command doesn't show up in 'gclient help'. Should it?

- When I accidentally used invalid syntax (forgot the "-r" before the revision I was trying to change), it didn't complain or return an error code. It just silently exited without making any changes, which was rather confusing until I realized my mistake.

- When I ran:
  gclient setdep --deps-file src/DEPS -r "src/v8@12345678"
instead of changing the "src/v8" entry, it changed the "v8_revision" var used by that entry. I wasn't looking for it to do that, but I think that's actually the right thing to do. Nice.

- However, it didn't work as well when I tried:
  gclient setdep --deps-file src/DEPS -r "src-internal@12345678"
which changed:
  'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@ca08cc1b0773392396de7e96cdcdc555149b6dcc'
to this:
  'url': '12345678'
I suspect it's a problem with the "single string" format which that entry is using, as opposed to the "'host' + 'repo' + '@' + 'rev'" format of most other entries. Unfortunately, I don't think we can insist on the concatenated string format, which is not universal, and certainly not something that gclient otherwise requires. It might be OK to standardize the 'setdeps' output on just one or the other format though, for consistency.

- Your CL talks about both 'setdeps' and 'setvar', but AFAICT, the 'setvar' command doesn't exist, and is just 'setdeps --var'. Am I missing something?

- The var editing should allow adding vars, not just editing existing ones. This is needed specifically for the release DEPS, which have to add some vars used by the downstream chromeos build system.

- Var editing appears to assume everything is a string, but vars can also be native bools (and maybe numbers and None too, but I'm not sure). So something like:
  gclient setdep --var checkout_src_internal=True --deps-file src/DEPS
should result in:
  checkout_src_internal': True
but instead gives:
  checkout_src_internal': 'True'

Hi, thanks for the comments!

- It should show in gclient help.

- Yes, it silently ignores anything in the command line it didn't process. I'll fix that (and maybe the rest of gclient works the same way?)

- Yeah, it's trying to be clever and edit the v8 revision variable. :)
  Do you like this behavior?

- Yeah, it doesn't support all the ways you can write revisions in DEPS. I'll add support for more cases. Though I would like to enforce some kind of format, or small set of formats.

- Yes, the setvar was merged into setdeps, and I forgot to update the CL description.

- Ok, I'll add variable addition it to the queue.

- True. So we'd have to specify string vars as --var name="value" I assume.

There are also more things we don't support yet, like variables inside the deps dict keys, or in cipd versions.

Comment 22 by mmoss@chromium.org, Mar 23 2018

- 'gclient help setdeps' does give the help for the command, but just running 'gclient help' doesn't list it as one of the available commands.

- I can't speak for everything in gclient -- there are plenty of quirks to go around -- but I'm pretty sure commands with required args complain if they are missing, and I would expect one or both of --var/--revision to be required here.

- Yeah, I think that fits the model of "how would a human make that edit".

- Maybe once we have this editing, we should just remove all the concatenated mess, which I think is mostly a nicety for human editors (or previous hackish string substitution code), and output everything with single strings, and using the newer "{var}" substitution syntax. So something like:
    Var('chromium_git') + '/chromium/buildtools.git' + '@' +  Var('buildtools_revision'),
would be simplified to:
    '{chromium_git}/chromium/buildtools.git@{buildtools_revision}',
which is also more consistent with the formatting that 'gclient flatten' outputs.

- ack

- sg, thanks

- Will that quoting make it through from the command line, or would it all still just look like "name=value"? Maybe just special case the strings "True" and "False"? It seems unlikely they would be used without meaning the bool types. Also, I took a quick look, and it doesn't look like None or numeric vars are supported, so no need to worry about those.

Regarding 
  gclient setdep --var checkout_src_internal=True --deps-file src/DEPS

I think 
  'checkout_src_internal': 'True',

Is an acceptable behavior. Whenever the variable is used as a condition, it will be interpreted as True, so it's semantically equivalent.

Comment 24 by mmoss@chromium.org, Mar 29 2018

And the string 'False' behaves the opposite? Or does 'True' just behave as True because it's a non-empty string?
And 'False' behaves like False, and 'None' behaves like None.
That's handled by EvaluateCondition here https://cs.chromium.org/chromium/tools/depot_tools/gclient_eval.py?l=408

Comment 26 by mmoss@chromium.org, Mar 29 2018

sg, thanks for clarifying
Project Member

Comment 27 by bugdroid1@chromium.org, Mar 30 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/tools/depot_tools/+/62af4e40a8f462f9009ca3ec119a8b37cefa0367

commit 62af4e40a8f462f9009ca3ec119a8b37cefa0367
Author: Edward Lesmes <ehmaldonado@chromium.org>
Date: Fri Mar 30 22:23:38 2018

gclient setdep: Add support for more use cases

Add support for more ways to express revisions in DEPS files, notably
"<origin-url>@<revision>" which is needed for src-internal.

Bug:  760633 
Change-Id: I86724b9c077c6101a0c424d80460123d15533da8
Reviewed-on: https://chromium-review.googlesource.com/988493
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: Aaron Gable <agable@chromium.org>

[modify] https://crrev.com/62af4e40a8f462f9009ca3ec119a8b37cefa0367/gclient_eval.py
[modify] https://crrev.com/62af4e40a8f462f9009ca3ec119a8b37cefa0367/tests/gclient_eval_unittest.py

Project Member

Comment 28 by bugdroid1@chromium.org, Mar 31 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/9bf7b00a9723654c04fa0c69d39d8dfff9be2f60

commit 9bf7b00a9723654c04fa0c69d39d8dfff9be2f60
Author: depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Date: Sat Mar 31 01:21:49 2018

Roll src/third_party/depot_tools/ bb16e339c..62af4e40a (2 commits)

https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/bb16e339ce72..62af4e40a8f4

$ git log bb16e339c..62af4e40a --date=short --no-merges --format='%ad %ae %s'
2018-03-30 ehmaldonado gclient setdep: Add support for more use cases
2018-03-30 amatyukhin [cipd] Do not rewrite ERRORLEVEL

Created with:
  roll-dep src/third_party/depot_tools
BUG= chromium:760633 ,chromium:none


The AutoRoll server is located here: https://depot-tools-chromium-roll.skia.org

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.


TBR=agable@chromium.org

Change-Id: I0d76a0615d81b408fd825f0eb8f12a5fb065b09a
Reviewed-on: https://chromium-review.googlesource.com/988690
Reviewed-by: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Commit-Queue: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Cr-Commit-Position: refs/heads/master@{#547348}
[modify] https://crrev.com/9bf7b00a9723654c04fa0c69d39d8dfff9be2f60/DEPS

Project Member

Comment 29 by bugdroid1@chromium.org, Apr 2 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/tools/depot_tools/+/3d9938134275059180e25a48a53b16890a7856b5

commit 3d9938134275059180e25a48a53b16890a7856b5
Author: Edward Lesmes <ehmaldonado@chromium.org>
Date: Mon Apr 02 17:02:33 2018

gclient setdep: Add support to create new variables.

If the variable doesn't already exist, gclient setdep will attempt to
create a new variable with the given name and value as the first variable
in the vars dict.

R=agable@chromium.org, mmoss@chromium.org

Bug:  760633 
Change-Id: I2462e70c3695a730f87c58e56c639104efbfa54a
Reviewed-on: https://chromium-review.googlesource.com/989282
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: Michael Moss <mmoss@chromium.org>
Reviewed-by: Aaron Gable <agable@chromium.org>

[modify] https://crrev.com/3d9938134275059180e25a48a53b16890a7856b5/gclient_eval.py
[modify] https://crrev.com/3d9938134275059180e25a48a53b16890a7856b5/gclient.py
[modify] https://crrev.com/3d9938134275059180e25a48a53b16890a7856b5/tests/gclient_eval_unittest.py

Project Member

Comment 30 by bugdroid1@chromium.org, Apr 2 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/996e6be69cced6f76b88cdb85273ad464c7e1d01

commit 996e6be69cced6f76b88cdb85273ad464c7e1d01
Author: depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Date: Mon Apr 02 22:33:42 2018

Roll src/third_party/depot_tools/ 0d466d22d..31e7d56c2 (2 commits)

https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/0d466d22d8e2..31e7d56c28f1

$ git log 0d466d22d..31e7d56c2 --date=short --no-merges --format='%ad %ae %s'
2018-04-02 rmistry Support setting Auto-Submit during "git cl upload"
2018-04-02 ehmaldonado gclient setdep: Add support to create new variables.

Created with:
  roll-dep src/third_party/depot_tools
BUG= chromium:631551 , chromium:760633 


The AutoRoll server is located here: https://depot-tools-chromium-roll.skia.org

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.


TBR=agable@chromium.org

Change-Id: Ia87a7c017f69d30bc5cd22d7f3df08e3e5bc8a8a
Reviewed-on: https://chromium-review.googlesource.com/990715
Commit-Queue: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Reviewed-by: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Cr-Commit-Position: refs/heads/master@{#547540}
[modify] https://crrev.com/996e6be69cced6f76b88cdb85273ad464c7e1d01/DEPS

Project Member

Comment 31 by bugdroid1@chromium.org, Apr 3 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/tools/depot_tools/+/c772cf7d8be06732889819773ed4141ab7df5281

commit c772cf7d8be06732889819773ed4141ab7df5281
Author: Edward Lesmes <ehmaldonado@chromium.org>
Date: Tue Apr 03 18:55:08 2018

roll_dep: Make roll_dep.py use gclient_eval instead of regexes.

Now we no longer care what revision was actually checked out in disk.

R=agable@chromium.org

Bug:  760633 
Change-Id: If18081808a8b8be2d4be8dd8dcca9e084ee2b7ef
Reviewed-on: https://chromium-review.googlesource.com/990784
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: Aaron Gable <agable@chromium.org>

[modify] https://crrev.com/c772cf7d8be06732889819773ed4141ab7df5281/roll_dep.py

Project Member

Comment 32 by bugdroid1@chromium.org, Apr 4 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/tools/depot_tools/+/a1df57cdc6573da28eebdcac0d58941f79b176a7

commit a1df57cdc6573da28eebdcac0d58941f79b176a7
Author: Edward Lesmes <ehmaldonado@chromium.org>
Date: Wed Apr 04 00:10:52 2018

roll-dep: Support dictionaries in deps revisions.

Adds support for when the URL of the dependency is inside a dictionary.

R=agable@chromium.org

Bug:  760633 
Change-Id: Idfdff0bdf27f0e3031f0cd17de2864da54ce65ac
Reviewed-on: https://chromium-review.googlesource.com/994416
Reviewed-by: Aaron Gable <agable@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>

[modify] https://crrev.com/a1df57cdc6573da28eebdcac0d58941f79b176a7/roll_dep.py

Project Member

Comment 33 by bugdroid1@chromium.org, Apr 4 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/5d7856ba64f2eeb3998c90e505646bc7fbef1cf8

commit 5d7856ba64f2eeb3998c90e505646bc7fbef1cf8
Author: depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Date: Wed Apr 04 00:53:07 2018

Roll src/third_party/depot_tools/ 668c1d8d1..adcf030f6 (2 commits)

https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/668c1d8d1f1a..adcf030f6910

$ git log 668c1d8d1..adcf030f6 --date=short --no-merges --format='%ad %ae %s'
2018-04-03 agable Continue the story
2018-04-03 ehmaldonado roll_dep: Make roll_dep.py use gclient_eval instead of regexes.

Created with:
  roll-dep src/third_party/depot_tools
BUG=chromium:828154, chromium:760633 


The AutoRoll server is located here: https://depot-tools-chromium-roll.skia.org

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.


TBR=agable@chromium.org

Change-Id: Ia25847fe34f0686dd3c1edc3176bc8a7135f3d1f
Reviewed-on: https://chromium-review.googlesource.com/994055
Reviewed-by: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Commit-Queue: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Cr-Commit-Position: refs/heads/master@{#547901}
[modify] https://crrev.com/5d7856ba64f2eeb3998c90e505646bc7fbef1cf8/DEPS

Project Member

Comment 34 by bugdroid1@chromium.org, Apr 4 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/5b8f78c80cfc0da771e9eaf79569376fb7222742

commit 5b8f78c80cfc0da771e9eaf79569376fb7222742
Author: depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Date: Wed Apr 04 03:19:10 2018

Roll src/third_party/depot_tools/ adcf030f6..a1df57cdc (2 commits)

https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/adcf030f6910..a1df57cdc657

$ git log adcf030f6..a1df57cdc --date=short --no-merges --format='%ad %ae %s'
2018-04-03 ehmaldonado roll-dep: Support dictionaries in deps revisions.
2018-04-03 ehmaldonado Revert "presubmit support: Run all tests in parallel."

Created with:
  roll-dep src/third_party/depot_tools
BUG= chromium:760633 ,chromium:819774


The AutoRoll server is located here: https://depot-tools-chromium-roll.skia.org

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.


TBR=agable@chromium.org

Change-Id: I965e7d61676852711ede33839ace1676344891d2
Reviewed-on: https://chromium-review.googlesource.com/994130
Reviewed-by: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Commit-Queue: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Cr-Commit-Position: refs/heads/master@{#547961}
[modify] https://crrev.com/5b8f78c80cfc0da771e9eaf79569376fb7222742/DEPS

Project Member

Comment 35 by bugdroid1@chromium.org, Apr 4 2018

Project Member

Comment 36 by bugdroid1@chromium.org, Apr 4 2018

Project Member

Comment 37 by bugdroid1@chromium.org, Apr 4 2018

It looks like the new "add var" handling doesn't consider comments, so for instance, if adding a "foo=bar" var to src/DEPS, which starts like:

vars = {
  # By default, we should check out everything needed to run on the main
  # chromium waterfalls. This var can be also be set to "small", in order
  # to skip things are not strictly needed to build chromium for development
  # purposes.
  'checkout_configuration': 'default',

you end up with the confusing:

vars = {
  # By default, we should check out everything needed to run on the main
  # chromium waterfalls. This var can be also be set to "small", in order
  # to skip things are not strictly needed to build chromium for development
  # purposes.
  'foo': 'bar',
  'checkout_configuration': 'default',

Maybe a quick fix would be to add vars at the end of the dict instead of the beginning, since you probably don't have to worry about breaking up context after an existing var.
Not sure if this is intentional or not, but

gclient setdep  --deps-file src/DEPS --var foo=bar -r "src-internal@yyz"

works as expected if the var "foo" exists, but if the var is being added, then it fails with a KeyError. In that case, "--var foo=bar" has to be run as its own command.
Huh, well, it's certainly not intentional.
I'll fix both of those things tomorrow :)
Thanks. FWIW, #38 is probably more important for release purposes, since I don't have a good workaround for it. I've already implemented a two-stage 'setdeps' step for #39, so I'm not too worried about that one, but just thought you might want to know about it.
Reality has uncovered another problem :(. Some DEPS files have entries which are not pinned at all, like:

https://chrome-internal.googlesource.com/chrome/src-internal.git/+/master/DEPS#146
or 
https://chrome-internal.googlesource.com/a/chrome/tools/build/internal.DEPS.git/+/master/DEPS#39

Trying to setdep entries like those will replace the URL with the revision, instead of appending the revision, creating diffs like:

   'src/remoting/internal':
-      Var('chrome_git') + '/chrome/app-streaming.git',
+      Var('chrome_git') + '1234',

   'build_internal/scripts/slave':
    'build_internal':
-      'https://chrome-internal.googlesource.com/chrome/tools/build.git',
+      '1234'

Project Member

Comment 43 by bugdroid1@chromium.org, Apr 5 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/tools/depot_tools/+/0ecf6d6a15416fda1c0a91ba021e866eb0f25425

commit 0ecf6d6a15416fda1c0a91ba021e866eb0f25425
Author: Edward Lesmes <ehmaldonado@chromium.org>
Date: Thu Apr 05 22:46:44 2018

gclient setdep: Command line interface nits.

'setdep' now shows as a command when typing 'gclient help'.
We now use parser errors to indicate invalid formatting of flags, and
raise an error when there are unused arguments.

R=agable@chromium.org

Bug:  760633 
Change-Id: I37fa65ef0c2cff9de1234efcf22bcd888a5e9589
Reviewed-on: https://chromium-review.googlesource.com/998741
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: Michael Moss <mmoss@chromium.org>
Reviewed-by: Aaron Gable <agable@chromium.org>

[modify] https://crrev.com/0ecf6d6a15416fda1c0a91ba021e866eb0f25425/gclient.py

Project Member

Comment 44 by bugdroid1@chromium.org, Apr 5 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/tools/depot_tools/+/8d6265766bdae09c8558253346b07243776558c0

commit 8d6265766bdae09c8558253346b07243776558c0
Author: Edward Lesmes <ehmaldonado@chromium.org>
Date: Thu Apr 05 23:28:09 2018

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>

[modify] https://crrev.com/8d6265766bdae09c8558253346b07243776558c0/gclient_eval.py
[modify] https://crrev.com/8d6265766bdae09c8558253346b07243776558c0/tests/gclient_eval_unittest.py
[modify] https://crrev.com/8d6265766bdae09c8558253346b07243776558c0/recipes/trigger_recipe_roller.txt

Project Member

Comment 45 by bugdroid1@chromium.org, Apr 5 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/tools/depot_tools/+/1118a2193b8f7b77c0e2336fa9528645ae70e804

commit 1118a2193b8f7b77c0e2336fa9528645ae70e804
Author: Edward Lesmes <ehmaldonado@chromium.org>
Date: Thu Apr 05 23:32:05 2018

gclient_eval: Support unpinned dependencies in SetRevision.

If a dependency was unpinned, support adding a revision to it.

R=agable@chromium.org

Bug:  760633 
Change-Id: Id2c9fe5174458acaea334726176b88558425ef5a
Reviewed-on: https://chromium-review.googlesource.com/998735
Reviewed-by: Aaron Gable <agable@chromium.org>
Reviewed-by: Michael Moss <mmoss@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>

[modify] https://crrev.com/1118a2193b8f7b77c0e2336fa9528645ae70e804/gclient_eval.py
[modify] https://crrev.com/1118a2193b8f7b77c0e2336fa9528645ae70e804/tests/gclient_eval_unittest.py

Project Member

Comment 46 by bugdroid1@chromium.org, Apr 6 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/e0b1361ff38e4bd72f9be464f232ce5fb591c10e

commit e0b1361ff38e4bd72f9be464f232ce5fb591c10e
Author: depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Date: Fri Apr 06 04:51:46 2018

Roll src/third_party/depot_tools/ 2a5f70cc0..1118a2193 (6 commits)

https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/2a5f70cc060a..1118a2193b8f

$ git log 2a5f70cc0..1118a2193 --date=short --no-merges --format='%ad %ae %s'
2018-04-05 ehmaldonado gclient_eval: Support unpinned dependencies in SetRevision.
2018-04-05 ehmaldonado gclient_eval: Add more support when adding new variables.
2018-04-05 ehmaldonado gclient setdep: Command line interface nits.
2018-04-05 ehmaldonado presubmit_unittest: Remove redundant tests.
2018-04-05 sergeyberezin Roll mac_toolchain to 496a91484
2018-04-05 borenet roll-dep: Fix behavior for relative DEPS

Created with:
  roll-dep src/third_party/depot_tools
BUG= chromium:760633 , chromium:760633 , chromium:760633 ,chromium:829134,chromium:797051


The AutoRoll server is located here: https://depot-tools-chromium-roll.skia.org

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.


TBR=agable@chromium.org

Change-Id: Ibc387b556140307f5ed87c799cb5318c8c59e631
Reviewed-on: https://chromium-review.googlesource.com/999308
Reviewed-by: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Commit-Queue: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Cr-Commit-Position: refs/heads/master@{#548671}
[modify] https://crrev.com/e0b1361ff38e4bd72f9be464f232ce5fb591c10e/DEPS

Project Member

Comment 47 by bugdroid1@chromium.org, Apr 6 2018

The following revision refers to this bug:
  https://chrome-internal.googlesource.com/chrome/src-internal.git/+/6af219d790d76a02009808c1d542d87bf97f1c4f

commit 6af219d790d76a02009808c1d542d87bf97f1c4f
Author: Michael Moss <mmoss@google.com>
Date: Fri Apr 06 16:59:40 2018

Project Member

Comment 48 by bugdroid1@chromium.org, Apr 6 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/tools/depot_tools/+/411041f9be78eac1958d4c89e8cbc2a71946db9f

commit 411041f9be78eac1958d4c89e8cbc2a71946db9f
Author: Edward Lesmes <ehmaldonado@chromium.org>
Date: Fri Apr 06 17:34:30 2018

gclient: Add a command to get revision/variable information.

Introduce a getdep command to get revision/version/variable value information
as a counterpart for gclient setdep.

It will be useful for autorollers.

Bug:  760633 
Change-Id: Iabeae0e78c6fbdcb1a3a79cfb380ac2d83f256d5
Reviewed-on: https://chromium-review.googlesource.com/999171
Reviewed-by: Aaron Gable <agable@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>

[modify] https://crrev.com/411041f9be78eac1958d4c89e8cbc2a71946db9f/gclient_eval.py
[modify] https://crrev.com/411041f9be78eac1958d4c89e8cbc2a71946db9f/gclient.py
[modify] https://crrev.com/411041f9be78eac1958d4c89e8cbc2a71946db9f/tests/gclient_eval_unittest.py

Project Member

Comment 49 by bugdroid1@chromium.org, Apr 6 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/5681116ab8d35a17b7bff0d05b0f653b0cea1c44

commit 5681116ab8d35a17b7bff0d05b0f653b0cea1c44
Author: src-internal-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com <src-internal-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Date: Fri Apr 06 19:27:53 2018

Roll src-internal/ ecf6e8e62..6af219d79 (1 commit)

https://chrome-internal.googlesource.com/chrome/src-internal.git/+log/ecf6e8e622df..6af219d790d7

$ git log ecf6e8e62..6af219d79 --date=short --no-merges --format='%ad %ae %s'

Created with:
  roll-dep src-internal
BUG= chromium:760633 


The AutoRoll server is located here: https://src-internal-chromium-roll.skia.org

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.


TBR=mmoss@chromium.org

Change-Id: Ibde9600953b585ade9e3740832025a4e59129eec
Reviewed-on: https://chromium-review.googlesource.com/999827
Reviewed-by: src-internal-chromium-autoroll <src-internal-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Commit-Queue: src-internal-chromium-autoroll <src-internal-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Cr-Commit-Position: refs/heads/master@{#548898}
[modify] https://crrev.com/5681116ab8d35a17b7bff0d05b0f653b0cea1c44/DEPS

Project Member

Comment 50 by bugdroid1@chromium.org, Apr 6 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/81b0aa8e18edd199320e78590c50d4855dafc707

commit 81b0aa8e18edd199320e78590c50d4855dafc707
Author: depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Date: Fri Apr 06 19:42:13 2018

Roll src/third_party/depot_tools/ 5e79d0789..411041f9b (1 commit)

https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/5e79d07891aa..411041f9be78

$ git log 5e79d0789..411041f9b --date=short --no-merges --format='%ad %ae %s'
2018-04-05 ehmaldonado gclient: Add a command to get revision/variable information.

Created with:
  roll-dep src/third_party/depot_tools
BUG= chromium:760633 


The AutoRoll server is located here: https://depot-tools-chromium-roll.skia.org

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.


TBR=agable@chromium.org

Change-Id: Ie915af7206f78bbd191807249ee7c9b9b12aa64a
Reviewed-on: https://chromium-review.googlesource.com/999952
Reviewed-by: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Commit-Queue: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Cr-Commit-Position: refs/heads/master@{#548904}
[modify] https://crrev.com/81b0aa8e18edd199320e78590c50d4855dafc707/DEPS

Project Member

Comment 51 by bugdroid1@chromium.org, Apr 6 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/tools/depot_tools/+/3f277fc747b51e6637c88f660e781a1c401a9913

commit 3f277fc747b51e6637c88f660e781a1c401a9913
Author: Edward Lesmes <ehmaldonado@chromium.org>
Date: Fri Apr 06 19:50:41 2018

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>

[modify] https://crrev.com/3f277fc747b51e6637c88f660e781a1c401a9913/roll_dep.py
[modify] https://crrev.com/3f277fc747b51e6637c88f660e781a1c401a9913/recipes/trigger_recipe_roller.txt

Project Member

Comment 52 by bugdroid1@chromium.org, Apr 6 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/9236e75a0bf84dbc3443a78cd5cb9bd6fa5ee6f8

commit 9236e75a0bf84dbc3443a78cd5cb9bd6fa5ee6f8
Author: depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Date: Fri Apr 06 23:32:04 2018

Roll src/third_party/depot_tools/ 411041f9b..3f277fc74 (1 commit)

https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/411041f9be78..3f277fc747b5

$ git log 411041f9b..3f277fc74 --date=short --no-merges --format='%ad %ae %s'
2018-04-06 ehmaldonado roll-dep: Add support for gclient root various levels above.

Created with:
  roll-dep src/third_party/depot_tools
BUG= chromium:760633 


The AutoRoll server is located here: https://depot-tools-chromium-roll.skia.org

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.


TBR=agable@chromium.org

Change-Id: I93c67445112994ea0f1deb5a6494a9385b4e29df
Reviewed-on: https://chromium-review.googlesource.com/1000119
Reviewed-by: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Commit-Queue: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Cr-Commit-Position: refs/heads/master@{#548967}
[modify] https://crrev.com/9236e75a0bf84dbc3443a78cd5cb9bd6fa5ee6f8/DEPS

Project Member

Comment 53 by bugdroid1@chromium.org, Apr 13 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/tools/depot_tools/+/58330b0db43d1b3ff7b94ea8f6dc67520af8621b

commit 58330b0db43d1b3ff7b94ea8f6dc67520af8621b
Author: Edward Lesmes <ehmaldonado@chromium.org>
Date: Fri Apr 13 17:36:40 2018

roll-dep: Use gclient_eval.GetRevision to get current revision.

R=agable@chromium.org

Bug:  760633 
Change-Id: Iebabb417b5b1bd5a987de2707e84a0329e1ebe66
Reviewed-on: https://chromium-review.googlesource.com/1000758
Reviewed-by: Aaron Gable <agable@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>

[modify] https://crrev.com/58330b0db43d1b3ff7b94ea8f6dc67520af8621b/roll_dep.py

Project Member

Comment 54 by bugdroid1@chromium.org, Apr 13 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/668615b61603d579ce7ac2bf1b390034722708af

commit 668615b61603d579ce7ac2bf1b390034722708af
Author: depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Date: Fri Apr 13 19:46:18 2018

Roll src/third_party/depot_tools/ 54a81e45d..58330b0db (1 commit)

https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/54a81e45ddfc..58330b0db43d

$ git log 54a81e45d..58330b0db --date=short --no-merges --format='%ad %ae %s'
2018-04-06 ehmaldonado roll-dep: Use gclient_eval.GetRevision to get current revision.

Created with:
  roll-dep src/third_party/depot_tools
BUG= chromium:760633 


The AutoRoll server is located here: https://depot-tools-chromium-roll.skia.org

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.


TBR=agable@chromium.org

Change-Id: Icab9883fd549a3383689c198168a5d196ab1c855
Reviewed-on: https://chromium-review.googlesource.com/1012342
Reviewed-by: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Commit-Queue: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Cr-Commit-Position: refs/heads/master@{#550724}
[modify] https://crrev.com/668615b61603d579ce7ac2bf1b390034722708af/DEPS

Status: Fixed (was: Started)
I'll mark this as fixed.

If you have more feature requests or find more bugs, please let me know :)
Project Member

Comment 56 by bugdroid1@chromium.org, Apr 17 2018

Labels: merge-merged-testbranch
The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/668615b61603d579ce7ac2bf1b390034722708af

commit 668615b61603d579ce7ac2bf1b390034722708af
Author: depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Date: Fri Apr 13 19:46:18 2018

Roll src/third_party/depot_tools/ 54a81e45d..58330b0db (1 commit)

https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/54a81e45ddfc..58330b0db43d

$ git log 54a81e45d..58330b0db --date=short --no-merges --format='%ad %ae %s'
2018-04-06 ehmaldonado roll-dep: Use gclient_eval.GetRevision to get current revision.

Created with:
  roll-dep src/third_party/depot_tools
BUG= chromium:760633 


The AutoRoll server is located here: https://depot-tools-chromium-roll.skia.org

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.


TBR=agable@chromium.org

Change-Id: Icab9883fd549a3383689c198168a5d196ab1c855
Reviewed-on: https://chromium-review.googlesource.com/1012342
Reviewed-by: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Commit-Queue: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Cr-Commit-Position: refs/heads/master@{#550724}
[modify] https://crrev.com/668615b61603d579ce7ac2bf1b390034722708af/DEPS

Sign in to add a comment