Commit Graph

32 Commits (b3065fb6a19f946287d64e234c761ee223ab13f5)

Author SHA1 Message Date
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
szager@chromium.org 0025380934 Add optional <DEPS file> argument to roll-dep.
BUG=chromium:425117
R=agable@chromium.org,kjellander@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@292563 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
thestig@chromium.org bf13f08b04 Fix roll_dep.py to print the right latest SVN revision number on error.
TEST="roll_dep.py breakpad/src 10000" should print ~1387, not 4.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@292129 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
borenet@google.com 2674ae08be roll-dep: If applicable, include svn revision range in commit message
This is analogous to the change made in
https://codereview.chromium.org/559243002/.  I want to change ARB to use the
commit message generated by roll-dep.

BUG=408700

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@291975 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
borenet@google.com 8eec89c2f8 Modify roll_dep's commit message
This conforms to the convention of using a single-line short description
followed by an empty line followed by a long description. Shortened the
revisions to more easily fit on one line.

BUG=408700

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@291743 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
szager@chromium.org 9e43b8b7ea Add comment with svn revision number.
R=iannucci@chromium.org,hinoka@chromium.org,mark@chromium.org
BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@287057 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
szager@chromium.org 03fd85bd0c Convenience tool for rolling git-style deps with an svn revision.
Usage: roll-dep third_party/WebKit 12345

That will update DEPS with the new revision, and leave the DEPS file
dirty.  It's the up to the user to 'git add; git commit;
git cl upload'.

This script won't handle arbitrary python syntax, but it will handle
variable references like Var("webkit_revision") correctly.

R=mmoss@chromium.org, iannucci@chromium.org
BUG=341098

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

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