Commit Graph

2317 Commits (279c21881c172206d3188a3281a00ef90eeaa90a)
 

Author SHA1 Message Date
bauerb@chromium.org 279c21881c Use `git rev-list A..B` to get the list of commits to be uploaded to Gerrit by git cl.
BUG=374121

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@270972 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
sheyang@chromium.org a656e70574 Revert of use canonical base URL for projects (https://codereview.chromium.org/271703010/)
Reason for revert:
CQ rejects all chromium projects because of this change.

Original issue's description:
> use canonical base URL for projects
> 
> BUG=372645
> R=iannucci@chromium.org, sergeyberezin@chromium.org
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=270460

TBR=iannucci@chromium.org,sergeyberezin@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=372645

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@270803 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
iannucci@chromium.org 6332b152c6 Make git_map properly update merge base markers.
R=agable@chromium.org
BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@270572 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
agable@chromium.org 40a3d0b62b Recursively find all tests in a git repo.
This method is necessary to allow good code organization (i.e., unittests live
adjacent to the source files they test) in the new infra.git repository.

R=maruel@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@270564 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
hinoka@chromium.org 46b874144e Pass shallow flag through gclient to git_cache.py
BUG=261741

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@270542 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
nodir@chromium.org 73c31cd9d0 trychange.py hotfix
Should use e.message instead of e.reason, where e is an Exception

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@270473 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
sheyang@google.com 6a9ead263f use canonical base URL for projects
BUG=372645
R=iannucci@chromium.org, sergeyberezin@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@270460 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
szager@chromium.org 174766fb97 Added Mirror.UnlockAll with logic fixes.
BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@270205 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
borenet@google.com 359bb6435f gclient: fix --delete_unversioned_trees bug
This occurs for svn checkouts when the DEPS change from:
  third_party/skia/gyp
  third_party/skia/include
  third_party/skia/src
to:
  third_party/skia

First, gclient deletes/moves third_party/skia to make room for the new checkout.
When finished, it notices that the three subdirectories under skia are now
"unversioned" according to .gclient_entries, even though they are part of Skia
repo. On the bots, this causes them to be deleted.

There is a check to determine whether the thought-to-be unversioned directories
are actually subdirectories of another checkout, but it doesn't work in the svn
case because the check assumes that, if they are subdirectories of another
checkout, it must be an svn checkout. scm.GetCheckoutRoot() returns None
because it can't find an svn checkout containing those subdirectories. None is
not in gclient_entries, so the directories get deleted.

BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@270133 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
nodir@chromium.org 3fb3fcd9a1 Renamed Tryjob label to Tryjob-Request
Some users interpreted Tryjob=+1 as "passed a try job", so renaming this one
Assuming will never rename again.

R=kmg@chromium.org
BUG=369665

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@270011 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
nodir@chromium.org ce32b6e3d0 gerrit_util is aware of auth errors
gerrit_util raises GerritAuthenticationError with a nice message
suggesting to check the .netrc file.

R=szager@chromium.org, vadimsh@chromium.org
BUG=369512

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@269865 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
iannucci@chromium.org 04404bc408 Make git-nav-downstream not print a stack if you Ctrl-C it.
R=agable@chromium.org
BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@269661 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
hinoka@chromium.org dc6a1d035a Don't have checkout.py's git apply_patch fail when files don't match
The contract for apply_patch is that it applies a patch on top of something, and
it either all applies cleanly or it fails.  The something that is applied on can
be as clean or dirty without having apply_patch judge.  The particular failure
condition was that we want to patch DEPS first (into the index), do some stuff,
then apply another patch on top of that.  Apply_patch was failing because it
saw that there was a DEPS in the index already when it wasn't expecting one.

A fix that could've also worked is to run git diff --staged before applying the
patch, then subtract that list from found_files, but it still gets tricky then
because what if you want to apply an independent patch on top of
an already patched index?  

Because apply_patch shouldn't need to be in the business of
keeping track of what the state of everything is like before and
after a patch (That's up to the patch application), the better thing would be to remove the assert
alltogether, and rely on "git apply" to complain if something doesn't apply.

BUG=370503
TBR=iannucci

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@269526 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
hinoka@chromium.org c4396a1b4e Re-land of have apply_patch.py/checkout.py stage git patches instead of committing them
For a bot_update Git world, we don't really want to commit patches. Instead
we just want to leave them unstaged.

BUG=370503

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@269489 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
hinoka@chromium.org 3e6848f2ae Revert of Have apply_patch.py/checkout.py stage git patches instead of committing them (https://codereview.chromium.org/273543002/)
Reason for revert:
Borked all the tryjobs due to missing --base_ref, needed to land with https://codereview.chromium.org/273543002/

Original issue's description:
> Have apply_patch.py/checkout.py stage git patches instead of committing them
> 
> For a bot_update Git world, we don't really want to commit patches.  Instead
> we just want to leave them unstaged.
> 
> BUG=370503
> TEST=ran locally with and without flag
> 
> Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=269468

TBR=maruel@chromium.org,agable@chromium.org,hinoka@google.com,iannucci@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=370503

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@269482 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
hinoka@chromium.org 17db905ebf Adds url to gclient json (try 2)
Reland of https://codereview.chromium.org/268373003/ with a fix (wraps the
url with str())
https://codereview.chromium.org/268393002/ (bot_update root@revision support) is dependent on this

BUG=370503
TEST= gclient sync --output-json ~/tmp/asdfasdf.json on both an SVN and Git checkout

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@269469 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
hinoka@chromium.org ba2f187250 Have apply_patch.py/checkout.py stage git patches instead of committing them
For a bot_update Git world, we don't really want to commit patches.  Instead
we just want to leave them unstaged.

BUG=370503
TEST=ran locally with and without flag

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@269468 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
raphael.kubo.da.costa@intel.com 331fbc43e3 Update cpplint.py to r119.
The only difference compared to upstream[1] is the shebang line from
depot_tools r136603.

[1] https://code.google.com/p/google-styleguide/source/browse/trunk/cpplint/cpplint.py?spec=svn131&r=119

R=maruel@chromium.org
BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@269187 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
iannucci@chromium.org 5912063e0d Remove git-cr{up,sync} and replace with informative shell script.
R=mmoss@chromium.org, szager@chromium.org
BUG=371421

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@269088 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
iannucci@chromium.org 1533693854 Fix typo in push_to_gs.sh which causes incorrect upload.
R=vadimsh@chromium.org
BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@269082 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
iannucci@chromium.org 43f4ecc65e Make git rebase-update more responsive.
Passes through git-fetch's output instead of buffering it.

R=djacques@chromium.org
TBR=agable@chromium.org
BUG=366375

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@269080 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
iannucci@chromium.org 5c7e5b3160 Add fast --HEAD option to upstream-diff.
This is useful for large repos (like src.git)

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

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@269079 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
borenet@google.com b225621281 gclient: Actually move or delete mismatched checkouts
Followup to https://codereview.chromium.org/189913020/ ("gclient: print a warning if a dep would get deleted or moved in the future")

BUG=skia:1638

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@268944 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
szager@chromium.org 931a11d294 Revert "Adds url to gclient json"
This reverts commit 2f2b0593e0.

Sample breakage:

http://build.chromium.org/p/chromium.chrome/builders/Google%20Chrome%20ChromeOS/builds/67372/steps/gclient%20sync/logs/stdio

BUG=
R=grt@chromium.org, hinoka@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@268887 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
hinoka@chromium.org 2f2b0593e0 Adds url to gclient json
So that bot_update can use them to figure out which repo correspons to where.

BUG=370503

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@268875 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
pgervais@chromium.org cee6dc461f git cl push -> git cl land
BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@268835 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
pgervais@chromium.org e57b09db3a Fixed wrong test
BUG=366554

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@268647 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
hinoka@google.com 64d819b659 Fix name setting when applying SVN settings in patches
"name" is passed in as a function argument, but its "redelcared" in another iterator.

Yay dynamic scoping.

BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@268593 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
hinoka@chromium.org b1d0cc13c0 Add black/whitelisting to apply_issue
BUG=370503
TESTS=
apply_issue.py --issue 243483007 --patchset 210001 --whitelst chrome/browser/chromeos/login/screen_locker.cc
apply_issue.py --issue 243483007 --patchset 210001 --blacklist chrome/browser/chromeos/login/screen_locker.cc

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@268589 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
jochen@chromium.org 048da08e1e Add recipe for v8
BUG=none
R=dpranke@chromium.org,machenbach@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@268466 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
hinoka@chromium.org d5a1ab12ef Remove prompt for default project ID
The "What is your project ID" has confused about every user of gsutil that I've
talked to, and isn't even useful in the context of download_from_google_storage
because its only good for "mb" on a bucket and "ls" without specifying a bucket,
neither of which this version of gsutil should ever do.

This CL:
* Removes the prompt for project ID
* Removes the 2 second delay which was meant for autolaunching a browser
  * We don't want this behavior anyways because most of our devs have multiple
    browser profiles open and they need to paste the URL into the correct profile.
* Removes support to autolaunch a broswer.
* Removes a lot of the extra messages.  The prompt now looks like:
===
$ download_from_google_storage -g
Please navigate your browser to the following URL:
https://accounts.google.com/o/oauth2/auth?.....

Enter the authorization code: <code>

Boto config file "/usr/local/google/home/hinoka/.boto.depot_tools" created.
$ 
===
BUG=351015

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@267973 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
szager@chromium.org ce2fccbdc1 self._Capture -> scm.GIT.Capture.
This is a special case where we want to run a git command, even if
it's an SVNWrapper instance.

R=iannucci@chromium.org,agable@chromium.org
BUG=369145

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@267707 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
agable@chromium.org 9c0f85130e Add newline to git-new-branch output.
R=iannucci@chromium.org, pgervais@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@267616 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
borenet@google.com 90fe58b610 gclient_scm: Only _DeleteOrMove if _Clone fails
BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@267587 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
bauerb@chromium.org f75c230c9c Warn before uploading more than one commit to Gerrit.
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@267480 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
nodir@chromium.org a779803c2b trychange.py: Gerrit protocol
This change implements Gerrit protocol for posting try jobs. The
"protocol" is described here:
https://code.google.com/p/chromium/issues/detail?id=366099#c10

CLs for Buildbot:
https://codereview.chromium.org/250983003/
https://codereview.chromium.org/259323003/

R=vadimsh@chromium.org, maruel@chromium.org, kmg@chromium.org
BUG=366099, 364639, 364631

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@267379 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
agable@chromium.org ea84ef1828 Get presubmit_support to compute diffs against a given upstream.
R=hinoka@chromium.org
BUG=368720

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@267309 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
agable@chromium.org 2da1ade7b4 Add --upstream flag to presubmit_support for Git.
R=hinoka@chromium.org
BUG=368720

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@267254 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
iannucci@chromium.org 3f802b8b1f Roll windows git to include htmlpathalt.
This will allow e.g. `git help rebase-update` to work.

R=agable@chromium.org
BUG=238428

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@267038 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
pgervais@chromium.org fb653b65e5 More explicit error message
When running an executable fails, the original error message sent by
the OS is printed, together with a more detailed suggested solution.

BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@266908 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
pgervais@chromium.org 022d06ef61 git new-branch displays an explanatory line.
BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@266905 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
iannucci@chromium.org 208246dcf7 Move docs folder to man.
This makes the depot_tools manpages automatically show up in the effective
MANPATH for mac/linux.

R=agable@chromium.org
BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@266667 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
bauerb@chromium.org c9cf90ae99 Clear configured merge-base when switching upstream.
Otherwise, the old merge-base value can confuse the hell out of `git cl upload`.

BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@266648 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
iannucci@chromium.org 280f250691 Add script to depot_tools to push html directory to gs bucket.
R=agable@chromium.org
BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@266590 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
hinoka@google.com 4dfb86684c Add more flushes to gclient_utils
BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@266255 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
agable@chromium.org 69995f4984 Fix gclient to correctly check out remote refs during update.
Currently, any bot run with "--revision=project@origin/master" fails, because
it fetches the remote ref into refs/remotes/origin/master, but then checks out
refs/heads/master, which hasn't been rolled forward. This is very similar to
the bug fixed by https://codereview.chromium.org/85473007

However, I am very wary of this patch, because I am worried about changing
something commented with " For compatibility...". Marc-Antoine, please comment.

R=maruel@chromium.org, smut@chromium.org, stip@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@266251 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
jrobbins@chromium.org a4c03054cb Process first branch status request before spawning threads.
BUG=341052

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@266219 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
hinoka@google.com 776a2c3fc7 Python fallback for git cache bootstrap
This is because the version of unzip on osx doesn't support zip64, so it can't
unzip large repositories like blink.

BUG=261741

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@266151 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
pgervais@chromium.org 2f64f78a07 logged changed paths list
This should help debugging should presubmit failures on a CQ.

BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@266063 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
hinoka@google.com 356cb5f4d6 Comment out lkcr/lkgr fetching from chromium/src.git's git cache
This isn't doing anything, and is currently costing 20 seconds of idle time
per bot_update run.  Lets remove it until we convert lkcr/lkgr to tags.

BUG=261741

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

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