Commit graph

736 commits

Author SHA1 Message Date
Bartosz Dziewoński
2911de600f ArchivedRevisionLookup: Allow lookups using just the revision ID
A unique index on ar_rev_id was added in T193180 (2019), allowing
revisions of deleted pages to be reliably looked up by just their ID.

Use the improved getArchivedRevisionRecord() method in a few places
that previously had to use manual queries.

Bug: T251066
Change-Id: I9352f64952ac4b803d76e9e72f88a01be7317c56
2023-09-02 01:56:20 +00:00
Amir Sarabadani
f4e68e055f Reorg: Move Status to MediaWiki\Status\
This class is used heavily basically everywhere, moving it to Utils
wouldn't make much sense. Also with this change, we can move
StatusValue to MediaWiki\Status as well.

Bug: T321882
Depends-On: I5f89ecf27ce1471a74f31c6018806461781213c3
Change-Id: I04c1dcf5129df437589149f0f3e284974d7c98fa
2023-08-25 15:44:17 +02:00
Tim Starling
7887b66ade Include $wgWikidiff2Options in the diff cache key
Bug: T341754
Change-Id: I3b7d71f811d7ebd0cf83273164c479762e1a680b
2023-08-23 10:00:47 +10:00
Amir Sarabadani
c57cdf4276 Migrate last batch of simple Database::select* calls to SQB
Done semi-automatically via a parser written on top of ANTLR4

Bug: T311866
Change-Id: Ib71d6810e480d7176726082347b569e346557de7
2023-08-01 20:38:13 +02:00
jenkins-bot
1d5e4f3d0a Merge "Add support for wikidiff2_multi_format_diff()" 2023-07-31 11:54:12 +00:00
Tim Starling
8d69f99a1a Don't show the inline toggle selector on Special:MobileDiff
Have Article opt in to inline toggle switch display, so that random
callers of DifferenceEngine::showDiffPage() do not receive a
non-functional format selector.

Bug: T342158
Change-Id: Id4e38c2a20b5381e5f70b1244304da2895eaf8e7
2023-07-26 05:16:55 +00:00
Tim Starling
2b608a35ed Add an API-only user preference for diff type
* Add an API-only user preference for diff type
* Retain query parameter stickiness but fix it so that the diff-type
  from user preferences does not leak into the query string. So the
  no-JS control continues to work. If a no-JS user has the inline
  preference set, respect it on the initial load, but add an explicit
  diff-type=table to the query string of the table link so that the
  preference can be overridden.
* Get the diff type from the initial state of the no-JS button. Infuse
  the widget to access the active property using the OOUI public API.
* For a logged-in user, when the JS toggle is clicked, fetch the new
  diff body and update the user preference.
* For an anonymous user, when the JS toggle is clicked, update the
  prev/next links to include the correct diff-type query parameter.

Bug: T336713
Change-Id: Ie409d79ac8222dfa6ec8fd170b76be088be80b3a
2023-07-25 10:49:51 +10:00
Tim Starling
4014f56d73 Add SlotDiffRenderer::localizeDiff()
It makes sense for SlotDiffRenderer to localize the diffs that it
returns.

DifferenceEngine can't conveniently use this right now since it stores
all slot diffs concatenated together in a cache entry. It can't break
the string apart again to call the right SlotDiffRenderer on each
slot diff. So it assumes there must be a text diff in there somewhere
and calls TextDiffer over the whole thing.

EntitySchema does not have this problem and can benefit from this
method.

Bug: T342209
Change-Id: Ie06e100bb0e945de5dbe3dade14b2e6b706e078d
2023-07-20 10:09:42 +10:00
Lucas Werkmeister
1a3f15cd43 Restore DifferenceEngine::localiseLineNumbers()
Since it’s needed by EntitySchema, and because it was also, as far as I
can tell, removed without following the stable interface policy in
change I5c506e3916 (commit 2aa87cdf2c).

Not marked as soft-deprecated because there doesn’t seem to be a way to
access the replacement.

Bug: T342209
Change-Id: Iba9fd8bb56ea0e1543c9a9beab85b01f9549fbd7
2023-07-19 12:26:43 +02:00
Tim Starling
2ed4e600b4 Add support for wikidiff2_multi_format_diff()
Bug: T341754
Change-Id: I17396985d0b26516a06df17e9bd1343054521e01
2023-07-19 12:38:18 +10:00
Tim Starling
191ec35340 Add unified format
The code is there, so we may as well expose it.

Change-Id: Ic4cf5c0d4a5b46f0f0f25454815dcea1f69970eb
2023-07-19 12:38:18 +10:00
Tim Starling
2aa87cdf2c Factor out TextDiffer hierarchy from TextSlotDiffRenderer
* Follow the TODO comment in TextSlotDiffRenderer
  ::getTextDiffInternal() by moving the code out to three parallel
  implementations, namely ExternalTextDiffer, PhpTextDiffer and
  Wikidiff2TextDiffer.
* Add a container/factory class ManifoldTextDiffer to glue them
  together and collate available formats.
* Move the inline legend to Wikidiff2TextDiffer. Not the toggle since
  the ability to toggle depends on the available format, not the current
  format.
* Update the diff cache keys so that ManifoldTextDiffer can store the
  engine=>format map it used to generate the diff.
* Drop support for the second parameter to TextSlotDiffRenderer
 ::setEngine(), since nothing used it anymore.
* Provide a format batch API, since some engines are able to efficiently
  generate multiple formats. This might be used by DifferenceEngine in
  future.

Needs risky change notification for the cache key change.

Bug: T339184
Depends-On: I8a35b9b8ec1622c9a36d2496bdd24f51bc52c85f
Change-Id: I5c506e39162855aff53dd420dd8145156739059c
2023-07-19 12:38:18 +10:00
Tim Starling
cbeceb1ae3 Slot diff option "contentLanguage" should be a string
Quick fix for production error.

Bug: T342099
Bug: T341961
Change-Id: Ifab76ab7018ee1498851223e1181b527d506efbb
2023-07-18 21:56:11 +10:00
Tim Starling
6790bf9910 Remove $wgLang usage from Title
StubUserLang was meant to avoid the cost of looking up the user
preferences on requests which don't need it. There's no point in using
it if you are going to unconditionally call a method on the resulting
object.

StubUserLang proxies to RequestContext::getLanguage() via __call(),
which has a cost. Originally this cost was avoided on subsequent calls
by overwriting $wgLang, but this mechanism is not effective if you retain
a reference to the StubUserLang.

Removing the potential for Title::getPageLanguage() to return
StubUserLang simplifies the type declarations for methods that call it.

Bug: T160814
Change-Id: I12ad75c2496ca727580aac55e860178d15febb6e
2023-07-11 11:15:02 +10:00
jenkins-bot
77f2208a22 Merge "Fix Chinese diff segmentation" 2023-07-07 05:07:18 +00:00
jenkins-bot
e7373e24e3 Merge "Inject page language into TextSlotDiffRenderer" 2023-07-07 01:37:43 +00:00
jenkins-bot
2b68525941 Merge "Add DifferenceEngine::getDefaultLanguage()" 2023-07-06 09:31:09 +00:00
Tim Starling
5d26080d62 Fix Chinese diff segmentation
segmentForDiff() is supposed to allow character-level diffing of Chinese
text, by adding spaces and then removing them after the diff is
complete. But when I tested it for I2d0a6996b02d37a3, unsegmentForDiff()
failed to remove the spaces, since there was an <ins> tag between the space
and the Chinese character.

So instead, use formfeed characters to separate the Chinese characters,
and strip them unconditionally instead of relying on them being next to
Chinese characters.

Add test.

Change-Id: I230d8261bbda34ad313785a1f7c31d4db7bf989b
2023-07-06 18:14:30 +10:00
Tim Starling
36b92d45db Inject page language into TextSlotDiffRenderer
Fix fixme by sending the language code to SlotDiffRenderer as an option.

Note that this is the language used for word segmentation of the
content, not the UI language.

Change-Id: I2d0a6996b02d37a3f2d8fefa851244803025bb6c
2023-07-06 10:35:03 +10:00
jenkins-bot
f74a79dc4f Merge "Migrate several wfGetDB() to use ICP" 2023-07-05 10:50:57 +00:00
Amir Sarabadani
3e157496ff Migrate several wfGetDB() to use ICP
And doing proper dependency injection.

Bug: T330641
Change-Id: I4978c158e513f88f5547343c4fbbe4b39078dc09
2023-07-05 11:00:59 +02:00
jenkins-bot
77e2974aa8 Merge "Optimise DifferenceEngine::addLocalisedTitleTooltips()" 2023-07-05 05:21:40 +00:00
Tim Starling
4fd2b0dfd5 Add DifferenceEngine::getDefaultLanguage()
So that Wikibase can stop accessing the protected property mDiffLang.

Change-Id: I1fc6dd8b6187682659a1689708405ddb81e22acd
2023-07-05 10:48:42 +10:00
Tim Starling
f1d1092f73 Optimise DifferenceEngine::addLocalisedTitleTooltips()
* Remove unnecessary regex
* Move message expansion outside the loop

Change-Id: I44c273f1d798c436687be1a43b3aa94be0a8fdcc
2023-07-03 18:44:31 +10:00
Tim Starling
4d0604d8fa Remove hard-deprecated public properties of DifferenceEngine
And remove commented-out code also dating from 1.32 with no near-term
prospect of being implemented.

Change-Id: I526c558b2efae4b77ae38d0b5bb8127c8b31c280
2023-07-03 16:51:22 +10:00
jenkins-bot
42f7ae69dc Merge "Switch back to oo-ui-element-hidden from mw-diff-element-hidden" 2023-06-26 19:17:58 +00:00
jenkins-bot
06fc24ee35 Merge "Update cascading protection when showing a diff page" 2023-06-26 16:55:08 +00:00
Sam Wilson
ae46eb63d5 Switch back to oo-ui-element-hidden from mw-diff-element-hidden
Using the OOUI class name is an established pattern outside of
OOUI widgets, so it's easier to stick with it for the diff page
hiding and showing (switching to and from inline/table diffs, etc.).

Bug: T324759
Change-Id: I805b6b71d8e137eaa3e000b15455557df42af838
2023-06-26 19:14:41 +08:00
jenkins-bot
d192ef7c02 Merge "Show the inline legend even if $wgShowDiffToggleSwitch = false" 2023-06-26 03:39:11 +00:00
jenkins-bot
7b7f1181d3 Merge "diff: Move SlotDiffRenderer::getTablePrefix() parts assembly up to DifferenceEngine" 2023-06-26 03:13:42 +00:00
jenkins-bot
5e1979ce15 Merge "diff: Change from WikiPage::getParserOutput to ParserOutputAccess" 2023-06-26 02:58:27 +00:00
Tim Starling
cfabbc842a Show the inline legend even if $wgShowDiffToggleSwitch = false
Change-Id: I33549fedf3f80b5542d16c3fb96c96a99da0459e
2023-06-26 12:29:31 +10:00
Tim Starling
12ec0d8557 Update cascading protection when showing a diff page
Links must be updated when the parser cache is updated, because
otherwise the subsequent parser cache hit on page view will suppress
further updates, breaking cascading protection.

Change-Id: I41b99e745e46329c73187c70627888651cf2d890
2023-06-26 12:04:42 +10:00
jenkins-bot
f7388feffa Merge "diff: Add inline format switch when Wikidiff2 is installed" 2023-06-26 02:03:41 +00:00
Umherirrender
25029b2739 diff: Change from WikiPage::getParserOutput to ParserOutputAccess
- Allows to reuse the RevisionRecord and not reloading in
  WikiPage::getParserOutput from the RevisionStore
- Allows to pass ParserOutputAccess::OPT_NO_AUDIENCE_CHECK to get a
  ParserOutput also for revision deleted content, where a check
  against RevisionRecord::FOR_PUBLIC would reject the content
- Allows to show error message when render does not work

Bug: T212316
Change-Id: Id3c2de3e5cf796f5a9b213bd7bd94c9291014eb5
2023-06-26 11:58:58 +10:00
Tim Starling
8983c9d862 diff: Move SlotDiffRenderer::getTablePrefix() parts assembly up to DifferenceEngine
getTablePrefix() is used to show the inline legend and inline switcher.
It is not yet part of a released stable interface.

Theoretically there may be multiple text slots on a page, and we don't
want multiple inline legends. There was already a fragment assembly
system, for the benefit of hook handlers, so move that up to the page
level, so that it can also deduplicate prefix fragments coming from
each slot.

Add tests.

Bug: T324759
Change-Id: I9baa5c24128c63bc318ba13e83a024843f4ab15e
2023-06-26 11:28:59 +10:00
hmonroy
360182a566 diff: Add inline format switch when Wikidiff2 is installed
Add a switch that allows toggling between inline and two-column format
when Wikidiff2 is installed.

Inline toggle should also support no-JS toggling

The legend should toggle when switching from table to inline after the
first load.

Introduced a temporary feature flag to show this inline toggle so that
we can merge and easily continue the improvements. It will be removed
when ready for production.

Bug: T336712
Bug: T330229
Change-Id: Ie6a48e495f2bb299d8b984e7c40363d534c7915b
2023-06-26 10:31:54 +10:00
Gergő Tisza
a9e0562cfb Improve handling of diffs between incompatible content models
When the old and new content object for a slot cannot be compared,
show an error message for that slot only, instead of throwing an
exception.

Bug: T214217
Change-Id: I6e982df358f85ca78f0448b3a93ded3f40676310
2023-06-23 19:09:59 +00:00
Tim Starling
512806564d Do not generate diffs for slots with identical content
When the old and new revisions have identical content in a given slot,
do not include the relevant SlotDiffRenderer in the return value of
DifferenceEngine::getSlotDiffRenderers(), so that the relevant table
prefixes and modules will be omitted.

Also:

* In TextSlotDiffRenderer::getTextDiff(), return an empty string when
  the inputs are equal, instead of invoking the diff engine. Previously,
  the inline format would produce a <tr> element in this case, causing
  the diff-empty message to be omitted.
* Clarify the doc comment up the stack, indicating SlotDiffRenderer may
  return zero <tr> tags, it doesn't have to be one or more.
* Fix the documented return type of getSlotContents() so that @var is
  not needed in the caller.
* Don't convert the return value of SlotDiffRenderer::getDiff() to
  boolean. It's always a string so compare it to the empty string.

Note that the cache key for inline empty diffs will change, because
TextSlotDiffRenderer::getExtraCacheKeys() is not called anymore for
empty diffs.

Bug: T338670
Change-Id: I0774ba0b159ac43ec214403cf2d06740f6d067cd
2023-06-21 14:46:19 +10:00
jenkins-bot
bdb701a634 Merge "Move DiffEngine and helpers to includes/libs/Diff and put them in a namespace" 2023-06-20 19:03:46 +00:00
Tim Starling
5127bb2f78 Remove RangeDifference
RangeDifference was introduced in 89f8141a7 (2008) by Guy Van den
Broeck as part of his experimental "wikidiff3" engine.

Wikidiff3 was mostly removed in dcac5f19 (2009), although the Wikidiff3
class itself remained until 20f066e97 (2016) when it was merged into
DiffEngine. The merge left diff_range() as an unused method with no
visibility modifier being the only caller of RangeDifference. "private"
was eventually added, and then finally the unused private method was
deleted, leaving no callers in core or extensions.

Change-Id: I11fd03b9b36449620518b94e2c4be02da32d1271
2023-06-20 10:53:39 +00:00
Tim Starling
359ce91a12 Move DiffEngine and helpers to includes/libs/Diff and put them in a namespace
I will address the dependencies on MW core in a followup.

Bug: T339184
Change-Id: I892364b0c9f15c9de4cfc29c683670c172d71764
2023-06-20 15:15:13 +10:00
Bartosz Dziewoński
36e54eb3e6 DifferenceEngine: Fix "No difference" notice on cached diffs
Also, HTML-escape the cache key in the output. In the current
implementation it is HTML-safe, but it could change.

Bug: T228761
Change-Id: I23406266fef4906cdf0a281f7058b66b30680f0d
2023-06-13 23:54:17 +00:00
Daimona Eaytoy
4d5cd3a84f Replace deprecated MWException
Bug: T328220
Change-Id: I66be7a6dd752d6b9c254beb65f4eb5ace3c89776
2023-06-09 17:21:12 +02:00
jenkins-bot
b88ae224e9 Merge "Replace usages of deprecated MWException" 2023-06-08 11:39:28 +00:00
Daimona Eaytoy
1c6e872bd4 Replace usages of deprecated MWException
Use SPL exceptions instead when the exception is unchecked.

Bug: T328220
Change-Id: Ia1e5edc2ef3269a44b670262b78b305d07559829
2023-06-06 17:05:32 +02:00
Sam Wilson
1eb586013c diff: Add legend and tooltips to inline diff display
Add a legend at the top of the inline diff display, showing the
meanings of the colours of the inserted and deleted highlighting.
Also add the same text as tooltips on the highlighted elements.

The legend is added as part of a new area above the diff table
that can be modified via a new TextSlotDiffRendererTablePrefix
hook, so that extensions can add other buttons etc. there as
required.

This is a follow-up to the previous attempt, which added the
legend in DifferenceEngine::showDiff() and was called from
too many places. This patch moves it to be called in
DifferenceEngine::showDiffPage().

Bug: T324759
Change-Id: I2a3c67bcfa47313dee597e602a62073e4e298cd2
Follow-up: I6de30bf79eb5ac262285951792782b870d075e00
2023-05-31 15:43:28 +10:00
Samtar
2ba3afbd47
Revert "diff: Add legend and tooltips to inline diff display"
This reverts commit 19eb61de66.

Reason for revert: Reworking

Change-Id: I2bc524254d10d6612c5b0a7db95dd6af5f60ccaa
Depends-On: I5c3d7df530eb6fc09ba380d42a81b17511861308
Depends-On: I60784afa0d47e22acd9e8a981092784c84b250eb
2023-05-18 15:50:59 +01:00
Sam Wilson
2d8b724e4e diff: Only show inline legend for text slot
To avoid showing it on other content types, such
as PageSlotDiffRenderer in ProofreadPage.

Bug: T336481
Change-Id: Ibe453fc9e8f4eea5de9c66e1446286174eb3ad17
2023-05-17 07:51:24 +08:00
Sam Wilson
19eb61de66 diff: Add legend and tooltips to inline diff display
Add a legend at the top of the inline diff display, showing the
meanings of the colours of the inserted and deleted highlighting.
Also add the same text as tooltips on the highlighted elements.

The legend is added as part of a new area above the diff table
that can be modified via a new DifferenceEngineBeforeDiffTable
hook, so that extensions can add other buttons etc. there as
required.

Bug: T324759
Change-Id: I6de30bf79eb5ac262285951792782b870d075e00
2023-04-28 11:27:10 +08:00