tag: Fix regression leaving generic {{merge}} instead of {{merge to}} or {{merge from}} #714
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Sorry for committing the bug. A better way to fix it is by simply adding params.mergeTag = tagName;after L1527. That is where the other merge-related params items such as |
… or {{merge from}}
As reported at [WT:TW](https://en.wikipedia.org/w/index.php?oldid=918480329#Merge_tags), Twinkle has been leaving `{{merge}}` on the other page when tagging with `{{merge to}}` or `{{merge from}}` (rather than `{{merge from}}` or `{{merge to}}`, respectively).
Stems from wikimedia-gadgets#485, where somewhere along the way the addition in [L1274](wikimedia-gadgets@95eac79#diff-03744d176dfd1e8a2178545886a87644R1606) at 95eac79 was removed but `params.mergeTag` remained.
Amorymeltzer
force-pushed
the
tag-fixmergeto
branch
from
f423e39
to
743e821
Compare
|
Thanks — not sure how I missed that section? |
Amorymeltzer
added a commit
to Amorymeltzer/twinkle
that referenced
this pull request
Feb 21, 2020
In doing wikimedia-gadgets#862, I undid the intent of wikimedia-gadgets#714 to avoid the client clock as much as possible for the specific case of soft redirects being nominated at RfD. It never worked - thus wikimedia-gadgets#861 - but the idea is sound. This has softredirects go through the same `curtimestamp` query and "typical" redirects, but simply skips processing of target or section. It's not a free check anymore, but it should be incredibly infrequent and fairly quick.
Amorymeltzer
added a commit
to Amorymeltzer/twinkle
that referenced
this pull request
Mar 2, 2020
In doing wikimedia-gadgets#862, I undid the intent of wikimedia-gadgets#714 to avoid the client clock as much as possible for the specific case of soft redirects being nominated at RfD. It never worked - thus wikimedia-gadgets#861 - but the idea is sound. This has softredirects go through the same `curtimestamp` query and "typical" redirects, but simply skips processing of target or section. It's not an entirely free check anymore, but it should be incredibly infrequent and fairly quick.
wiki-ST47
pushed a commit
to wiki-ST47/twinkle
that referenced
this pull request
Sep 2, 2020
In doing wikimedia-gadgets#862, I undid the intent of wikimedia-gadgets#714 to avoid the client clock as much as possible for the specific case of soft redirects being nominated at RfD. It never worked - thus wikimedia-gadgets#861 - but the idea is sound. This has softredirects go through the same `curtimestamp` query and "typical" redirects, but simply skips processing of target or section. It's not an entirely free check anymore, but it should be incredibly infrequent and fairly quick.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As reported at WT:TW, Twinkle has been leaving
{{merge}}on the other page when tagging with{{merge to}}or{{merge from}}(rather than{{merge from}}or{{merge to}}, respectively).Stems from #485, where somewhere along the way the addition in L1274 at 95eac79 was removed but
params.mergeTagremained.I've added the line back when validating the various merge tags, since we're already evaluating them all.
*cries in
.includes()*