Commit Graph

2440 Commits (4848fb62cc77894a1890f48664a7aaf4d0587297)
 

Author SHA1 Message Date
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
zturner@chromium.org 0db9a14294 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
11 years ago
scottmg@chromium.org 64e04008fd 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
11 years ago
avakulenko@google.com 59146756b6 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
11 years ago
pgervais@chromium.org b9f2751b87 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
11 years ago
iannucci@chromium.org 49f859c005 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
11 years ago
dyen@chromium.org d915ccadcb 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
11 years ago
szager@chromium.org f314511616 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
11 years ago
iannucci@chromium.org cc2d3e3147 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
11 years ago
primiano@chromium.org 5439ea5996 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
11 years ago
primiano@chromium.org 69177ea3ba 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
11 years ago
jrobbins@chromium.org e1623bbab3 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
11 years ago
primiano@chromium.org 107bca31f6 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
11 years ago
szager@chromium.org 9e43b8b7ea Add comment with svn revision number.
R=iannucci@chromium.org,hinoka@chromium.org,mark@chromium.org
BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@287057 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
rsesek@chromium.org 27b15a3447 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
11 years ago
mark@chromium.org 671c7a3b9d 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
abbaa843f4.

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
11 years ago
smut@google.com cd1e3d4092 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
11 years ago
sergeyberezin@chromium.org fbfecb72a5 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
11 years ago
avakulenko@google.com 174499398f 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
11 years ago
dnj@chromium.org de219ec51d 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
11 years ago
scottmg@chromium.org b8e529fae4 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
11 years ago
maruel@chromium.org 85616e0e66 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
11 years ago
treib@chromium.org de3ee9016f 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
11 years ago
pgervais@chromium.org abbaa843f4 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
11 years ago
szager@chromium.org e98e04cb6b 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
11 years ago