git.chromium.org Git - chromium/tools/depot

Fix gclient sync 'dontswitchurl' url stickiness

._Capture throws exception on non-zero status, switch to
subprocess2 capture method. Switch magic value to dontswitchurl.

BUG=241907
R=dpranke@chromium.org, maruel@chromium.org

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

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

Don't "hang" gclient if fast-forward is not possible.

As noticed in the TODO, raw_input (used by ask_for_data) works badly
on background threads. On my Windows it doesn't even print the prompt which
makes it hard to interact with it.

Better to just abort and tell the user of gclient how to proceed.

BUG=

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

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

Try to fix mac bots. I rebuilt ninja-mac with -mmacosx-version-min=10.6 in
cflags and ldflags.

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

Update ninja to v1.3.3 on Mac, Linux32, Linux64, Windows.

On mac, I ran:
git checkout v1.3.3
./bootstrap.py
CXX=path/to/chromiums/clang++ ./configure --with-gtest=path/to/gtest
./ninja ninja_test
./ninja_test # all passed
strip ninja

Empty build perf is ~7% slower (https://github.com/martine/ninja/issues/544),
but this allows us to enable deps mode by default which will make empty builds
twice as fast.

Mac binary size grew by ~16kB.

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

New stuff since 1.1:
- NINJA_STATUS now allows %e, for elapsed time.
- "pool" feature
- "compdb" tool for writing clang compilation databases
- faster deps mode (needs to be explicitly enabled in gyp, not done yet)

BUG=241628
Review URL: https://codereview.chromium.org/15490003

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

Add |git cl description| to allow you to change the description in your favorite $EDITOR.

R=maruel@chromium.org

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

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

Change parallel test logic to run only with jobs>1

Regular map is preferred when parallization does
not speed presubmit tests. It makes stacktraces more
understandable and facilitates debugging. Only use
parallel pool when tests > 1.

R=maruel@chromium.org

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

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

Added posix and windows runner scripts for download_from_google_storage.py

Windows bots are having trouble calling download_from_google_storage.py from the
DEPS hooks. This should allow it to be called as just "download_from_google_storage".

BUG=
R=maruel@chromium.org

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

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

Fix 'git cl format'

This patch fixes the implementation as follows:

  1/ Fix '--full' option to check for all changes in the
     current branch relative to upstream. The old code only
     considered currently modified files, which made little
     sense.

  2/ Fix '--full' option to apply Chromium style too.

  3/ Use a proper source file filter. The original code used
     ".*.cc .*.cpp .*.h" as the filter, which didn't catch anything !?

  4/ Add --no-ext-diff to make it work with custom "git diff" handlers.

R=agable@chromium.org, maruel@chromium.org, pliard@chromium.org
BUG=NONE

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

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

Revert partially r200799, it would break the official builders.

Until r200514 is merged into every active branches on Windows, python can't be
upgraded to 2.7.x.

TBR=iannucci@chromium.org,joi@chromium.org
BUG=241769

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

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

Switch depot_tools python to 2.7.4.

TBR=joi@chromium.org
BUG=

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

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

Fix RunTests to not stall on empty test list

Some PRESUBMIT files dynamically generate test list
and so may pass an empty list to RunTests. There
appears to be a bug in multiprocessing.Pool that
causes a stall in map_async with an empty list.

TBR=maruel

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

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

Remove git-wktry as we only want to support rietveld-based try jobs

R=maruel@chromium.org, iannucci@chromium.org
BUG=239665

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

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

Add option to prevent gclient from changing remote

Allow users to set a git config entry which stops
gclient from messing with remote.origin.url. Useful
for using experimental repos.

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

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

Rename assertEquals to assertEqual in auto_stub.py.

assertEquals is deprecated.

R=iannucci@chromium.org
BUG=

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

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

Have Rietveld.get_description() consistently strip CR and whitespace.

This makes the commit description cleaner.

R=iannucci@chromium.org
BUG=

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

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

Fix many (but not all[1]) depot_tools tests on Windows.

[1] *scm_test.py are deeply broken, svnadmin is missing for svn_bin\.
And the git test are failing at shutdown.

Also Fix SvnCheckout.testMove flakiness.

TBR=ilevy@chromium.org,szager@chromium.org
BUG=

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

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

Images are binaries too, yo.

Make upload.py treat images as binaries, so they upload correctly and display in Reitveld.

BUG=227346

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

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

Add colors to git cl comments.

Helps scanning faster. colorma is already slightly used by gclient but wasn't
by git-cl yet.

Update a unit test to be stricter, it was caught in the cross fire as colorma
hooks sys.stdout and stderr.

R=iannucci@chromium.org
BUG=

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

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

Reinstate automatic line-end cleaning removed in r194182.

BUG=238390

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

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

Adding 'git cl format' command for clang-format.

As per the discussion in
https://groups.google.com/a/chromium.org/forum/?fromgroups=#!topic/chromium-dev/Hl2QPNQ9E5o,
this CL adds a 'git cl format' command. Users may use it at their own
discretion. By default, it generates a diff against the local tracking
(upstream) branch and runs clang-format-diff on that diff. When given the
'--full' flag, it instead identifies all .cc, .cpp, and .h files in the diff and
runs clang-format on the entirety of each of those files.

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

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

Chanot branch[0].isdigit()nging --milestone to use JSON source and adding prompt for branch mismatch.

Sample output:

$ drover --merge 196360 --milestone 27

Not all platforms have same branch number for M27.

Here's a list of platforms on each branch:
-(1453): win, ios, cf, mac, linux, android
-(1460): cros
Which branch? ('q' to cancel) 1453

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

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

chromite_wrapper: Fix up comment.

BUG=None
TEST=Manual

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

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

Use logger formatting instead of string interpolation.

Follow-up to ilevy's comments in https://chromiumcodereview.appspot.com/14759006/

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

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

Refactor nag functionality in to NagTimer class.

Add default 30 second nag timer to gclient subprocesses.

BUG=227537

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

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

Kill subprocesses on KeyboardInterrupt.

SVN traps SIGINT and attempts to clean itself up, but this results in hangs
waiting for TCP. This patch does two things: daemonizes worker threads so they
are culled when the main thread dies (is ctrl-C'd) and keeps track of spawned
subprocesses to kill any remaining ones when the main program is ctrl-C'd.

A user ctrl-C'ing gclient has to manually terminate hung SVN processes, so this
introduces no extra data loss or hazard. stracing a hung SVN process shows that
it is indeed hanging on TCP reads after receiving a SIGINT, implying there is an
underlying but in the SVN binary.

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

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

chromite_wrapper: Support git submodule checkouts.

BUG=None
TEST=Ran locally

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

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

Make git-cl more accurately imitate git's editor selection process, and respect $VISUAL.

It is somewhat surprising when git-cl, which acts as a git subcommand, launches
a different editor. In particular, git has a config option (core.editor) which
specifies the editor that should be used. Since we already respect $GIT_EDITOR,
it makes sense for git-cl to respect core.editor and $VISUAL as well.

R=maruel@chromium.org
BUG=237504

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

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

Update update.py from rietveld/chromium@r1052.

R=maruel@chromium.org
BUG=166901

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

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

Fix 236148: Avoid triggering a pager in internal git commands.

BUG=236148

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

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

Add nag_timer.

BUG=227537
R=maruel@chromium.org,cmp@chromium.org
NOTRY=true

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

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

Allow branches without upstream.

Clean up formatting a bit.

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

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

Don't discard stderr.

R=maruel@chromium.org
NOTRY=true

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

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

Remove getpid from SuperMox.

It is called by logging.foo() so it breaks this use case.

TBR=iannucci@chromium.org
BUG=

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

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

Make apply_issue.py more aggressive when deleting an entry from a DEPS file.

Without this change, if an entry is removed from a DEPS file, it won't be
effectively deleted. Specify --delete_unversioned_trees so the dependency is
properly deleted.

TBR=szager@chromium.org
BUG=

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

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

Add fetch recipe alias targetting Android

"fetch android" is a basic alias for "fetch chromium --target_os=android",
which adds "target_os=['android']" to the gclient specs as described in
chromium's AndroidBuildInstructions wiki page.

NOTRY=true

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

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

Fix uninitialized variable error in presubmit_support

Remove 'out' variable reference. If subprocess.communicate()
throws an exception, out cannot contain data.

BUG=236073
TBR=cmp

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

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

Messages are required to get the right list of reviewers.

Fix gcl which was broken in r196786 and wasn't fixed in r196798.

TBR=dpranke@chromium.org
BUG=

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

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

Fix gcl.py error introduced in r196786.

The hostname was used instead of the rpc object.

TBR=phajdan.jr@chromium.org
BUG=

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

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

Update the R= line with the actual list of reviewers that approved the CL.

This makes the commit logs much more useful for a build sheriff. Not only he
sees who committed the CL but see who approved it directly at the log. This
should help build sheriffs when they fail to contact the author and want to
fallback on the reviewer for quick questions.

R=dpranke@chromium.org
BUG=76730

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

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

Reland r195308, r195328, and r195363, which use --internal-diff on svn 1.7+.

This time, do not use the --config-dir hack on svn < 1.7 for the diff command
that runs against a remote URL. This seems to trigger auth prompts (see revert
comments on https://codereview.chromium.org/14297017/ ).

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

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

Revert http://crrev.com/195336

BUG=235215

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

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

Offer empty branches for deletion & provide upstream distances

Empty branch output:
    # Empty branches
    git branch -D ipc2 # Empty.
    git branch -D m3 # Empty.

Empty branches that have origin/* as upstream will not be considered for deletion.

Provide distance from upstream in output, i.e.

    # Branch gypi-own - [master: ahead 1, behind 281]
    # Branch m2 - [master: ahead 1]

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

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

Remove gclient_utils.RemoveDirectory().

The 'RemoveDirectory()' function in gclient_utils is deprecated and
rmtree() should be used instead for consistency.

This patch modifies all clients in depot_tools to use rmtree() instead
and removes the RemoveDirectory function.

+ The SVNWrapperTestCase.testRevertNoDotSvn() mocking
  expectation has been slightly changed. This was required
  because the test invokes code that used to call
  gclient_utils.RemoveDirectory() directly, while only
  gclient_utils.rmtree() was mocked.

BUG=NONE
R=maruel@chromium.org, ilevy@chromium.org
TEST=manually run gclient_utils_test / gclient_smoketest / scm_unittest / gclient_scm_test

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

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

Add iannucci to depot_tools OWNERS

He has a lot of experience in this directory and we could
use the additional reviewer.

Also remove nsylvain, who is inactive.

R=maruel@chromium.org

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

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

Allow presubmit_support to fetch issue data from Rietveld.

R=ilevy@chromium.org, maruel@chromium.org
BUG=

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

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

Revert 195308 "Tweak GenerateDiff:"

Reverting r195363, r195328 and r195308. gcl upload is hanging for me unless I revert these changes.

f:\src\chrome3\src>gcl upload o0m7

at this point, there's no output. If I press enter, I get:

Got an exception
Command svn diff --config-dir c:\users\jabdel~1\appdata\local\temp\tmp7dwbyp -r 195324:head svn://chrome-svn/chrome/trun
k/src/webkit/glue/dom_operations_unittest.cc returned non-zero exit status 1 in f:\src\chrome3\src
Authentication realm: <svn://chrome-svn:3690> 0039d316-1c4b-4281-b951-d872f2087c98
Password for 'jabdelmalek':
Authentication realm: <svn://chrome-svn:3690> 0039d316-1c4b-4281-b951-d872f2087c98

> Tweak GenerateDiff:
>
> * Update comment for accuracy
> * Keep the base diff command in a variable; this fixes an oversight where GenerateDiff would run svn diff without the --config-dir hack, and makes later refactoring easy
> * Apply review comments from https://codereview.chromium.org/14247007/ to existing code
>
> Review URL: https://chromiumcodereview.appspot.com/14366029

TBR=pkasting@chromium.org

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

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

Revert 195328 "Use --internal-diff on svn 1.7+ to slightly reduc..."

Reverting r195363, r195328 and r195308. gcl upload is hanging for me unless I revert these changes.

f:\src\chrome3\src>gcl upload o0m7

at this point, there's no output. If I press enter, I get:

Got an exception
Command svn diff --config-dir c:\users\jabdel~1\appdata\local\temp\tmp7dwbyp -r 195324:head svn://chrome-svn/chrome/trun
k/src/webkit/glue/dom_operations_unittest.cc returned non-zero exit status 1 in f:\src\chrome3\src
Authentication realm: <svn://chrome-svn:3690> 0039d316-1c4b-4281-b951-d872f2087c98
Password for 'jabdelmalek':
Authentication realm: <svn://chrome-svn:3690> 0039d316-1c4b-4281-b951-d872f2087c98

> Use --internal-diff on svn 1.7+ to slightly reduce disk thrashing.
>
> This just saves the need to create and remove an empty directory on every call to GenerateDiff.
>
> Review URL: https://chromiumcodereview.appspot.com/14064017

TBR=pkasting@chromium.org

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

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

Revert 195363

Reverting r195363, r195328 and r195308. gcl upload is hanging for me unless I revert these changes.

f:\src\chrome3\src>gcl upload o0m7

at this point, there's no output. If I press enter, I get:

Got an exception
Command svn diff --config-dir c:\users\jabdel~1\appdata\local\temp\tmp7dwbyp -r 195324:head svn://chrome-svn/chrome/trun
k/src/webkit/glue/dom_operations_unittest.cc returned non-zero exit status 1 in f:\src\chrome3\src
Authentication realm: <svn://chrome-svn:3690> 0039d316-1c4b-4281-b951-d872f2087c98
Password for 'jabdelmalek':
Authentication realm: <svn://chrome-svn:3690> 0039d316-1c4b-4281-b951-d872f2087c98
Username: svn: Can't read stdin: End of file found

"Fix typo."

> Fix typo.
>
> Review URL: https://chromiumcodereview.appspot.com/13987010

TBR=pkasting@chromium.org

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

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

Add support for parallel presubmit unit testing.

Enable parallel tests on depot_tools.
On Z620 presubmit times: 3m -> 35s.

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

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

Fix typo.

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

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

Add placeholder git hooks.

This is a bit of future-proofing. The git hooks in depot_tools/git-templates/hooks all try to forward to build/git-hooks.

Currently, the only actual hook we have is in src/build/git-hooks/pre-commit, which (usefully) makes sure no one inadvertently commits a submodule change. If we want to add more git hooks, we can simply commit them to build/git-hooks, rather than asking everyone to modify .git/hooks in their checkout.

NOTRY=true

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

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

Use --internal-diff on svn 1.7+ to slightly reduce disk thrashing.

This just saves the need to create and remove an empty directory on every call to GenerateDiff.

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

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

Tweak GenerateDiff:

* Update comment for accuracy
* Keep the base diff command in a variable; this fixes an oversight where GenerateDiff would run svn diff without the --config-dir hack, and makes later refactoring easy
* Apply review comments from https://codereview.chromium.org/14247007/ to existing code

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

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

Removes DiffItem, which was unused, and moves _DiffItemInternal below GenerateDiff, now its lone caller.

No other code changes, so should be no behavioral change.

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

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

Fix R= line handling when there is no value and improve presubmit TAG line regex

Make it more consistent across the tool. Using \s also includes \n, which
confuses the tool.

Add more tests.

R=iannucci@chromium.org
BUG=

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

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

Revert 194990 "Second take at handling users with locally overri..."

> Second take at handling users with locally overridden diff-cmds.
>
> The first take at https://chromiumcodereview.appspot.com/14130006 tried to pass
> "--diff-cmd diff", which doesn't work for e.g. Windows cmd users who don't have
> a "diff" executable installed.
>
> This take instead passes the "--internal-diff" switch which tells svn to ignore
> any diff-cmd set locally and use its internal diff engine at all times.
>
> While implementing this I found that the existing code tried to work around this
> problem in a different way, by setting up a bogus config dir. Since that
> doesn't seem to work for me, and shouldn't be necessary with this patch anyway,
> removed that code.
>
> Review URL: https://chromiumcodereview.appspot.com/14050007

TBR=pkasting@chromium.org

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

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

Second take at handling users with locally overridden diff-cmds.

The first take at https://chromiumcodereview.appspot.com/14130006 tried to pass
"--diff-cmd diff", which doesn't work for e.g. Windows cmd users who don't have
a "diff" executable installed.

This take instead passes the "--internal-diff" switch which tells svn to ignore
any diff-cmd set locally and use its internal diff engine at all times.

While implementing this I found that the existing code tried to work around this
problem in a different way, by setting up a bogus config dir. Since that
doesn't seem to work for me, and shouldn't be necessary with this patch anyway,
removed that code.

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

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

Sort list of files that are missing OWNERS LGTM in presubmit check.

BUG=none

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

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

Control the order of gclient spec keys in fetch

Follow the explicit iteration order of the spec keys array instead of relying
on the arbitrary iteration order of the hashtable.

BUG=

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

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

Revert 194740 "Explicitly pass "--diff-cmd diff" to "svn diff", ..."

On Windows, I got the following error:
f:\src\chrome2\src>gcl commit n3d2
Loaded authentication cookies from C:\Users\jabdelmalek/.codereview_upload_cookies
Running presubmit commit checks ...
checking owners took a long time: 906ms
Got an exception
Command svn diff --diff-cmd diff --config-dir c:\users\jabdel~1\appdata\local\temp\tmpu7bui5 content\browser\web_content
s\web_contents_impl.cc returned non-zero exit status 1 in f:\src\chrome2\src
Index: content/browser/web_contents/web_contents_impl.cc
===================================================================

svn: Can't start process 'diff': The system cannot find the file specified.

> Explicitly pass "--diff-cmd diff" to "svn diff", for users who have set some other diff tool.
>
> Review URL: https://chromiumcodereview.appspot.com/14130006

TBR=pkasting@chromium.org

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

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

Use rd on Windows in rmdir

This is needed because the current implementation commonly fails on Windows due to "directory not empty" errors. Using rd is more reliable.

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

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

Add missing word "be" in CL description comments

s/This will displayed/This will be displayed/g

BUG=

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

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

Changed the behaviour of '--transitive' in gclient.py to use revision instead of timestamp for identical repositories.

Here's some background why we need this:
We discovered that google code defines the timestamp of a revision to be the time when a commit was started
rather than when it was finished (apache subversion takes the timestamp when the commit transaction is finished).
This can result in a situation where revision R(i-1) has a higher timestamp than Ri.
See bug: https://code.google.com/p/support/issues/detail?id=30419

When using 'gclient --transitive' we effectively do date-based checkouts.
If a parent has a dependency (without a ...@revision) and that dependency lives in the same repository as the parent does
we'd like to checkout the exact same revision as the parent (if we do a date-based checkout as we do now the google code
bug can result in a situation where we don't get the same revision).

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

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

Explicitly pass "--diff-cmd diff" to "svn diff", for users who have set some other diff tool.

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

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

Support "--with_branch_heads" for unmanaged checkouts.

R=piman@chromium.org,maruel@chromium.org

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

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

Make sure branch-heads is configured whenever requested.

This allows the branch-heads to be pulled even if not configured on the
original clone.

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

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

Add cpplint to presubmit input_api

This will let clients that don't use the heavily filtered canned cpplint
check and want to behave more strictly (aka cc/) reuse any common
settings applied to the cpplint module.

R=maruel@chromium.org
BUG=none

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

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

Reapply r193525 "Make gcl use git_cl.py code for consistency in the CL description formatting."

It was manually tested to work.

R=dpranke@chromium.org,iannucci@chromium.org
Review URL: https://codereview.chromium.org/13832005

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

Fix presubmit check compatibility with GAE SDK 1.7.6 (bis).

Improve temporary storage management.

Print the error message on local GAE instance failure.

Useful to debug when a new version of the GAE SDK breaks something.

TBR=iannucci@chromium.org
BUG=

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

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

Fix presubmit check with newer version of AppEngine SDK v1.7.6.

The kill() call may fail because the process already exited.

TBR=iannucci@chromium.org
BUG=

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

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

Teach cpplint include-what-you-use about chromium hash_set and hash_map.

For hash_map and hash_set, we should include "base/hashtables.h", not
the <hash_set> or <hash_map> standard headers.

R=maruel@chromium.org
BUG=

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

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

improve the error message fetch returns if a checkout exists

to tell the user how to recover from partial checkouts and
what to do with an existing checkout.

R=iannucci@chromium.org
BUG=230691

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

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

Ensures that local git config is used while checking if it is a Git-svn repo.

If no `--local` option is passed to git config command line tool, it will relies
on the local repository and then to the user configuration ($HOME/.gitconfig).
In case the user has - for some reason - a svn repository configured in this
user configuration, the checking: `git config --get-regexp ^svn-remote\.` will
accuse that there is svn repo and so the `git cl tool`. This patch just add
the option `--local` to the git config command line tool, avoiding this
situation.

R=maruel@chromium.org,dpranke@chromium.org
BUG=

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

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

Remove trailing '\n' from last-upload-hash branch property.

BUG=None

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

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

Allow multiple OSes to be checked out with git submodules.

Allow target.os to be a multivalue config option, which will cause
submodules required by any of the listed OSes to be checked out. You can
add additional OSes to the list with "git config --add target.os".

BUG=

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

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

Ensure that we pick up 'git.bat' and 'svn.bat' on Windows.

R=maruel@chromium.org
BUG=227526

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

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

Ignore ctags index file.

R=szager@chromium.org
BUG=

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

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

Add the --nosvn property to the chromium solution.

This allows non-committers to use fetch to checkout chromium or blink using

$ fetch chromium --nosvn=true

BUG=230357
R=dpranke@chromium.org

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

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

Revert 193525

I get the following when doing "gcl upload"

Traceback (most recent call last):
  File "f:\src\depot_tools\gcl.py", line 1459, in <module>
    sys.exit(main(sys.argv[1:]))
  File "f:\src\depot_tools\gcl.py", line 1437, in main
    return command(argv[1:])
  File "f:\src\depot_tools\gcl.py", line 1070, in CMDchange
    description = change_info.GetIssueDescription()
AttributeError: 'ChangeInfo' object has no attribute 'GetIssueDescription'
Sending crash report ...
  args: ['f:\\src\\depot_tools\\gcl.py', 'change', 'w4f4']
  cwd: f:\src\chrome3\src
  exception: 'ChangeInfo' object has no attribute 'GetIssueDesc
  host: JABDELMALEK3-W.ad.corp.google.com
  stack:   File "f:\src\depot_tools\gcl.py", line 1459, in
  user: jabdelmalek
  version: 2.6.2 (r262:71600, Apr 21 2009, 15:05:37) [MSC v.1
A stack trace has been sent to the maintainers.

"Make gcl use git_cl.py code for consistency in th..."

> Make gcl use git_cl.py code for consistency in the CL description formatting.
>
> This way, git_cl.py's ChangeDescription becomes the canonical CL description
> handler.
>
> R=dpranke@chromium.org
> BUG=
>
> Review URL: https://chromiumcodereview.appspot.com/13800018

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

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

Make gcl use git_cl.py code for consistency in the CL description formatting.

This way, git_cl.py's ChangeDescription becomes the canonical CL description
handler.

R=dpranke@chromium.org
BUG=

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

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

Switch ChangeDescription usage to be stricter.

Include all the preparatory work to eventually update the R= line to match the
actual reviewers.

The goal here is that ChangeDescription becomes the official implementation for
handling and modifying commit messages accross git-cl, gcl and the commit queue.

This change does slightly tweak the spacing between the hot lines.
It is done on purpose to make them consistent.

R=dpranke@chromium.org
BUG=

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

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

Make git-cl accepts multiple --reviewers and --cc arguments.

It makes sure the resulting options.reviewers and options.cc are internally
consistent by splitting comma separated items.

R=iannucci@chromium.org
BUG=

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

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

Make warning for mismatched local and remote patchset more clear.

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

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

Change "git cl patch" to say "Committed patch locally."

Currently, if "git cl patch" succeeds it prints:
Committed patch.
This patch changes "git cl patch" to print:
Committed patch locally.

BUG=

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

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

Do not systematically update the description on CL close.

This is not always necessary, like for "git cl set_close".

R=dpranke@chromium.org
BUG=

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

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

Misc improvements to drover

- Improve SVN heuristic by using cutoff of 180 days instead of
  120. I've verified this won't cause problems with the repos
  we use.  (the closest is blink ToT and chrome, blink ToT
  refers to a revision in chrome from 9 months ago)
- Alert if using local drover.properties file. Webkit devs had
  a drover.properties file that hardcodes svn.webkit.org, which
  makes drover point to the wrong revision.

BUG=227168

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

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

Unpoison gclient checkouts by setting recurseSubmodules=false

This was causing extremely slow gclient sync's, and was preventing gclient from
outputting anything if a slow submodule needed significant updating.

R=cmp@chromium.org
BUG=

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

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

Add -s as a short option for --send-mail

R=dpranke@chromium.org

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

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

Add blink drover revert support.

Building on crrev.com/12670008, add support for blink svn. The svn
revision for blink is sufficiently different from chromium that we
can revert blink changes without further logic changes. The order of
alternative repos corresponds roughly to the expected rate of use.

TEST=Tried reverting some blink revs.

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

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

Make maxlen configurable in PanProjectChecks

Blink wants to override the maxlen which is currently configurable in CheckLongLines but not in PanProjectChecks. This exposes the parameter on PanProjectChecks.

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

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

add in deltaBaseCacheLimit workaround

R=maruel@chromium.org
BUG=

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

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

Revert "Make gclient fetch git repos recursively. This is needed when adding a git repo through DEPS. If that repo has submodules, we need to fetch them or else the repo won't be complete."

This reverts commit 6a2e4710bf3bbde9ab3f8c5ce44f7e9cd1fb3036.

cmp says:
This CL causes NewGit and Git submodules workflows to comingle in ways that result in bad and unexpected failures for new and existing users. One failure is for the new Blink developers who need to use git-svn with their WebKit third_party checkout. Another failure is in the Windows NewGit workflow where gclient sync takes longer than necessary to complete.

The right approach at this point given the costs of this change is to revert it and rethink the best way to get projects the functionality they need while restoring the functionality existing projects have required for over a year now.

Please discuss the recursive/recurseSubmodules code face-to-face with cmp@google.com before attempting to make this live again. Thanks.

R=cmp@chromium.org
BUG=224074

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

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

Revert "disable 'svn init' for blink temporarily"

TBR=iannucci@chromium.org

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

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

add auto-update step to 'fetch' wrappers

R=iannucci@chromium.org

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

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

disable 'svn init' for blink temporarily

Currently the NewGit workflow sets up git submodules to point to a
.git dir through a textfile indirection. git-svn isn't smart enough to
deal with this, and so we need to change things to use symlinks instead.

In the meantime, 'fetch blink' will fail. For now, we'll turn off
the svn configuration.

TBR=iannucci@chromium.org

BUG=

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

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

Add print statement to blink overwrite hack.

TBR=cmp@chromium.org

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

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

Make fetch run svn ls for svn repos behind git-svn configs.

R=dpranke@chromium.org,iannucci@chromium.org

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

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

Add webkit_trunk override in gclient to force bots to use blink for now.

R=cmp@chromium.org
BUG=

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

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

Make depot_tools' fetch work on windows if 'gclient' isn't in the path

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

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

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