Commit Graph

2156 Commits (a112f03fcf8f2e8b4119c5582b1ab0910f5f0ea4)
 

Author SHA1 Message Date
iannucci@chromium.org a112f03fcf Fix git_nav_downstream.py when origin/master is checked out.
Also fix missing copyright notices.

R=agable@chromium.org
BUG=261738

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@256777 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
tzik@chromium.org f204d4b81f Pass through "--filter" arguments from "git cl lint" to cpplint.py
Review URL: https://codereview.chromium.org/196943006

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@256776 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
stip@chromium.org 626e77d9d3 Make rietveld test work on port 10000.
depot_tools PRESUBMIT.py and tools/build PRESUBMIT.py both run on cq.golo.

If broken dev_appserver.py instances are left around, they will conflict with
master ports.

BUG=351926

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@256721 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
agable@chromium.org 7dc11449f0 Fix GitCheckout to be sane and use git-cache
The commit queue uses checkout.GitCheckout to manage the
local git repository. It resets it to a clean state,
commits patches locally, and pushes those changes to the
golden-source-of-truth repo.

This CL fixes the prepare() method to use the new git-cache
tool, and in the process makes it more consistent, more
readable, and more correct. It also makes minor changes to
other methods to bring them in line with the git-cache
approach.

R=iannucci@chromium.org, rmistry@chromium.org
BUG=261619

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@256681 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
agable@chromium.org 99f9c92f73 Accept remote urls as gospel in git_cache.
git_cache rewrites all urls to https://netloc/path when
setting them as remote urls. This doesn't work when the
remote is actually local on disk, and the "url" is a
/path/to/repo. This seems like an unlikely case, but it
is leveraged by testing, and it doesn't hurt to support
it, so now we do.

R=iannucci@chromium.org
BUG=261619

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@256386 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
iannucci@chromium.org 8bc9b5c101 Add git-map and git-map-branches to depot_tools.
git-map: Show your local repo's history in a pseudo-graphical format from the command line.

git-map-branches: Show the topology of all of your branches, and their upstream relationships.

git-nav-upstream: Navigate (checkout) to the upstream branch of the current branch.

git-nav-downstream: Navigate (checkout) to a downstream branch of the current branch. If there's more than one downstream branch, then present a menu to select which one you want.

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

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@256384 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
szager@chromium.org ab4d438e34 Don't use -rc versions of gerrit.
This is an emergency patch to avoid picking up the
upcoming 2.9-rc0 version of gerrit, which requires java 7
and will break the chromeos bots.

BUG=346369
R=davidjames@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@256378 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
thestig@chromium.org 16c319dd46 Validate input dates in my_reviews.py.
Review URL: https://codereview.chromium.org/194753007

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@256292 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
thestig@chromium.org 44202a28e9 Implement git cl lint.
Review URL: https://codereview.chromium.org/134223010

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@256289 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
iannucci@chromium.org f52a6053e6 Refactor the way that git executables are launched in depot tools.
This introduces python_git_runner.sh, and makes git-cl, git-cache, git-number,
and git-try use it.

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

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@256131 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
scottmg@chromium.org afc32ce3b6 Less attempted magic in pulling toolchain
- Don't try to wrap download_from_google_storage --config, instead just
request that the user runs it manually. (This is annoying either way
but making it magically run makes it less clear what's going on, and so
harder to debug when something goes wrong, per linked bug).

- Check that SHA1s are passed as expected on the command line in case
the script is run directly, rather than from gyp_chromium.

R=scherkus@chromium.org
BUG=349596

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@256049 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
thakis@chromium.org d0b0a5b08c Revert of Another attempt: gclient: delete mismatching checkouts (https://codereview.chromium.org/183283003/)
Reason for revert:
Broke `gclient sync` for me, failing with:

Error: 1> Can't update/checkout /Volumes/MacintoshHD2/src/chrome-git/src if an unversioned directory is present. Delete the directory and try again.


For someone else, it broke it with:

% gclient sync

________ unmanaged solution; skipping src

Error: Command svn info --xml returned non-zero exit status 1 in /Users/pawliger/chromium/src/.

<?xml version="1.0" encoding="UTF-8"?>

<info>

svn: E155007: '/Users/pawliger/chromium/src' is not a working copy

Original issue's description:
> Another attempt: gclient: delete mismatching checkouts
> 
> Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=255930

TBR=iannucci@chromium.org,szager@chromium.org,maruel@chromium.org,mmoss@chromium.org,borenet@google.com
NOTREECHECKS=true
NOTRY=true

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@256005 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
plundblad@chromium.org 0455ed572c git gs: search .json files as well.
R=maruel@chromium.org
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@255960 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
borenet@google.com 7ff04292ac Another attempt: gclient: delete mismatching checkouts
Review URL: https://codereview.chromium.org/183283003

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@255930 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
scottmg@chromium.org 0d23d776e8 Move Googlers to gs:// based toolchain pull
The gs:// download path is much faster. Move anyone who could have
access to gs://chrome-wintoolchain/ over to that for less pain.

The downside is that we have to prompt them to run
download_from_google_storage --config which people are going to
complain about, but I think this is a better experience overall.

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

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@255696 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
wittman@chromium.org 04d5a22ea9 Add git cl format --diff option to print format diff without modifying files
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@255667 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
scottmg@chromium.org 6352945d3d x86 binaries for 7z for win_toolchain
To allow toolchain script to run successfully on x86 hosts.

R=phajdan.jr@chromium.org
TBR=iannucci@chromium.org
BUG=349824

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@255641 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
scottmg@chromium.org 454f2ca9ed CHROME_HEADLESS is always Pro
Follow up to https://codereview.chromium.org/185423004/

The unzip is always Pro, and without setting this the data.json will
be getting the Express settings and so gyp will generate the wrong
project.

TBR=iannucci@chromium.org
BUG=323300

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@255378 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
hinoka@google.com b16a16551d Be more aggressive about breaking locks
There is an issue where:
1. Lock for asdf.git acquires, which creates asdf.lock
2. asdf.git is cloned into tmp_asdf.git
3. Buildbot crashes, because timeouts
4. neither asdf.lock or tmp_asdf.git/config.lock gets cleaned out on the next unlock.

This aims to fix this issue by aggressively unlocking everything it can find that
vaguely resembles a lock.

BUG=339171

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@255138 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
mdempsky@chromium.org d59e761ba8 Make missing PRESUBMIT.py warning consistent with others.
Review URL: https://codereview.chromium.org/188013003

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@255125 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
viettrungluu@chromium.org 5b9f90e592 Make toolchain2013.py work properly if there's a space in the temp path.
TBR=maruel@chromium.org
R=scottmg@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@254932 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
alokp@chromium.org f634964529 Fix presubmit checks when --trybot-json flag is specified.
Must change current working directory to the presubmit file's directory
to follow the contract of the presubmit scripts.

BUG=348691

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@254618 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
primiano@chromium.org 2ddad2c0e3 Fix the git-svn remote for the depot_tools and nacl recipes.
The depot_tools and nacl recipes aren't setting up git-svn
properly. There is no git-svn branch in the git mirror for
depot-tools and nacl, just master.
As a consequence "fetch depot-tools" ends up recreating all
the objects from svn taking much more time than it should.

BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@254506 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
scottmg@chromium.org 71756329cb Add toolchain simple mirror option used for bots
I tried a git-ish tree/blob model, but way too slow for a ton of files.
This maps easily on to the current way the tree is mapped, saves
temp space on bots (because the full isos aren't downloaded), and is
a lot faster too. It means we can pull old revisions too now.

TBR=iannucci@chromium.org
BUG=348350

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@254421 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
machenbach@chromium.org 58a69cbe01 Support multiple try masters when sending tries to rietveld.
BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@254321 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
hinoka@google.com 703fe5d2c3 Need to run git cache exists in a directory we know for sure that exists
We don't want to run it in the DEPS directory, which is apperently what
the default behavior is.

BUG=339171

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@254266 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
hinoka@google.com 267f33e6ad Make gclient_scm.py use cache_dir
Instead of having custom logic for dealing with cache directories, use
git_cache.py to populate caches.

Also fixes a bug in git_cache.py where it was looking for lockfiles in cwd rather than the cache dir.

Other changes:
* _Run now returns output.
* Always print to stdout in CheckCallAndFilterOutput, even if it gets a carriage return.  This is done because git progress report are carriage returns and not newlines and we don't want everything on the same line and not strip out the CRs.
* Removed members changed tests, its not very useful to know a new import is added.

BUG=339171

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@254248 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
tnagel@chromium.org a2aaa63f80 Minor fixes to help texts
It's not true (anymore?) that the number of SCM jobs for gclient sync equals the
number of cores, thus the new text is less specific.

BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@254242 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
scottmg@chromium.org c1abae1ec8 chmod +x 7z.dll and 7z.exe for cygwin
TBR=pkasting@chromium.org
BUG=323300

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@254042 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
hinoka@chromium.org fc330cb102 Add +refs/tags/*:refs/tags/* to git cache config
For some reason "--tags" wasn't working on some versions of git (pre-1.9)

BUG=339171

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@253929 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
agable@chromium.org c3553743cf Remove --update-shallow from git-cache.
R=hinoka@chromium.org
BUG=339171

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@253887 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
scottmg@chromium.org bd4dafb963 Make git non-interactive when checking for src-internal access
git sometimes blocks asking for a password. On a random machine that
didn't know anything about google/chromium, it failed immediately with

"fatal: could not read Username for 'https://chrome-internal.googlesource.com': No such file or directory"

but on my real machine w/o _netrc it blocks and wants this:

Username for 'https://chrome-internal.googlesource.com':
Password for 'https://chrome-internal.googlesource.com':

There's no --non-interactive unfortunately, it's supposed to magically
decide if it's connected to a tty and behave appropriately. It does
not, perhaps because of being wrapped in depot_tools .bat files,
perhaps an msysgit-port bug, perhaps being called from python. Anyway
https://github.com/bower/bower/issues/1009 had a magic incantation
that works for this case: 'true' is available in the msys
distribution.

R=iannucci@chromium.org
BUG=323300

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@253844 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
szager@chromium.org 6c2b49d392 Revert "Re-re-land gclient deletion of mismatching checkouts again"
This reverts commit 6ff5448534.

'fetch --nohooks chromium' is broken with this change.

BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@253640 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
borenet@google.com 6ff5448534 Re-re-land gclient deletion of mismatching checkouts again
Review URL: https://codereview.chromium.org/164053003

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@253616 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
scottmg@chromium.org 28974af759 Add some missing setlocals from various .bat files
Shell PATH was growing quite long in some cases.

R=gab@chromium.org, iannucci@chromium.org, johnw@chromium.org, maruel@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@253347 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
sergeyberezin@chromium.org 04bd6b16bd Incorrect SSLError attribute.
ssl.SSLError does NOT have 'reason' attribute. Use str() to get a
reliable string.

Fixed the silly bug in another CL: https://codereview.chromium.org/180273003/

The ssl.SSLError does NOT have attribute 'reason', and must use the
generic 'strerror' instead. This is what happens when I submit a CL
too fast...

BUG=346845
R=stip@chromium.org,maruel@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@253317 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
nick@chromium.org 8ca1aa3cd5 clang-format: Allow .proto files to be formatted (supported by an upcoming binary/script; this change is safe if you are running an older binary); remove warnings.
BUG=344916

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@253295 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
sergeyberezin@chromium.org 36bc38406a Handle SSL timeouts in Rietveld requests.
BUG=346845
R=maruel@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@253271 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
agable@chromium.org 5a306a2aa6 Create "git cache" command.
The git cache command is a central place to manage a machine's git cache.

It provides two subcommands:
* populate -- creates or updates the cache of a given repository
* exists -- prints the path to the cache of a repo, if it exists

Gclient, deps2git, bot_update, and any other tools that touch the cache will
be able to use this command to make sure that everyone is interacting with
the cache in the same way.

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

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@253007 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
scottmg@chromium.org b460ebe723 Don't have svn ls block waiting for password
If user is unauthenticated, svn ls would just hang waiting at
"Password for 'User':", now it'll correctly fail with
"svn: Can't get password".

R=iannucci@chromium.org
BUG=323300,346472

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@253004 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
scottmg@chromium.org 4a56efe4a5 Add some missing parts from MFC to toolchain
TBR=iannucci@chromium.org
BUG=345993

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@252757 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
scottmg@chromium.org 360f032356 Move data.json to win_toolchain to its abs paths aren't hashed
TBR=iannucci@chromium.org
BUG=323300

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@252737 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
hinoka@google.com be6b308fa8 Instead of passing --author, lets just set the name/email for the repo temporarily.
BUG=339171

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@252729 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
scottmg@chromium.org 5d17b921db Move toolchain update control into src, but keep download logic in depot_tools
Moves the update functionality out of update_depot_tools into src/ in https://codereview.chromium.org/175573004 .

get_toolchain_if_required.py now expects a list of hashes on the
command line, and makes sure that it gets one of those.

toolchain2013.py saves a .json which contains information relevant to the
interests of the caller, so that it can set up the parent environment. This
is returned via the --output-json command line argument to get_...py

R=iannucci@chromium.org
BUG=323300

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@252725 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
hinoka@google.com 998deaf360 Pass in "--author 'name <email@somewhere.com>" when doing git patches in apply_issue.py
This is to tackle the issue that slaves don't have global git vars set up.

BUG=339171

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@252705 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
scottmg@chromium.org 805133df83 Revert 252633 "Switch to opt-out for toolchain"
> Switch to opt-out for toolchain
> 
> R=maruel@chromium.org
> BUG=323300
> 
> Review URL: https://codereview.chromium.org/174663005

TBR=scottmg@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@252634 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
scottmg@chromium.org e604eafd83 Switch to opt-out for toolchain
R=maruel@chromium.org
BUG=323300

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@252633 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
mmoss@chromium.org 3b16a28565 More fixes for hardcoded git directory paths.
The git path is based on the git version, so it might change whenever git is
updated. Run git.bat instead, since that's updated with new git installs and
should always point to the right path.

The mingw logic is based on similar handling of python.bat in git-cl.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@252584 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
agable@chromium.org 0211dcb161 Add agable@ to OWNERS
R=iannucci@chromium.org, maurel@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@252474 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
hinoka@google.com d067d81657 Apply Issue changes for disabling checkout when bot update ran.
This add --force to ignore the flag file.
This also passes --base_ref so we can specify which ref we're basing off of so that it does not incorrectly assert that it is basing off origin/master

BUG=339171

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

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