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
@xjm: @larowlan and @catch also agreed we should split out the comment changes from the changes to deprecation or runtime error messages.
Follow up #3121362: Fix duplicate word typos (the the, to to, etc.) for code comments
Proposed resolution
Fix the duplicate words in the test assertions.
Remaining tasks
- Convert https://www.drupal.org/files/issues/2020-03-26/interdiff-9.0.x-19-27.txt into a patch for this issue.
- Reviews.
- RTBC.
- Commit.
User interface changes
N/A
API changes
N/A
Data model changes
N/A
Release notes snippet
N/A
Comment | File | Size | Author |
---|---|---|---|
#16 | 3122547.7_16.rawdiff.txt | 2.16 KB | dww |
#16 | 3122547-16.patch | 6.19 KB | dww |
#7 | 3122547-7.patch | 6.02 KB | dww |
Comments
Comment #2
dww@jungle Thanks for opening this.
https://www.drupal.org/files/issues/2020-03-23/3121362-13-9.0.x.patch actually contains no fixes for deprecation notices, since all the wonky deprecation messages were already removed from the 9.0.x branch. ;)
It seems there's nothing to do here. Should we just close this as "by design"?
Comment #3
jungleHi @dww, see https://www.drupal.org/files/issues/2020-03-26/interdiff-9.0.x-19-27.txt, I think this should be opening. Maybe the title should be adjusted later on.
And the latest patch is https://www.drupal.org/files/issues/2020-03-26/3121362-9.0.x-27.patch, not 3121362-13-9.0.x.patch.
Thanks for commenting!
Comment #4
dww@jungle I replied upstream. I know #27 in the latest patch there. I was specifically looking at earlier patches since I believe all of that should be fixed in 9.0.x, and is in scope in the parent issue. I don't think any of https://www.drupal.org/files/issues/2020-03-26/interdiff-9.0.x-19-27.txt needs to only happen in 9.1.x, and all that can be done in both 9.1.x and 9.0.x. But I'm probably wrong (as usual) about what's in scope where, so thanks for opening this, just in case... ;) /shrug
Comment #5
dwwp.s. To clarify, because none of the linked interdiff includes any of "for exception and deprecation messages" per the title here...
Comment #6
dwwPer #3121362-38: Fix duplicate word typos (the the, to to, etc.) for code comments, the proper scope for this issue is fixing the duplicate words in the test assertions. More accurate title and minor summary updates.
Comment #7
dww;)
Both affected tests pass locally. Applies cleanly to 9.0.x and 9.1.x. Doesn't apply to 8.9.x, but I get the sense this isn't going to be backported that far, so probably it doesn't matter.
Crediting @jungle since it's their code, not mine.
Comment #8
Kristen PolThanks for the patch.
1) I reviewed the changes and see them as follows:
"in in" => "in"
Ditto.
"the the" => "the"
Ditto.
Ditto++.
Ditto ditto!
Ditto ditto ditto.
And final one.
2) Patch applied cleanly:
3) Searched the code after applying the patch for "the the" and they were all in comments:
4) Searched the code after applying the patch for "in in" and there weren't any left.
Looks good so marking RTBC.
Comment #11
catchCommitted 8964921 and pushed to 9.1.x. Thanks!
Comment #12
Kristen Pol@catch Maybe there is a better place to ask and maybe it'll show up at some point, but I noticed that 2 other fixed issues showed up in my issue credits but this one didn't. The odd thing is that one that did show up was marked fixed *after* this issue.
https://www.drupal.org/u/Kristen%20Pol/issue-credits/3060
If the issue credit for this issue doesn't show up at some point, should I file an issue somewhere since it may be a general issue? I don't want to appear "needy" ;) but am concerned that this might be an issue for other people too. The credit does show up for dww and jungle:
https://www.drupal.org/u/dww/issue-credits/3060
https://www.drupal.org/u/jungle/issue-credits/3060
so I would assume it's due to:
1) A caching issue and it will show up at some point
2) The fact it's the last name in the list and has ":" at the end of it (unlikely)
3) The fact there is a space in the name (unlikely)
4) Something else entirely
Thanks!
Comment #13
dww@Kristen Pol re: #12:
No, it's due to the fact that the issue credit system isn't based on Git commits at all, but is entirely based on checkboxes on the issue nodes themselves. @catch seems to have credited you for the review during commit, but didn't actually save that change on the issue. Only project maintainers can toggle those checkboxes and have the value "stick", but they have to save a comment on the issue for that to happen. Since I'm a project maintainer here, and since @catch clearly intended to credit you, doing so now.
Cheers,
-Derek
Comment #14
Kristen Pol@dww Oh, that totally makes sense, it's just the checkboxes. :) My brain obviously hasn't woken up yet. Thanks for sorting that out!
Comment #15
Kristen PolSide note, from what I've seen in the past, if you add a *file* then it automatically checks the box for you but, when I review, I don't add files just for the sake of adding files to make the checkbox get checked... only if there are screenshots from manual testing.
UPDATE: Maybe the logic could be changed that if someone marks it RTBC then it also is automatically checked?
Comment #16
dww@catch: @alexpott cherry-picked #3121362: Fix duplicate word typos (the the, to to, etc.) for code comments all the way back to 8.8.x. Is this worth backporting, too? That'd keep tests/assertions more similar on all branches to make further patching easier and not require manual backporting. If so, here's a patch that applies cleanly to 8.8.x and 8.9.x. There was a conflict in core/modules/system/tests/modules/js_message_test/js/js_message_test.js but everything else applied cleanly and I just had to run yarn build:js to regenerate that .js file. Interdiff can't hang since patch #7 doesn't apply on this branch, so here's a raw diff of the 2 patch files. /shrug
@Kristen Pol: Generally, core committers are pretty on it. It's rare that there's a mix-up like this, and when it happens, they usually resolve it very quickly. I'm hesitant to propose any further changes to the behavior of the credit system. There was a few month period where any comment on an issue automatically checked the box for you, and while that was live, there was a noticeable spike in useless comments on core issues where folks were just fishing for credit. Even if we restrict it to only RTBC'ing comments, I fear folks will start leaving useless-RTBC comments (when something isn't really RTBC, or they haven't really reviewed). Of course, all this is totally out of scope in this issue. ;) If you're serious, you should propose it in the core ideas queue or perhaps directly in the drupal.org customizations queue and try to get support there.
Thanks,
-Derek
Comment #17
Kristen Pol@dww Thanks for the info. Yeah, makes sense. Lots of "gaming the system" we have to consider :(
Comment #18
Kristen Pol@dww Do you want a review of the 8.9 patch?
Comment #19
jungleI'd RTBC this. Confirmed the
.js
file is identical with the one generated from its.es6.js
file. But please feel free to continue reviewing if you want. @Kristen Pol.Thanks!
Comment #20
Kristen Pol@jungle Thanks for jumping on that! All good. :)
Comment #22
jungleRandom failure, back to RTBC
Comment #26
xjmRe: crediting, @Kristen Pol was in the commit message, so if her name got unchecked, it was due to a data loss race condition with System Message. If that happens again in the future, it should definitely be reported to infra as soon as it happens. As an aside, note that the fact that the issue was reopened effectively "de-activated" those credits, since credit is only applied when the issue is Fixed or Closed (Fixed). :)
I reviewed the backport with
git diff --color-words
, committed it to 8.9.x, and cherry-picked it to 8.8.x. Thanks!