Commit Graph

56 Commits (b22aabe437517e44c1ac2876bf89c005d5e0d91e)

Author SHA1 Message Date
Edward Lemur 3c814957ee depot_tools: Run Python scripts using vpython (Part 2)
Tbr: iannucci@chromium.org
Bug: 984182
Change-Id: I2e8469f8ee0acd6a54109697d5a6b76faf24fa42
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1748590
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
6 years ago
James Darpinian f994d87e56 Revert "Reland "depot_tools: Move six to depot_tools' .vpython""
This reverts commit d52b306f84.

Reason for revert: Broke ANGLE CQ with "ImportError: No module named six"
Example: https://ci.chromium.org/p/angle/builders/try/mac-dbg/6758

Original change's description:
> Reland "depot_tools: Move six to depot_tools' .vpython"
> 
> This is a reland of 3a98df0bdd
> 
> Original change's description:
> > depot_tools: Move six to depot_tools' .vpython
> > 
> > Bug: 984182
> > Change-Id: I34a242c8607624beb0f06a27c563e413dec99790
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1717492
> > Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
> > Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>
> > Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
> > Reviewed-by: Michael Moss <mmoss@chromium.org>
> 
> Bug: 984182
> Change-Id: Ibf7034201e65a18f833cf1e7432f81a903a99aae
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1732880
> Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
> Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>

TBR=iannucci@chromium.org,mmoss@chromium.org,tandrii@chromium.org,ehmaldonado@chromium.org

Change-Id: Id4488249b607441df9f00aa51f4a1f2bc4ad5cfd
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 984182
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1739582
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Commit-Queue: Kenneth Russell <kbr@chromium.org>
6 years ago
Edward Lemur d52b306f84 Reland "depot_tools: Move six to depot_tools' .vpython"
This is a reland of 3a98df0bdd

Original change's description:
> depot_tools: Move six to depot_tools' .vpython
> 
> Bug: 984182
> Change-Id: I34a242c8607624beb0f06a27c563e413dec99790
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1717492
> Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
> Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>
> Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
> Reviewed-by: Michael Moss <mmoss@chromium.org>

Bug: 984182
Change-Id: Ibf7034201e65a18f833cf1e7432f81a903a99aae
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1732880
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
6 years ago
Edward Lesmes 365720e237 Revert "depot_tools: Move six to depot_tools' .vpython"
This reverts commit 3a98df0bdd.

Reason for revert:
Can't roll into skia and build_internal

Original change's description:
> depot_tools: Move six to depot_tools' .vpython
> 
> Bug: 984182
> Change-Id: I34a242c8607624beb0f06a27c563e413dec99790
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1717492
> Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
> Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>
> Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
> Reviewed-by: Michael Moss <mmoss@chromium.org>

TBR=iannucci@chromium.org,mmoss@chromium.org,tandrii@chromium.org,ehmaldonado@chromium.org

Change-Id: I51e502e6f7633a6f26898f1ecbcd86ccf9c7c123
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 984182
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1718996
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
6 years ago
Edward Lemur 3a98df0bdd depot_tools: Move six to depot_tools' .vpython
Bug: 984182
Change-Id: I34a242c8607624beb0f06a27c563e413dec99790
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1717492
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
Reviewed-by: Michael Moss <mmoss@chromium.org>
6 years ago
Raul Tambre 80ee78e7fa Convert print statements to Python 3 style
Ran "2to3 -w -n -f print ./" and manually added imports.
Ran "^\s*print " and "\s+print " to find batch/shell scripts, comments and the like with embedded code, and updated them manually.
Also manually added imports to files, which used print as a function, but were missing the import.

The scripts still work with Python 2.
There are no intended behaviour changes.

Bug: 942522
Change-Id: Id777e4d4df4adcdfdab1b18bde89f235ef491b9f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1595684
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Commit-Queue: Dirk Pranke <dpranke@chromium.org>
Auto-Submit: Raul Tambre <raul@tambre.ee>
6 years ago
Marc-Antoine Ruel 1e2cb1573b [roll-dep] Ignore chromium-autoroll rolls
- It uses a different commit subject than recipe roller.
- Switch from looking up for magic strings to use a regexp instead. Document the
  source of each string, to help keep up when the source diverge.

Tested manually.

Change-Id: I76fc6b6692508c615a0e76c4b6b403f8c513dd31
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1564938
Commit-Queue: Marc-Antoine Ruel <maruel@chromium.org>
Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>
6 years ago
Andrii Shyshkalov e30d051370 roll_dep: update blacklist with new recipe roller.
R=maruel

Change-Id: Iebe989314c9dffa5b433641c4f099806291350f0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1548718
Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>
Auto-Submit: Andrii Shyshkalov <tandrii@chromium.org>
Reviewed-by: Marc-Antoine Ruel <maruel@chromium.org>
6 years ago
Marc-Antoine Ruel 6ce18220f4 roll-dep: use Middle Out Compression™️ for logs
Trimming at the bottom looses an important datapoint: which is the
oldest commit. To fix this problem, use Middle Out Compression™️ to
creates a better DEPS roll CL description.

Change-Id: I290073d25989b6880a4b608cd2b8f26a300cc3a1
Reviewed-on: https://chromium-review.googlesource.com/c/1415430
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Auto-Submit: Marc-Antoine Ruel <maruel@chromium.org>
6 years ago
Edward Lemur faae42e183 roll-dep: Use gclient setdep/getdep.
Use gclient setdep/getdep instead of evaluating the contents of the
DEPS file, so we don't have to deal with builtin_variables.

Bug: 906114
Change-Id: I2082d4a3feb84d15c251b7d99056fd4c6f925453
Reviewed-on: https://chromium-review.googlesource.com/c/1347450
Reviewed-by: Nico Weber <thakis@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
6 years ago
Robert Iannucci c1e6594df5 [roll-dep] Use Bug: instead of BUG=
This is the more modern syntax and everything should already work with
it.

R=tandrii@chromium.org

Change-Id: I7acbe6cc7c663e03e9a72c2b6c155a7982477146
Reviewed-on: https://chromium-review.googlesource.com/c/1289233
Auto-Submit: Robbie Iannucci <iannucci@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
6 years ago
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>
7 years ago
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>
7 years ago
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>
7 years ago
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>
7 years ago
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>
7 years ago
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>
7 years ago
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>
7 years ago
Edward Lesmes 58330b0db4 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>
7 years ago
Eric Boren 5888d6f676 roll-dep: Run gclient.py rather than gclient
gclient calls into update_depot_tools, where gclient.py does not.

Change-Id: Idabf0fd613ee241460fbeb6b897a79b084bbc4e2
Reviewed-on: https://chromium-review.googlesource.com/1000786
Reviewed-by: Aaron Gable <agable@chromium.org>
Commit-Queue: Eric Boren <borenet@chromium.org>
7 years ago
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>
7 years ago
Eric Boren 0eb3956e13 roll-dep: Fix behavior for relative DEPS
Change-Id: I7580c3b890d0c5a9e926e1354bd9e0a44ac20f31
Reviewed-on: https://chromium-review.googlesource.com/997972
Reviewed-by: Aaron Gable <agable@chromium.org>
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Commit-Queue: Eric Boren <borenet@chromium.org>
7 years ago
Edward Lesmes a1df57cdc6 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>
7 years ago
Edward Lesmes c772cf7d8b 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>
7 years ago
Kenneth Russell ebe839b6bf Add a '\n' at the end of the roll tool's command line.
Currently the BUG= line is being concatenated at the end, preventing
Bugdroid from picking it up and bugs from being updated.

BUG=797444

Change-Id: I7242db76a9552658d94fda10ec564b230f4f0037
Reviewed-on: https://chromium-review.googlesource.com/843014
Commit-Queue: Marc-Antoine Ruel <maruel@chromium.org>
Reviewed-by: Marc-Antoine Ruel <maruel@chromium.org>
7 years ago
Marc-Antoine Ruel 85a8c108a4 roll_dep: Allow rolling multiple dependencies simultaneously
The way it is done is by switching to a multiple phases model:
- Gather data
- Calculate actions
- Execute

Rolling multiple dependencies simultaneously is occasionally needed.
This will permit to supersede roll-deps.py in infra.git.

R=agable@chromium.org
Bug:
Change-Id: Ibdc7883268b2b08c8a0db1637a9601ffce943c48
Reviewed-on: https://chromium-review.googlesource.com/817616
Reviewed-by: Aaron Gable <agable@chromium.org>
Commit-Queue: Marc-Antoine Ruel <maruel@chromium.org>
7 years ago
Achuith Bhandarkar f6b946d71d Also print key in commit message.
BUG=
TEST=manual

Change-Id: Ic0335ecae5809e1cf328e130a29d2e42acc463ce
Reviewed-on: https://chromium-review.googlesource.com/798591
Commit-Queue: Marc-Antoine Ruel <maruel@chromium.org>
Reviewed-by: Eric Boren <borenet@chromium.org>
Reviewed-by: Marc-Antoine Ruel <maruel@chromium.org>
7 years ago
Eric Boren 3be96a83b8 roll-dep: Add comments indicating that --no-log needs to keep working
Bug:
Change-Id: Id5efd1e84318b95297c6d83f77e58f617d7db8de
Reviewed-on: https://chromium-review.googlesource.com/690242
Commit-Queue: Aaron Gable <agable@chromium.org>
Reviewed-by: Paweł Hajdan Jr. <phajdan.jr@chromium.org>
Reviewed-by: Aaron Gable <agable@chromium.org>
8 years ago
Eric Boren 07efc5a757 [roll-dep] Allow logs in ANGLE rolls
This is hampering Skia's ability to easily diagnose failures introduced
by ANGLE rolls.

Bug:skia:6998
Change-Id: I646200b691be0a07051e9ae1f7feaf2cd1c0671a
Reviewed-on: https://chromium-review.googlesource.com/638070
Reviewed-by: Marc-Antoine Ruel <maruel@chromium.org>
Commit-Queue: Eric Boren <borenet@chromium.org>
8 years ago
Marc-Antoine Ruel 51104fec03 Update roll-dep to skip trivial recipe roll
Otherwise it can make the log overwhelming when the number of rolls is higher
than the number of meaningful commits.

R=iannucci@chromium.org
BUG=620765

Change-Id: Iec0b41304d50091498d43abc4883e522b8cc9a2c
Reviewed-on: https://chromium-review.googlesource.com/448676
Commit-Queue: Marc-Antoine Ruel <maruel@chromium.org>
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
8 years ago
Marc-Antoine Ruel 22e7a27c29 roll-dep: Add command used to make the roll in the CL description.
That's marketing 101. :)

R=sergeyberezin@chromium.org
BUG=

Change-Id: Ibbc1cd18650b7b601c27662fcb40ea7b15b40fc7
Reviewed-on: https://chromium-review.googlesource.com/439006
Reviewed-by: Sergey Berezin <sergeyberezin@chromium.org>
Commit-Queue: Sergey Berezin <sergeyberezin@chromium.org>
8 years ago
borenet 16b0eb6cb8 roll-dep: Show the git log for catapult
TBR=maruel
BUG=skia:5660

Review-Url: https://codereview.chromium.org/2262283002
9 years ago
smut 7036c4f0a6 Use different exit code when desired dep roll is a no-op
BUG=609899

Review-Url: https://codereview.chromium.org/2047013005
9 years ago
rohitrao@chromium.org d4ef599ba1 Fix regexp in roll_dep.py.
The fallback code was parsing DEPS entries improperly.

BUG=None

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@298839 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
brucedawson@chromium.org 8a6495cb4f Clarify error messages in roll_dep.py
If you specify a directory incorrectly to roll_dep then it may not be
obvious why it cannot be found. For instance, "roll-dep tools\gyp" vs.
"roll-dep src\tools\gyp". This change prints the full directory.

This change also clarifies what is meant by a clean tree to make that
error message easier to understand.

R=maruel@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297875 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
maruel@chromium.org 261fa7db54 Strip trailing / or \ when rolling.
Otherwise it makes CL description like foo/bar// which is ugly.

R=vadimsh@chromium.org
BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297670 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
smut@google.com 02d2087b9a Add an option to ignore a dirty tree to roll_dep.py
BUG=554638
TBR=maruel
TESTED=locally verified that two deps can be rolled

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297553 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
johannkoenig@google.com 64f2fc3b2c Add --no-merges to roll_dep.py
Print only the most interesting commit messages.

R=maruel@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297050 0039d316-1c4b-4281-b951-d872f2087c98
10 years ago
maruel@chromium.org 398ed34efc Reapply https://codereview.chromium.org/1257233006/ with conditional eliding.
- Create logs URL for both gitiles and github.
- Include the number of commits being rolled in in the commit subject, which is
  always useful.
- Make the log inclusion conditional on the repository being rolled in and the
  number of commits.
- Checkout the new commit when using this script, otherwise this is surprising
  to users.
- Add flags to support more use cases.
- Use --quiet when calling git to reduce noise in the output.

R=spang@chromium.org,jochen@chromium.org
BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@296924 0039d316-1c4b-4281-b951-d872f2087c98
10 years ago
maruel@chromium.org c6e39fe486 Revert of roll_dep: Avoid large commit messages by providing the log as a link (patchset #1 id:1 of https://codereview.chromium.org/1257233006/ )
Reason for revert:
Blink merge is done, blink people won't have to use it anymore.

Original issue's description:
> roll_dep: Avoid large commit messages by providing the log as a link
> 
> The majority of chromium projects are on googlesource.com, which can
> display a range of commits on the web. Use this feature instead of
> dumping logs into the commit message.
> 
> Particularly, this avoids creating large commit messages as these logs
> sometimes contain upwards of 50 commits.
> 
> Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=296184

TBR=jochen@chromium.org,spang@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@296840 0039d316-1c4b-4281-b951-d872f2087c98
10 years ago
spang@chromium.org faa4dfc118 roll_dep: Avoid large commit messages by providing the log as a link
The majority of chromium projects are on googlesource.com, which can
display a range of commits on the web. Use this feature instead of
dumping logs into the commit message.

Particularly, this avoids creating large commit messages as these logs
sometimes contain upwards of 50 commits.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@296184 0039d316-1c4b-4281-b951-d872f2087c98
10 years ago
sbc@chromium.org 30e5b23701 roll_dep.py: switch to argparse
This makes for cleaner code and better --help.

Also, handle case when deps directory does not exist.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@295475 0039d316-1c4b-4281-b951-d872f2087c98
10 years ago
sbc@chromium.org e5d984b90a Fix crash in roll_dep.py when key == None
Also, unify error handling to use exceptions.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@295465 0039d316-1c4b-4281-b951-d872f2087c98
10 years ago
scottmg@chromium.org c20f470011 Make roll_dep.py work on Windows
Didn't have any shell=True for git.bat/cmd.

Was able to upload https://codereview.chromium.org/1151373003 after
this CL (though the printed description didn't make it to Rietveld,
not sure if it normally does that.)

R=maruel@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@295397 0039d316-1c4b-4281-b951-d872f2087c98
10 years ago
maruel@chromium.org a7a229fe6d Also handle IOError in roll_dep.py.
TBR=smut@chromium.org
BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@295391 0039d316-1c4b-4281-b951-d872f2087c98
10 years ago
maruel@chromium.org 96550949d5 Rename roll-dep to roll-dep-svn and add roll-dep for git.
It is inspired by src/tools/roll_swarming_client.py but generalized.

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

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@295386 0039d316-1c4b-4281-b951-d872f2087c98
10 years ago
sbc@chromium.org 98201125ea Improve --help and usage message for roll_deps.py
Also, don't use assert for user error handling plus
some other general python cleanup.

NOPRESUBMIT=true (presubmit is broken)

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@294950 0039d316-1c4b-4281-b951-d872f2087c98
10 years ago
sbc@chromium.org 013731e832 Handle KeyboardInterrupt consistently in python scripts
Handle KeyboardInterrupt gracefully rather the printing a
backtrace. Most users of these tools don't expect a
backtrace when then hit Ctrl-C.

Also, fix a few other inconsistencies found in the python
startup code of these different scripts:
- always call main function 'main' (rather than 'Main')
- always return 0 from main function
- if main takes args never include argv[0]

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@294250 0039d316-1c4b-4281-b951-d872f2087c98
10 years ago
machenbach@chromium.org e0c897317b Allow to skip revision check in roll-dep.
Without this change, roll-dep requires dependencies to be
checked out and up to date in order to roll a newer revision.

This change allows to use roll-dep with less checking and
makes the script user responsible to verify the correctness
of the deps path and git hash.

This eases writing a deps roller that updates multiple deps
including a variety of os deps, which might not be checked
out on the host of the deps roller.

BUG=438705, 437462
R=jochen@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@293444 0039d316-1c4b-4281-b951-d872f2087c98
10 years ago
szager@chromium.org 4293787cae Fix handling of ast.Str object.
TBR=iannucci@chromium.org
BUG=

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

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