Page MenuHomePhabricator
Create Task
Maniphest T217243

Add baserevid to WikibaseLexeme API modules
Closed, ResolvedPublic5 Estimated Story Points
Actions

Description

As user of the WikibaseLexeme API I want to be able to provide a baserevid for the edit i am making while using the WikibaseLexeme API modules.

A user of the WikibaseLexeme API = our UI

API modules that needs adjusting:

Acceptance criteria:

All listed API modules now have the baserevid parameter

When baserevid is not valid (for a different entity .. etc)
Then API request should fail

When there's a conflict around baserevid (same behavior as wbeditentity endpoint)
Then API request should fail

Details

SubjectRepoBranchLines +/-
Make conflict detection more strictmediawiki/extensions/Wikibasemaster+1 -1
Send the patched lexeme based on the baserevid sent in wbladdformmediawiki/extensions/WikibaseLexememaster+19 -14
lexeme.api: require and check conflict on baserevid parammediawiki/extensions/WikibaseLexememaster+576 -36
Add baserevid and conflict detection to AddForm API modulemediawiki/extensions/WikibaseLexememaster+164 -17
Customize query in gerrit

Related Objects
Search...

Event Timeline

There are a very large number of changes, so older changes are hidden. Show Older Changes
• alaa_wmde updated the task description. (Show Details)Mar 5 2019, 4:05 PM
• alaa_wmde set the point value for this task to 5.
• alaa_wmde moved this task from Ready to estimate to Wikidata-Campsite-Iteration-∞ (On Hold) on the Wikidata-Campsite board.
• alaa_wmde edited projects, added Wikidata-Campsite (Wikidata-Campsite-Iteration-∞ (On Hold)); removed Wikidata-Campsite.
• alaa_wmde claimed this task.Mar 12 2019, 10:13 AM
• alaa_wmde moved this task from To Do (prioritised from top to bottom) to Doing on the Wikidata-Campsite (Wikidata-Campsite-Iteration-∞ (On Hold)) board.Mar 12 2019, 10:47 AM
gerritbot subscribed.Mar 12 2019, 3:27 PM

Change 495908 had a related patch set uploaded (by Alaa Sarhan; owner: Alaa Sarhan):
[mediawiki/extensions/WikibaseLexeme@master] lexeme.api: require and check conflict on baserevid param

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

gerritbot added a project: Patch-For-Review.Mar 12 2019, 3:27 PM
• alaa_wmde mentioned this in rEWLE0fc44025a717: lexeme.api: require and check conflict on baserevid param.Mar 12 2019, 3:31 PM
• alaa_wmde mentioned this in rEWLE1409d120adfa: lexeme.api: require and check conflict on baserevid param.Mar 13 2019, 1:11 PM
• alaa_wmde mentioned this in rEWLE4674968139af: lexeme.api: require and check conflict on baserevid param.Mar 13 2019, 4:39 PM
• alaa_wmde mentioned this in rEWLE70db7de766b2: lexeme.api: require and check conflict on baserevid param.Mar 14 2019, 9:17 AM
• alaa_wmde mentioned this in rEWLE301ab3da000f: lexeme.api: require and check conflict on baserevid param.Mar 14 2019, 12:28 PM
• alaa_wmde mentioned this in rEWLE45f092e29119: lexeme.api: require and check conflict on baserevid param.Mar 14 2019, 2:26 PM
• alaa_wmde mentioned this in rEWLE4724d6a1a585: lexeme.api: require and check conflict on baserevid param.Mar 14 2019, 2:59 PM
• alaa_wmde mentioned this in rEWLEdd2154784f50: lexeme.api: require and check conflict on baserevid param.Mar 18 2019, 2:12 PM
• alaa_wmde mentioned this in rEWLE8d0e4cc9e679: lexeme.api: require and check conflict on baserevid param.Mar 18 2019, 2:27 PM
• alaa_wmde mentioned this in rEWLEc335a40ec340: lexeme.api: require and check conflict on baserevid param.Mar 18 2019, 3:05 PM
• alaa_wmde moved this task from Doing to Peer Review on the Wikidata-Campsite (Wikidata-Campsite-Iteration-∞ (On Hold)) board.Mar 18 2019, 3:25 PM
• alaa_wmde mentioned this in rEWLE3a221c9e141a: lexeme.api: require and check conflict on baserevid param.Mar 18 2019, 3:28 PM
• alaa_wmde mentioned this in rEWLEc85dfcc00f19: lexeme.api: require and check conflict on baserevid param.Mar 18 2019, 3:42 PM
• alaa_wmde mentioned this in rEWLEd4b4246ea065: lexeme.api: require and check conflict on baserevid param.Mar 18 2019, 4:06 PM
• alaa_wmde mentioned this in rEWLE369e0d9f9ef5: lexeme.api: require and check conflict on baserevid param.Mar 18 2019, 4:35 PM
gerritbot added a comment.Mar 19 2019, 2:01 PM

Change 495908 had a related patch set uploaded (by Alaa Sarhan; owner: Alaa Sarhan):
[mediawiki/extensions/WikibaseLexeme@master] lexeme.api: require and check conflict on baserevid param

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

• alaa_wmde mentioned this in rEWLE90bfbd0c6e49: lexeme.api: require and check conflict on baserevid param.Mar 21 2019, 12:41 AM
Tarrow mentioned this in rEWLEbe9c7e1965b5: lexeme.api: require and check conflict on baserevid param.Mar 27 2019, 10:04 AM
Tarrow subscribed.Mar 27 2019, 10:37 AM

I took a little look at this and I'm not feeling super clear on what the acceptance criteria are. My immediate thoughts would be that baseRevId not equalling the latest id shouldn't immediately result in a conflict.

@Addshore could you maybe give some examples in the acceptance criteria to make it explicit what the expected behaviour is?

Trying to mimic similar functionality from existing modules is hard because the checks are apparently spread about a bit. e.g. this red herring in https://github.com/wikimedia/mediawiki-extensions-Wikibase/blob/a7db4c9fd88bc1ddfdf3b5266b399cff7e808954/repo/includes/Api/EditEntity.php#L198 which makes the check look much simpler than I would expect it is

Tarrow added a comment.Mar 27 2019, 10:50 AM

From Mattermost: according to @Addshore WikiPageEntityStore is the place to look for hints as to the existing logic

• alaa_wmde moved this task from Peer Review to Doing on the Wikidata-Campsite (Wikidata-Campsite-Iteration-∞ (On Hold)) board.Mar 27 2019, 1:05 PM
• alaa_wmde added a comment.EditedMar 28 2019, 1:41 PM

findings from reading through code again:

current logic and status quo:
in wikibase, explained here T126231
in lexeme, there was no such logic in lexeme -> we added very basic baserevid !== latestrevid

If I understand correctly, I think wikibase is not doing what we think it is. Wikibase only checks that the patch is valid on both base and current revisions, but does not do a two- or three-way diff (as far as I could see in code).

If that is true, then the current logic we did for lexeme is a better edit conflict prevention than what's in wikibase, and probably we can go with it for this iteration and leave implementing more sophisticated diffing and conflict detection for a later one.

But that might not be true. If someone knows from the top of their head I'd appreciate a shout. Otherwise, I'll have to go deeper later and figure out for sure.

• alaa_wmde mentioned this in T217671: Use baserevid in Senses editing.Apr 2 2019, 4:33 PM
• alaa_wmde updated the task description. (Show Details)Apr 10 2019, 8:38 AM
• alaa_wmde added a comment.Apr 10 2019, 8:43 AM

As @Tarrow pointed out the current patch has lot simpler solution compared to the existing logic on wbeditentity endpoint, so we have to change the endpoints covered by this task so that they behave consistently with wbeditentity behavior.

• alaa_wmde removed • alaa_wmde as the assignee of this task.May 7 2019, 3:26 PM
• alaa_wmde moved this task from Doing to To Do (prioritised from top to bottom) on the Wikidata-Campsite (Wikidata-Campsite-Iteration-∞ (On Hold)) board.
• alaa_wmde subscribed.
• Ladsgroup claimed this task.May 8 2019, 11:56 AM
• Ladsgroup moved this task from To Do (prioritised from top to bottom) to Doing on the Wikidata-Campsite (Wikidata-Campsite-Iteration-∞ (On Hold)) board.
Restricted Application added a project: User-Ladsgroup. · View Herald TranscriptMay 8 2019, 11:56 AM
• Ladsgroup added a comment.May 8 2019, 1:55 PM
This comment was removed by • Ladsgroup.
gerritbot added a comment.May 8 2019, 3:42 PM

Change 508851 had a related patch set uploaded (by Ladsgroup; owner: Ladsgroup):
[mediawiki/extensions/WikibaseLexeme@master] Add baserevid and conflict detection to AddForm API module

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

• Ladsgroup added a comment.May 8 2019, 3:43 PM

I found an easy and funny way to use Wikibase's edit conflict detection. I tested it and it works completely fine.

• Ladsgroup mentioned this in rEWLE8fa863d4b68e: Add baserevid and conflict detection to AddForm API module.May 8 2019, 3:43 PM
• Ladsgroup mentioned this in rEWLE9dcc4484057d: Add baserevid and conflict detection to AddForm API module.May 8 2019, 4:21 PM
• Ladsgroup updated the task description. (Show Details)May 8 2019, 4:35 PM
• Ladsgroup moved this task from Doing to Peer Review on the Wikidata-Campsite (Wikidata-Campsite-Iteration-∞ (On Hold)) board.
• Ladsgroup mentioned this in rEWLE3e4b72301486: Add baserevid and conflict detection to AddForm API module.May 8 2019, 5:52 PM
• Ladsgroup mentioned this in rEWLE4375a1864266: Add baserevid and conflict detection to AddForm API module.May 9 2019, 11:29 AM
• Ladsgroup mentioned this in rEWLE5808e3c95e60: Add baserevid and conflict detection to AddForm API module.May 9 2019, 12:13 PM
• Ladsgroup mentioned this in rEWLE8e736212a10c: Add baserevid and conflict detection to AddForm API module.May 13 2019, 12:14 PM
gerritbot added a comment.May 13 2019, 2:23 PM

Change 508851 merged by jenkins-bot:
[mediawiki/extensions/WikibaseLexeme@master] Add baserevid and conflict detection to AddForm API module

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

ReleaseTaggerBot added a project: MW-1.34-notes (1.34.0-wmf.5; 2019-05-14).May 13 2019, 3:00 PM
Michael moved this task from Peer Review to Test (Verification) on the Wikidata-Campsite (Wikidata-Campsite-Iteration-∞ (On Hold)) board.May 13 2019, 3:51 PM
• Ladsgroup moved this task from Test (Verification) to Peer Review on the Wikidata-Campsite (Wikidata-Campsite-Iteration-∞ (On Hold)) board.May 13 2019, 8:09 PM
gerritbot added a comment.May 13 2019, 8:22 PM

Change 509933 had a related patch set uploaded (by Ladsgroup; owner: Ladsgroup):
[mediawiki/extensions/WikibaseLexeme@master] Send the patched lexeme based on the baserevid sent in wbladdform

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

• Ladsgroup mentioned this in rEWLE8564c2223408: Send the patched lexeme based on the baserevid sent in wbladdform.May 13 2019, 8:25 PM
Michael moved this task from Peer Review to Test (Verification) on the Wikidata-Campsite (Wikidata-Campsite-Iteration-∞ (On Hold)) board.May 14 2019, 9:22 AM
• Ladsgroup moved this task from Test (Verification) to Peer Review on the Wikidata-Campsite (Wikidata-Campsite-Iteration-∞ (On Hold)) board.May 14 2019, 9:42 AM
In T217243#5178315, @gerritbot wrote:

Change 509933 had a related patch set uploaded (by Ladsgroup; owner: Ladsgroup):
[mediawiki/extensions/WikibaseLexeme@master] Send the patched lexeme based on the baserevid sent in wbladdform

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

This is not merged :D

• Ladsgroup mentioned this in rEWLE3c1075918049: Send the patched lexeme based on the baserevid sent in wbladdform.May 14 2019, 12:29 PM
Michael mentioned this in rEWLE885a8deb26b6: Send the patched lexeme based on the baserevid sent in wbladdform.May 15 2019, 3:41 PM
gerritbot added a comment.May 17 2019, 6:14 PM

Change 495908 abandoned by Alaa Sarhan:
lexeme.api: require and check conflict on baserevid param

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

WMDE-leszek moved this task from Peer Review to Stalled/Waiting on the Wikidata-Campsite (Wikidata-Campsite-Iteration-∞ (On Hold)) board.May 27 2019, 1:45 PM
WMDE-leszek moved this task from Stalled/Waiting to Doing on the Wikidata-Campsite (Wikidata-Campsite-Iteration-∞ (On Hold)) board.
gerritbot added a comment.Jun 20 2019, 3:08 PM

Change 518052 had a related patch set uploaded (by Ladsgroup; owner: Ladsgroup):
[mediawiki/extensions/Wikibase@master] Make conflict detection more strict

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

Addshore moved this task from incoming to in progress on the Wikidata board.Jun 21 2019, 11:25 PM
gerritbot added a comment.Jul 4 2019, 10:45 AM

Change 509933 abandoned by Ladsgroup:
Send the patched lexeme based on the baserevid sent in wbladdform

Reason:
There's no need to add base rev id to add form

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

gerritbot added a comment.Jul 11 2019, 4:26 PM

Change 518052 merged by jenkins-bot:
[mediawiki/extensions/Wikibase@master] Make conflict detection more strict

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

ReleaseTaggerBot edited projects, added MW-1.34-notes (1.34.0-wmf.14; 2019-07-16); removed MW-1.34-notes (1.34.0-wmf.5; 2019-05-14).Jul 11 2019, 5:00 PM
Lydia_Pintscher closed subtask T225071: Add baserevid to wbleditsenseelements API module as Resolved.Jul 15 2019, 11:08 AM
matej_suchanek added a project: Wikidata Lexicographical data.Jul 16 2019, 7:06 AM
• Ladsgroup moved this task from Doing to Test (Verification) on the Wikidata-Campsite (Wikidata-Campsite-Iteration-∞ (On Hold)) board.Jul 18 2019, 2:47 PM
Rosalie_WMDE moved this task from Test (Verification) to Done on the Wikidata-Campsite (Wikidata-Campsite-Iteration-∞ (On Hold)) board.Jul 26 2019, 1:37 PM
• alaa_wmde closed this task as Resolved.Oct 1 2019, 2:47 PM
• alaa_wmde closed subtask T225070: Add baserevid to wbleditformelements API module as Resolved.Oct 1 2019, 2:52 PM
• alaa_wmde closed subtask T225072: Add baserevid to wblremoveform API module as Resolved.
• alaa_wmde closed subtask T225073: Add baserevid to wblremovesense API module as Resolved.
• Lucas_Werkmeister_WMDE reopened subtask T225072: Add baserevid to wblremoveform API module as Open.Jan 27 2022, 4:30 PM
• Lucas_Werkmeister_WMDE reopened this task as Open.Jan 27 2022, 5:01 PM
• Lucas_Werkmeister_WMDE subscribed.

Reopening because T225072 wasn’t actually done yet, and also we apparently never even had a subtask for wbladdsense, which is also still missing a baserevid.

• Lucas_Werkmeister_WMDE closed subtask T225072: Add baserevid to wblremoveform API module as Resolved.Jan 27 2022, 5:11 PM
Maintenance_bot moved this task from Incoming to In progress on the User-Ladsgroup board.Jan 27 2022, 5:15 PM
• Ladsgroup removed • Ladsgroup as the assignee of this task.Jan 31 2022, 9:14 AM
• Ladsgroup subscribed.
Addshore moved this task from Wikidata-Campsite-Iteration-∞ (On Hold) to Incoming on the Wikidata-Campsite board.Feb 1 2022, 10:15 AM
Addshore edited projects, added Wikidata-Campsite; removed Wikidata-Campsite (Wikidata-Campsite-Iteration-∞ (On Hold)).
• Lucas_Werkmeister_WMDE closed subtask T300274: Add baserevid to wbladdsense API module as Resolved.Feb 1 2022, 11:21 AM
• Lucas_Werkmeister_WMDE closed this task as Resolved.Feb 1 2022, 11:38 AM
• Lucas_Werkmeister_WMDE claimed this task.
• Lucas_Werkmeister_WMDE updated the task description. (Show Details)

All the listed modules have a baserevid in the Beta Wikidata API Sandbox now, so I think this is finally done.

Maintenance_bot moved this task from In progress to Done on the User-Ladsgroup board.Feb 1 2022, 12:16 PM
Content licensed under Creative Commons Attribution-ShareAlike (CC BY-SA) 4.0 unless otherwise noted; code licensed under GNU General Public License (GPL) 2.0 or later and other open source licenses. By using this site, you agree to the Terms of Use, Privacy Policy, and Code of Conduct. · Wikimedia Foundation · Privacy Policy · Code of Conduct · Terms of Use · Disclaimer · CC-BY-SA · GPL · Credits