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

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

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

"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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

* 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

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

> 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

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

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

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

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

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

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

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

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

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

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

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

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

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

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