This uses grep instead.  Note that just grepping for "--force" matches other
things, e.g. "foo--force--foo", but that's a problem with the original code as
well, I think.

BUG=435729
TEST=Run gclient under msysgit bash.  No error should occur.

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

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

This change goes hand in hand with the corresponding Rietveld change here:
https://codereview.chromium.org/773083004/
The motivation for both CLs came from the discussion in the internal CL: https://chromereviews.googleplex.com/115567013/

AFAIK either change can be submitted first without breaking anything in the other framework.

Observe the "Tracked Ref" field in the below CLs-

Tracking a remote ref:
* https://skia-codereview-staging.appspot.com/8861001 (Tracking skiabot-test's refs/heads/master)
* https://skia-codereview-staging.appspot.com/851002 (Tracking skiabot-test's refs/diff/test1)
* https://skia-codereview-staging.appspot.com/2891001 (Tracking Chromium's refs/heads/master)
* https://skia-codereview-staging.appspot.com/1931003 (Tracking Chromium's refs/branch-heads/1916)

Tracking a local branch which in turn tracks a remote ref:
* https://skia-codereview-staging.appspot.com/3891002 (Transitively tracking skiabot-test's refs/heads/master)
* https://skia-codereview-staging.appspot.com/4921001 (Transitively tracking Chromium's refs/branch-heads/1916)

CL when no target_ref is specified in depot_tools/third_party/upload.py:
* https://skia-codereview-staging.appspot.com/3871003 (CL with missing target_ref should default to /refs/heads/master)


Try the above links with and without the 'Deprecated UI' checked in https://skia-codereview-staging.appspot.com/settings


BUG=435702

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

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

This CL makes gclient understand correctly whether a git project is
being moved from DEPS to an upper project and vice-versa.
The driving use case for this is the upcoming Blink merge, where
third_party/Webkit will be removed from DEPS (and .gitignore) and will 
become part of the main project.

At present state, gclient leaves the .git folder around when a project
is removed from DEPS, and that causes many problems. 

Furthermore this CL solves the performance problem of bisecting across
the merge point. The subproject's (Blink) .git/ folder is moved to a
backup location (in the main checkout root) and is restored when moving
backwards, avoiding a re-fetch when bisecting across the merge point. 

BUG=431469

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

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

This is for transitioning us out of the horribly outdated gsutil 3.4 thats
currently residing in depot_tools.  This script:
1. Downloads GSUtil, pinned to a version (4.6 by default).
2. Executes GSUtil with the given parameters
3. (TODO) Runs the fallback GSUtil if #2 fails.


The transition plan is:
1. Set the fallback as default, making this script a no-op
2. Modify recipes (main consumer of gsutil) to pass in --force_version 4.6
3. Switch 4.6 as the default for gsutil.py
4. Make fallback failure a loud red failure
5. Remove depot_tools/third_party/gsutil

BUG=434422

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

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

This will only have an effect if one's buildtools checkout is new enough, since
only then:

a) clang-format will be new enough to do a decent job for java files
b) clang-format-diff.py will be new enough to look at java files

So for older buildtools checkouts, `git cl format` will continue to ignore java
files.  For newer buildtools checkouts (like the one pulled by `gclient sync`
with a recent chromium checkout), it'll work and do a fairly decent job.

BUG=429372

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

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

Tested with the following command lines:

$ cd
$ mkdir skia_test
$ cd skia_test
$ fetch skia_buildbot
$ cd skia_buildbot
 # confirm the repo is what one would expect.

BUG=None
TEST=see above
R=agable@chromium.org

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

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

R=agable@chromium.org
BUG=N/A

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

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

This just a copy of cpplint.py from upstream [1].

[1] https://code.google.com/p/google-styleguide/source/detail?spec=svn141&r=141

The change in gclient_scm.py is to address a presubmit check error
which was introduced by https://codereview.chromium.org/227163002
"print_func" parameter was being passed to a function instead of
the object constructor.

BUG=None
NOTRY=True

Change-Id: I4dca890d5f02957ddae33c4bd4269fd37758be3d

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

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

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

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

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

Requires https://codereview.chromium.org/779883002/ to be landed/rolled before it's useful.

R=dpranke@chromium.org
BUG=348474

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

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

Includes fix for bug 388937.

R=agable@chromium.org, jrobbins@chromium.org, maruel@chromium.org
BUG=388937

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

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

r293250 broke it. I didn't realize that check_bucket_permissions
was shared code. It now only returns a single value.

TBR=vadimsh@chromium.org

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

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

check_bucket_permissions should no longer return a tuple.

TBR=vadimsh@chromium.org

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

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

check_bucket_permissions() takes exactly 2 arguments (3 given)

TBR=vadimsh@chromium.org

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

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

--sha1_filename unnecessarily forces the output to have
the same filename and be in the same directory. The code
in main already correctly sets the file name to the
sha1_filename minus the .sha1, so the only change is
to actually use the --output path the same way the
rest of the code does.

R=iannucci@chromium.org

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

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

Checking bucket permissions takes ~400ms. We don't
need to do this if --no-auth because we know we
won't get a 403 and the 404 check will be handled
later when we try to actually download the file.

Also, remove the check for a null bucket. This
can't happen since we will throw a parser error
in the main function before we get to this code.

R=iannucci@chromium.org

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

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

This could be simplified a bunch more, but this path was already
non-functional and tries to download Express which is a waste of
time and confusing for people.

R=dpranke@chromium.org
BUG=433551

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

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

R=dpranke@chromium.org

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

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

This fix is created to avoid having to rebuild all the WebRTC
Git mirrors since they're configured to sync with the http URL
instead of https (resulting in git-svn-id Git footers with the
http URL in the commit messages). Without rewriting this, it is
not possible to commit to SVN since Google code disallows committing
to a http URL.

BUG=412012
TEST=Created a CL using a Git repo like this (both before and after landing https://webrtc-codereview.appspot.com/32569004):
git clone https://chromium.googlesource.com/external/webrtc.git
cd webrtc
git auto-svn
git checkout master
git checkout -b test
(edit whitespace change)
git commit -am "Whitespace edit
git cl upload --bypass-hooks"
git cl dcommit

R=agable@chromium.org, machenbach@chromium.org, mmoss@chromium.org

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

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

Revert of git_auto_svn.py: Rewrite http SVN URLs to https (patchset #3 id:40001 of https://codereview.chromium.org/745473003/)

Reason for revert:
This actually makes the Git mirrors unusable for git svn, since there's a mismatch between the svn remote URL and the URLs of the git-svn-id footers in each Git commit (which confuses scripts like git_cl.py and makes uploading and committing CLs impossible).

Original issue's description:
> git_auto_svn.py: Rewrite http SVN URLs to https
>
> BUG=435091
> TESTED=Ran the following:
> git clone https://chromium.googlesource.com/external/webrtc
> cd webrtc
> git auto-svn
> cat .git/config
> Verified the URL was using http before this patch, and https after applying it.
>
> R=agable@chromium.org, mmoss@chromium.org
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=293041

TBR=agable@chromium.org,mmoss@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=435091

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

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

Tested with the following command lines:

$ cd somewhere
$ mkdir some-test-dir
$ cd some-test-dir
$ fetch skia
$ cd skia
 # confirm it is what we expected.

BUG=None
TEST=see above
R=agable@chromium.org

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

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

R=iannucci@chromium.org, szager@chromium.org, pdr@chromium.org
BUG=435729

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

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

R=kjellander@chromium.org

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

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

For Mac, we're depending on having both ios+mac for target_os.

R=agable@chromium.org

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

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

See the bug for how these were built.

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

BUG=436109
TBR=maruel@chromium.org

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

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

The reason cited for reverting was invalid, so reland the update.

BUG=chromium:431514

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

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

This reverts commit e642ee86.

Conflicts:
	pylintrc

Reason:
	All repos are borked.

TBR=vapier

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

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

BUG=435091
TESTED=Ran the following:
git clone https://chromium.googlesource.com/external/webrtc
cd webrtc
git auto-svn
cat .git/config
Verified the URL was using http before this patch, and https after applying it.

R=agable@chromium.org, mmoss@chromium.org

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

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

BUG=none
TBR=jrobbins@chromium.org

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

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

People are just ignoring these and bypassing the presubmit entirely, so
disable all the warnings until someone feels like shaving these yaks one
by one.

BUG=chromium:431514
TEST=ran presubmit on build/ and so no more warnings

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

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

The current pylint is very old at this point.  Pull in the latest version
as it supports a lot more features.  Also need to fix the pylint wrapper
to actually update sys.path to use the local modules.

We include the six module since not all bots have it, and it's small.

This will trigger new warnings in files, but they look like legitimate
issues that should be fixed at some point.

BUG=chromium:431514
TEST=ran on some code bases and checked output

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

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

This reverts commit 451939d5.

Throws an exception with a missing import, breaking Telemetry's
presubmit checks and presumably presubmit checks for all Python files
in Chromium. See comment on https://codereview.chromium.org/707353002/ .

BUG=chromium:431514

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

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

The current pylint is very old at this point.  Pull in the latest version
as it supports a lot more features.  Also need to fix the pylint wrapper
to actually update sys.path to use the local modules.

This will trigger new warnings in files, but they look like legitimate
issues that should be fixed at some point.

BUG=chromium:431514
TEST=ran on some code bases and checked output

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

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

See also https://codereview.chromium.org/720033003/

BUG=311488,432748

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

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

and a link to it.

BUG=

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

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

BUG=None
TEST=my_activity.py still works.

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

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

BUG=https://code.google.com/p/chromium/issues/detail?id=430602
R=bradnelson@google.com, dpranke@chromium.org

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

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

BUG=415464
R=agable@chromium.org, tandrii@chromium.org

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

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

It currently crashes, which is sad.

R=pgervais@chromium.org
BUG=

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

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

BUG=chromium:430343
TEST=None

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

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