Commit Graph

2664 Commits (d6d15b8e29d85f898388d521b919231df278df54)
 

Author SHA1 Message Date
iannucci@chromium.org bbe9cc5aa8 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
11 years ago
kjellander@chromium.org f7facfab38 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
11 years ago
hinoka@chromium.org 42f9adffd3 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
11 years ago
piman@chromium.org 336f9125c0 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
11 years ago
luqui@chromium.org 0b88762379 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
11 years ago
calamity@chromium.org 9d2c880e98 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
11 years ago
dnj@chromium.org e57a6ebed7 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
11 years ago
iannucci@chromium.org 34504a15bb 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
11 years ago
thakis@chromium.org 2c35e96f9f 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
11 years ago
iannucci@chromium.org 6c217b1fd6 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
11 years ago
iannucci@chromium.org 6e95d401c5 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
11 years ago
borenet@google.com 8eec89c2f8 Modify roll_dep's commit message
This conforms to the convention of using a single-line short description
followed by an empty line followed by a long description. Shortened the
revisions to more easily fit on one line.

BUG=408700

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@291743 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
iannucci@chromium.org e6896b5818 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
11 years ago
philipj@opera.com acca42eb61 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
11 years ago
asanka@chromium.org 39e72a4411 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
11 years ago
rmistry@google.com 52d224a24e 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
11 years ago
hinoka@chromium.org d612e4938a 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
11 years ago
mmoss@chromium.org 8f93f79bce 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
11 years ago
vadimsh@chromium.org 749fbd9a50 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
11 years ago
mmoss@chromium.org a2e54c17a5 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
11 years ago
agable@chromium.org 19f1c459ce 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
11 years ago
dnj@chromium.org b682b3e514 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
11 years ago
avakulenko@google.com 68a4fa6a7d 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
11 years ago
szager@chromium.org 808bcfbad4 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
11 years ago
szager@chromium.org 4848fb62cc 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
11 years ago
szager@chromium.org caf5bef484 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
11 years ago
szager@chromium.org 162183be0d 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
11 years ago
hinoka@chromium.org a5cda1e5db 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
11 years ago
mmoss@chromium.org e75854552e 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
11 years ago
iannucci@chromium.org c7c41681a1 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
11 years ago
szager@chromium.org 84c560061d 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
11 years ago
szager@chromium.org c532504d17 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
11 years ago
szager@chromium.org 1132f5f896 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
11 years ago
szager@chromium.org 7b8b6dee5b 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
11 years ago
agable@chromium.org beea0b0c38 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
11 years ago
vadimsh@chromium.org 3fd325b2f0 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
11 years ago
jam@chromium.org 82114c0092 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
11 years ago
szager@chromium.org 3ec84f61ea 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
11 years ago
hinoka@chromium.org fa2b9b4f85 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
11 years ago
vadimsh@chromium.org 566a02afb9 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
11 years ago
szager@chromium.org 5273b8a2ad 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
11 years ago
mmoss@chromium.org 62e41c3487 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
11 years ago
iannucci@chromium.org 785142189e 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
11 years ago
mmoss@chromium.org 3ce636bc5d 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
11 years ago
agable@chromium.org 787e306103 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
11 years ago
szager@chromium.org 8d3348fc7a 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
11 years ago
szager@chromium.org 965c44f41c 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
11 years ago
iannucci@chromium.org 885361a676 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
11 years ago
techtonik@gmail.com a5a945a18d 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
11 years ago
sheyang@chromium.org 2b34d558ba 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
11 years ago