Support for Drupal 7 is ending on 5 January 2025—it’s time to migrate to Drupal 10! Learn about the many benefits of Drupal 10 and find migration tools in our resource center.Problem/Motivation
It's possible to "generate" a patch file based from the diff or a merge request/branch/commit/... from gitlab. This would be handy to be able to use with the new issue fork flow on Drupal.org.
Steps to reproduce
- Select widget_block as project
- Add patch: https://git.drupalcode.org/issue/widget_block-3085435/-/commit/507987fa7...
- Get the error "The patch URL must be from http://www.drupal.org/files/."
Proposed resolution
Simply also allowing https://git.drupalcode.org would resolve the issue.
Remaining tasks
Updated the Regex variable fallback.
Update the error message if something else is parsed.
Update the placeholder on the patch field.
Update documentation?
Only possible for admins on simplytest.me: Update the "Allowed patch source (simplytest_advanced_patch_source)" setting value to "^/https?:\/\/(www\.)?(?:drupal\.org\/files\/|git\.drupalcode\.org\/)/"
User interface changes
The placeholder text and error message is changed.
API changes
N/A
Data model changes
N/A
| Comment | File | Size | Author |
|---|---|---|---|
| #6 | Screenshot at Dec 14 22-14-33.png | 112.74 KB | BramDriesen |
Issue fork simplytest-3188350
Show commands
Start within a Git clone of the project using the version control instructions.
Or, if you do not have SSH keys set up on git.drupalcode.org:
- 3188350-allow-httpsgit.drupalcode.org-as
changes, plain diff MR !1
1 hidden branch
Comments
Comment #2
BramDriesenI picked the wrong version obviously :)
Comment #3
BramDriesenComment #5
BramDriesenComment #6
BramDriesenPatched the logic as much as I could without testing directly. I did validate the regex expressions.
Comment #7
jhodgdon+1 for fixing this as soon as possible:
Thanks!
Comment #9
Charles Belov@jhodgdon I'm not seeing a preview link at either https://git.drupalcode.org/project/drupal/-/merge_requests/4656#note_209449 or https://git.drupalcode.org/project/drupal/-/merge_requests/4656#note_209449
Please advise where to look for that link.
Further, when I tried to apply a patch using simplytest.me, the console log shows:
- Applying patches for drupal/core
https://git.drupalcode.org/issue/drupal-3273986/-/commit/7bd5d37bb692615... (STM patch 7bd5d37bb6926152fd9cca21cc565824e6b034f2)
Could not apply patch! Skipping. The error was: Cannot apply patch https://git.drupalcode.org/issue/drupal-3273986/-/commit/7bd5d37bb692615...
Comment #10
Charles BelovIt appears this change has in fact been merged and was never marked as being complete or closed.
It turns out that I misunderstood what URL I needed to supply to simplytest.me. Once I gave it the correct URL for the patch, https://git.drupalcode.org/project/drupal/-/merge_requests/4656.patch, the console confirmed that it had been applied:
and the effects of the patch were visible when I logged into my new test instance.
It was not particularly easy for me to find that patch URL. It required multiple steps on git.drupalcode.org to find the proper patch and copy the link. It would be nice if it were documented somewhere, and I would happily file an issue for that documentation if I had any idea where the documentation actually belongs. It probably doesn't belong on the simplytest.me project.
It would be nice for the simplytest.me project to cross-link to it once the documentation exists, given that failure to supply the proper URL results in failure failure to apply the patch, and given that the redirect to the instance occurs even though there has been an error (again, a separate issue).
Comment #11
rachel_norfolkYes, just tested this with an 11.x link to an MR and it is accepted just fine.
Not actually sure where the change was applied to, which means I can’t reference it in the (inevitable) duplicate. Sorry.