Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163851
Change subject: Update Wikidata, fix for jquery.wikibase.sitelinklistview.js
and hhvm
......................................................................
Update Wikidata, fix for jquery.wikibase.sitelinklistview.js and hhvm
Change-Id: I3e11fbdf509b78fdb022bfc1aad434f9a020624d
---
M WikibaseClient.settings.php
M WikibaseRepo.settings.php
M composer.lock
M extensions/Wikibase/lib/includes/store/CachingEntityRevisionLookup.php
M
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
M vendor/composer/autoload_files.php
M vendor/composer/installed.json
7 files changed, 108 insertions(+), 94 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/51/163851/1
diff --git a/WikibaseClient.settings.php b/WikibaseClient.settings.php
index b6c8abd..69b07cb 100644
--- a/WikibaseClient.settings.php
+++ b/WikibaseClient.settings.php
@@ -1,2 +1,2 @@
<?php
-$wgWBClientSettings["sharedCacheKeyPrefix"] = "wikibase:WBL/1411740968";
\ No newline at end of file
+$wgWBClientSettings["sharedCacheKeyPrefix"] = "wikibase:WBL/1412085892";
\ No newline at end of file
diff --git a/WikibaseRepo.settings.php b/WikibaseRepo.settings.php
index bf53581..ccf9b36 100644
--- a/WikibaseRepo.settings.php
+++ b/WikibaseRepo.settings.php
@@ -1,2 +1,2 @@
<?php
-$wgWBRepoSettings["sharedCacheKeyPrefix"] = "wikibase:WBL/1411740968";
\ No newline at end of file
+$wgWBRepoSettings["sharedCacheKeyPrefix"] = "wikibase:WBL/1412085892";
\ No newline at end of file
diff --git a/composer.lock b/composer.lock
index 981ae25..2a03bec 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1191,12 +1191,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "f59b83fa72a654fba6dbd0c3f5db38b3479e05da"
+ "reference": "210c5a0c936211fa8f3210c65bac38efa7958ea4"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/f59b83fa72a654fba6dbd0c3f5db38b3479e05da";,
- "reference": "f59b83fa72a654fba6dbd0c3f5db38b3479e05da",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/210c5a0c936211fa8f3210c65bac38efa7958ea4";,
+ "reference": "210c5a0c936211fa8f3210c65bac38efa7958ea4",
"shasum": ""
},
"require": {
@@ -1265,7 +1265,7 @@
"wikibaserepo",
"wikidata"
],
- "time": "2014-09-26 14:12:51"
+ "time": "2014-09-30 13:33:12"
},
{
"name": "wikibase/wikimedia-badges",
diff --git
a/extensions/Wikibase/lib/includes/store/CachingEntityRevisionLookup.php
b/extensions/Wikibase/lib/includes/store/CachingEntityRevisionLookup.php
index c6073cd..6cb39ed 100644
--- a/extensions/Wikibase/lib/includes/store/CachingEntityRevisionLookup.php
+++ b/extensions/Wikibase/lib/includes/store/CachingEntityRevisionLookup.php
@@ -104,7 +104,14 @@
wfProfileIn( __METHOD__ );
$key = $this->getCacheKey( $entityId );
- $entityRevision = $this->cache->get( $key );
+ try {
+ $entityRevision = $this->cache->get( $key );
+ } catch ( \UnexpectedValueException $ex ) {
+ // @fixme ugly hack to work around hhvm issue, see bug
71461, in addition
+ // to varying cache key based on if HHVM_VERSION is
defined.
+ wfLogWarning( 'Failed to deserialize ' .
$entityId->getSerialization() . ' from cache.' );
+ $entityRevision = false;
+ }
if ( $entityRevision !== false ) {
if ( $revisionId === 0 && $this->shouldVerifyRevision
) {
diff --git
a/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
b/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
index ef80587..fce3526 100644
---
a/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
+++
b/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
@@ -362,7 +362,11 @@
self._saveSiteLink( emptySiteLink )
.done( function() {
self._afterRemove();
- next();
+
+ // Use setTimeout here to break
out of the current call stack.
+ // This is needed because the
stack can get very large (if the queue
+ // is very large), eventually
leading to failures.
+ setTimeout( next, 0 );
} )
.fail( function( error ) {
self.setError( error );
@@ -387,7 +391,10 @@
$queue.queue( 'stopediting', function( next ) {
sitelinkview.element
.one(
'sitelinkviewafterstopediting.sitelinklistview', function( event ) {
- next();
+ // Use setTimeout here to break out of
the current call stack.
+ // This is needed because the stack can
get very large (if the queue
+ // is very large), eventually leading
to failures.
+ setTimeout( next, 0 );
} );
sitelinkview.stopEditing( dropValue );
} );
diff --git a/vendor/composer/autoload_files.php
b/vendor/composer/autoload_files.php
index 968d4af..aa7629d 100644
--- a/vendor/composer/autoload_files.php
+++ b/vendor/composer/autoload_files.php
@@ -21,6 +21,6 @@
$baseDir . '/extensions/ValueView/ValueView.php',
$vendorDir . '/data-values/data-types/DataTypes.php',
$vendorDir . '/data-values/validators/Validators.php',
- $baseDir . '/extensions/Wikibase/Wikibase.composer.php',
$baseDir . '/extensions/WikimediaBadges/WikimediaBadges.php',
+ $baseDir . '/extensions/Wikibase/Wikibase.composer.php',
);
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 463e3ea..0530a9b 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1174,90 +1174,6 @@
]
},
{
- "name": "wikibase/wikibase",
- "version": "dev-wmf/1.25wmf1",
- "version_normalized": "dev-wmf/1.25wmf1",
- "source": {
- "type": "git",
- "url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "f59b83fa72a654fba6dbd0c3f5db38b3479e05da"
- },
- "dist": {
- "type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/f59b83fa72a654fba6dbd0c3f5db38b3479e05da";,
- "reference": "f59b83fa72a654fba6dbd0c3f5db38b3479e05da",
- "shasum": ""
- },
- "require": {
- "data-values/common": "~0.2.0",
- "data-values/data-types": "~0.4.0",
- "data-values/data-values": "~0.1.0",
- "data-values/geo": "~1.0.0",
- "data-values/interfaces": "~0.1.4",
- "data-values/javascript": "~0.6.0",
- "data-values/number": "~0.4.0",
- "data-values/serialization": "~1.0",
- "data-values/time": "~0.6.0",
- "data-values/validators": "~0.1.0",
- "data-values/value-view": "~0.7.0",
- "diff/diff": "~1.0",
- "php": ">=5.3.2",
- "wikibase/data-model": "~1.0",
- "wikibase/data-model-javascript": "~0.3.0",
- "wikibase/data-model-serialization": "~1.1",
- "wikibase/easyrdf_lite": "~0.8.1",
- "wikibase/internal-serialization": "~1.2",
- "wikibase/serialization-javascript": "~1.1.1"
- },
- "conflict": {
- "mediawiki/mediawiki": "<1.23"
- },
- "time": "2014-09-26 14:12:51",
- "type": "mediawiki-extension",
- "installation-source": "dist",
- "autoload": {
- "files": [
- "Wikibase.composer.php"
- ],
- "classmap": [
- "client/includes/",
- "client/WikibaseClient.hooks.php",
- "client/tests/phpunit/MockPageUpdater.php",
- "client/tests/phpunit/MockClientStore.php",
-
"client/tests/phpunit/includes/scribunto/WikibaseLuaIntegrationTestItemSetUpHelper.php",
-
"client/tests/phpunit/includes/scribunto/Scribunto_LuaWikibaseLibraryTestCase.php",
- "lib/includes/",
- "lib/WikibaseLib.hooks.php",
- "lib/tests/phpunit/",
- "repo/includes/",
- "repo/maintenance/",
- "repo/tests/phpunit/",
- "repo/Wikibase.hooks.php"
- ],
- "psr-4": {
- "Wikibase\\Repo\\View\\": "repo/includes/View"
- }
- },
- "notification-url": "https://packagist.org/downloads/";,
- "license": [
- "GNU GPL v2+"
- ],
- "authors": [
- {
- "name": "The Wikidata team"
- }
- ],
- "description": "Structured data repository for MediaWiki",
- "homepage": "http://wikiba.se";,
- "keywords": [
- "wikibase",
- "wikibaseclient",
- "wikibaselib",
- "wikibaserepo",
- "wikidata"
- ]
- },
- {
"name": "wikibase/wikimedia-badges",
"version": "dev-master",
"version_normalized": "9999999-dev",
@@ -1357,5 +1273,89 @@
"source": "https://github.com/wmde/Wikidata.org/tree/master";,
"issues": "https://github.com/wmde/Wikidata.org/issues";
}
+ },
+ {
+ "name": "wikibase/wikibase",
+ "version": "dev-wmf/1.25wmf1",
+ "version_normalized": "dev-wmf/1.25wmf1",
+ "source": {
+ "type": "git",
+ "url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
+ "reference": "210c5a0c936211fa8f3210c65bac38efa7958ea4"
+ },
+ "dist": {
+ "type": "zip",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/210c5a0c936211fa8f3210c65bac38efa7958ea4";,
+ "reference": "210c5a0c936211fa8f3210c65bac38efa7958ea4",
+ "shasum": ""
+ },
+ "require": {
+ "data-values/common": "~0.2.0",
+ "data-values/data-types": "~0.4.0",
+ "data-values/data-values": "~0.1.0",
+ "data-values/geo": "~1.0.0",
+ "data-values/interfaces": "~0.1.4",
+ "data-values/javascript": "~0.6.0",
+ "data-values/number": "~0.4.0",
+ "data-values/serialization": "~1.0",
+ "data-values/time": "~0.6.0",
+ "data-values/validators": "~0.1.0",
+ "data-values/value-view": "~0.7.0",
+ "diff/diff": "~1.0",
+ "php": ">=5.3.2",
+ "wikibase/data-model": "~1.0",
+ "wikibase/data-model-javascript": "~0.3.0",
+ "wikibase/data-model-serialization": "~1.1",
+ "wikibase/easyrdf_lite": "~0.8.1",
+ "wikibase/internal-serialization": "~1.2",
+ "wikibase/serialization-javascript": "~1.1.1"
+ },
+ "conflict": {
+ "mediawiki/mediawiki": "<1.23"
+ },
+ "time": "2014-09-30 13:33:12",
+ "type": "mediawiki-extension",
+ "installation-source": "dist",
+ "autoload": {
+ "files": [
+ "Wikibase.composer.php"
+ ],
+ "classmap": [
+ "client/includes/",
+ "client/WikibaseClient.hooks.php",
+ "client/tests/phpunit/MockPageUpdater.php",
+ "client/tests/phpunit/MockClientStore.php",
+
"client/tests/phpunit/includes/scribunto/WikibaseLuaIntegrationTestItemSetUpHelper.php",
+
"client/tests/phpunit/includes/scribunto/Scribunto_LuaWikibaseLibraryTestCase.php",
+ "lib/includes/",
+ "lib/WikibaseLib.hooks.php",
+ "lib/tests/phpunit/",
+ "repo/includes/",
+ "repo/maintenance/",
+ "repo/tests/phpunit/",
+ "repo/Wikibase.hooks.php"
+ ],
+ "psr-4": {
+ "Wikibase\\Repo\\View\\": "repo/includes/View"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/";,
+ "license": [
+ "GNU GPL v2+"
+ ],
+ "authors": [
+ {
+ "name": "The Wikidata team"
+ }
+ ],
+ "description": "Structured data repository for MediaWiki",
+ "homepage": "http://wikiba.se";,
+ "keywords": [
+ "wikibase",
+ "wikibaseclient",
+ "wikibaselib",
+ "wikibaserepo",
+ "wikidata"
+ ]
}
]
--
To view, visit https://gerrit.wikimedia.org/r/163851
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3e11fbdf509b78fdb022bfc1aad434f9a020624d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: wmf/1.25wmf1
Gerrit-Owner: Aude <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
