Don't include codereview.settings when checking crashpad into chromium |
||||
Issue descriptionCrashpad 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.
,
Feb 28 2017
I liked it better the other way too. See bug 472900 .
,
Feb 28 2017
DEPS and gclient are a bug. :( Is the codereview.settings file problematic? Presumably update.py could easily exclude that if it'd help.
,
Feb 28 2017
Yes, it is a problem. It contains crashpad-specific variables which put codereviews uploaded from that directory of chromium into a bad state.
,
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?
,
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.)
,
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.
,
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.)
,
Mar 1 2017
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
,
Mar 1 2017
,
Mar 3 2017
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/6af56c56185b4ca8518353f49c43121bda5f8b0d commit 6af56c56185b4ca8518353f49c43121bda5f8b0d Author: mark <mark@chromium.org> Date: Fri Mar 03 18:08:09 2017 Exclude codereview.settings from Crashpad BUG= 697185 Review-Url: https://codereview.chromium.org/2722063003 Cr-Commit-Position: refs/heads/master@{#454620} [modify] https://crrev.com/6af56c56185b4ca8518353f49c43121bda5f8b0d/third_party/crashpad/README.chromium [delete] https://crrev.com/200362b9d0f8bb3748364f8d4938ec6333cf47ab/third_party/crashpad/crashpad/codereview.settings [modify] https://crrev.com/6af56c56185b4ca8518353f49c43121bda5f8b0d/third_party/crashpad/update.py
,
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
,
Mar 14 2017
|
||||
►
Sign in to add a comment |
||||
Comment 1 by siggi@chromium.org
, Feb 28 2017Status: WontFix (was: Available)