New issue
Advanced search Search tips
Note: Color blocks (like or ) mean that a user may not be available. Tooltip shows the reason.

Issue 651068 link

Starred by 2 users

Issue metadata

Status: Fixed
Owner:
Closed: Nov 2016
Cc:
Components:
EstimatedDays: ----
NextAction: ----
OS: ----
Pri: 2
Type: Bug-Regression

Blocking:
issue skia:5612



Sign in to add a comment

Using "git cl patch --gerrit" in chromium/src/third_party/skia does not work

Project Member Reported by rmis...@google.com, Sep 28 2016

Issue description

"git cl patch ${issue_num} --gerrit" works from a standalone checkout of Skia created with "git clone https://skia.googlesource.com/skia"

But from chromium/src/third_party/skia running
"git cl patch 2719 --gerrit" seems to try to patch in http://gerrit.chromium.org/gerrit/2719 instead of https://skia-review.googlesource.com/c/2719/

Is there a configuration we are missing to make it work from chromium/src/third_party/skia ?

 
Cc: -tandrii@chromium.org
Components: Infra>SDK
Labels: Milestone-Fishfood
Owner: tandrii@chromium.org
Status: Assigned (was: Untriaged)

Comment 2 by rmis...@google.com, Sep 28 2016

Blocking: skia:5612

Comment 3 by rmis...@google.com, Sep 28 2016

From fmalita@:
"""
A workaround I found is to add a gerritserver .git/config entry for the branch I'm trying to patch to, before executing git cl:

git config branch.$(git rev-parse --abbrev-ref HEAD).gerritserver https://skia-review.googlesource.com
"""

Comment 4 by tandrii@google.com, Sep 28 2016

fmalita@ is correct, and it's indeed a valid workaround. `git cl` guesses Gerrit host from remote (usually origin) url. Because chromium DEPS [1] uses skias mirror, it doens't work from inside chromium chechkout.

Two independent things that can be done:
1) update chromium DEPS to use skia's actual source of truth.
2) actually record GERRIT CODE REVIEW url inside codereview.settings.

I believe 2) is preferred. The challenge with it is that there is already CODE_REVIEW_SERVER used by Rietveld. For example, [2].
So, maybe finally make use of Gerrit server value instead of treating it as a bool (see [3]).


[1] https://chromium.googlesource.com/chromium/src/+/master/DEPS#173
[2] https://chromium.googlesource.com/chromium/src/+/master/codereview.settings#2
[3] https://chromium.googlesource.com/angle/angle/+/master/codereview.settings#3
Project Member

Comment 5 by sheriffbot@chromium.org, Sep 29 2016

Labels: Hotlist-Google
Labels: -Type-Bug Type-Bug-Regression
Cc: rmis...@chromium.org tandrii@chromium.org
Owner: aga...@chromium.org
Status: Started (was: Assigned)
Here's an implementation of (1): https://codereview.chromium.org/2477533002

I don't think there's any reason for it to be "not preferred". gclient already has support for understanding that the remote url has been updated, and should handle cache invalidation correctly. It won't cause lots of churn, since the hashes are identical. And we already use the swiftshader, pdfium, and boringssl hosts directly, so we can do the same for skia.
Project Member

Comment 8 by bugdroid1@chromium.org, Nov 4 2016

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/851c6f72587756eab07e345c2212c0d45c8c10e1

commit 851c6f72587756eab07e345c2212c0d45c8c10e1
Author: agable <agable@chromium.org>
Date: Fri Nov 04 17:17:39 2016

DEPS in Skia from their actual googlesource host

There is no reason to rely on googlesource-to-googlesource
mirroring in DEPS files. We already pull directly from the
pdfium, boringssl, swiftshader, and android hosts, so we should
do the same for skia as well.

R=jam@chromium.org, rmistry@chromium.org
BUG= chromium:651068 

Review-Url: https://codereview.chromium.org/2477533002
Cr-Commit-Position: refs/heads/master@{#429926}

[modify] https://crrev.com/851c6f72587756eab07e345c2212c0d45c8c10e1/DEPS

Status: Fixed (was: Started)
This should be fixed the next time you run gclient sync. If it isn't, let me know.

(It won't be fixed for checkouts based on previous release buildspecs, but I doubt that's the main use-case here.)

Sign in to add a comment