wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-24 22:35:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

When content and metadata have different revids, explicitly retry the higher one

Browse source 
It's much less likely we'll get another conflict if we retry
with ?oldid=12345 than if we retry omitting the oldid again.

Change-Id: I10e40f714fd44d7f0ac16c9d0dc6239a95c0ec51
This commit is contained in:
Roan Kattouw 2015-03-26 16:06:43 -07:00
parent b19104ed04
commit 6bd5142f2a
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
modules/ve-mw/init/ve.init.mw.Target.js
View file

@ -354,8 +354,13 @@ ve.init.mw.Target.onLoad = function ( response ) {
); );
} else { } else {
this.retriedRevIdConflict = true; this.retriedRevIdConflict = true;
// Have to retry both until we can access the document server directly... // TODO this retries both requests, in RESTbase mode we should only retry
// the request that gave us the lower revid
this.loading = false; this.loading = false;
// HACK: Load with explicit revid to hopefully prevent this from happening again
if ( !this.requestedRevId ) {
this.requestedRevId = Math.max( docRevId, this.revid );
}
this.load(); this.load();
} }
return; return;