Commit Graph

1727 Commits (3e8df4bfc9d5585b2377a75f7e402db1b8c05ce8)
 

Author SHA1 Message Date
iannucci@chromium.org 3830a67f5f Make safesync w/ git hash work when lkgr is ahead of clone.
R=maruel@chromium.org, szager@chromium.org
BUG=


Review URL: https://chromiumcodereview.appspot.com/12301002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@183275 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
sadrul@chromium.org 34b5d82686 tyop: 'patchsets' seems to be the correct key, not 'patchset'.
BUG='git cl dcommit' fails


Review URL: https://chromiumcodereview.appspot.com/12300006

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@183051 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
iannucci@chromium.org 1e7187a595 Make gclient_scm_test pass even if no global user name or email is defined.
R=maruel@chromium.org
BUG=


Review URL: https://chromiumcodereview.appspot.com/12300002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@183044 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
iannucci@chromium.org 16b514092c Fix parameters for git_cl and gcl.
TBR=maruel@chromium.org
BUG=


Review URL: https://chromiumcodereview.appspot.com/12300005

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@183022 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
iannucci@chromium.org 25a4ab4397 Add patchset number on manual commit comment.
R=cmp@chromium.org, maruel@chromium.org


Review URL: https://chromiumcodereview.appspot.com/12276007

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@182861 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
szager@chromium.org 69aea1659f Add --sync option, to only sync submodules.
Also add git-crsync as shorthand for `git crup --sync`.

TBR=iannucci@chromium.org

BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@182767 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
torne@chromium.org 0ecad9c05d Presubmit tests: allow 200 columns in .mk files.
The Android WebView code includes several manually-maintained .mk files
that are included by the Android build system. These contain some fairly
long lines as they need to refer to deep pathnames, which means the CQ
cannot be used as it always triggers a presubmit warning.

Allow .mk files to have 200 columns per line instead, which should be
enough for the long paths that are used. Add a test case for this.

BUG=


Review URL: https://chromiumcodereview.appspot.com/12252067

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@182733 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
torne@chromium.org 1100c91ae1 Fix lint error in git_wktry.
gpylint doesn't like the use of "type" as a variable name (redefining a
builtin) - change the signature of the method to use the exc_ prefix
like sys.exc_*. The variables are not actually used anyway.

BUG=


Review URL: https://chromiumcodereview.appspot.com/12255048

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@182722 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
deymo@chromium.org c840e21e9c my_activity.py: Add a shorturl for cromium-os.
This fix adds the crosbug.com shorturl scheme for the chromium-os project.

BUG=None
TEST=manual run of ./my_activity.py


Review URL: https://chromiumcodereview.appspot.com/12226135

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@182300 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
tony@chromium.org 0e30595a9f Add a git command for running ToT WebKit patches against the trybots.
This is basically a wrapper script for running a WebKit change against
the try bots.  It can be run from within third_party/WebKit and will try to apply the patch against ToT WebKit.

This tells the try server we want to use ToT WebKit by passing third_party/WebKit@HEAD as the first line of the patch file.

BUG=None
Review URL: https://codereview.chromium.org/12226013

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@181972 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
bcwhite@chromium.org 6683ab4c49 handle bad python install
BUG=


Review URL: https://chromiumcodereview.appspot.com/12035089

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@181695 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
maruel@chromium.org 17f70a5ae4 Fix presubmit check failure caused by r179457.
TBR=laforge@chromium.org
BUG=


Review URL: https://chromiumcodereview.appspot.com/12225116

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@181694 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
rcui@google.com 3f4f3fb481 chromite_wrapper: Add support for gclient checkouts.
Chromite will be added to the Chrome checkout at third_party/chromite -
detect when the checkout is a gclient checkout, and look for chromite at
that path.

BUG=None
TEST=ran 'cbuildbot' in both a repo and gclient checkout.


Review URL: https://chromiumcodereview.appspot.com/12094111

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@181563 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
sadrul@chromium.org 955a3e2590 git-gs: Search in java files too.
BUG=none


Review URL: https://chromiumcodereview.appspot.com/12094102

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@180109 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
mmoss@chromium.org d0b272b3bc Remove restriction on paths in 'deps_file' setting.
BUG=172935
Review URL: https://codereview.chromium.org/12089080

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@179741 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
laforge@chromium.org 0689a623d8 Add support for svn paths in the revert (removes need for .properties file).
Review URL: https://codereview.chromium.org/12111002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@179457 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
scheib@chromium.org f57093659c Add --closest option to git-lkgr.
Use closest git commit to the target svn revision.
Otherwise --checkout may be required to create
a git commit for a specific svn revision.

NOTRY=true

Review URL: https://chromiumcodereview.appspot.com/11886086

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@179023 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
iannucci@chromium.org b85a316315 Make gcl commit/git cl dcommit append a commit notification to rietveld.
R=maruel@chromium.org
BUG=163426

Review URL: https://chromiumcodereview.appspot.com/12047089

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@178975 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
szager@chromium.org 08c772323f Point to newer git-1.8.0_bin directory.
BUG=169945


Review URL: https://chromiumcodereview.appspot.com/12047061

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@178430 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
jochen@chromium.org adb7a0ceec Print an error message if git crup doesn't run hooks because of an error
BUG=171501
R=szager@chromium.org


Review URL: https://chromiumcodereview.appspot.com/12040027

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@178357 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
jochen@chromium.org 009264f9cc Correctly forward error code when git pull fails in crup-runner.sh
The old code would always exit 0, because it returned the exit status of the if command

BUG=none
TEST=try to run git crup in src/ with unstaged changes. Should bail out and not run hooks
R=szager@chromium.org


Review URL: https://chromiumcodereview.appspot.com/12040046

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@178356 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
jochen@chromium.org d2d1861474 Add a heuristic to skip git checkouts not managed by crup
BUG=171500
R=szager@chromium.org


Review URL: https://chromiumcodereview.appspot.com/12051022

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@178350 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org 0df1e0de11 Cut the comment short in Rietveld.add_comment(). [follow up of r177704]
Very long comments, like when posting a diff that failed to apply, cause extra
burden on the Commit Queue logs.

TBR=csharp@chromium.org
BUG=


Review URL: https://chromiumcodereview.appspot.com/11929027

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@177713 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org c1715ec26f Make logging a bit shorter on Rietveld().add_comment().
It's done for the Commit Queue.

TBR=csharp@chromium.org
BUG=


Review URL: https://chromiumcodereview.appspot.com/11941019

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@177704 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
chrisha@chromium.org 40e5d3dfa1 Fix pylint presubmit check so that it works on Windows.
r176777 introduced a change that relied on os.path.samepath, which does not exist on Windows.

BUG=


Review URL: https://chromiumcodereview.appspot.com/12021013

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@177701 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
dpranke@chromium.org 9d66f480c8 handle OWNERS suggestions where anyone can approve better.
previously we would return "*" as one of the suggested owners when
a CL included a file that anyone could approve. If the change had
other owners, the "*" was unnecessary, and if the change only included
wildcard-owned files, "*" isn't very helpful, so I've changed the text slightly.

R=maruel@chromium.org
BUG=169168


Review URL: https://chromiumcodereview.appspot.com/11867016

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@177575 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
scheib@chromium.org 78d11342a8 Update git-lkgr with --create and --name options.
The previous --force-branch option is renamed --checkout (the old name preserved for backwards compatibility).

Usage:
  --checkout         Create a branch and check it out.
  --create           Create a branch.
  -n, --name <name>  Specify the name of branch to create or reset.
                       This will force the branch using 'git branch -f '.
  -q, --quiet        Quiet.

NOTRY=true

Review URL: https://chromiumcodereview.appspot.com/11962003

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@177286 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
szager@chromium.org 6562e9d0cd I own you, depot_tools.
NOTRY=true

Review URL: https://chromiumcodereview.appspot.com/11987002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@177284 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
szager@chromium.org cc9cbc899d Add -r <svn revision> option
TBR=scheib@chromium.org
NOTRY=true



Review URL: https://chromiumcodereview.appspot.com/11959013

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@177228 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
ilevy@chromium.org dd4e931730 Fix pylint presubmit checks
pylint checks were erronously excluded for PRESUBMIT.py files in
root directory of repos because the regex was getting a './' added.

R=iannucci@chromium.org
TBR=M-A

Review URL: https://chromiumcodereview.appspot.com/11880040

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@176777 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
ilevy@chromium.org 36576334f3 Escape paths used in regexs for pylint
This fixes a potential issue with RunPylint in windows where paths
can contain special characters.

TBR=iannucci@chromium.org


Review URL: https://chromiumcodereview.appspot.com/11786007

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@175481 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
szager@chromium.org 9f36c3891b Add prompt for updating remote URL to git-on-borg.
Review URL: https://codereview.chromium.org/11778024

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@175419 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org 6d2d7217e8 Fix small error in SimpleMock.
It's bad python practice to use a class-level member that is mutable. self.calls
is already initialized in __init__ so it's not useful (and dangerous) to have it
as a class member.

R=cmp@chromium.org
BUG=


Review URL: https://chromiumcodereview.appspot.com/11801018

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@175368 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
ilevy@chromium.org 7b677f7a11 Fix RunPylint affected files regex issue
The AffectedSourceFiles query matches against files with paths relative
to repository root.  On the other hand _FindAllFiles checks white_lists
and black_lists against files paths relative to PRESUBMIT.py

As a result, when a PRESUBMIT.py is not at RepositoryRoot, RunPylint
can misbehave.

I fix this by modifying the white_lists and black_list regexes to
include the relative directory of PRESUBMIT.py.

Also adding some logging to pylint and simplified misc logic.


Review URL: https://chromiumcodereview.appspot.com/11776016

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@175364 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
ilevy@chromium.org eebd3c9e53 Add rietveld POST logging
I've found it helpful and instructive to see what we're posting to
rietveld. Let's add it as a debug log for others too.  Can be helpful
to debug certain network issues.

Review URL: https://chromiumcodereview.appspot.com/11778015

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@175361 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
pliard@chromium.org b25d95cd38 Make getBranchForMilestone() explictly request the CSV data.
This fixes the following crash:
Traceback (most recent call last):
  File "/usr/local/google/home/pliard/ssd/depot_tools/drover.py", line 682, in <module>
    sys.exit(main())
  File "/usr/local/google/home/pliard/ssd/depot_tools/drover.py", line 678, in main
    return drover(options, args)
  File "/usr/local/google/home/pliard/ssd/depot_tools/drover.py", line 493, in drover
    options.branch = getBranchForMilestone(options.milestone)
  File "/usr/local/google/home/pliard/ssd/depot_tools/drover.py", line 393, in getBranchForMilestone
    version = string.split(parameters[2], '.')
IndexError: list index out of range
Sending crash report ...
  args: ['/usr/local/google/home/pliard/ssd/depot_tools/drover.py', '--merge', '175139', '--milestone', '25']
  cwd: /mnt/ssd/pliard/chromium/src/drover
  exception: list index out of range
  host: vox.par.corp.google.com
  stack:   File "/usr/local/google/home/pliard/ssd/depot_to
  user: pliard
  version: 2.7.3 (default, Aug  1 2012, 05:14:39)
[GCC 4.6.3

This function is called when the --milestone switch is provided. It requests
omahaproxy to fetch the branch corresponding to the provided milestone.
This function expects some CSV data coming from omahaproxy although it appeared
to actually receive the same HTML data that a browser receives when requesting
http://omahaproxy.appspot.com (user agent issue?).


Review URL: https://chromiumcodereview.appspot.com/11801007

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@175337 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
ilevy@chromium.org 375a902f83 Add short options for git cl presubmit
Adding -u and -f as short options for --upload and --force.
There is precedent for these short options elsewhere in
git_cl.py

TBR=maruel@chromium.org

Review URL: https://chromiumcodereview.appspot.com/11783007

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@175310 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
szager@chromium.org 143c3ffe54 For git checkouts of depot_tools, update remote.origin.url to the git-on-borg mirror.
BUG=168205


Review URL: https://chromiumcodereview.appspot.com/11742032

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@175040 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
thakis@chromium.org d2ea1dc578 Update ninja to v1.1.0 on Mac, Linux32, Linux64, Windows.
On mac, I ran:
git checkout v1.1.0
ninja
./ninja ninja_test
./ninja_test # all passed
strip ninja

I verified that the empty build speed doesn't change.
Mac binary size grew by ~8kB.

The linux binaries were built by tony@chromium.org.
The windows binary was built by scottmg@chromium.org.

BUG=167996

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@174818 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
szager@chromium.org e5599b1f44 Another round of refactoring and optimizing.
Call update_depot_tools and re-invoke from git-crup, to get latest
updates.

Move more of the target os functionality into git-crup.sh, so there's
no longer a need for a first-checkout script.

`git submodule sync` is horribly slow on windows.  Replicate the
functionality (but faster) in git-crup.sh.

TBR=mmoss@chromium.org,cmp@chromium.org
Review URL: https://codereview.chromium.org/11709003

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@174747 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
szager@chromium.org 9aca104a0f git template files for chromium checkouts.
To be used in conjunction with the --template argument to git-clone.

The hooks all redirect to build/git-hooks, which are files under
revision control.  This allows us to version the hooks along with
the source code.

TBR=mmoss@chromium.org,cmp@chromium.org
Review URL: https://codereview.chromium.org/11689005

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@174738 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
ferringb@google.com 8db6c88c2b Pull in repo v1.18 script for matching repo v1.11.1 update.
BUG=chromium-os:37471
TEST=manual invocations, tracking upstream code, running these
     versions on builders for validation in addition.

Review URL: https://chromiumcodereview.appspot.com/11660027

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@174609 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
szager@chromium.org a79f5cf754 Some polishing...
If the working copy isn't on a named branch, don't try to
pull; just fetch.

Use --quiet flag to git-submodule, to prevent interleaving of
terminal output.

Check target os before updating a submodule.

TBR'ing, since no one really has a stake in this, and maruel doesn't
do bash :).

TBR=maruel@chromium.org
Review URL: https://codereview.chromium.org/11645056

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@174280 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
dpranke@chromium.org c591a700cc Try #3 to improve the owners suggesting algorithm.
This version handles the case where we need to suggest two reviewers
who have overlapping sets of directories they can review.

R=maruel@chromium.org
BUG=76727


Review URL: https://chromiumcodereview.appspot.com/11639028

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@174216 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
nyquist@chromium.org 18bc90d2d2 Add support for specifying my_activity.py list format.
This adds the possibility to specify the format for your activity
through: -f <format>, --output-format=<format>

<format> is specified as in strings.format(...).

It is also possible to specify the output format for specific
activity types.

This enables users to use other formats such as Markdown:
[%(title)s](%(url)s)

This CL also adds support for new variables such as author,
and adds a generic framework for adding more variables.

BUG=166519


Review URL: https://chromiumcodereview.appspot.com/11607007

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@174203 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
dpranke@chromium.org 5e5d37bf09 Revert "Try again to land the improved owners algorithm." again :).
TBR=maruel@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@173990 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
dpranke@chromium.org 055a0dee07 Try again to land the improved owners algorithm.
Initially landed in r173784, reverted in r173808

R=maruel@chromium.org
BUG=76727


Review URL: https://chromiumcodereview.appspot.com/11645009

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@173979 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
kjellander@chromium.org 3cc75307e9 Fix toplevel_root parsing in trychange.py
In https://codereview.chromium.org/11574007/ I attempted to make it possible to use the TRYSERVER_ROOT setting in codereview.settings. It seems like some checkouts ran into errors with it not finding the codereview.settings file when it was parsed. This is probably due to the fact that the following call chain reads the self.toplevel_root variable:
_GclStyleSettings -> GetCodeReviewSetting -> ReadRootFile
By moving _GclStyleSettings up before self.toplevel_root is set probably causes this.

This CL attempts to correct this.

BUG=none, but try job upload fails for some users.
TEST=submitting try job to locally running try server.


Review URL: https://chromiumcodereview.appspot.com/11571052

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@173928 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org 6e904b4761 Add workaround where SVN.Revert() deletes the checkout.
This would cause a few exceptions on the CQ until it realizes the checkout is
not present anymore.

R=petermayo@chromium.org
BUG=


Review URL: https://chromiumcodereview.appspot.com/11649011

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@173916 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
dpranke@chromium.org 13f24eb0a8 Revert "Rework the owner-suggesting algorithm."
TBR=maruel@chromium.org
BUG=

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

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