chromium/tools/depot_tools.git
14 hours agoMake check_output of subprocess2 compatible with Python's subprocess. master
tandrii@chromium.org [Fri, 19 Sep 2014 11:51:43 +0000 (11:51 +0000)]
Make check_output of subprocess2 compatible with Python's subprocess.

According to Python's doc (
https://docs.python.org/2/library/subprocess.html#subprocess.check_output
):
if check_output raises exception CalledProcessError, the exception object
should contain stdout data as `output` attribute. Before this commit,
subprocess2.CalledProcessError had `output` always None, and used `stdout`
instead. This commit fixes this problem storing the same data in both `stdout`
and `output`.

BUG=NONE

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

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

4 days agoroll-dep: If applicable, include svn revision range in commit message
borenet@google.com [Mon, 15 Sep 2014 21:00:23 +0000 (21:00 +0000)]
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

8 days agoRevert "Make check for dirty index work."
smut@google.com [Thu, 11 Sep 2014 19:57:55 +0000 (19:57 +0000)]
Revert "Make check for dirty index work."

This reverts commit 931b6c6a6c72038b8994565aff5926d5050fb329.

This was causing our try bots to fail on DEPS changes.

After applying the patch successfully, apply_issue.py tries to run gclient sync to get the updated DEPS, resulting in this error:
src (ERROR)
----------------------------------------
[0:00:00] Started.
----------------------------------------
Error:
____ src at origin/master
Your index contains uncommitted changes
Please commit, stash, or reset.

BUG=413326
TESTED=Manually: https://paste.googleplex.com/6375653263802368

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

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

8 days agoFactor out Changelist GetStatus() for eventual use by other tools
jsbell@chromium.org [Thu, 11 Sep 2014 17:29:28 +0000 (17:29 +0000)]
Factor out Changelist GetStatus() for eventual use by other tools

Pulls the logic for computing an issue's "status" - has LGTM, is in
CQ, etc. - out of the "git cl status" command itself, so that other
tools can get the status of a Changelist.

BUG=379849
R=iannucci@chromium.org

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

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

9 days agoFix ascii art escaping.
maruel@chromium.org [Wed, 10 Sep 2014 11:08:06 +0000 (11:08 +0000)]
Fix ascii art escaping.

This was done because a line ending with a '\' will not be printed properly.
Completely escape the string.

R=stip@chromium.org
BUG=

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

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

10 days agoSwitching off svn in naclports fetch recipe.
bradnelson@google.com [Wed, 10 Sep 2014 01:25:38 +0000 (01:25 +0000)]
Switching off svn in naclports fetch recipe.

BUG=https://code.google.com/p/chromium/issues/detail?id=409185
TEST=local
R=iannucci@chromium.org

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

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

10 days agoAllow trunk to not end in a slash for git_footers.
iannucci@chromium.org [Tue, 9 Sep 2014 23:07:36 +0000 (23:07 +0000)]
Allow trunk to not end in a slash for git_footers.

R=luqui@chromium.org, prasadv@chromium.org
BUG=

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

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

10 days agoExpand git-footers to read the svn position for any trunk path in any repo.
iannucci@chromium.org [Tue, 9 Sep 2014 22:35:03 +0000 (22:35 +0000)]
Expand git-footers to read the svn position for any trunk path in any repo.

This is to support non-chrome repos in the bisect scripts.

R=hinoka@chromium.org, luqui@chromium.org
BUG=

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

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

10 days agoFix typo in git-footers docs.
mmoss@chromium.org [Tue, 9 Sep 2014 22:09:53 +0000 (22:09 +0000)]
Fix typo in git-footers docs.

R=luqui@chromium.org

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

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

10 days agoClear up some git-drover docs confusion.
mmoss@chromium.org [Tue, 9 Sep 2014 21:06:30 +0000 (21:06 +0000)]
Clear up some git-drover docs confusion.

TBR=iannucci@chromium.org

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

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

10 days agoFix gclient branch ref mangling and allow --force branch switches.
mmoss@chromium.org [Tue, 9 Sep 2014 18:23:39 +0000 (18:23 +0000)]
Fix gclient branch ref mangling and allow --force branch switches.

R=iannucci@chromium.org, maruel@chromium.org
BUG=410959

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

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

10 days agoMake check for dirty index work.
mmoss@chromium.org [Tue, 9 Sep 2014 16:57:26 +0000 (16:57 +0000)]
Make check for dirty index work.

Without --exit-code, diff-index always returns 0 and thus never throws
the exception for a dirty index.

R=iannucci@chromium.org

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

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

11 days agoAdd git cl lol.
maruel@chromium.org [Mon, 8 Sep 2014 22:58:00 +0000 (22:58 +0000)]
Add git cl lol.

Because everyone needs humour.

Fix a small bug in subcommands.py with undocumented commands.

R=stip@chromium.org
BUG=

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

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

11 days agoRun prune in git cache update bootstrap to remove loose objects
hinoka@chromium.org [Mon, 8 Sep 2014 21:40:50 +0000 (21:40 +0000)]
Run prune in git cache update bootstrap to remove loose objects

BUG=411236

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

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

11 days agoAdd pgp key for davidjames to repo.
szager@chromium.org [Mon, 8 Sep 2014 17:50:45 +0000 (17:50 +0000)]
Add pgp key for davidjames to repo.

This incorporates:

https://chromium-review.googlesource.com/#/c/216850

R=davidjames@chromium.org,petermayo@chromium.org
BUG=

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

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

11 days agoFix git-map-branches crashing on HEAD, and other minor quality-of-life
iannucci@chromium.org [Mon, 8 Sep 2014 02:12:24 +0000 (02:12 +0000)]
Fix git-map-branches crashing on HEAD, and other minor quality-of-life
improvements.

  * No longer crash on HEAD
  * Always correctly highlight lines based on hash-matching-ness
  * Only import git_cl if you want it (it can be slow)
  * Print a message when NO branches are found (instead of blank output)

R=calamity@chromium.org, jsbell@chromium.org
BUG=410353

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

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

12 days agoSkip tracking status in map-branches when -v flag is not supplied.
calamity@chromium.org [Mon, 8 Sep 2014 01:03:19 +0000 (01:03 +0000)]
Skip tracking status in map-branches when -v flag is not supplied.

This CL prevents map-branches from loading the tracking status when
the -v flag is not supplied. This prevents the vanilla map-branches
from taking a potentially long time to retrieve the tracking status.

BUG=410137

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

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

2 weeks agoAdd 'revert' example to git-drover docs.
mmoss@chromium.org [Sat, 6 Sep 2014 00:06:24 +0000 (00:06 +0000)]
Add 'revert' example to git-drover docs.

TBR=iannucci@chromium.org

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

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

2 weeks agoGrammar up.
thakis@chromium.org [Fri, 5 Sep 2014 21:33:23 +0000 (21:33 +0000)]
Grammar up.

BUG=
TBR=iannucci

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

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

2 weeks agoMake git cl format work on my Windows box.
thakis@chromium.org [Fri, 5 Sep 2014 18:54:22 +0000 (18:54 +0000)]
Make git cl format work on my Windows box.

For me, PATH was a unicode instead of a str for some reason, so things
failed with

D:\src\chromefetch\src>git cl format
Traceback (most recent call last):
  File "d:\src\depot_tools\git_cl.py", line 2821, in <module>
    sys.exit(main(sys.argv[1:]))
  File "d:\src\depot_tools\git_cl.py", line 2807, in main
    return dispatcher.execute(OptionParser(), argv)
  File "d:\src\depot_tools\subcommand.py", line 245, in execute
    return command(parser, args[1:])
  File "d:\src\depot_tools\git_cl.py", line 2768, in CMDformat
    stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
  File "d:\src\depot_tools\git_cl.py", line 81, in RunCommand
    return subprocess2.check_output(args, shell=False, **kwargs)
  File "d:\src\depot_tools\subprocess2.py", line 515, in check_output
    return check_call_out(args, stdout=PIPE, **kwargs)[0]
  File "d:\src\depot_tools\subprocess2.py", line 475, in check_call_out
    out, returncode = communicate(args, **kwargs)
  File "d:\src\depot_tools\subprocess2.py", line 449, in communicate
    proc = Popen(args, **kwargs)
  File "d:\src\depot_tools\subprocess2.py", line 237, in __init__
    super(Popen, self).__init__(args, **kwargs)
  File "d:\src\depot_tools\python276_bin\lib\subprocess.py", line 709, in __init__
    errread, errwrite)
  File "d:\src\depot_tools\python276_bin\lib\subprocess.py", line 957, in _execute_child
    startupinfo)
TypeError: environment can only contain strings
Sending crash report ...
  args: ['d:\\src\\depot_tools\\git_cl.py', 'format']
  cwd: D:\src\chromefetch\src
  exception: environment can only contain strings
  host: THAKIS1-W.ad.corp.google.com
  stack:   File "d:\src\depot_tools\git_cl.py", line 2821,
  user: thakis
  version: 2.7.6 (default, Nov 10 2013, 19:24:18)

This fixes the glitch.

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

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

2 weeks agoReturn 1 from git_cl land when you Ctrl-C it in the middle.
iannucci@chromium.org [Fri, 5 Sep 2014 18:25:51 +0000 (18:25 +0000)]
Return 1 from git_cl land when you Ctrl-C it in the middle.

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

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

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

2 weeks agoMake gn.py support root directories other than 'src'.
kjellander@chromium.org [Fri, 5 Sep 2014 12:40:28 +0000 (12:40 +0000)]
Make gn.py support root directories other than 'src'.

In https://codereview.chromium.org/341533006/ a change
was made so that gn.py is not looking for the .gn file
to identify the root of the checkout. This breaks
GN functionality for projects that uses gclient but
have a top directory named something else than 'src'.

This change adds support for arbitrarily named primary (the first)
solutions in the .gclient file.
It also adds a check for the generated GN path so a friendly
error message can be printed if the GN executable cannot be found.

BUG=389883
TESTED=Various cases of Chromium, WebRTC and custom checkouts
with .gclient containing empty solution list, solution missing the
'name' key and so on.

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

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

2 weeks agoMake git cache delete a defunct directory instead of moving it
hinoka@chromium.org [Fri, 5 Sep 2014 11:10:35 +0000 (11:10 +0000)]
Make git cache delete a defunct directory instead of moving it

So the original intention of moving it to a different directory to be deleted later
was to (1) save it for diagnosis (2) be a single inode swap rather than a long
rmtree delete.

1. No one is actually looking at these directories
2. The tmpdir sometimes end up on a different partition, so it ends up being
   a copy + delete instead.  Since we're not getting timeouts from that, its
   probably actually better to just straight up delete it.

BUG=410727

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

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

2 weeks agoAdd a --tbr-owners option to git cl upload
piman@chromium.org [Thu, 4 Sep 2014 02:16:55 +0000 (02:16 +0000)]
Add a --tbr-owners option to git cl upload

BUG=410125

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

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

2 weeks agoAdded git footers tool to parse conventional metadata from git commits
luqui@chromium.org [Wed, 3 Sep 2014 02:31:03 +0000 (02:31 +0000)]
Added git footers tool to parse conventional metadata from git commits

BUG=407316

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

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

2 weeks agoGive git map-branches extra information behind -v and -vv flags.
calamity@chromium.org [Wed, 3 Sep 2014 02:04:46 +0000 (02:04 +0000)]
Give git map-branches extra information behind -v and -vv flags.

This CL adds information to the git map-branches command. Invoking
it map-branches with -v, will show tracking status of branches and
invoking with -vv will additionally show the Rietveld URL and the
branch hash.

BUG=None

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

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

2 weeks agoRequire 'CHROME_HEADLESS' to use 'git-number'.
dnj@chromium.org [Tue, 2 Sep 2014 20:49:59 +0000 (20:49 +0000)]
Require 'CHROME_HEADLESS' to use 'git-number'.

Updated 'git-number' to produce an error message if it's run without the
CHROME_HEADLESS (bot) environment variable. This is intended to alert developers
who may be incorrectly using this tool to get positioning information instead of
the commit position.

BUG=409917
TEST=local
  - Ran with and without 'CHROME_HEADLESS'; observed the error message in the
    'without' case.

R=iannucci@chromium.org

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

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

3 weeks agoUse full hash in Committed link when closing issue via git-cl.
iannucci@chromium.org [Fri, 29 Aug 2014 23:51:37 +0000 (23:51 +0000)]
Use full hash in Committed link when closing issue via git-cl.

R=agable@chromium.org, vadimsh@chromium.org
BUG=

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

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

3 weeks agoRemove ilevy-cc from WATCHLIST, depot_tools edition :-(
thakis@chromium.org [Fri, 29 Aug 2014 23:09:12 +0000 (23:09 +0000)]
Remove ilevy-cc from WATCHLIST, depot_tools edition :-(

BUG=

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

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

3 weeks agoMake git-cl-{dcommit,land} fail if retcode is not zero after push.
iannucci@chromium.org [Fri, 29 Aug 2014 22:10:59 +0000 (22:10 +0000)]
Make git-cl-{dcommit,land} fail if retcode is not zero after push.

R=dnj@chromium.org, vadimsh@chromium.org
BUG=409170

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

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

3 weeks agoFix transient error regexes.
iannucci@chromium.org [Fri, 29 Aug 2014 22:10:55 +0000 (22:10 +0000)]
Fix transient error regexes.

R=agable@chromium.org, dnj@chromium.org, vadimsh@chromium.org
BUG=409167

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

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

3 weeks agoModify roll_dep's commit message
borenet@google.com [Fri, 29 Aug 2014 22:03:07 +0000 (22:03 +0000)]
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

3 weeks agoMake git-cl-land wait
iannucci@chromium.org [Fri, 29 Aug 2014 01:38:03 +0000 (01:38 +0000)]
Make git-cl-land wait

R=vadimsh@chromium.org
BUG=406198

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

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

3 weeks agoUpdate the Blink recipe to use 'webkit_revision' instead of 'webkit_rev'
philipj@opera.com [Thu, 28 Aug 2014 21:54:23 +0000 (21:54 +0000)]
Update the Blink recipe to use 'webkit_revision' instead of 'webkit_rev'

With the deletion of .DEPS.git, 'webkit_rev' became 'webkit_revision':
https://codereview.chromium.org/497313003

Without this change, gclient sync will not get the latest Blink commit.

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

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

3 weeks agoMake git-nav-downstream synchronous
asanka@chromium.org [Thu, 28 Aug 2014 00:25:22 +0000 (00:25 +0000)]
Make git-nav-downstream synchronous

Currently git-nav-downstream invokes 'git checkout' in a subprocess, but
exits without waiting for the checkout to complete. Instead wait for the
subprocess to complete.

BUG=376101

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

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

3 weeks agoAdd the patchset id to the manual commit messages
rmistry@google.com [Wed, 27 Aug 2014 14:44:41 +0000 (14:44 +0000)]
Add the patchset id to the manual commit messages

Context is here:
https://groups.google.com/a/chromium.org/d/msg/chromium-dev/M7f9VTqrR8w/RECOX2Y5YasJ

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

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

3 weeks agoRetry fetching patch from rietveld on a 404
hinoka@chromium.org [Wed, 27 Aug 2014 14:00:41 +0000 (14:00 +0000)]
Retry fetching patch from rietveld on a 404

Also added a tiny bit of exponential backoff.

BUG=375479

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

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

3 weeks agoRevert hard-coded src.git DEPS file name.
mmoss@chromium.org [Tue, 26 Aug 2014 23:24:09 +0000 (23:24 +0000)]
Revert hard-coded src.git DEPS file name.

This is breaking the ability to specify an alternate DEPS file, and do
things like sync release tags where DEPS is still from svn and we need
.DEPS.git to do a git checkout.

R=iannucci@chromium.org, szager@chromium.org
BUG=407049

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

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

3 weeks agoBe verbose about what's happening in 'git cl land' when pusing to pending ref.
vadimsh@chromium.org [Tue, 26 Aug 2014 21:57:53 +0000 (21:57 +0000)]
Be verbose about what's happening in 'git cl land' when pusing to pending ref.

Also reduce number of attempts and give up right away on ACL errors.

R=iannucci@chromium.org
BUG=407369,407470

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

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

3 weeks agoAdd some more context to git-drover tutorial.
mmoss@chromium.org [Mon, 25 Aug 2014 23:58:16 +0000 (23:58 +0000)]
Add some more context to git-drover tutorial.

BUG=407284
R=iannucci@google.com

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

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

3 weeks agoHave 'fetch chromium' set up with .DEPS.git to support recursion.
agable@chromium.org [Mon, 25 Aug 2014 20:48:07 +0000 (20:48 +0000)]
Have 'fetch chromium' set up with .DEPS.git to support recursion.

R=iannucci@chromium.org

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

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

3 weeks agoOnly clear cache locks if the cache exists.
dnj@chromium.org [Mon, 25 Aug 2014 19:17:12 +0000 (19:17 +0000)]
Only clear cache locks if the cache exists.

BUG=407259
TEST=None

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

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

3 weeks agodepot_tools: update cpplint.py to r137
avakulenko@google.com [Mon, 25 Aug 2014 16:26:18 +0000 (16:26 +0000)]
depot_tools: update cpplint.py to r137

Implements 'linelength' option in CPPLINT.cfg.
See:
https://code.google.com/p/google-styleguide/source/browse/trunk/cpplint/cpplint.py?r=137

BUG=None
TEST=None

Change-Id: I7b017078d997dfafc524a2f50a32289391d011f9

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

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

3 weeks agoEnsure deps_file=.DEPS.git in .gclient
szager@chromium.org [Sun, 24 Aug 2014 19:38:43 +0000 (19:38 +0000)]
Ensure deps_file=.DEPS.git in .gclient

R=agable@chromium.org,cmp@chromium.org
BUG=

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

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

3 weeks agoFix git cache unlock invocation to specify cache dir.
szager@chromium.org [Sun, 24 Aug 2014 19:16:31 +0000 (19:16 +0000)]
Fix git cache unlock invocation to specify cache dir.

TBR=cmp@chromium.org,agable@chromium.org
BUG=

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

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

3 weeks agoForce break git cache locks when CHROME_HEADLESS is set.
szager@chromium.org [Sun, 24 Aug 2014 18:56:32 +0000 (18:56 +0000)]
Force break git cache locks when CHROME_HEADLESS is set.

BUG=406669
R=dnj@chromium.org,agable@chromium.org

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

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

3 weeks agoDon't remove "'deps_file': '.DEPS.git'" for chromium/src
szager@chromium.org [Sun, 24 Aug 2014 18:41:38 +0000 (18:41 +0000)]
Don't remove "'deps_file': '.DEPS.git'" for chromium/src

BUG=406880
R=iannucci@chromium.org,cmp@chromium.org

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

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

3 weeks agoRemove the old cache dir before moving the bootstrapped cache dir into the real location
hinoka@chromium.org [Sun, 24 Aug 2014 12:09:13 +0000 (12:09 +0000)]
Remove the old cache dir before moving the bootstrapped cache dir into the real location

Seems like some combination of things (bad cache dir, shallow checkout, etc) causes
git cache to not clean up properly before trying to move new directory A into
already existing directory B.

So the logic is all there to detect that the cache is invalid, its just not
being cleaned up properly during shallow checkouts.

BUG=406864
TBR=iannucci

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

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

3 weeks agoFix git-cl when working on branches.
mmoss@chromium.org [Sun, 24 Aug 2014 01:41:11 +0000 (01:41 +0000)]
Fix git-cl when working on branches.

This updates various assumptions to coincide with how gclient fetches
branch-heads refs from chromium repos.

R=iannucci@google.com
BUG=406858

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

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

3 weeks agoFix gclient hook for stubborn hooks.
iannucci@chromium.org [Sat, 23 Aug 2014 03:44:18 +0000 (03:44 +0000)]
Fix gclient hook for stubborn hooks.

R=szager@chromium.org
BUG=

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

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

3 weeks agoDo threading.Lock the Right Way.
szager@chromium.org [Sat, 23 Aug 2014 03:33:28 +0000 (03:33 +0000)]
Do threading.Lock the Right Way.

R=cmp@chromium.org, dnj@chromium.org, iannucci@chromium.org
BUG=

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

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

3 weeks agoFix thread lock around cachepath access.
szager@chromium.org [Sat, 23 Aug 2014 02:35:23 +0000 (02:35 +0000)]
Fix thread lock around cachepath access.

R=cmp@chromium.org, agable@chromium.org
BUG=

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

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

3 weeks agoAdd thread locking around GetCachePath().
szager@chromium.org [Sat, 23 Aug 2014 01:57:59 +0000 (01:57 +0000)]
Add thread locking around GetCachePath().

BUG=406662
R=cmp@chromium.org, agable@chromium.org

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

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

4 weeks agoAuto-update .gclient files for git.
szager@chromium.org [Sat, 23 Aug 2014 00:57:31 +0000 (00:57 +0000)]
Auto-update .gclient files for git.

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

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

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

4 weeks agoMake fetch chromium operate in git-only mode.
agable@chromium.org [Sat, 23 Aug 2014 00:20:42 +0000 (00:20 +0000)]
Make fetch chromium operate in git-only mode.

DO NOT LAND until Flag Day.

R=stip@chromium.org
BUG=406165

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

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

4 weeks agoDon't freak out if 'ignore_locks' options is not set.
vadimsh@chromium.org [Fri, 22 Aug 2014 23:56:49 +0000 (23:56 +0000)]
Don't freak out if 'ignore_locks' options is not set.

BUG=406636
R=stip@chromium.org

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

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

4 weeks agoStop git cl using CQ_TRYBOTS.
jam@chromium.org [Fri, 22 Aug 2014 22:13:21 +0000 (22:13 +0000)]
Stop git cl using CQ_TRYBOTS.

This is broken for a few reasons (see bug for details). Also, this works automatically now with the analyze step.

This is a revert of r280039.

BUG=406238
R=iannucci@chromium.org, sky@chromium.org

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

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

4 weeks agoSometimes options won't have a 'shallow' field. Don't freak out.
szager@chromium.org [Fri, 22 Aug 2014 21:00:22 +0000 (21:00 +0000)]
Sometimes options won't have a 'shallow' field.  Don't freak out.

BUG=406535
R=stip@chromium.org,vadimsh@chromium.org

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

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

4 weeks agoUse a regex instead of shlex.split() to get remote url
hinoka@chromium.org [Fri, 22 Aug 2014 18:08:53 +0000 (18:08 +0000)]
Use a regex instead of shlex.split() to get remote url

shlex.spit(), in addition to doing str.split(' '), also strips out '\\'
from windows paths, which causes the cache_dir check to fail and Gclient to think
that we're not in cache_dir mode even if we are.

Instead of using shlex to strip data from a stdout log, I think regex is more
suited for this job.

BUG=405973

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

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

4 weeks agoTeach 'git cl land' to land to pending ref.
vadimsh@chromium.org [Fri, 22 Aug 2014 01:34:13 +0000 (01:34 +0000)]
Teach 'git cl land' to land to pending ref.

R=iannucci@chromium.org
BUG=404214

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

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

4 weeks agoDon't be pedantic about .gclient file for non-mutating commands.
szager@chromium.org [Thu, 21 Aug 2014 15:10:10 +0000 (15:10 +0000)]
Don't be pedantic about .gclient file for non-mutating commands.

This is primarily a hack to enable the chromeos ebuild.

BUG=367027
TBR=iannucci@chromium.org,mmoss@chromium.org

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

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

4 weeks agoAdd stub git-drover documentation.
mmoss@chromium.org [Wed, 20 Aug 2014 23:23:28 +0000 (23:23 +0000)]
Add stub git-drover documentation.

R=iannucci@google.com
BUG=261738

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

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

4 weeks agoOnly check for clean repos when not (--force or --reset).
iannucci@chromium.org [Wed, 20 Aug 2014 23:08:00 +0000 (23:08 +0000)]
Only check for clean repos when not (--force or --reset).

This allows cache_dir to be enabled on bots when the individual repo path has
changes (like android_tools, which has a bunch of generated, non-ignored .h
files)

R=agable@chromium.org, szager@chromium.org
BUG=

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

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

4 weeks agoFix manpage creation error.
mmoss@chromium.org [Wed, 20 Aug 2014 22:54:14 +0000 (22:54 +0000)]
Fix manpage creation error.

When running make_docs.sh, I get the error:
  asciidoc: FAILED: manpage document title is mandatory
  make: *** [git-cherry-pick-upload.xml] Error 1

I don't fully understand why, or why this hasn't come up before, but it
seems to be complaining about the formatting of "===" in
git-cherry-pick-upload.txt. This was with xmlto version 0.0.25 on
Precise.

R=iannucci@google.com

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

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

4 weeks agoHave git-cl try fail when used on a closed CL
agable@chromium.org [Wed, 20 Aug 2014 16:31:19 +0000 (16:31 +0000)]
Have git-cl try fail when used on a closed CL

R=phajdan.jr@chromium.org, rch@chromium.org

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

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

4 weeks agoAdd --with_tags to enable git tag fetching.
szager@chromium.org [Tue, 19 Aug 2014 22:49:16 +0000 (22:49 +0000)]
Add --with_tags to enable git tag fetching.

Needed for chromeos ebuild.

BUG=chromium:376027
R=mmoss@chromium.org,hinoka@chromium.org

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

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

4 weeks agoNon-destructive editing of git cache config.
szager@chromium.org [Tue, 19 Aug 2014 21:19:19 +0000 (21:19 +0000)]
Non-destructive editing of git cache config.

R=agable@chromium.org,iannucci@chromium.org
BUG=

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

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

4 weeks agoAdd expect_tests and testing_support to infra recipe.
iannucci@chromium.org [Sun, 17 Aug 2014 17:55:03 +0000 (17:55 +0000)]
Add expect_tests and testing_support to infra recipe.

For more better access :)

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

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

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

5 weeks agoDiscover git.bat even if git_cl.py is executed using relative path
techtonik@gmail.com [Fri, 15 Aug 2014 20:01:53 +0000 (20:01 +0000)]
Discover git.bat even if git_cl.py is executed using relative path

This allows git_cl.py to be used without adding depot_tools to PATH

BUG=
R=iannucci@chromium.org

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

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

5 weeks agoAuto find tryserver master for git cl try
sheyang@chromium.org [Thu, 14 Aug 2014 22:18:42 +0000 (22:18 +0000)]
Auto find tryserver master for git cl try

BUG=352461

TEST=local tests

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

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

5 weeks agoAllow chromium buildtools path to be overriden in the environment.
zturner@chromium.org [Wed, 13 Aug 2014 23:15:25 +0000 (23:15 +0000)]
Allow chromium buildtools path to be overriden in the environment.

This is useful in certain (admittedly unsupported) cases
when trying to use tools from depot_tools outside of a
chrome repository.  In this particular case, I was trying
to "git cl format" something that wasn't a chrome
repository.

BUG=0

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

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

5 weeks agowin: Add recipe to package Pro toolchain
scottmg@chromium.org [Tue, 12 Aug 2014 02:53:12 +0000 (02:53 +0000)]
win: Add recipe to package Pro toolchain

Previously https://codereview.chromium.org/284663003/, this was done
manually. This script attempts to automates that manual process.

R=iannucci@chromium.org
BUG=402543

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

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

5 weeks agoUpdate cpplint.py to r136.
avakulenko@google.com [Mon, 11 Aug 2014 20:20:55 +0000 (20:20 +0000)]
Update cpplint.py to r136.

The only difference compared to upstream[1] is the shebang line from
depot_tools.

[1] https://code.google.com/p/google-styleguide/source/browse/trunk/cpplint/cpplint.py?r=136

BUG=None

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

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

6 weeks agoAdded hyphen-only options
pgervais@chromium.org [Fri, 8 Aug 2014 15:52:33 +0000 (15:52 +0000)]
Added hyphen-only options

Some options have words separated by underscores. Added options with
same name and underscores replaced by hyphens.

BUG=400953

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

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

6 weeks agoChange chromium fetch spec to use master as the git-svn ref.
iannucci@chromium.org [Fri, 8 Aug 2014 02:34:11 +0000 (02:34 +0000)]
Change chromium fetch spec to use master as the git-svn ref.

R=vadimsh@chromium.org
BUG=366924

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

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

6 weeks agoAdded support for relative paths for the .gclient cache_dir field.
dyen@chromium.org [Thu, 7 Aug 2014 21:41:37 +0000 (21:41 +0000)]
Added support for relative paths for the .gclient cache_dir field.

R=iannucci@chromium.org
BUG=None
TEST=gclient sync with a relative and absolute "cache_dir"

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

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

6 weeks agoAdd 'git cache fetch' subcommand.
szager@chromium.org [Thu, 7 Aug 2014 21:02:36 +0000 (21:02 +0000)]
Add 'git cache fetch' subcommand.

If you're in a git checkout cloned from the git cache, this will:
  - Update the cache with the latest upstream commits.
  - Update the cwd with the latest commits from the cache.

For example:

> cd $HOME/workspace/chromium/src
> git cache fetch

R=agable@chromium.org,iannucci@chromium.org
BUG=

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

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

6 weeks agoMake fetch help display all known recipes.
iannucci@chromium.org [Wed, 6 Aug 2014 19:47:54 +0000 (19:47 +0000)]
Make fetch help display all known recipes.

R=agable@chromium.org
BUG=366884

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

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

6 weeks agoReland: Add --no-history option to fetch and gclient for shallow clones.
primiano@chromium.org [Wed, 6 Aug 2014 17:18:18 +0000 (17:18 +0000)]
Reland: Add --no-history option to fetch and gclient for shallow clones.

Original CL: https://codereview.chromium.org/440263002/

Many people* have complained on chromium-dev about the long times
required to perform a full fetch over a DSL. This seems to be mostly
due to the huge size of chromium's history (~9 GB). On the other side,
not everybody is interested in downloading the full git history of
the projects. The size of git packs required to fetch a working HEAD
is one order of magnitude smaller (1.5 GB).
This change makes it possible to perform a shallow fetch (in a way
which is consistent with DEPS, leveraging git templates on clone),
reducing fetch times by 80% for those not interested in the history.

* See:
[chromium-dev] "fetch chromium" keeps hanging/getting stuck on Windows 7
[chromium-dev] Initial checkout with git taking long
[chromium-dev] Trying to get latest source code fails when fetching
[chromium-dev] Gclient sync takes too long

BUG=228996
TBR=iannucci@chromium.org,szager@chromium.org,wtc@chromium.org

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

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

6 weeks agoRevert of Add --no-history option to fetch and gclient for shallow clones. (https...
primiano@chromium.org [Tue, 5 Aug 2014 23:19:29 +0000 (23:19 +0000)]
Revert of Add --no-history option to fetch and gclient for shallow clones. (https://codereview.chromium.org/437903002/)

Reason for revert:
Broke the WebRTC waterfall:
http://build.chromium.org/p/tryserver.webrtc/builders/win/builds/3958/steps/gclient%20revert/logs/stdio

Original issue's description:
> Add --no-history option to fetch and gclient for shallow clones.
>
> Many people* have complained on chromium-dev about the long times
> required to perform a full fetch over a DSL. This seems to be mostly
> due to the huge size of chromium's history (~9 GB). On the other side,
> not everybody is interested in downloading the full git history of
> the projects. The size of git packs required to fetch a working HEAD
> is one order of magnitude smaller (1.5 GB).
> This change makes it possible to perform a shallow fetch (in a way
> which is consistent with DEPS, leveraging git templates on clone),
> reducing fetch times by 80% for those not interested in the history.
>
> * See:
> [chromium-dev] "fetch chromium" keeps hanging/getting stuck on Windows 7
> [chromium-dev] Initial checkout with git taking long
> [chromium-dev] Trying to get latest source code fails when fetching
> [chromium-dev] Gclient sync takes too long
>
> BUG=228996
>
> Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=287606

TBR=iannucci@chromium.org,szager@chromium.org,wtc@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=228996

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

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

6 weeks agoWhen getting content for a moved file w/ history, don't convert newlines in output...
jrobbins@chromium.org [Tue, 5 Aug 2014 22:19:09 +0000 (22:19 +0000)]
When getting content for a moved file w/ history, don't convert newlines in output of 'git show'

BUG=339068

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

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

6 weeks agoAdd --no-history option to fetch and gclient for shallow clones.
primiano@chromium.org [Tue, 5 Aug 2014 21:50:44 +0000 (21:50 +0000)]
Add --no-history option to fetch and gclient for shallow clones.

Many people* have complained on chromium-dev about the long times
required to perform a full fetch over a DSL. This seems to be mostly
due to the huge size of chromium's history (~9 GB). On the other side,
not everybody is interested in downloading the full git history of
the projects. The size of git packs required to fetch a working HEAD
is one order of magnitude smaller (1.5 GB).
This change makes it possible to perform a shallow fetch (in a way
which is consistent with DEPS, leveraging git templates on clone),
reducing fetch times by 80% for those not interested in the history.

* See:
[chromium-dev] "fetch chromium" keeps hanging/getting stuck on Windows 7
[chromium-dev] Initial checkout with git taking long
[chromium-dev] Trying to get latest source code fails when fetching
[chromium-dev] Gclient sync takes too long

BUG=228996

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

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

7 weeks agoAdd comment with svn revision number.
szager@chromium.org [Fri, 1 Aug 2014 18:53:45 +0000 (18:53 +0000)]
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

7 weeks agoDo not put an 'r' in front of the revision when commenting on Rietveld after committing.
rsesek@chromium.org [Fri, 1 Aug 2014 01:06:24 +0000 (01:06 +0000)]
Do not put an 'r' in front of the revision when commenting on Rietveld after committing.

When using `git cl land` this would result in r<hash>, which is not desirable.

R=maruel@chromium.org

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

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

7 weeks agoMake “git cl land” handle core.abbrev > 7.
mark@chromium.org [Thu, 31 Jul 2014 17:09:36 +0000 (17:09 +0000)]
Make “git cl land” handle core.abbrev > 7.

This also fixes the confusing help message that appears when using “git
cl dcommit” in a git project. “git cl push” was totally removed in
abbaa843f4ad.

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

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

7 weeks agoAdd git cherry picking extension
smut@google.com [Tue, 29 Jul 2014 19:01:13 +0000 (19:01 +0000)]
Add git cherry picking extension

This extension uploads a fake cherry pick-style diff to rietveld with a modified project parameter. The modified project is intended to be used by the commit queue to attempt to land the change on a branch.

This works by grabbing the parent of the targeted revision and generating the diff. It is intended to be used to CQ trivial cherry picks which apply cleanly on top of other branches without conflicts.

BUG=387111

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

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

7 weeks agoUpdate git cl try command to mention tryserver.chromium.linux.
sergeyberezin@chromium.org [Tue, 29 Jul 2014 17:17:20 +0000 (17:17 +0000)]
Update git cl try command to mention tryserver.chromium.linux.

This is a purely cosmetic CL.

R=agable@chromium.org
BUG=395196

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

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

7 weeks agodepot_tools: modify cpplint.py to allow CPPLINT.cfg overrides
avakulenko@google.com [Mon, 28 Jul 2014 22:13:33 +0000 (22:13 +0000)]
depot_tools: modify cpplint.py to allow CPPLINT.cfg overrides

Added the ability to provide CPPLINT.cfg files to provide
linter message filters per sub-directory and special exclusion
rules. Each file can have instructions like:

filter=-build/include_order,+build/include_alpha
exclude_files=.*\.cc

The above disables build/include_order warning and enables
build/include_alpha as well as excludes all .cc from being
processed by linter, in the current directory (where the .cfg
file is located) and all sub-directories.

Related CL: https://chromium-review.googlesource.com/#/c/209384/

BUG=chromium:395296
TEST=ran cpplint.py on a bunch of directories in platform2/

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

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

7 weeks agoAdded 'git-retry' bootstrap
dnj@chromium.org [Mon, 28 Jul 2014 17:39:08 +0000 (17:39 +0000)]
Added 'git-retry' bootstrap

Added the 'git-retry' bootstrap command. This can be used to wrap other 'git'
commands around a fault-tolerant retry wrapper.

BUG=295109
TEST=localtest
R=iannucci@chromium.org, petermayo@chromium.org

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

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

7 weeks agoRevert 284349 "Add winrt to the INCLUDE directories of the toolc..."
scottmg@chromium.org [Mon, 28 Jul 2014 16:42:14 +0000 (16:42 +0000)]
Revert 284349 "Add winrt to the INCLUDE directories of the toolc..."

Sorry, I screwed up. This breaks Express-only per skia:2781. I'll reland it before I push the next VS update.

> Add winrt to the INCLUDE directories of the toolchain bundler.
>
> The motivation is that vcvarsall sets it, and that it might make it possible to
> land https://codereview.chromium.org/405723002/ one day.
>
> BUG=395405
> TBR=jochen
>
> Review URL: https://codereview.chromium.org/393233004

TBR=thakis@chromium.org

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

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

7 weeks agoDo not fetch the CL description when using git cl status --fast.
maruel@chromium.org [Mon, 28 Jul 2014 15:37:55 +0000 (15:37 +0000)]
Do not fetch the CL description when using git cl status --fast.

This causes a network I/O, which is not fast. Also this is a non-starter in the
case of no network connectivity, causing a crash instead of completing
successfully. Until Air Canada provides on-flight internet, this is a
non-starter. #firstworldproblem.

Also fix git cl presubmit in case of lack of network connectivity.

R=stip@chromium.org
BUG=

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

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

7 weeks agoAdd exception for long url(..) lines in css files in presubmit_canned_checks.CheckLon...
treib@chromium.org [Mon, 28 Jul 2014 14:23:11 +0000 (14:23 +0000)]
Add exception for long url(..) lines in css files in presubmit_canned_checks.CheckLongLines

BUG=397508

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

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

8 weeks agoRemoved git cl push command
pgervais@chromium.org [Fri, 25 Jul 2014 14:30:33 +0000 (14:30 +0000)]
Removed git cl push command

The user message says the subcommand will stop working on July 1.

BUG=

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

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

8 weeks agoFix off-by-one error in gclient progress indicator.
szager@chromium.org [Fri, 25 Jul 2014 00:28:06 +0000 (00:28 +0000)]
Fix off-by-one error in gclient progress indicator.

BUG=368673
R=iannucci@chromium.org,cmp@chromium.org

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

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

8 weeks agoRemove confirmation from git cl land.
maruel@chromium.org [Wed, 23 Jul 2014 23:05:07 +0000 (23:05 +0000)]
Remove confirmation from git cl land.

It serves no purpose, and it's annoying when the presubmit checks take more than
2-3 seconds because I always switch off to another window, so I come back
minutes later seeing this prompt waiting for me.

R=stip@chromium.org
BUG=

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

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

2 months agoAdd winrt to the INCLUDE directories of the toolchain bundler.
thakis@chromium.org [Sat, 19 Jul 2014 22:20:37 +0000 (22:20 +0000)]
Add winrt to the INCLUDE directories of the toolchain bundler.

The motivation is that vcvarsall sets it, and that it might make it possible to
land https://codereview.chromium.org/405723002/ one day.

BUG=395405
TBR=jochen

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

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

2 months agoGit Cache speculative fix for windows
hinoka@chromium.org [Sat, 19 Jul 2014 01:23:45 +0000 (01:23 +0000)]
Git Cache speculative fix for windows

Git cache sometimes fail on:
Traceback (most recent call last):
  File "E:\b\depot_tools\\gclient.py", line 2064, in <module>
    sys.exit(Main(sys.argv[1:]))
  File "E:\b\depot_tools\\gclient.py", line 2052, in Main
    return dispatcher.execute(OptionParser(), argv)
  File "E:\b\depot_tools\subcommand.py", line 245, in execute
    return command(parser, args[1:])
  File "E:\b\depot_tools\\gclient.py", line 1830, in CMDsync
    ret = client.RunOnDeps('update', args)
  File "E:\b\depot_tools\\gclient.py", line 1342, in RunOnDeps
    work_queue.flush(revision_overrides, command, args, options=self._options)
  File "E:\b\depot_tools\gclient_utils.py", line 852, in flush
    self._run_one_task(self.queued.pop(i), args, kwargs)
  File "E:\b\depot_tools\gclient_utils.py", line 944, in _run_one_task
    task_item.run(*args, **kwargs)
  File "E:\b\depot_tools\\gclient.py", line 744, in run
    file_list)
  File "E:\b\depot_tools\gclient_scm.py", line 160, in RunCommand
    return getattr(self, command)(options, args, file_list)
  File "E:\b\depot_tools\gclient_scm.py", line 387, in update
    self._UpdateMirror(mirror, options)
  File "E:\b\depot_tools\gclient_scm.py", line 802, in _UpdateMirror
    ignore_lock=options.ignore_locks)
  File "E:\b\depot_tools\git_cache.py", line 409, in populate
    os.rename(tempdir, self.mirror_path)
WindowsError: [Error 183] Cannot create a file when that file already exists

It would appear that its being racy, but otherwise it doesn't make any sense.  A theory
is that this could be running twice and stepping on each other.  Allowing this
to pass on OSError allows us to test this theory.

BUG=395333

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

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

2 months agoAdd fetch recipe for the open source infra repo.
agable@chromium.org [Sat, 19 Jul 2014 00:26:01 +0000 (00:26 +0000)]
Add fetch recipe for the open source infra repo.

R=iannucci@chromium.org, primiano@chromium.org

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

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

2 months agoConvert recursedeps test syntax to list literal.
cmp@chromium.org [Thu, 17 Jul 2014 19:15:40 +0000 (19:15 +0000)]
Convert recursedeps test syntax to list literal.

This will remove a Python 2.7 dependency from the tests.

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

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

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

2 months agoUpdate recursedeps to support use_relative_path.
cmp@chromium.org [Wed, 16 Jul 2014 19:48:54 +0000 (19:48 +0000)]
Update recursedeps to support use_relative_path.

Also cast recursedeps to a set.  We'll continue
to support using a list literal form in DEPS for
now.

R=iannucci@chromium.org,agable@chromium.org
BUG=393000

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

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