Page MenuHomePhabricator

MediaWiki-MergeHistoryComponent
ActivePublic

Members (1)

Watchers (2)

Details

Description

The "Merge history" functionality of MediaWiki core. Includes the MergeHistory class and the frontend SpecialMergeHistory ApiMergeHistory. (Documentation)

Parent: MediaWiki-General

Recent Activity

Yesterday

Pppery renamed T395112: History merges appearing twice in non-page-specific log entry lists is confusing from Log entries appearing twice (and in other language) to History merges appearing twice in non-page-specific log entry lists is confusing.
Fri, May 23, 9:44 PM · MW-Interfaces-Team, MediaWiki-MergeHistory, MediaWiki-Logevents
Pppery added a comment to T395112: History merges appearing twice in non-page-specific log entry lists is confusing.

I think of the "merge-target" and "merge" logs as the same log entry displayed in two different ways, not two different log entries.

Fri, May 23, 9:43 PM · MW-Interfaces-Team, MediaWiki-MergeHistory, MediaWiki-Logevents
A_smart_kitten added a comment to T395112: History merges appearing twice in non-page-specific log entry lists is confusing.

Fair enough :) duplicate move-log bug split to T395168: Duplicate log-events sometimes created for page moves.

Fri, May 23, 9:38 PM · MW-Interfaces-Team, MediaWiki-MergeHistory, MediaWiki-Logevents
Pppery added a comment to T395112: History merges appearing twice in non-page-specific log entry lists is confusing.

There's a real software change that would be done if there were infinite resources to do things: only show "merge-target" logs when viewing the logs for a specific page, and not the logs for a specific user (or all logs). That should be tracked on Phabricator somewhere, even though I don't plan to code it and don't expect anyone else to.

Fri, May 23, 4:38 PM · MW-Interfaces-Team, MediaWiki-MergeHistory, MediaWiki-Logevents
A_smart_kitten added a comment to T395112: History merges appearing twice in non-page-specific log entry lists is confusing.

True, but (from what I can see) I don't think there is a histmerge bug here — the two log events seem to be expected behaviour as a result of T118132. I guess I was thinking that this ticket would be reframed to be about the move-logs bug only, but no objections to splitting out the move bug to another task :)

Fri, May 23, 4:35 PM · MW-Interfaces-Team, MediaWiki-MergeHistory, MediaWiki-Logevents
Pppery added a comment to T395112: History merges appearing twice in non-page-specific log entry lists is confusing.

The move bug is probably completely unrelated to the histmerge bug and should be split to a different task.

Fri, May 23, 3:57 PM · MW-Interfaces-Team, MediaWiki-MergeHistory, MediaWiki-Logevents
A_smart_kitten added a comment to T395112: History merges appearing twice in non-page-specific log entry lists is confusing.

Looks like there are no more instances of fully duplicate entries though, more general quarry query: https://quarry.wmcloud.org/query/93916

Fri, May 23, 3:23 PM · MW-Interfaces-Team, MediaWiki-MergeHistory, MediaWiki-Logevents
Count_Count added a comment to T395112: History merges appearing twice in non-page-specific log entry lists is confusing.

The move log entries are not exactly duplicate, they differ in the associated_rev_id field of the log_params column.

Fri, May 23, 2:34 PM · MW-Interfaces-Team, MediaWiki-MergeHistory, MediaWiki-Logevents
Maintenance_bot added a project to T395112: History merges appearing twice in non-page-specific log entry lists is confusing: MW-Interfaces-Team.
Fri, May 23, 2:30 PM · MW-Interfaces-Team, MediaWiki-MergeHistory, MediaWiki-Logevents
Count_Count added a comment to T395112: History merges appearing twice in non-page-specific log entry lists is confusing.

Looks like there are no more instances of fully duplicate entries though, more general quarry query: https://quarry.wmcloud.org/query/93916

Fri, May 23, 2:23 PM · MW-Interfaces-Team, MediaWiki-MergeHistory, MediaWiki-Logevents
Pppery edited projects for T395112: History merges appearing twice in non-page-specific log entry lists is confusing, added: MediaWiki-Logevents, MediaWiki-MergeHistory; removed MediaWiki-General.
Fri, May 23, 2:07 PM · MW-Interfaces-Team, MediaWiki-MergeHistory, MediaWiki-Logevents
Ammarpad reassigned T395075: "redirect=no" appears on the wrong link in Merge log entries at the destination from Ammarpad to codeofdusk.
Fri, May 23, 12:23 PM · Patch-For-Review, MW-Interfaces-Team, MediaWiki-MergeHistory
gerritbot added a project to T395075: "redirect=no" appears on the wrong link in Merge log entries at the destination: Patch-For-Review.
Fri, May 23, 11:28 AM · Patch-For-Review, MW-Interfaces-Team, MediaWiki-MergeHistory
gerritbot added a comment to T395075: "redirect=no" appears on the wrong link in Merge log entries at the destination.

Change #1149646 had a related patch set uploaded (by Codeofdusk; author: Codeofdusk):

[mediawiki/core@master] MergeLogFormatter: Fix `redirect` parameter on wrong link in merge logs

https://gerrit.wikimedia.org/r/1149646

Fri, May 23, 11:28 AM · Patch-For-Review, MW-Interfaces-Team, MediaWiki-MergeHistory
Ammarpad claimed T395075: "redirect=no" appears on the wrong link in Merge log entries at the destination.
Fri, May 23, 11:20 AM · Patch-For-Review, MW-Interfaces-Team, MediaWiki-MergeHistory
Pppery added a watcher for MediaWiki-MergeHistory: Pppery.
Fri, May 23, 1:50 AM

Thu, May 22

GTrang renamed T395075: "redirect=no" appears on the wrong link in Merge log entries at the destination from "redirect=no" appears on the wrong link in Merge log entries to "redirect=no" appears on the wrong link in Merge log entries at the destination.
Thu, May 22, 10:23 PM · Patch-For-Review, MW-Interfaces-Team, MediaWiki-MergeHistory
GTrang updated the task description for T395075: "redirect=no" appears on the wrong link in Merge log entries at the destination.
Thu, May 22, 10:22 PM · Patch-For-Review, MW-Interfaces-Team, MediaWiki-MergeHistory
GTrang added a comment to T118132: Merging pages should add a log entry to the destination page.

This has resulted in merge log entries at the destination showing "redirect=no" on the wrong link (T395075). For example, https://en.wikipedia.org/w/index.php?title=Special:Log&logid=169948608 should have "redirect=no" on the link to Draft:Percilla Bejano rather than the link to Percilla Bejano.

Thu, May 22, 10:22 PM · MW-Interfaces-Team (MW-Sprint-9 (2025-05-07 to 2025-05-20)), MW-1.45-notes (1.45.0-wmf.2; 2025-05-20), MediaWiki-MergeHistory, MediaWiki-Logevents
Maintenance_bot added a project to T395075: "redirect=no" appears on the wrong link in Merge log entries at the destination: MW-Interfaces-Team.
Thu, May 22, 7:30 PM · Patch-For-Review, MW-Interfaces-Team, MediaWiki-MergeHistory
GTrang created T395075: "redirect=no" appears on the wrong link in Merge log entries at the destination.
Thu, May 22, 6:37 PM · Patch-For-Review, MW-Interfaces-Team, MediaWiki-MergeHistory

Tue, May 20

HCoplin-WMF closed T118132: Merging pages should add a log entry to the destination page as Resolved.
Tue, May 20, 4:34 PM · MW-Interfaces-Team (MW-Sprint-9 (2025-05-07 to 2025-05-20)), MW-1.45-notes (1.45.0-wmf.2; 2025-05-20), MediaWiki-MergeHistory, MediaWiki-Logevents

Fri, May 16

daniel moved T118132: Merging pages should add a log entry to the destination page from Committed to Demo Ready! on the MW-Interfaces-Team (MW-Sprint-9 (2025-05-07 to 2025-05-20)) board.

Shall we mark this as resolved, or does the MW-Interfaces-Team want to track this on their kanban board?

Fri, May 16, 10:14 PM · MW-Interfaces-Team (MW-Sprint-9 (2025-05-07 to 2025-05-20)), MW-1.45-notes (1.45.0-wmf.2; 2025-05-20), MediaWiki-MergeHistory, MediaWiki-Logevents
daniel edited projects for T118132: Merging pages should add a log entry to the destination page, added: MW-Interfaces-Team (MW-Sprint-9 (2025-05-07 to 2025-05-20)); removed MW-Interfaces-Team.
Fri, May 16, 10:14 PM · MW-Interfaces-Team (MW-Sprint-9 (2025-05-07 to 2025-05-20)), MW-1.45-notes (1.45.0-wmf.2; 2025-05-20), MediaWiki-MergeHistory, MediaWiki-Logevents
Maintenance_bot removed a project from T118132: Merging pages should add a log entry to the destination page: Patch-For-Review.
Fri, May 16, 6:30 PM · MW-Interfaces-Team (MW-Sprint-9 (2025-05-07 to 2025-05-20)), MW-1.45-notes (1.45.0-wmf.2; 2025-05-20), MediaWiki-MergeHistory, MediaWiki-Logevents
ReleaseTaggerBot added a project to T118132: Merging pages should add a log entry to the destination page: MW-1.45-notes (1.45.0-wmf.2; 2025-05-20).
Fri, May 16, 6:00 PM · MW-Interfaces-Team (MW-Sprint-9 (2025-05-07 to 2025-05-20)), MW-1.45-notes (1.45.0-wmf.2; 2025-05-20), MediaWiki-MergeHistory, MediaWiki-Logevents
Novem_Linguae added a comment to T118132: Merging pages should add a log entry to the destination page.

Nice. I have a user script that puts a "log" link on every page, and opens a little panel with all the log entries for that page. Once this patch rides the train, I suspect I can click this, and reliably see if the page has ever been history merged (since the date of the patch anyway). 👍

Fri, May 16, 5:52 PM · MW-Interfaces-Team (MW-Sprint-9 (2025-05-07 to 2025-05-20)), MW-1.45-notes (1.45.0-wmf.2; 2025-05-20), MediaWiki-MergeHistory, MediaWiki-Logevents
gerritbot added a comment to T118132: Merging pages should add a log entry to the destination page.

Change #1139219 merged by jenkins-bot:

[mediawiki/core@master] MergeHistory: Add a log entry at the merge destination

https://gerrit.wikimedia.org/r/1139219

Fri, May 16, 5:31 PM · MW-Interfaces-Team (MW-Sprint-9 (2025-05-07 to 2025-05-20)), MW-1.45-notes (1.45.0-wmf.2; 2025-05-20), MediaWiki-MergeHistory, MediaWiki-Logevents
daniel added a comment to T118132: Merging pages should add a log entry to the destination page.

Log entry on the source page already exists. Adding one for the target page seems iffy to me, as it creates a situation where Special:Log/merge would have two entries for each merge action.

Fri, May 16, 3:09 PM · MW-Interfaces-Team (MW-Sprint-9 (2025-05-07 to 2025-05-20)), MW-1.45-notes (1.45.0-wmf.2; 2025-05-20), MediaWiki-MergeHistory, MediaWiki-Logevents
Graham87 added a comment to T118132: Merging pages should add a log entry to the destination page.

I suppose that the issue of double-logging has been discussed during the RFC. From a technical perspective, it's not a problem.

Nope, it wasn't. But if you say that from a technical perspective it's unproblematic, then I have no issues with it either.

Can we go ahead with adding the log entry for the destination page? I'm happy to hit +2 on the patch.

I for one would have no issue with that.

Fri, May 16, 1:01 PM · MW-Interfaces-Team (MW-Sprint-9 (2025-05-07 to 2025-05-20)), MW-1.45-notes (1.45.0-wmf.2; 2025-05-20), MediaWiki-MergeHistory, MediaWiki-Logevents
daniel added a comment to T118132: Merging pages should add a log entry to the destination page.

The patch that implements the second log entry is ready to be merged, and what it does reflects the outcome of the RFC. I think it would be nice to add a dummy revision on the target page at some point, but that's not a blocker.

Fri, May 16, 12:48 PM · MW-Interfaces-Team (MW-Sprint-9 (2025-05-07 to 2025-05-20)), MW-1.45-notes (1.45.0-wmf.2; 2025-05-20), MediaWiki-MergeHistory, MediaWiki-Logevents
Graham87 added a comment to T118132: Merging pages should add a log entry to the destination page.

Yes but log entries are typically on the source page, and dummy revision on the target page, as in the case of MovePage.

Log entry on the source page already exists. Adding one for the target page seems iffy to me, as it creates a situation where Special:Log/merge would have two entries for each merge action. I don't think there's a precedent for that.

So, on the target page I think we should only add a dummy revision.

Fri, May 16, 12:29 PM · MW-Interfaces-Team (MW-Sprint-9 (2025-05-07 to 2025-05-20)), MW-1.45-notes (1.45.0-wmf.2; 2025-05-20), MediaWiki-MergeHistory, MediaWiki-Logevents
SD0001 added a comment to T118132: Merging pages should add a log entry to the destination page.

It's unfortunate that these were discussed as alternatives - dummy revisions (nearly?) always reflect log entries, so there ahould have been an option 1a+b, meaning a log ewntry *and* a dummy revision.

Fri, May 16, 10:26 AM · MW-Interfaces-Team (MW-Sprint-9 (2025-05-07 to 2025-05-20)), MW-1.45-notes (1.45.0-wmf.2; 2025-05-20), MediaWiki-MergeHistory, MediaWiki-Logevents

Wed, May 14

matmarex closed T393849: MergeHistory does not update derived page data as Resolved.
Wed, May 14, 7:44 PM · MW-1.45-notes (1.45.0-wmf.2; 2025-05-20), MW-Interfaces-Team, MediaWiki-MergeHistory
Maintenance_bot removed a project from T393849: MergeHistory does not update derived page data: Patch-For-Review.
Wed, May 14, 7:30 PM · MW-1.45-notes (1.45.0-wmf.2; 2025-05-20), MW-Interfaces-Team, MediaWiki-MergeHistory
gerritbot added a comment to T393849: MergeHistory does not update derived page data.

Change #1139844 merged by jenkins-bot:

[mediawiki/core@master] page: Emit events from MergeHistory when appropriate

https://gerrit.wikimedia.org/r/1139844

Wed, May 14, 7:05 PM · MW-1.45-notes (1.45.0-wmf.2; 2025-05-20), MW-Interfaces-Team, MediaWiki-MergeHistory

Tue, May 13

ReleaseTaggerBot added a project to T393849: MergeHistory does not update derived page data: MW-1.45-notes (1.45.0-wmf.2; 2025-05-20).
Tue, May 13, 5:01 PM · MW-1.45-notes (1.45.0-wmf.2; 2025-05-20), MW-Interfaces-Team, MediaWiki-MergeHistory
gerritbot added a comment to T393849: MergeHistory does not update derived page data.

Change #1143971 merged by jenkins-bot:

[mediawiki/core@master] page: Test update propagation from MergeHistory command

https://gerrit.wikimedia.org/r/1143971

Tue, May 13, 4:59 PM · MW-1.45-notes (1.45.0-wmf.2; 2025-05-20), MW-Interfaces-Team, MediaWiki-MergeHistory

Sun, May 11

Maintenance_bot added a project to T393849: MergeHistory does not update derived page data: MW-Interfaces-Team.
Sun, May 11, 8:30 PM · MW-1.45-notes (1.45.0-wmf.2; 2025-05-20), MW-Interfaces-Team, MediaWiki-MergeHistory
daniel updated subscribers of T393849: MergeHistory does not update derived page data.
Sun, May 11, 7:41 PM · MW-1.45-notes (1.45.0-wmf.2; 2025-05-20), MW-Interfaces-Team, MediaWiki-MergeHistory
gerritbot added a comment to T393849: MergeHistory does not update derived page data.

Change #1139844 had a related patch set uploaded (by Daniel Kinzler; author: Daniel Kinzler):

[mediawiki/core@master] page: Emit events from MergeHistory when appropriate

https://gerrit.wikimedia.org/r/1139844

Sun, May 11, 7:40 PM · MW-1.45-notes (1.45.0-wmf.2; 2025-05-20), MW-Interfaces-Team, MediaWiki-MergeHistory
gerritbot added a project to T393849: MergeHistory does not update derived page data: Patch-For-Review.
Sun, May 11, 7:34 PM · MW-1.45-notes (1.45.0-wmf.2; 2025-05-20), MW-Interfaces-Team, MediaWiki-MergeHistory
gerritbot added a comment to T393849: MergeHistory does not update derived page data.

Change #1143971 had a related patch set uploaded (by Daniel Kinzler; author: Daniel Kinzler):

[mediawiki/core@master] page: Test update propagation from MergeHistory command

https://gerrit.wikimedia.org/r/1143971

Sun, May 11, 7:34 PM · MW-1.45-notes (1.45.0-wmf.2; 2025-05-20), MW-Interfaces-Team, MediaWiki-MergeHistory
daniel created T393849: MergeHistory does not update derived page data.
Sun, May 11, 7:32 PM · MW-1.45-notes (1.45.0-wmf.2; 2025-05-20), MW-Interfaces-Team, MediaWiki-MergeHistory

Wed, May 7

daniel moved T118132: Merging pages should add a log entry to the destination page from Incoming (Needs Triage) to Next Up on the MW-Interfaces-Team board.
Wed, May 7, 5:02 PM · MW-Interfaces-Team (MW-Sprint-9 (2025-05-07 to 2025-05-20)), MW-1.45-notes (1.45.0-wmf.2; 2025-05-20), MediaWiki-MergeHistory, MediaWiki-Logevents

Tue, Apr 29

Pppery added a comment to T118132: Merging pages should add a log entry to the destination page.

And for the record, I still disagree with all of these tasks and think the current amount of logging is sufficient for reasons I explained in the RfC.

Tue, Apr 29, 1:56 PM · MW-Interfaces-Team (MW-Sprint-9 (2025-05-07 to 2025-05-20)), MW-1.45-notes (1.45.0-wmf.2; 2025-05-20), MediaWiki-MergeHistory, MediaWiki-Logevents
Novem_Linguae added a comment to T118132: Merging pages should add a log entry to the destination page.

As the author of T341760, I support dummy revisions for this. Move and protect have dummy revisions. If I am doing investigation into the history of a page and what titles it's been at, i want its old titles displayed prominently in the history.

Tue, Apr 29, 1:54 PM · MW-Interfaces-Team (MW-Sprint-9 (2025-05-07 to 2025-05-20)), MW-1.45-notes (1.45.0-wmf.2; 2025-05-20), MediaWiki-MergeHistory, MediaWiki-Logevents
Novem_Linguae renamed T341760: Special:MergeHistory should place a dummy revision in the source and target page's history describing the merge from Special:MergeHistory should place a null edit in the page's history describing the merge to Special:MergeHistory should place a dummy revision in the source and target page's history describing the merge.
Tue, Apr 29, 1:51 PM · MW-Interfaces-Team, MediaWiki-MergeHistory
Graham87 added a comment to T118132: Merging pages should add a log entry to the destination page.

It's unfortunate that these were discussed as alternatives - dummy revisions (nearly?) always reflect log entries, so there ahould have been an option 1a+b, meaning a log ewntry *and* a dummy revision.

It was a relatively rushed RFC, started in reaction to me losing my adminship after the first-ever ENWP admin recall (see my user subpage for all the details). Many people wanted to let me continue doing history merges (which is one of the things I specialised in) and I happened to be an importer (another specialty) ... so I was granted history-merging permission via T380753. However, when I was an admin, I very much preferred to use selective undelete to do history-merges rather than the mergehistory special pag ebecause of the logging issues, but now I have no choice. This is all a round-about way of saying: I'm not sure how much weight to give the RFC.

Tue, Apr 29, 1:46 PM · MW-Interfaces-Team (MW-Sprint-9 (2025-05-07 to 2025-05-20)), MW-1.45-notes (1.45.0-wmf.2; 2025-05-20), MediaWiki-MergeHistory, MediaWiki-Logevents
daniel added a comment to T118132: Merging pages should add a log entry to the destination page.

(possibly a naïve) idea: if - judging by the RfC closure - enwiki specifically doesn't want histmerges to show up in the target page's history as a dummy revision

Tue, Apr 29, 12:53 PM · MW-Interfaces-Team (MW-Sprint-9 (2025-05-07 to 2025-05-20)), MW-1.45-notes (1.45.0-wmf.2; 2025-05-20), MediaWiki-MergeHistory, MediaWiki-Logevents