chromium/tools/depot_tools.git
20 hours agoRemove confirmation from git cl land. master
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

4 days 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

5 days 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

5 days 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

7 days 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

7 days 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

8 days agoAdd CanAccessToolchainBucket() to ways to use GStorage.
liamjm@chromium.org [Tue, 15 Jul 2014 20:37:53 +0000 (20:37 +0000)]
Add CanAccessToolchainBucket() to ways to use GStorage.
This allows Googlers who didn't pass existing checks to use G storage and
the Pro version of Visual studio.

BUG=
TBR=maruel

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

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

2 weeks agoRoll windows git binary package up to v6 everywhere.
iannucci@chromium.org [Tue, 8 Jul 2014 22:03:31 +0000 (22:03 +0000)]
Roll windows git binary package up to v6 everywhere.

Thus solving the sh.exe problem once and for all...

R=hinoka@google.com, hinoka@chromium.org
BUG=383455, 241556, 389361, 380958

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

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

2 weeks agoBump git bleeding edge up to 6.
iannucci@chromium.org [Tue, 8 Jul 2014 02:53:17 +0000 (02:53 +0000)]
Bump git bleeding edge up to 6.

This includes the new (fast) custom sh.exe/bash.exe/msys-1.0.dll.

R=hinoka@google.com, hinoka@chromium.org
BUG=383455,241556,389361,380958

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

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

2 weeks agoRevert of Consolidated 'git' refish parsing into a class (https://codereview.chromium...
smut@google.com [Mon, 7 Jul 2014 19:35:18 +0000 (19:35 +0000)]
Revert of Consolidated 'git' refish parsing into a class (https://codereview.chromium.org/328843005/)

Reason for revert:
https://code.google.com/p/chromium/issues/detail?id=391871

Original issue's description:
> Consolidated 'git' refish parsing into a class
>
> Created the 'GitRefish' class to centralize 'git' refish parsing and consistent
> usage by 'gclient' 'git' code.
>
> BUG=373504
> TEST=localtest
> R=agable@chromium.org, iannucci@chromium.org
>
> Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=281553

TBR=dnj
BUG=391871

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

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

2 weeks agoConsolidated 'git' refish parsing into a class
dnj@chromium.org [Mon, 7 Jul 2014 17:08:48 +0000 (17:08 +0000)]
Consolidated 'git' refish parsing into a class

Created the 'GitRefish' class to centralize 'git' refish parsing and consistent
usage by 'gclient' 'git' code.

BUG=373504
TEST=localtest
R=agable@chromium.org, iannucci@chromium.org

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

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

2 weeks agoRevert of Allow git cl also in repos with read-only git-svn. (https://codereview...
bratell@opera.com [Mon, 7 Jul 2014 09:30:23 +0000 (09:30 +0000)]
Revert of Allow git cl also in repos with read-only git-svn. (https://codereview.chromium.org/344013005/)

Reason for revert:
Breaks WebRTC (and possibly other projects actually using https:// for svn access).

Original issue's description:
> Allow git cl also in repos with read-only git-svn.
>
> If you have read-only git-svn git cl would still try
> to use svn commands, which would then fail. This
> changes git cl to only use git-svn if the remote
> svn repository use the svn:// protocol. It matches
> how chromium works and it allowed me to upload a patch.
>
> BUG=391430
>
> R=iannucci
>
> Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=281500

TBR=iannucci@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=391430

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

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

2 weeks agoAllow git cl also in repos with read-only git-svn.
bratell@opera.com [Mon, 7 Jul 2014 07:28:34 +0000 (07:28 +0000)]
Allow git cl also in repos with read-only git-svn.

If you have read-only git-svn git cl would still try
to use svn commands, which would then fail. This
changes git cl to only use git-svn if the remote
svn repository use the svn:// protocol. It matches
how chromium works and it allowed me to upload a patch.

BUG=391430

R=iannucci

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

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

3 weeks agoUpdate recurselist to be a set, call it recursedeps now.
cmp@chromium.org [Wed, 2 Jul 2014 23:20:08 +0000 (23:20 +0000)]
Update recurselist to be a set, call it recursedeps now.

Now that recurselist is no longer a list, it doesn't make
sense to call it recurselist.  recurseset is available, but
that's not as easy to read/say compared to recurselist.
Call this recursedeps, instead.

R=iannucci@chromium.org
BUG=390246

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

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

3 weeks agoChange clang_format.py to search for clang-format in buildtools
jochen@chromium.org [Wed, 2 Jul 2014 07:35:31 +0000 (07:35 +0000)]
Change clang_format.py to search for clang-format in buildtools

BUG=none
R=brettw@chromium.org,nick@chromium.org

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

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

3 weeks agoAdd fallback to DEPS from a missing deps file.
cmp@chromium.org [Wed, 2 Jul 2014 00:13:18 +0000 (00:13 +0000)]
Add fallback to DEPS from a missing deps file.

It's possible to tell gclient to use a different
"deps" file from the default DEPS through the "deps_file"
variable in the .gclient file.

If this file is missing, fallback to DEPS (the
default).

BUG=390700

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

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

3 weeks agoDon't pass in --revision into gclient sync on the DEPS sync in apply_issue.py if git
hinoka@chromium.org [Tue, 1 Jul 2014 18:48:28 +0000 (18:48 +0000)]
Don't pass in --revision into gclient sync on the DEPS sync in apply_issue.py if git

We changed apply_issue to stage the patch if its on git, so it doesn't make sense to pass in --revision because that causes gclient to run solutions in managed mode.

BUG=388374

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

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

3 weeks agoAdd recurselist DEPS var setting.
cmp@chromium.org [Mon, 30 Jun 2014 23:14:35 +0000 (23:14 +0000)]
Add recurselist DEPS var setting.

Previously, recursion overrides were only available by setting
a numeric 'depth' value in a DEPS file.  This meant that it
was not possible to control recursion per-dependency entry.

This change adds a recurselist variable with a list structure.
If a named dependency is present in the list, then gclient will
recurse into that dependency's DEPS.

As part of this change, I move the recursion controls off of
DependencySetting and onto Dependency.  The new setup of being
based on Dependency allows access to the dependency's name.

The controls are only called from Dependency instances.  They
have always needed access to self.parent (in the Dependency
context), so this should be more correct than the previous setup.

BUG=390246

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

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

3 weeks agoUpdate ninja to v1.5.1 on Mac, Linux32, Linux64, Windows.
thakis@chromium.org [Sat, 28 Jun 2014 00:00:36 +0000 (00:00 +0000)]
Update ninja to v1.5.1 on Mac, Linux32, Linux64, Windows.

See the bug for how these were built.

The linux binaries were built by thestig@chromium.org.
The windows binary was built by scottmg@chromium.org.
The mac binary was built by thakis@chromium.org

BUG=389683
TBR=maruel@chromium.org

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

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

3 weeks agoRevert r280425.
thakis@chromium.org [Fri, 27 Jun 2014 22:37:00 +0000 (22:37 +0000)]
Revert r280425.

Might have caused

ninja: error: '..\..\third_party\qunit\src', needed by 'remoting\unittests\qunit\src', missing and no known rule to make it

on the windows bots.

BUG=389683

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

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

3 weeks agoUpdate ninja to v1.5.0 on Mac, Linux32, Linux64, Windows.
thakis@chromium.org [Fri, 27 Jun 2014 22:04:30 +0000 (22:04 +0000)]
Update ninja to v1.5.0 on Mac, Linux32, Linux64, Windows.

See the bug for how these were built.

The linux binaries were built by thestig@chromium.org.
The windows binary was built by scottmg@chromium.org.
The mac binary was built by thakis@chromium.org

BUG=389683
R=maruel@chromium.org

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

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

3 weeks agoFix undefined default_config_path_bak in gsutil config.
dtu@chromium.org [Fri, 27 Jun 2014 19:55:54 +0000 (19:55 +0000)]
Fix undefined default_config_path_bak in gsutil config.

This is already fixed upstream in gsutil.

BUG=None.
TEST=None.

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

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

3 weeks agoHave git-gs search .gni files
jamesr@chromium.org [Fri, 27 Jun 2014 12:47:02 +0000 (12:47 +0000)]
Have git-gs search .gni files

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

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

3 weeks agoHave git cache bootstrap repo if repo is corrupt
hinoka@chromium.org [Thu, 26 Jun 2014 21:58:51 +0000 (21:58 +0000)]
Have git cache bootstrap repo if repo is corrupt

We're seeing fetches fail in interesting ways:
running "git fetch -v --progress origin +refs/heads/*:refs/heads/*" in "/mnt/scratch0/b_used/build/slave/cache_dir/chrome--internal.googlesource.com-chrome-src--internal"
error: object file ./objects/a1/4bd89aa4cc7d7bbad7594cba0ae73e99dbb54c is empty
error: object file ./objects/a1/4bd89aa4cc7d7bbad7594cba0ae73e99dbb54c is empty
fatal: loose object a14bd89aa4cc7d7bbad7594cba0ae73e99dbb54c (stored in ./objects/a1/4bd89aa4cc7d7bbad7594cba0ae73e99dbb54c) is corrupt
fatal: The remote end hung up unexpectedly

And then the cache becomes corrupted.  This blows the cache away if this happens.

BUG=261741

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

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

4 weeks agoMoved around pylint disable warning comments
martiniss@chromium.org [Thu, 26 Jun 2014 18:06:24 +0000 (18:06 +0000)]
Moved around pylint disable warning comments

BUG=

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

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

4 weeks agoAdded support for git cl upload automatic trybot determination.
martiniss@chromium.org [Thu, 26 Jun 2014 17:38:38 +0000 (17:38 +0000)]
Added support for git cl upload automatic trybot determination.

This is part of my intern project, which is detailed here:
  "https://docs.google.com/a/google.com/document/d/10bkzag1UUbtESPkEWHYaZtGMEEbCN5Zad72PuoRpwZE/edit#"

The idea is to have "git cl upload" annotate the CL description with a
flag like "CQ_TRYBOTS=...", which CQ will then look at to determine which
trybots to run the the given CL.

The CL for the change for CQ is at "https://chromereviews.googleplex.com/51757013/".

R=dpranke@google.com, iannucci@google.com
BUG=378097

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

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

4 weeks agoAdd PROJECT to tools
sheyang@google.com [Wed, 25 Jun 2014 22:52:32 +0000 (22:52 +0000)]
Add PROJECT to tools

BUG=374398
R=phajdan.jr@chromium.org

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

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

4 weeks agoAdded common git 'fetch' function
dnj@chromium.org [Wed, 25 Jun 2014 00:39:32 +0000 (00:39 +0000)]
Added common git 'fetch' function

Replaced multiple various invocations of 'git fetch' with calls to a common
fetch function.

BUG=373504
TEST=localtest

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

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

4 weeks agoShow an error message when the user tries to set the commit flag or add trybots to...
jrobbins@chromium.org [Tue, 24 Jun 2014 22:14:36 +0000 (22:14 +0000)]
Show an error message when the user tries to set the commit flag or add trybots to a private issue.

BUG=387088

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

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

4 weeks agoIncreased timeout for rietveld lint calls.
jrobbins@chromium.org [Tue, 24 Jun 2014 19:30:42 +0000 (19:30 +0000)]
Increased timeout for rietveld lint calls.

BUG=

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

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

4 weeks agoAdded common git 'checkout' function
dnj@chromium.org [Mon, 23 Jun 2014 22:42:51 +0000 (22:42 +0000)]
Added common git 'checkout' function

Replaced multiple various invocations of 'git checkout' with calls to a common
checkout function.

BUG=373504
TEST=localtest
R=agable@chromium.org, iannucci@chromium.org

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

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

4 weeks agoAdd option to gclient to ignore cache locks
hinoka@chromium.org [Mon, 23 Jun 2014 18:38:57 +0000 (18:38 +0000)]
Add option to gclient to ignore cache locks

BUG=261741

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

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

4 weeks agoMake gn wrapper use the one in buildtools rather than tools/gn/bin.
brettw@chromium.org [Mon, 23 Jun 2014 17:30:32 +0000 (17:30 +0000)]
Make gn wrapper use the one in buildtools rather than tools/gn/bin.

This updates some infrastructure to make it easy to get at the platform-specific build tools directories.

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

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

4 weeks agoAllow gclient sync to overwrite untracked files when moving detached git HEAD.
vadimsh@chromium.org [Fri, 20 Jun 2014 18:15:37 +0000 (18:15 +0000)]
Allow gclient sync to overwrite untracked files when moving detached git HEAD.

Do it only when both --force and --delete_unversioned_trees are specified.

BUG=386878
R=iannucci@chromium.org

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

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

4 weeks agoRemove hooks until Windows performance issues are sorted.
szager@chromium.org [Fri, 20 Jun 2014 15:55:01 +0000 (15:55 +0000)]
Remove hooks until Windows performance issues are sorted.

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

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

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

4 weeks agoAdd --ignore-lock option.
szager@chromium.org [Thu, 19 Jun 2014 21:22:43 +0000 (21:22 +0000)]
Add --ignore-lock option.

Unfortunately, the locking mechanism is still flaky on Windows.
bot_update.py will use this, since we can be certain that there
won't be overlapping access to the cache.

R=hinoka@google.com, agable@chromium.org, hinoka@chromium.org
BUG=

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

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

4 weeks agoDo not notify watchers about --private issues
jrobbins@chromium.org [Thu, 19 Jun 2014 21:11:46 +0000 (21:11 +0000)]
Do not notify watchers about --private issues

BUG=382297

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

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

5 weeks agoAllow pruning other files when uploading bootstrap tarball
hinoka@chromium.org [Wed, 18 Jun 2014 23:18:17 +0000 (23:18 +0000)]
Allow pruning other files when uploading bootstrap tarball

BUG=366748

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

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

5 weeks agoDon't os.listdir() on a non-existent dir (it raises).
szager@chromium.org [Wed, 18 Jun 2014 19:03:39 +0000 (19:03 +0000)]
Don't os.listdir() on a non-existent dir (it raises).

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

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

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

5 weeks agoRefactor cache-updating code to eliminate unnecessary fetches.
szager@chromium.org [Wed, 18 Jun 2014 00:52:25 +0000 (00:52 +0000)]
Refactor cache-updating code to eliminate unnecessary fetches.

This is an update of the following reverted change:

https://codereview.chromium.org/344443002/

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

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

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

5 weeks agoClean up temp dirs when breaking locks.
szager@chromium.org [Tue, 17 Jun 2014 18:26:24 +0000 (18:26 +0000)]
Clean up temp dirs when breaking locks.

A number of bots have been running out of disk space because they
are accumulating temp dirs and temp pack files.  Be more careful
to clean up temp dirs whenever UnlockAll() is called.

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

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

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

5 weeks agoRevert "If managed=False, don't fetch."
szager@chromium.org [Tue, 17 Jun 2014 15:06:05 +0000 (15:06 +0000)]
Revert "If managed=False, don't fetch."

This reverts commit 617a1617cff80653d989ffbba597d843d3728a35.

BUG=385417
TBR=hinoka@chromium.org,agable@chromium.org

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

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

5 weeks agoDo not assign revision when checking the commit existence.
halton.huo@intel.com [Tue, 17 Jun 2014 01:50:37 +0000 (01:50 +0000)]
Do not assign revision when checking the commit existence.

'git rev-parse <revision> will return same revision result with
newline appended if revision exists. The newline will cause the
following checkout command will fail, so remove the assignment.

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

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

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

5 weeks agoIf managed=False, don't fetch.
szager@chromium.org [Mon, 16 Jun 2014 23:12:28 +0000 (23:12 +0000)]
If managed=False, don't fetch.

This is an issue when bot_update.py is used, and a top-level
solution takes a long time to fetch.  Without this change, it will
be fetched twice.

managed=False really means 'hands off my checkout', so gclient
should honor that.

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

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

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

5 weeks agoTweak git gc settings, and periodically re-bootstrap.
szager@chromium.org [Mon, 16 Jun 2014 17:13:50 +0000 (17:13 +0000)]
Tweak git gc settings, and periodically re-bootstrap.

BUG=383455
R=hinoka@chromium.org,iannucci@chromium.org

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

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

5 weeks agoChanged backoff to be exponential. This will help to reduce apply_issue flakiness.
sergiyb@chromium.org [Fri, 13 Jun 2014 17:08:01 +0000 (17:08 +0000)]
Changed backoff to be exponential. This will help to reduce apply_issue flakiness.

BUG=373797
R=maruel@chromium.org

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

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

5 weeks agoCorrect remote URL when uploading from a repo cloned from a git_cache.
dyen@chromium.org [Fri, 13 Jun 2014 00:06:37 +0000 (00:06 +0000)]
Correct remote URL when uploading from a repo cloned from a git_cache.

R=bradnelson@google.com, hinoka@chromium.org
BUG=None

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

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

6 weeks agoRevert of scm.GIT.IsValidRevision: Only return True if the given object is a commit...
hinoka@google.com [Wed, 11 Jun 2014 22:14:35 +0000 (22:14 +0000)]
Revert of scm.GIT.IsValidRevision: Only return True if the given object is a commit (https://codereview.chromium.org/329823002/)

Reason for revert:
Speculative revert to see if this is the cause of auto_roll_test.py to fail in build/ presubmit.

Original issue's description:
> scm.GIT.IsValidRevision: Only return True if the given object is a commit
>
> BUG=383476
>
> Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=276487

TBR=iannucci@chromium.org,maruel@chromium.org,borenet@google.com
NOTREECHECKS=true
NOTRY=true
BUG=383476

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

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

6 weeks agoUpload project option in 'gcl' and 'git cl' uploading commands.
sheyang@chromium.org [Wed, 11 Jun 2014 21:37:49 +0000 (21:37 +0000)]
Upload project option in 'gcl' and 'git cl' uploading commands.

BUG=374398

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

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

6 weeks agoscm.GIT.IsValidRevision: Only return True if the given object is a commit
borenet@google.com [Wed, 11 Jun 2014 20:37:30 +0000 (20:37 +0000)]
scm.GIT.IsValidRevision: Only return True if the given object is a commit

BUG=383476

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

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

6 weeks agoMake fetch v8 work with the new branch
jochen@chromium.org [Wed, 11 Jun 2014 18:49:54 +0000 (18:49 +0000)]
Make fetch v8 work with the new branch

BUG=none
R=mmoss@chromium.org

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

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

6 weeks agoClean up temporary git pack files when breaking locks.
szager@chromium.org [Tue, 10 Jun 2014 23:40:46 +0000 (23:40 +0000)]
Clean up temporary git pack files when breaking locks.

When a git-cache operation is interrupted, it can leave behind large
temporary pack files.  Over time, these pack files will fill up
disks.

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

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

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

6 weeks agoConvenience tool for rolling git-style deps with an svn revision.
szager@chromium.org [Mon, 9 Jun 2014 23:43:33 +0000 (23:43 +0000)]
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

6 weeks agoHave git_cache print out download progress when bootstrapping the git cache
hinoka@chromium.org [Mon, 9 Jun 2014 23:34:35 +0000 (23:34 +0000)]
Have git_cache print out download progress when bootstrapping the git cache

BUG=261741,380958

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

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

6 weeks agoFixed bad arguments to gsutil
hinoka@chromium.org [Thu, 5 Jun 2014 21:19:38 +0000 (21:19 +0000)]
Fixed bad arguments to gsutil

boto is required.

BUG=261741
TBR=iannucci

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

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

6 weeks agoVerify our assumptions about SCM commands deleting files from checkout
phajdan.jr@chromium.org [Thu, 5 Jun 2014 20:33:37 +0000 (20:33 +0000)]
Verify our assumptions about SCM commands deleting files from checkout

BUG=131061

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

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

6 weeks agoFix for authenticating to internal repos
hinoka@chromium.org [Thu, 5 Jun 2014 20:20:03 +0000 (20:20 +0000)]
Fix for authenticating to internal repos

Last patch (https://codereview.chromium.org/313933005/) forgot to take into account using a boto file (setting boto to os.devnull
means connect unauthenticated, setting it to None will allow it to do the default
behavior)

This patch will always use a boto file, which should be fine.

BUG=261741

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

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

7 weeks agoAdd internal buckets for bootstrapping internal repos
hinoka@chromium.org [Thu, 5 Jun 2014 01:00:04 +0000 (01:00 +0000)]
Add internal buckets for bootstrapping internal repos

BUG=261741

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

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

7 weeks agoUpdate cpplint.py to r133.
avakulenko@google.com [Wed, 4 Jun 2014 22:55:20 +0000 (22:55 +0000)]
Update cpplint.py to r133.

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?spec=svn131&r=133

BUG=None

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

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

7 weeks agoImproved message when CL description is missing
pgervais@chromium.org [Tue, 3 Jun 2014 00:53:48 +0000 (00:53 +0000)]
Improved message when CL description is missing

'Add a description' is not enough to know what the test is about. Added
some more info.

BUG=

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

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

7 weeks agoBump version to 5 to clear out slow win7 git rollout.
iannucci@chromium.org [Mon, 2 Jun 2014 23:12:52 +0000 (23:12 +0000)]
Bump version to 5 to clear out slow win7 git rollout.

The previous rollout pushed the xp version of chromium git v4 to windows7. This rollout pushes the correct windows 7 version.

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

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

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

7 weeks agoCall _UpdateBranchHeads within _Clone.
mmoss@chromium.org [Mon, 2 Jun 2014 21:53:29 +0000 (21:53 +0000)]
Call _UpdateBranchHeads within _Clone.

This will avoid errors where _Clone is called for a new DEP, but where the DEP
refers to a branch commit, thus causing the clone to fail because it can't
checkout that commit (such as happens currently with 'fetch v8').

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

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

7 weeks agoInvoke the bash shell via /usr/bin/env so that these scripts run on operating systems...
r.c.ladan@gmail.com [Mon, 2 Jun 2014 20:39:42 +0000 (20:39 +0000)]
Invoke the bash shell via /usr/bin/env so that these scripts run on operating systems without /bin/bash too.

TEST=run "git cl owners" on FreeBSD
BUG=

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

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

7 weeks agoHandle the case of git cl lint when the CL is empty.
thestig@chromium.org [Fri, 30 May 2014 16:20:51 +0000 (16:20 +0000)]
Handle the case of git cl lint when the CL is empty.

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

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

7 weeks agoMinor fixes
pgervais@chromium.org [Fri, 30 May 2014 16:11:47 +0000 (16:11 +0000)]
Minor fixes

BUG=

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

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

7 weeks agoHandle branch or commit refs in the url for unmanaged git solutions
romain.pokrzywka@gmail.com [Fri, 30 May 2014 00:06:07 +0000 (00:06 +0000)]
Handle branch or commit refs in the url for unmanaged git solutions

This allows having a git repo cloned on a specific branch or commit, similar to
what's possible for svn solutions by specifying a url like svnrepo/branches/foo

Having the possibility to check the code out on a specific branch makes the
initial code checkout workflow simpler, and allows specifying all the relevant
info directly in the fetch recipe, instead of  having to deal with branches
manually afterwards (which is the whole purpose of recipes in the first place)

So with this change, I'm able to do the following in my custom fetch recipe:

    solution = {
        'name' : 'src',
        'url' : 'git@github.snei.sony.com:SNEI/chromium.git@refs/heads/custombranch',
        <following lines skipped>

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

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

7 weeks agoExplicitly print diff stats to sys.stdout, if possible.
szager@chromium.org [Thu, 29 May 2014 21:09:36 +0000 (21:09 +0000)]
Explicitly print diff stats to sys.stdout, if possible.

This makes it possible to effectively re-route the stdout by
re-assigning sys.stdout.

BUG=

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

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

8 weeks agoProvide diagnostic messages about netrc failures.
szager@chromium.org [Tue, 27 May 2014 18:55:52 +0000 (18:55 +0000)]
Provide diagnostic messages about netrc failures.

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

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

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

2 months agoAdd --quiet option.
szager@chromium.org [Fri, 23 May 2014 09:07:15 +0000 (09:07 +0000)]
Add --quiet option.

This is need, e.g., to suppress logging message for 'exists'.

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

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

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

2 months agoChanged error message on no auth in .netrc
nodir@chromium.org [Thu, 22 May 2014 22:18:16 +0000 (22:18 +0000)]
Changed error message on no auth in .netrc

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

2 months agoAdd a strict mode for gclient DEPS parsing, to enable saner parsing constraints.
iannucci@chromium.org [Thu, 22 May 2014 00:29:22 +0000 (00:29 +0000)]
Add a strict mode for gclient DEPS parsing, to enable saner parsing constraints.

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

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

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

2 months agoEnable --revision flag for all deps.
szager@chromium.org [Tue, 20 May 2014 04:43:47 +0000 (04:43 +0000)]
Enable --revision flag for all deps.

Currently, only top-level solutions may be pinned via --revision.  With this, we can:

gclient sync --revision src/third_party/WebKit@deadbeef

BUG=

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

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

2 months agoMake marked merge base invalid when the upstream changes.
iannucci@chromium.org [Fri, 16 May 2014 22:31:13 +0000 (22:31 +0000)]
Make marked merge base invalid when the upstream changes.

This should let the base marker transparently work with plain-old-git tools
which was the idea in the first place. Specifically `git branch -u` without a
corresponding rebase.

R=agable@chromium.org
BUG=373977

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

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

2 months agoUse `git rev-list A..B` to get the list of commits to be uploaded to Gerrit by git cl.
bauerb@chromium.org [Fri, 16 May 2014 09:22:09 +0000 (09:22 +0000)]
Use `git rev-list A..B` to get the list of commits to be uploaded to Gerrit by git cl.

BUG=374121

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

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

2 months agoRevert of use canonical base URL for projects (https://codereview.chromium.org/271703...
sheyang@chromium.org [Thu, 15 May 2014 20:43:05 +0000 (20:43 +0000)]
Revert of use canonical base URL for projects (https://codereview.chromium.org/271703010/)

Reason for revert:
CQ rejects all chromium projects because of this change.

Original issue's description:
> use canonical base URL for projects
>
> BUG=372645
> R=iannucci@chromium.org, sergeyberezin@chromium.org
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=270460

TBR=iannucci@chromium.org,sergeyberezin@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=372645

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

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

2 months agoMake git_map properly update merge base markers.
iannucci@chromium.org [Thu, 15 May 2014 03:16:10 +0000 (03:16 +0000)]
Make git_map properly update merge base markers.

R=agable@chromium.org
BUG=

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

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

2 months agoRecursively find all tests in a git repo.
agable@chromium.org [Thu, 15 May 2014 01:59:16 +0000 (01:59 +0000)]
Recursively find all tests in a git repo.

This method is necessary to allow good code organization (i.e., unittests live
adjacent to the source files they test) in the new infra.git repository.

R=maruel@chromium.org

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

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

2 months agoPass shallow flag through gclient to git_cache.py
hinoka@chromium.org [Thu, 15 May 2014 00:42:05 +0000 (00:42 +0000)]
Pass shallow flag through gclient to git_cache.py

BUG=261741

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

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

2 months agotrychange.py hotfix
nodir@chromium.org [Wed, 14 May 2014 21:22:48 +0000 (21:22 +0000)]
trychange.py hotfix

Should use e.message instead of e.reason, where e is an Exception

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

2 months agouse canonical base URL for projects
sheyang@google.com [Wed, 14 May 2014 20:03:55 +0000 (20:03 +0000)]
use canonical base URL for projects

BUG=372645
R=iannucci@chromium.org, sergeyberezin@chromium.org

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

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

2 months agoAdded Mirror.UnlockAll with logic fixes.
szager@chromium.org [Tue, 13 May 2014 21:27:46 +0000 (21:27 +0000)]
Added Mirror.UnlockAll with logic fixes.

BUG=

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

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

2 months agogclient: fix --delete_unversioned_trees bug
borenet@google.com [Tue, 13 May 2014 17:28:19 +0000 (17:28 +0000)]
gclient: fix --delete_unversioned_trees bug

This occurs for svn checkouts when the DEPS change from:
  third_party/skia/gyp
  third_party/skia/include
  third_party/skia/src
to:
  third_party/skia

First, gclient deletes/moves third_party/skia to make room for the new checkout.
When finished, it notices that the three subdirectories under skia are now
"unversioned" according to .gclient_entries, even though they are part of Skia
repo. On the bots, this causes them to be deleted.

There is a check to determine whether the thought-to-be unversioned directories
are actually subdirectories of another checkout, but it doesn't work in the svn
case because the check assumes that, if they are subdirectories of another
checkout, it must be an svn checkout. scm.GetCheckoutRoot() returns None
because it can't find an svn checkout containing those subdirectories. None is
not in gclient_entries, so the directories get deleted.

BUG=

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

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

2 months agoRenamed Tryjob label to Tryjob-Request
nodir@chromium.org [Tue, 13 May 2014 04:15:28 +0000 (04:15 +0000)]
Renamed Tryjob label to Tryjob-Request

Some users interpreted Tryjob=+1 as "passed a try job", so renaming this one
Assuming will never rename again.

R=kmg@chromium.org
BUG=369665

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

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

2 months agogerrit_util is aware of auth errors
nodir@chromium.org [Mon, 12 May 2014 20:31:32 +0000 (20:31 +0000)]
gerrit_util is aware of auth errors

gerrit_util raises GerritAuthenticationError with a nice message
suggesting to check the .netrc file.

R=szager@chromium.org, vadimsh@chromium.org
BUG=369512

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

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

2 months agoMake git-nav-downstream not print a stack if you Ctrl-C it.
iannucci@chromium.org [Sun, 11 May 2014 00:49:45 +0000 (00:49 +0000)]
Make git-nav-downstream not print a stack if you Ctrl-C it.

R=agable@chromium.org
BUG=

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

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

2 months agoDon't have checkout.py's git apply_patch fail when files don't match
hinoka@chromium.org [Sat, 10 May 2014 04:42:48 +0000 (04:42 +0000)]
Don't have checkout.py's git apply_patch fail when files don't match

The contract for apply_patch is that it applies a patch on top of something, and
it either all applies cleanly or it fails.  The something that is applied on can
be as clean or dirty without having apply_patch judge.  The particular failure
condition was that we want to patch DEPS first (into the index), do some stuff,
then apply another patch on top of that.  Apply_patch was failing because it
saw that there was a DEPS in the index already when it wasn't expecting one.

A fix that could've also worked is to run git diff --staged before applying the
patch, then subtract that list from found_files, but it still gets tricky then
because what if you want to apply an independent patch on top of
an already patched index?

Because apply_patch shouldn't need to be in the business of
keeping track of what the state of everything is like before and
after a patch (That's up to the patch application), the better thing would be to remove the assert
alltogether, and rely on "git apply" to complain if something doesn't apply.

BUG=370503
TBR=iannucci

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

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

2 months agoRe-land of have apply_patch.py/checkout.py stage git patches instead of committing...
hinoka@chromium.org [Sat, 10 May 2014 02:19:27 +0000 (02:19 +0000)]
Re-land of have apply_patch.py/checkout.py stage git patches instead of committing them

For a bot_update Git world, we don't really want to commit patches. Instead
we just want to leave them unstaged.

BUG=370503

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

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

2 months agoRevert of Have apply_patch.py/checkout.py stage git patches instead of committing...
hinoka@chromium.org [Sat, 10 May 2014 02:08:24 +0000 (02:08 +0000)]
Revert of Have apply_patch.py/checkout.py stage git patches instead of committing them (https://codereview.chromium.org/273543002/)

Reason for revert:
Borked all the tryjobs due to missing --base_ref, needed to land with https://codereview.chromium.org/273543002/

Original issue's description:
> Have apply_patch.py/checkout.py stage git patches instead of committing them
>
> For a bot_update Git world, we don't really want to commit patches.  Instead
> we just want to leave them unstaged.
>
> BUG=370503
> TEST=ran locally with and without flag
>
> Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=269468

TBR=maruel@chromium.org,agable@chromium.org,hinoka@google.com,iannucci@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=370503

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

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

2 months agoAdds url to gclient json (try 2)
hinoka@chromium.org [Sat, 10 May 2014 01:11:29 +0000 (01:11 +0000)]
Adds url to gclient json (try 2)

Reland of https://codereview.chromium.org/268373003/ with a fix (wraps the
url with str())
https://codereview.chromium.org/268393002/ (bot_update root@revision support) is dependent on this

BUG=370503
TEST= gclient sync --output-json ~/tmp/asdfasdf.json on both an SVN and Git checkout

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

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

2 months agoHave apply_patch.py/checkout.py stage git patches instead of committing them
hinoka@chromium.org [Sat, 10 May 2014 00:38:54 +0000 (00:38 +0000)]
Have apply_patch.py/checkout.py stage git patches instead of committing them

For a bot_update Git world, we don't really want to commit patches.  Instead
we just want to leave them unstaged.

BUG=370503
TEST=ran locally with and without flag

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

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

2 months agoUpdate cpplint.py to r119.
raphael.kubo.da.costa@intel.com [Fri, 9 May 2014 08:48:20 +0000 (08:48 +0000)]
Update cpplint.py to r119.

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

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

R=maruel@chromium.org
BUG=

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

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

2 months agoRemove git-cr{up,sync} and replace with informative shell script.
iannucci@chromium.org [Thu, 8 May 2014 21:59:48 +0000 (21:59 +0000)]
Remove git-cr{up,sync} and replace with informative shell script.

R=mmoss@chromium.org, szager@chromium.org
BUG=371421

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

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

2 months agoFix typo in push_to_gs.sh which causes incorrect upload.
iannucci@chromium.org [Thu, 8 May 2014 20:22:22 +0000 (20:22 +0000)]
Fix typo in push_to_gs.sh which causes incorrect upload.

R=vadimsh@chromium.org
BUG=

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

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

2 months agoMake git rebase-update more responsive.
iannucci@chromium.org [Thu, 8 May 2014 19:22:47 +0000 (19:22 +0000)]
Make git rebase-update more responsive.

Passes through git-fetch's output instead of buffering it.

R=djacques@chromium.org
TBR=agable@chromium.org
BUG=366375

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

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

2 months agoAdd fast --HEAD option to upstream-diff.
iannucci@chromium.org [Thu, 8 May 2014 19:20:10 +0000 (19:20 +0000)]
Add fast --HEAD option to upstream-diff.

This is useful for large repos (like src.git)

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

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

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

2 months agogclient: Actually move or delete mismatched checkouts
borenet@google.com [Wed, 7 May 2014 20:57:28 +0000 (20:57 +0000)]
gclient: Actually move or delete mismatched checkouts

Followup to https://codereview.chromium.org/189913020/ ("gclient: print a warning if a dep would get deleted or moved in the future")

BUG=skia:1638

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

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

2 months agoRevert "Adds url to gclient json"
szager@chromium.org [Wed, 7 May 2014 19:11:19 +0000 (19:11 +0000)]
Revert "Adds url to gclient json"

This reverts commit 2f2b0593e0d23dbb77efb9ffb634e87f5b1698c7.

Sample breakage:

http://build.chromium.org/p/chromium.chrome/builders/Google%20Chrome%20ChromeOS/builds/67372/steps/gclient%20sync/logs/stdio

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

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

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

2 months agoAdds url to gclient json
hinoka@chromium.org [Wed, 7 May 2014 18:44:19 +0000 (18:44 +0000)]
Adds url to gclient json

So that bot_update can use them to figure out which repo correspons to where.

BUG=370503

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

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

2 months agogit cl push -> git cl land
pgervais@chromium.org [Wed, 7 May 2014 17:04:03 +0000 (17:04 +0000)]
git cl push -> git cl land

BUG=

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

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

2 months agoFixed wrong test
pgervais@chromium.org [Wed, 7 May 2014 00:58:13 +0000 (00:58 +0000)]
Fixed wrong test

BUG=366554

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

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