New issue
Advanced search Search tips

Issue 697185 link

Starred by 1 user

Issue metadata

Status: Fixed
Owner:
Closed: Mar 2017
Cc:
Components:
EstimatedDays: ----
NextAction: ----
OS: All
Pri: 2
Type: Bug



Sign in to add a comment

Don't include codereview.settings when checking crashpad into chromium

Project Member Reported by aga...@chromium.org, Feb 28 2017

Issue description

Crashpad is currently included in chromium by directly checking in all of the files. (e.g. https://chromium.googlesource.com/chromium/src/+/d0b0e164df66904125ecdcf3473212a1d97a11ce)

This has a few downsides:
* It doesn't match the workflow used by other large projects like skia and v8
* It loses the revision history of those files for anyone investigating in their local checkout of chromium/src/third_party/crashpad
* It puts a codereview.settings file which specifies crashpad-specific parameters into the src.git repository
* It requires manual effort to synchronize any changes made directly to the copy in src.git back to the upstream source of truth

Effort should be made to switch crashpad to use the correct DEPS-based workflow to integrating into chromium/src.
 

Comment 1 by siggi@chromium.org, Feb 28 2017

Cc: mark@chromium.org scottmg@chromium.org
Status: WontFix (was: Available)
This is done for <reasons>, which have been discussed and vetted and stuff. See also mini_chromium, and http://go/crashpad-overview-dd, which touches lightly on this.

Comment 2 by mark@chromium.org, Feb 28 2017

I liked it better the other way too. See  bug 472900 .
DEPS and gclient are a bug. :(

Is the codereview.settings file problematic? Presumably update.py could easily exclude that if it'd help.

Comment 4 by aga...@chromium.org, Feb 28 2017

Status: Available (was: WontFix)
Summary: Don't include codereview.settings when checking crashpad into chromium (was: Include crashpad in chromium via DEPS instead of direct check-in)
Yes, it is a problem. It contains crashpad-specific variables which put codereviews uploaded from that directory of chromium into a bad state.

Comment 5 by mark@chromium.org, Feb 28 2017

We can exclude it like Scott said. It makes it a little harder to deal with some things because imports will trip over updates to that file and it’ll be harder for the importer to determine that there are no local changes, but we can probably find ways to work around those.

Or could we change git-cl to use the topmost codereview.settings and not an inner one as it’s presumably doing now?

Comment 6 by aga...@chromium.org, Feb 28 2017

(I'd also say that it shouldn't include the DEPS file, which could be confusing since it is not at the root of the repository, but that doesn't seem to be actively messing with any tools at the moment.)

Comment 7 by aga...@chromium.org, Feb 28 2017

No, git-cl correctly wants to use the codereview.settings file which is the nearest ancestor of all files in the CL. This is a feature which allows some subdirectories to set up different CC lists, or some subdirectories to upload to Gerrit instead of Rietveld, or some subdirectories to have different default notification settings. But this codereview.settings file says "you're uploading to crashpad!" which isn't true.

Comment 8 by aga...@chromium.org, Feb 28 2017

(In the future gerrit-only world, codereview.settings will go away entirely. So that'll be nice. But we're not there yet.)

Comment 9 by mark@chromium.org, Mar 1 2017

Owner: mark@chromium.org
Status: Started (was: Available)
Noting here too (first came up in the context of  bug 683158 ):

I found that once git-cl started wanting to talk to Gerrit (which happens after you try working on a Crashpad-only change in Chrome), that horrible-ness “stuck” in Chrome. This command, run from the Chrome checkout, fixes it:

git config --remove-section gerrit
Project Member

Comment 12 by bugdroid1@chromium.org, Mar 14 2017

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

commit 391e842f5feab036653813d0d441c1d504a971e8
Author: mark <mark@chromium.org>
Date: Tue Mar 14 02:20:40 2017

Be shell-safe with git-filter-branch use in update.py

The command argument to git filter-branch --index-filter is always
passed to a shell. Even on Windows, this will be git bash. Use proper
quoting when building this argument.

BUG= 697185 

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

[modify] https://crrev.com/391e842f5feab036653813d0d441c1d504a971e8/third_party/crashpad/update.py

Comment 13 by mark@chromium.org, Mar 14 2017

Status: Fixed (was: Started)

Sign in to add a comment