[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Move ResultWrapper subclasses to Rdbms
Aaron Schulz has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/338613 ) Change subject: Move ResultWrapper subclasses to Rdbms .. Move ResultWrapper subclasses to Rdbms Change-Id: I6f3f0e85e268b24c57c537aa6ad8016e0b4cdddb --- M autoload.php M includes/libs/rdbms/database/DatabaseMssql.php M includes/libs/rdbms/database/IDatabase.php M includes/libs/rdbms/database/resultwrapper/FakeResultWrapper.php M includes/libs/rdbms/database/resultwrapper/MssqlResultWrapper.php M includes/libs/rdbms/database/resultwrapper/ResultWrapper.php M includes/utils/AutoloadGenerator.php 7 files changed, 36 insertions(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/13/338613/1 diff --git a/autoload.php b/autoload.php index b21310e..436b46f 100644 --- a/autoload.php +++ b/autoload.php @@ -970,7 +970,6 @@ 'MovePage' => __DIR__ . '/includes/MovePage.php', 'MovePageForm' => __DIR__ . '/includes/specials/SpecialMovepage.php', 'MssqlInstaller' => __DIR__ . '/includes/installer/MssqlInstaller.php', - 'MssqlResultWrapper' => __DIR__ . '/includes/libs/rdbms/database/resultwrapper/MssqlResultWrapper.php', 'MssqlUpdater' => __DIR__ . '/includes/installer/MssqlUpdater.php', 'MultiConfig' => __DIR__ . '/includes/config/MultiConfig.php', 'MultiHttpClient' => __DIR__ . '/includes/libs/MultiHttpClient.php', @@ -1579,6 +1578,7 @@ 'Wikimedia\\Rdbms\\ConnectionManager' => __DIR__ . '/includes/libs/rdbms/connectionmanager/ConnectionManager.php', 'Wikimedia\\Rdbms\\DBMasterPos' => __DIR__ . '/includes/libs/rdbms/database/position/DBMasterPos.php', 'Wikimedia\\Rdbms\\DatabaseDomain' => __DIR__ . '/includes/libs/rdbms/database/DatabaseDomain.php', + 'Wikimedia\\Rdbms\\FakeResultWrapper' => __DIR__ . '/includes/libs/rdbms/database/resultwrapper/FakeResultWrapper.php', 'Wikimedia\\Rdbms\\Field' => __DIR__ . '/includes/libs/rdbms/field/Field.php', 'Wikimedia\\Rdbms\\IBlob' => __DIR__ . '/includes/libs/rdbms/encasing/IBlob.php', 'Wikimedia\\Rdbms\\ILBFactory' => __DIR__ . '/includes/libs/rdbms/lbfactory/ILBFactory.php', @@ -1595,10 +1595,12 @@ 'Wikimedia\\Rdbms\\LoadMonitorNull' => __DIR__ . '/includes/libs/rdbms/loadmonitor/LoadMonitorNull.php', 'Wikimedia\\Rdbms\\MssqlBlob' => __DIR__ . '/includes/libs/rdbms/encasing/MssqlBlob.php', 'Wikimedia\\Rdbms\\MssqlField' => __DIR__ . '/includes/libs/rdbms/field/MssqlField.php', + 'Wikimedia\\Rdbms\\MssqlResultWrapper' => __DIR__ . '/includes/libs/rdbms/database/resultwrapper/MssqlResultWrapper.php', 'Wikimedia\\Rdbms\\MySQLField' => __DIR__ . '/includes/libs/rdbms/field/MySQLField.php', 'Wikimedia\\Rdbms\\MySQLMasterPos' => __DIR__ . '/includes/libs/rdbms/database/position/MySQLMasterPos.php', 'Wikimedia\\Rdbms\\PostgresBlob' => __DIR__ . '/includes/libs/rdbms/encasing/PostgresBlob.php', 'Wikimedia\\Rdbms\\PostgresField' => __DIR__ . '/includes/libs/rdbms/field/PostgresField.php', + 'Wikimedia\\Rdbms\\ResultWrapper' => __DIR__ . '/includes/libs/rdbms/database/resultwrapper/ResultWrapper.php', 'Wikimedia\\Rdbms\\SQLiteField' => __DIR__ . '/includes/libs/rdbms/field/SQLiteField.php', 'Wikimedia\\Rdbms\\SessionConsistentConnectionManager' => __DIR__ . '/includes/libs/rdbms/connectionmanager/SessionConsistentConnectionManager.php', 'Wikimedia\\Rdbms\\TransactionProfiler' => __DIR__ . '/includes/libs/rdbms/TransactionProfiler.php', diff --git a/includes/libs/rdbms/database/DatabaseMssql.php b/includes/libs/rdbms/database/DatabaseMssql.php index 7c82479..31b92ec 100644 --- a/includes/libs/rdbms/database/DatabaseMssql.php +++ b/includes/libs/rdbms/database/DatabaseMssql.php @@ -27,6 +27,7 @@ use Wikimedia\Rdbms\Blob; use Wikimedia\Rdbms\MssqlBlob; use Wikimedia\Rdbms\MssqlField; +use Wikimedia\Rdbms\MssqlResultWrapper; /** * @ingroup Database diff --git a/includes/libs/rdbms/database/IDatabase.php b/includes/libs/rdbms/database/IDatabase.php index f7bb6cf..6bc870b 100644 --- a/includes/libs/rdbms/database/IDatabase.php +++ b/includes/libs/rdbms/database/IDatabase.php @@ -28,6 +28,7 @@ use Wikimedia\Rdbms\LikeMatch; use Wikimedia\Rdbms\DBMasterPos; use Wikimedia\Rdbms\Field; +use Wikimedia\Rdbms\IResultWrapper; /** * Basic database interface for live and lazy-loaded relation database handles @@ -363,7 +364,7 @@ * member variables. * If no more rows are available, false is returned. * -* @param ResultWrapper|stdClass $res Object as returned from IDatabase::query(), etc. +* @param IResultWrapper|stdClass $res Object as returned from IDatabase::query(), etc. * @return stdClass|bool * @throws DBUnexpectedError Thrown if the database returns an error */ @@ -374,7 +375,7 @@
[MediaWiki-commits] [Gerrit] operations/puppet[production]: toolserver_legacy: Use Redirect instead of RedirectMatch
Hello DatGuy, Dzahn, I'd like you to do a code review. Please visit https://gerrit.wikimedia.org/r/338610 to review the following change. Change subject: toolserver_legacy: Use Redirect instead of RedirectMatch .. toolserver_legacy: Use Redirect instead of RedirectMatch Change-Id: Ic79292fdc3c1d54ba58b32aaa157e74d81533143 --- M modules/toolserver_legacy/templates/www.toolserver.org.erb 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/10/338610/1 diff --git a/modules/toolserver_legacy/templates/www.toolserver.org.erb b/modules/toolserver_legacy/templates/www.toolserver.org.erb index 0657086..3fd77d5 100644 --- a/modules/toolserver_legacy/templates/www.toolserver.org.erb +++ b/modules/toolserver_legacy/templates/www.toolserver.org.erb @@ -214,7 +214,7 @@ Redirect 301 /~magnus/geohack https://tools.wmflabs.org/geohack Redirect 301 /~magnus/geo https://tools.wmflabs.org/geohack Redirect 301 /~magnus/joanjoc/sugart.php https://tools.wmflabs.org/joanjoc/sugart.php -RedirectMatch 301 \/~magnus\/(.*) https://tools.wmflabs.org/magnustools/$1 +Redirect 301 /~magnus https://tools.wmflabs.org/magnustools Redirect 301 /~master https://tools.wmflabs.org/wiwosm Redirect 303 /~mathbot https://tools.wmflabs.org/mathbot/ Redirect 301 /~multichill/coordinates.php https://tools.wmflabs.org/locator/coordinates.php -- To view, visit https://gerrit.wikimedia.org/r/338610 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic79292fdc3c1d54ba58b32aaa157e74d81533143 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Tim LandscheidtGerrit-Reviewer: DatGuy Gerrit-Reviewer: Dzahn ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...PubSubHubbub[master]: Add file for special page aliases
Umherirrender has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/336093 ) Change subject: Add file for special page aliases .. Add file for special page aliases Allows translations and avoids: Notice: Did not find alias for special page ''. Perhaps no aliases are defined for it? Change-Id: I9b9752f940608a2f568f58892c5a53cc713bc6ff --- A PubSubHubbub.alias.php M PubSubHubbub.php 2 files changed, 16 insertions(+), 0 deletions(-) Approvals: Umherirrender: Verified; Looks good to me, approved Reedy: Looks good to me, approved Nikerabbit: Looks good to me, but someone else must approve diff --git a/PubSubHubbub.alias.php b/PubSubHubbub.alias.php new file mode 100644 index 000..7304209 --- /dev/null +++ b/PubSubHubbub.alias.php @@ -0,0 +1,15 @@ + array( 'PubSubHubbub-Export' ), +); diff --git a/PubSubHubbub.php b/PubSubHubbub.php index 0d57a40..11921cf 100644 --- a/PubSubHubbub.php +++ b/PubSubHubbub.php @@ -47,6 +47,7 @@ $wgMessagesDirs['PubSubHubbub'] = __DIR__ . '/i18n'; $wgExtensionMessagesFiles['PubSubHubbub'] = $dir . 'PubSubHubbub.i18n.php'; +$wgExtensionMessagesFiles['PubSubHubbubAlias'] = $dir . 'PubSubHubbub.alias.php'; $wgAutoloadClasses['PubSubHubbub\\PubSubHubbub'] = $dir . 'PubSubHubbub.body.php'; $wgAutoloadClasses['PubSubHubbub\\SpecialPubSubHubbubExport'] = $dir . 'specials/SpecialPubSubHubbubExport.php'; -- To view, visit https://gerrit.wikimedia.org/r/336093 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9b9752f940608a2f568f58892c5a53cc713bc6ff Gerrit-PatchSet: 4 Gerrit-Project: mediawiki/extensions/PubSubHubbub Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Nikerabbit Gerrit-Reviewer: Raimond Spekking Gerrit-Reviewer: Reedy Gerrit-Reviewer: Umherirrender Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: Improve vertical alignment of button icons in MW
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/338542 ) Change subject: Improve vertical alignment of button icons in MW .. Improve vertical alignment of button icons in MW Bug: T158486 Change-Id: Ie3598034b484e9ecf1fe42abbbc547c4b80a4e0d --- M src/themes/mediawiki/elements.less 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/42/338542/1 diff --git a/src/themes/mediawiki/elements.less b/src/themes/mediawiki/elements.less index 4e66de7..cc32e3b 100644 --- a/src/themes/mediawiki/elements.less +++ b/src/themes/mediawiki/elements.less @@ -181,7 +181,7 @@ &.oo-ui-iconElement { > .oo-ui-buttonElement-button > .oo-ui-iconElement-icon { position: absolute; - top: 0.2em; + top: 0.25em; // This centers the icon in icon-only buttons left: 1.5em - @size-icon / 2; } -- To view, visit https://gerrit.wikimedia.org/r/338542 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie3598034b484e9ecf1fe42abbbc547c4b80a4e0d Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: puppet: Remove templatedir setting
Tim Landscheidt has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/338540 ) Change subject: puppet: Remove templatedir setting .. puppet: Remove templatedir setting All templates are now part of modules, eliminating the need for the global templates/ directory. Bug: T95158 Change-Id: I063781e9fd1fb09ef2b250eae0c2ca407a3fea04 --- M modules/puppet/templates/self.conf.erb M modules/puppetmaster/templates/master.conf.erb D templates/DO_NOT_ADD_FILES_HERE 3 files changed, 0 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/40/338540/1 diff --git a/modules/puppet/templates/self.conf.erb b/modules/puppet/templates/self.conf.erb index 831fd44..f3ce85c 100644 --- a/modules/puppet/templates/self.conf.erb +++ b/modules/puppet/templates/self.conf.erb @@ -29,7 +29,6 @@ bindaddress = <%= bindaddress %> certname = <%= certname %> thin_storeconfigs = true -templatedir = /etc/puppet/templates modulepath = /etc/puppet/secret/modules:/etc/puppet/private/modules:/etc/puppet/modules # SSL diff --git a/modules/puppetmaster/templates/master.conf.erb b/modules/puppetmaster/templates/master.conf.erb index f422c7d..5a16a6d 100644 --- a/modules/puppetmaster/templates/master.conf.erb +++ b/modules/puppetmaster/templates/master.conf.erb @@ -1,7 +1,6 @@ [master] certname = <%= scope.lookupvar('puppetmaster::server_name') %> -templatedir = /etc/puppet/templates <% if @is_37_plus >= 0 %>base<% end %>modulepath = /etc/puppet/private/modules:/etc/puppet/modules # puppetmaster($config) settings diff --git a/templates/DO_NOT_ADD_FILES_HERE b/templates/DO_NOT_ADD_FILES_HERE deleted file mode 100644 index 95774ce..000 --- a/templates/DO_NOT_ADD_FILES_HERE +++ /dev/null @@ -1,5 +0,0 @@ -Using a templatedir is not only deprecated, but also prints large red -warnings for every damn catalog compilation or other puppet action. - -We're getting rid of them as fast as possible. If you add one, well, -that means you've done so disregarding this large sign... -- To view, visit https://gerrit.wikimedia.org/r/338540 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I063781e9fd1fb09ef2b250eae0c2ca407a3fea04 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Tim Landscheidt___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...SearchStats[master]: Fix typo in searchstats-desc in en.json
SamanthaNguyen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/338537 ) Change subject: Fix typo in searchstats-desc in en.json .. Fix typo in searchstats-desc in en.json Bug: T158469 Change-Id: Id30fef145e47c814abe8c383b4a76bca4a1b8466 --- M SearchStats.php M i18n/en.json 2 files changed, 3 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SearchStats refs/changes/37/338537/1 diff --git a/SearchStats.php b/SearchStats.php index f80fff2..37e6730 100644 --- a/SearchStats.php +++ b/SearchStats.php @@ -9,7 +9,7 @@ * @author Steven Orvis, 2016 * @license GNU General Public Licence 2.0 or later */ - + # Alert the user that this is not a valid access point to MediaWiki if they try to access the special pages file directly. if ( !defined( 'MEDIAWIKI' ) ) { echo << array( 'Steven Orvis', ), - 'version' => '0.1.0', + 'version' => '0.1.1', 'url' => 'https://www.mediawiki.org/wiki/Extension:SearchStats', 'descriptionmsg' => 'searchstats-desc', ); @@ -50,4 +50,3 @@ $wgSpecialPages['SearchStats'] = 'SpecialSearchStats'; # Tell MediaWiki about the new special page and its class name /* Configuration */ - diff --git a/i18n/en.json b/i18n/en.json index 761b837..b5efae4 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -1,4 +1,4 @@ { "@metadata": {}, - "searchstats-desc": "Tracks internal searches to allow identifing commonally seeked pages on the wiki" + "searchstats-desc": "Tracks internal searches to allow identifing commonly sought pages on the wiki" } -- To view, visit https://gerrit.wikimedia.org/r/338537 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id30fef145e47c814abe8c383b4a76bca4a1b8466 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SearchStats Gerrit-Branch: master Gerrit-Owner: SamanthaNguyen___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] labs...stewardbots[master]: Updated privacy statement
MarcoAurelio has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/338536 ) Change subject: Updated privacy statement .. Updated privacy statement Change-Id: Ic3e0262b96192c2ddf3afceaa6f6cdf837030528 --- M privacy.html 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/labs/tools/stewardbots refs/changes/36/338536/1 diff --git a/privacy.html b/privacy.html index 229f019..8af6dbc 100644 --- a/privacy.html +++ b/privacy.html @@ -15,7 +15,7 @@ By accessing and/or using this project, you agree that the volunteer administrators of this project will have access to any data you submit. This can include your IP address, your username/password combination for accounts created in Labs services, and any other information that you send. The volunteer administrators of this project are bound by the Wikimedia Labs Terms of Use, and are not allowed to share this information or use it in any non-approved way. -In particular, we mantain an access and a service log for maintenance and debug purposes. Those logs collect browser and operating systemdata, the tool accessed or used and other technical data. IP addresses are not avalaible to us, and those logged in our files are not real IPs. No account creation or registration is required to use any of our tools for now, so no account data nor password data will be recorded. +In particular, we mantain an access and a service log for maintenance and debug purposes. Those logs collect browser and operating system data, the tool accessed or used and other technical data. No account creation or registration is required to use any of our tools for now, so no account data nor password data will be recorded. Since access to this information is fundamental to the operation of Wikimedia Labs, these terms regarding use of your data expressly override the Wikimedia Foundations Privacy Policy as it relates to the use and access of your personal information. @@ -26,4 +26,4 @@ https://tools.wmflabs.org/;>Return to main tools directory Privacy statement https://wikitech.wikimedia.org/wiki/Wikitech:Labs_Terms_of_use; target="_blank">Terms of Use - + \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/338536 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic3e0262b96192c2ddf3afceaa6f6cdf837030528 Gerrit-PatchSet: 1 Gerrit-Project: labs/tools/stewardbots Gerrit-Branch: master Gerrit-Owner: MarcoAurelio___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Use OO.ui.confrim for edit abandon message
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/338535 ) Change subject: Use OO.ui.confrim for edit abandon message .. Use OO.ui.confrim for edit abandon message Could potentially be upstreamed to mw.confirmCloseWindow but would make #trigger an async method. Change-Id: I986dee021b7881c7f27cff80ca50011c47742a70 --- M resources/mobile.editor.common/EditorOverlayBase.js 1 file changed, 11 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/35/338535/1 diff --git a/resources/mobile.editor.common/EditorOverlayBase.js b/resources/mobile.editor.common/EditorOverlayBase.js index cb94bef..64d2044 100644 --- a/resources/mobile.editor.common/EditorOverlayBase.js +++ b/resources/mobile.editor.common/EditorOverlayBase.js @@ -335,12 +335,18 @@ * @inheritdoc */ hide: function () { - // trigger the customEvent for mw.confirmCloseWindow - if ( !this.allowCloseWindow.trigger() ) { - return; + var self = this; + if ( this.hasChanged() ) { + OO.ui.confirm( mw.msg( 'mobile-frontend-editor-cancel-confirm' ) ).done( function ( confirmed ) { + if ( confirmed ) { + self.allowCloseWindow.release(); + Overlay.prototype.hide.call( self ); + } + } ); + } else { + this.allowCloseWindow.release(); + Overlay.prototype.hide.call( this ); } - this.allowCloseWindow.release(); - return Overlay.prototype.hide.apply( this, arguments ); }, /** * Check, if the user should be asked if they really want to leave the page. -- To view, visit https://gerrit.wikimedia.org/r/338535 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I986dee021b7881c7f27cff80ca50011c47742a70 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: build: Enable no-duplicate-selectors stylelint rule
VolkerE has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/338534 ) Change subject: build: Enable no-duplicate-selectors stylelint rule .. build: Enable no-duplicate-selectors stylelint rule Enabling no-duplicate-selectors stylelint rule and making it pass. Change-Id: Ib62b463898098eea1301f0ddfcd4837498272dd4 Depends-on: I3859e04797203a64d82206a379dbb320e5e113d5 --- M .stylelintrc M resources/src/mediawiki.action/mediawiki.action.view.filepage.css M resources/src/mediawiki.legacy/commonPrint.css M resources/src/mediawiki.legacy/oldshared.css M resources/src/mediawiki.legacy/shared.css M resources/src/mediawiki.widgets.datetime/CalendarWidget.less M resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.less M resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.less 8 files changed, 13 insertions(+), 42 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/34/338534/1 diff --git a/.stylelintrc b/.stylelintrc index f9663fc..75d3839 100644 --- a/.stylelintrc +++ b/.stylelintrc @@ -7,7 +7,6 @@ "indentation": null, "no-descending-specificity": null, - "no-duplicate-selectors": null, "number-leading-zero": null, diff --git a/resources/src/mediawiki.action/mediawiki.action.view.filepage.css b/resources/src/mediawiki.action/mediawiki.action.view.filepage.css index 85e5c26..7a9a212 100644 --- a/resources/src/mediawiki.action/mediawiki.action.view.filepage.css +++ b/resources/src/mediawiki.action/mediawiki.action.view.filepage.css @@ -76,25 +76,13 @@ font-size: 0.8em; margin-left: 0.5em; margin-bottom: 0.5em; + border: 0; + border-collapse: collapse; width: 400px; } .mw_metadata caption { font-weight: bold; -} - -.mw_metadata th { - font-weight: normal; - text-align: center; -} - -.mw_metadata td { - padding: 0.1em; -} - -.mw_metadata { - border: 0; - border-collapse: collapse; } .mw_metadata td, @@ -106,10 +94,13 @@ .mw_metadata th { background-color: #f8f9fa; + font-weight: normal; + text-align: center; } .mw_metadata td { background-color: #fcfcfc; + padding: 0.1em; } .mw_metadata ul.metadata-langlist { diff --git a/resources/src/mediawiki.legacy/commonPrint.css b/resources/src/mediawiki.legacy/commonPrint.css index 99accf4..b3c5233 100644 --- a/resources/src/mediawiki.legacy/commonPrint.css +++ b/resources/src/mediawiki.legacy/commonPrint.css @@ -189,13 +189,6 @@ a.stub { color: #000 !important; text-decoration: none !important; -} - -/* Continue ... */ -a, -a.external, -a.new, -a.stub { color: inherit !important; text-decoration: inherit !important; } diff --git a/resources/src/mediawiki.legacy/oldshared.css b/resources/src/mediawiki.legacy/oldshared.css index c36ddd9..d10f58a 100644 --- a/resources/src/mediawiki.legacy/oldshared.css +++ b/resources/src/mediawiki.legacy/oldshared.css @@ -331,23 +331,12 @@ /* Classes for Exif data display */ table.mw_metadata { margin-left: 0.5em; + border: 0; + border-collapse: collapse; } table.mw_metadata caption { font-weight: bold; -} - -table.mw_metadata th { - font-weight: normal; -} - -table.mw_metadata td { - padding: 0.1em; -} - -table.mw_metadata { - border: 0; - border-collapse: collapse; } table.mw_metadata td, @@ -359,10 +348,12 @@ table.mw_metadata th { background-color: #f9f9f9; + font-weight: normal; } table.mw_metadata td { background-color: #fcfcfc; + padding: 0.1em; } table.mw_metadata td.spacer { diff --git a/resources/src/mediawiki.legacy/shared.css b/resources/src/mediawiki.legacy/shared.css index a9cd947..929ddde 100644 --- a/resources/src/mediawiki.legacy/shared.css +++ b/resources/src/mediawiki.legacy/shared.css @@ -166,6 +166,7 @@ */ td.mw-label { text-align: right; + vertical-align: middle; } td.mw-input { @@ -174,13 +175,6 @@ td.mw-submit { text-align: left; -} - -td.mw-label { - vertical-align: middle; -} - -td.mw-submit { white-space: nowrap; } diff --git a/resources/src/mediawiki.widgets.datetime/CalendarWidget.less b/resources/src/mediawiki.widgets.datetime/CalendarWidget.less index 1fb234e..248c2b4 100644 --- a/resources/src/mediawiki.widgets.datetime/CalendarWidget.less +++ b/resources/src/mediawiki.widgets.datetime/CalendarWidget.less @@ -1,3 +1,4 @@ +/* stylelint-disable no-duplicate-selectors */ @import "mediawiki.widgets.datetime.definitions"; .mw-widgets-datetime-calendarWidget { diff --git a/resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.less b/resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.less index 183694f..75c82a5 100644 ---
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: build: Enable declaration-block-no-duplicate-properties styl...
VolkerE has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/338531 ) Change subject: build: Enable declaration-block-no-duplicate-properties stylelint rule .. build: Enable declaration-block-no-duplicate-properties stylelint rule Enabling declaration-block-no-duplicate-properties stylelint rule and making it pass. Amongst others, removing IE 7 specific debug CSS rules. Depends-on: I3859e04797203a64d82206a379dbb320e5e113d5 Change-Id: I0fa611fff61c13646a81193b7fa079f3427a0080 --- M .stylelintrc M resources/src/jquery/jquery.badge.css M resources/src/jquery/jquery.spinner.css M resources/src/jquery/jquery.suggestions.css M resources/src/mediawiki.action/mediawiki.action.edit.css M resources/src/mediawiki.legacy/oldshared.css M resources/src/mediawiki.legacy/shared.css M resources/src/mediawiki.skinning/content.css M resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.less M resources/src/mediawiki/mediawiki.debug.less M resources/src/mediawiki/mediawiki.feedback.css 11 files changed, 8 insertions(+), 16 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/31/338531/1 diff --git a/.stylelintrc b/.stylelintrc index f9663fc..dc8edd9 100644 --- a/.stylelintrc +++ b/.stylelintrc @@ -1,7 +1,6 @@ { "extends": "stylelint-config-wikimedia", "rules": { - "declaration-block-no-duplicate-properties": null, "declaration-no-important": null, "indentation": null, diff --git a/resources/src/jquery/jquery.badge.css b/resources/src/jquery/jquery.badge.css index 8b4bd7b..7833979 100644 --- a/resources/src/jquery/jquery.badge.css +++ b/resources/src/jquery/jquery.badge.css @@ -21,7 +21,7 @@ display: inline-block; /* Hack for IE6 and IE7 (bug 47926) */ zoom: 1; - *display: inline; + *display: inline; /* stylelint-disable-line declaration-block-no-duplicate-properties */ } .mw-badge-overlay { diff --git a/resources/src/jquery/jquery.spinner.css b/resources/src/jquery/jquery.spinner.css index 76b4845..6c7bd0e 100644 --- a/resources/src/jquery/jquery.spinner.css +++ b/resources/src/jquery/jquery.spinner.css @@ -36,5 +36,5 @@ /* IE < 8 */ zoom: 1; - *display: inline; + *display: inline; /* stylelint-disable-line declaration-block-no-duplicate-properties */ } diff --git a/resources/src/jquery/jquery.suggestions.css b/resources/src/jquery/jquery.suggestions.css index c32f25a..2cc0cc9 100644 --- a/resources/src/jquery/jquery.suggestions.css +++ b/resources/src/jquery/jquery.suggestions.css @@ -17,7 +17,6 @@ background-color: #fff; cursor: pointer; border: solid 1px #aaa; - padding: 0; margin: 0; margin-top: -2px; display: none; diff --git a/resources/src/mediawiki.action/mediawiki.action.edit.css b/resources/src/mediawiki.action/mediawiki.action.edit.css index 9b0c430..f68dbfa 100644 --- a/resources/src/mediawiki.action/mediawiki.action.edit.css +++ b/resources/src/mediawiki.action/mediawiki.action.edit.css @@ -11,5 +11,5 @@ display: inline-block; /* IE7 */ zoom: 1; - *display: inline; + *display: inline; /* stylelint-disable declaration-block-no-duplicate-properties */ } diff --git a/resources/src/mediawiki.legacy/oldshared.css b/resources/src/mediawiki.legacy/oldshared.css index c36ddd9..ef7be3b 100644 --- a/resources/src/mediawiki.legacy/oldshared.css +++ b/resources/src/mediawiki.legacy/oldshared.css @@ -173,9 +173,7 @@ /* IE7 and earlier */ zoom: 1; - *display: inline; - - padding: 7px; + *display: inline; /* stylelint-disable-line declaration-block-no-duplicate-properties */ } /* CSS for backwards-compatibility with cached page renders and creative uses in wikitext */ diff --git a/resources/src/mediawiki.legacy/shared.css b/resources/src/mediawiki.legacy/shared.css index a9cd947..2b79a57 100644 --- a/resources/src/mediawiki.legacy/shared.css +++ b/resources/src/mediawiki.legacy/shared.css @@ -266,7 +266,7 @@ margin: 0.125em 0; padding: 0 0.5em; zoom: 1; - display: inline !ie; + display: inline !ie; /* stylelint-disable-line declaration-block-no-duplicate-properties */ } .catlinks li:first-child { @@ -422,7 +422,7 @@ margin-bottom: 1em; display: inline-block; zoom: 1; - *display: inline; + *display: inline; /* stylelint-disable-line declaration-block-no-duplicate-properties */ } .errorbox h2, diff --git a/resources/src/mediawiki.skinning/content.css b/resources/src/mediawiki.skinning/content.css index 2cf2cb7..4cc2f09 100644 --- a/resources/src/mediawiki.skinning/content.css +++ b/resources/src/mediawiki.skinning/content.css @@ -35,7 +35,7 @@ /* IE7 and earlier */ zoom: 1; - *display: inline; + *display: inline;
[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: Change #f0f0f0 to color of color palette
EddieGP has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/338529 ) Change subject: Change #f0f0f0 to color of color palette .. Change #f0f0f0 to color of color palette The color #f0f0f0 was used but is not a standard color of the color palette. Now instead #eaecf0 (Base80) is used. Bug: T158401 Change-Id: I2f25d95bb231dccb239a722dde3f391d375be0eb --- M modules/dashboard/styles/ext.cx.dashboard.less M modules/dashboard/styles/ext.cx.lists.common.less M modules/tools/styles/ext.cx.tools.mt.card.less M modules/ui/legacy/styles/mw.cx.ui.ToolsColumn.less M modules/ui/styles/mw.cx.ui.ToolsColumn.less M modules/widgets/common/ext.cx.common.less M modules/widgets/translator/ext.cx.translator.less 7 files changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation refs/changes/29/338529/1 diff --git a/modules/dashboard/styles/ext.cx.dashboard.less b/modules/dashboard/styles/ext.cx.dashboard.less index cdfa817..66e9731 100644 --- a/modules/dashboard/styles/ext.cx.dashboard.less +++ b/modules/dashboard/styles/ext.cx.dashboard.less @@ -2,7 +2,7 @@ @import 'mediawiki.mixins'; body { - background-color: #f0f0f0; + background-color: #eaecf0; } .cx-cta { @@ -12,7 +12,7 @@ padding: 20px 0; float: left; font-size: 16px; - background-color: #f0f0f0; + background-color: #eaecf0; z-index: 100; &__new-translation:before { @@ -117,7 +117,7 @@ .mw-ui-two-thirds; padding: 0 10px 0 0; - background-color: #f0f0f0; + background-color: #eaecf0; } .translation-source-language-filter, @@ -133,7 +133,7 @@ .translation-filter { .mw-ui-one-whole; - background-color: #f0f0f0; + background-color: #eaecf0; padding: 0; .cx-filters { diff --git a/modules/dashboard/styles/ext.cx.lists.common.less b/modules/dashboard/styles/ext.cx.lists.common.less index 48c3226..c2232b5 100644 --- a/modules/dashboard/styles/ext.cx.lists.common.less +++ b/modules/dashboard/styles/ext.cx.lists.common.less @@ -33,7 +33,7 @@ &__img { .background-image-svg('../images/cx-circle.svg', '../images/cx-circle.png'); background-repeat: no-repeat; - background-color: #f0f0f0; + background-color: #eaecf0; background-position: top; border-right: 1px solid #eee; padding: 50px 0; diff --git a/modules/tools/styles/ext.cx.tools.mt.card.less b/modules/tools/styles/ext.cx.tools.mt.card.less index 6fdfe82..b03d0b0 100644 --- a/modules/tools/styles/ext.cx.tools.mt.card.less +++ b/modules/tools/styles/ext.cx.tools.mt.card.less @@ -81,7 +81,7 @@ } .cx-provider-reset-mt { - border-bottom: 4px solid #f0f0f0; + border-bottom: 4px solid #eaecf0; } } diff --git a/modules/ui/legacy/styles/mw.cx.ui.ToolsColumn.less b/modules/ui/legacy/styles/mw.cx.ui.ToolsColumn.less index c3f25b5..361e32f 100644 --- a/modules/ui/legacy/styles/mw.cx.ui.ToolsColumn.less +++ b/modules/ui/legacy/styles/mw.cx.ui.ToolsColumn.less @@ -3,7 +3,7 @@ .cx-column--tools { .mw-ui-one-whole(@palm); - background-color: #f0f0f0; + background-color: #eaecf0; min-height: 100vh; position: relative; z-index: 20; diff --git a/modules/ui/styles/mw.cx.ui.ToolsColumn.less b/modules/ui/styles/mw.cx.ui.ToolsColumn.less index c72ef7d..da9de8c 100644 --- a/modules/ui/styles/mw.cx.ui.ToolsColumn.less +++ b/modules/ui/styles/mw.cx.ui.ToolsColumn.less @@ -3,7 +3,7 @@ .cx-column-tools { .mw-ui-one-whole(@palm); - background-color: #f0f0f0; + background-color: #eaecf0; min-height: 100vh; position: relative; z-index: 20; diff --git a/modules/widgets/common/ext.cx.common.less b/modules/widgets/common/ext.cx.common.less index 518d448..092fb0b 100644 --- a/modules/widgets/common/ext.cx.common.less +++ b/modules/widgets/common/ext.cx.common.less @@ -6,7 +6,7 @@ @gray-darker: #222; @gray-dark: #54595d; @gray: #c8ccd1; -@gray-light: #f0f0f0; +@gray-light: #eaecf0; @gray-lighter: #f8f9fa; @white: #fff; diff --git a/modules/widgets/translator/ext.cx.translator.less b/modules/widgets/translator/ext.cx.translator.less index e88349b..8fe95ab 100644 --- a/modules/widgets/translator/ext.cx.translator.less +++ b/modules/widgets/translator/ext.cx.translator.less @@ -37,5 +37,5 @@ #cxtranslatorstats { .mw-ui-one-whole; max-height: 50px; - background-color: #f0f0f0; + background-color: #eaecf0; } -- To view, visit https://gerrit.wikimedia.org/r/338529 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id:
[MediaWiki-commits] [Gerrit] mediawiki...MultimediaViewer[master]: build: Bump stylelint and make pass
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/338498 ) Change subject: build: Bump stylelint and make pass .. build: Bump stylelint and make pass grunt-stylelint 0.6.0 → 0.7.0 stylelint-config-wikimedia 0.3.0 → 0.4.1 Change-Id: Id87b8df04d415e1f1058a4042a31408236402037 Depends-On: If53a735458703f0bd2c094349edf86f38f05ccd7 --- M package.json 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: MaxSem: Looks good to me, approved jenkins-bot: Verified diff --git a/package.json b/package.json index fff82ba..e8b9142 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "grunt-banana-checker": "0.5.0", "grunt-eslint": "19.0.0", "grunt-jsonlint": "1.0.8", -"grunt-stylelint": "0.6.0", -"stylelint-config-wikimedia": "0.3.0" +"grunt-stylelint": "0.7.0", +"stylelint-config-wikimedia": "0.4.1" } } -- To view, visit https://gerrit.wikimedia.org/r/338498 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id87b8df04d415e1f1058a4042a31408236402037 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/MultimediaViewer Gerrit-Branch: master Gerrit-Owner: JforresterGerrit-Reviewer: MaxSem Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: Centering non-square images
Harej has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/338528 ) Change subject: Centering non-square images .. Centering non-square images Bug: T158284 Change-Id: If2d6c00789e562a1e0db36728f364cb4d82897bb --- M includes/content/CollaborationKitImage.php M includes/content/CollaborationListContent.php M modules/ext.CollaborationKit.list.styles.less 3 files changed, 46 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CollaborationKit refs/changes/28/338528/1 diff --git a/includes/content/CollaborationKitImage.php b/includes/content/CollaborationKitImage.php index ffc7f68..ee12e0f 100644 --- a/includes/content/CollaborationKitImage.php +++ b/includes/content/CollaborationKitImage.php @@ -26,6 +26,8 @@ * @param string $options['fallback'] If the specified image is null or doesn't exist. Valid * options are none', a valid icon ID, or an arbitrary string to use a seed. (Note: if you * specify a label, then that will serve as the fallback.) +* @param bool $options['optimizeForSquare'] Fetch an image such that it's ideal for shoving +* into a square frame. Default is false. * @return string HTML elements or wikitext, depending on $options['renderAsWikitext'] */ public static function makeImage( $image, $width, $options = [] ) { @@ -38,6 +40,7 @@ $colour = isset( $options['colour'] ) ? $options['colour'] : ''; $css = isset( $options['css'] ) ? $options['css'] : ''; $renderAsWikitext = isset( $options['renderAsWikitext'] ) ? $options['renderAsWikitext'] : false; + $optimizeForSquare = isset( $options['optimizeForSquare'] ) ? $options['optimizeForSquare'] : false; $label = isset( $options['label'] ) ? $options['label'] : ''; if ( !isset( $options['fallback'] ) ) { @@ -61,11 +64,24 @@ // Are we loading an image file or constructing a div based on an icon class? if ( wfFindFile( $image ) ) { - $imageCode = self::makeImageFromFile( $image, $classes, $width, $link, - $renderAsWikitext, $label ); + $imageObj = wfFindFile( $image ); + + $squareAdjustmentAxis = null; + if ( $optimizeForSquare ) { + $fullHeight = $imageObj->getHeight(); + $fullWidth = $imageObj->getWidth(); + $ratio = $fullWidth / $fullHeight; // get ratio of width to height + if ( $ratio > 1 ) { + $squareAdjustmentAxis = 'x'; + $classes[] = 'mw-ck-adjustedimage-x'; + } elseif ( $ratio < 1 ) { // If image is a perfect square (ratio == 1) nothing needs to be done + $squareAdjustmentAxis = 'y'; + $classes[] = 'mw-ck-adjustedimage-y'; + } + } + $imageCode = self::makeImageFromFile( $imageObj, $width, $link, $renderAsWikitext, $label, $squareAdjustmentAxis ); } elseif ( in_array( $image, $cannedIcons ) ) { - $imageCode = self::makeImageFromIcon( $image, $classes, $width, $colour, - $link, $renderAsWikitext, $label ); + $imageCode = self::makeImageFromIcon( $image, $width, $colour, $link, $renderAsWikitext, $label ); } // Finishing up @@ -77,16 +93,18 @@ /** * @return string */ - protected static function makeImageFromFile( $image, $classes, $width, $link, - $renderAsWikitext, $label ) { + protected static function makeImageFromFile( $imageObj, $width, $link, $renderAsWikitext, $label, $squareAdjustmentAxis ) { // This assumes that colours cannot be assigned to images. // This is currently true, but who knows what the future might hold! global $wgParser; - $imageObj = wfFindFile( $image ); $imageTitle = $imageObj->getTitle(); $imageFullName = $imageTitle->getFullText(); + + if ( $squareAdjustmentAxis == 'x' ) { + $width = 'x' . $width; // i.e. "x64px" + } $wikitext = "[[{$imageFullName}|{$width}px"; @@ -123,8 +141,7 @@ /** * @return string */ - protected static function makeImageFromIcon( $image, $classes, $width, $colour, $link, - $renderAsWikitext, $label ) { + protected static function makeImageFromIcon( $image,
[MediaWiki-commits] [Gerrit] mediawiki...DeskMessMirrored[master]: Add missing qqq message documentation
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/338526 ) Change subject: Add missing qqq message documentation .. Add missing qqq message documentation Added missing qqq.json with 2 message keys and added a short documentation. This allows the skin to be added to translatewiki.net and adding checker for valid i18n files later. Change-Id: Ia5fe290ccac01362dcb54cf04400eda5656ee218 --- A i18n/qqq.json 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/DeskMessMirrored refs/changes/26/338526/1 diff --git a/i18n/qqq.json b/i18n/qqq.json new file mode 100644 index 000..d8ff360 --- /dev/null +++ b/i18n/qqq.json @@ -0,0 +1,5 @@ +{ + "@metadata": {}, + "deskmessmirrored-skin-desc": "{{desc|what=skin|name=DeskMessMirrored|url=https://www.mediawiki.org/wiki/Skin:DeskMessMirrored}};, + "deskmessmirrored-navigation": "The sidebar menu structure" +} -- To view, visit https://gerrit.wikimedia.org/r/338526 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia5fe290ccac01362dcb54cf04400eda5656ee218 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/DeskMessMirrored Gerrit-Branch: master Gerrit-Owner: Umherirrender___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...TimedMediaHandler[master]: Add missing qqq message documentation
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/338520 ) Change subject: Add missing qqq message documentation .. Add missing qqq message documentation Add missing 11 message key to qqq.json and added a short documentation. Documentation can be changed on translatewiki later, when registered for translation - I31e55ffe872ed91f4c8445b4271818e3af5253a7 Enabled banana checker for the i18n files to ensure complete qqq Change-Id: I192a1299e3b9aae1c1894b7e86d74f9cb279782c --- M Gruntfile.js M MwEmbedModules/TimedText/i18n/qqq.json 2 files changed, 18 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler refs/changes/20/338520/1 diff --git a/Gruntfile.js b/Gruntfile.js index e4f137a..eead5dc 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -32,7 +32,8 @@ }, banana: { all: 'i18n/', - EmbedPlayer: 'MwEmbedModules/EmbedPlayer/i18n/' + EmbedPlayer: 'MwEmbedModules/EmbedPlayer/i18n/', + TimedText: 'MwEmbedModules/TimedText/i18n/' }, jsonlint: { all: [ diff --git a/MwEmbedModules/TimedText/i18n/qqq.json b/MwEmbedModules/TimedText/i18n/qqq.json index 4714d5b..0e7f932 100644 --- a/MwEmbedModules/TimedText/i18n/qqq.json +++ b/MwEmbedModules/TimedText/i18n/qqq.json @@ -7,12 +7,23 @@ "Umherirrender" ] }, - "mwe-timedtext-back-btn": "{{Identical|Back}}", + "mwe-timedtext-back-btn": "Used in javascript as text of a button\n{{Identical|Back}}", + "mwe-timedtext-layout-off": "Used in javascript as a Layout option", + "mwe-timedtext-loading-text": "Used in javascript to show a status\n{{Identical|Loading}}", "mwe-timedtext-key-language": "{{optional}}\nParameters:\n* $1 - language key. e.g. \"en\"\n* $2 - language name", - "mwe-timedtext-textcat-cc": "{{Identical|Caption}}", - "mwe-timedtext-textcat-sub": "{{Identical|Subtitle}}", - "mwe-timedtext-textcat-ktv": "See [[w:Karaoke]].", - "mwe-timedtext-textcat-nb": "{{Identical|Annotation}}", + "mwe-timedtext-textcat-cc": "Name for a menu category\n{{Identical|Caption}}", + "mwe-timedtext-textcat-sub": "Name for a menu category\n{{Identical|Subtitle}}", + "mwe-timedtext-textcat-tad": "Name for a menu category", + "mwe-timedtext-textcat-ktv": "Name for a menu category\nSee [[w:Karaoke]].", + "mwe-timedtext-textcat-tik": "Name for a menu category", + "mwe-timedtext-textcat-ar": "Name for a menu category", + "mwe-timedtext-textcat-nb": "Name for a menu category\n{{Identical|Annotation}}", + "mwe-timedtext-textcat-meta": "Name for a menu category", + "mwe-timedtext-textcat-trx": "Name for a menu category", + "mwe-timedtext-textcat-lrc": "Name for a menu category", + "mwe-timedtext-textcat-lin": "Name for a menu category", + "mwe-timedtext-textcat-cue": "Name for a menu category", + "mwe-timedtext-no-subs": "Shown in javascript, when no subtitles available", "mwe-timedtext-language-subtitles-for-clip": "$1 is language name for subtitles (e.g. \"English\"), $2 is title of file that timed text is for.\nShown as the page title on a TimedText namespace page when the page exists. See also mwe-timedtext-language-no-subtitles-for-clip.", "mwe-timedtext-language-no-subtitles-for-clip": "$1 is language name, $2 is title of file that timed text is for.\nShown as the page title on a TimedText namespace page when the page does not exist. See also mwe-timedtext-language-subtitles-for-clip", "mwe-timedtext-upload-timed-text": "After clicking the 'CC' button on the video player, the button on the resulting menu to add subtitles to a video file." -- To view, visit https://gerrit.wikimedia.org/r/338520 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I192a1299e3b9aae1c1894b7e86d74f9cb279782c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TimedMediaHandler Gerrit-Branch: master Gerrit-Owner: Umherirrender___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations...mwbzutils[master]: bump version to 0.0.6
ArielGlenn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/338409 ) Change subject: bump version to 0.0.6 .. bump version to 0.0.6 Change-Id: I361ec6f6755bddc5f5d66e1481d340c0742acdb3 --- M xmldumps-backup/mwbzutils/Makefile 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: ArielGlenn: Verified; Looks good to me, approved diff --git a/xmldumps-backup/mwbzutils/Makefile b/xmldumps-backup/mwbzutils/Makefile index be1a905..449325c 100644 --- a/xmldumps-backup/mwbzutils/Makefile +++ b/xmldumps-backup/mwbzutils/Makefile @@ -16,7 +16,7 @@ # 2010-2013: see the file COPYING for details. # -- -VERSION= "0.0.5" +VERSION= "0.0.6" CC?= gcc BIGFILES = -D_FILE_OFFSET_BITS=64 CPPFLAGS += $(BIGFILES) -DVERSION=\"$(VERSION)\" -- To view, visit https://gerrit.wikimedia.org/r/338409 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I361ec6f6755bddc5f5d66e1481d340c0742acdb3 Gerrit-PatchSet: 2 Gerrit-Project: operations/dumps/mwbzutils Gerrit-Branch: master Gerrit-Owner: ArielGlennGerrit-Reviewer: ArielGlenn ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations...mwbzutils[master]: trailing whitespace cleanup
ArielGlenn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/338519 ) Change subject: trailing whitespace cleanup .. trailing whitespace cleanup Change-Id: Ifda9eaa02c1edb083ddebd3ba17866e95729bc41 --- M xmldumps-backup/mwbzutils/Makefile M xmldumps-backup/mwbzutils/README M xmldumps-backup/mwbzutils/dumpbz2filefromoffset.c M xmldumps-backup/mwbzutils/dumplastbz2block.c M xmldumps-backup/mwbzutils/findpageidinbz2xml.c M xmldumps-backup/mwbzutils/httptiny.c M xmldumps-backup/mwbzutils/mwbzlib.c M xmldumps-backup/mwbzutils/recompressxml.c M xmldumps-backup/mwbzutils/writeuptopageid.c 9 files changed, 96 insertions(+), 96 deletions(-) Approvals: ArielGlenn: Verified; Looks good to me, approved diff --git a/xmldumps-backup/mwbzutils/Makefile b/xmldumps-backup/mwbzutils/Makefile index 0b869ee..be1a905 100644 --- a/xmldumps-backup/mwbzutils/Makefile +++ b/xmldumps-backup/mwbzutils/Makefile @@ -1,7 +1,7 @@ # -- # This Makefile builds binaries which rely on three source files -# from libbzip2 version 1.0.6. (See bz2libfuncs.c, bzlib.h and -# bzlib_private.h; the first is slightly modified while the +# from libbzip2 version 1.0.6. (See bz2libfuncs.c, bzlib.h and +# bzlib_private.h; the first is slightly modified while the # second is unchanged from the library version.) # # The copyright for those two files is as follows: @@ -142,7 +142,7 @@ rm -f $(DOCDIR)LICENSE_BZ rm -f $(DOCDIR)COPYING -clean: +clean: rm -f *.o *.a dumplastbz2block findpageidinbz2xml \ getlastidinbz2xml \ checkforbz2footer dumpbz2filefromoffset \ @@ -155,7 +155,7 @@ reallyclean: distclean rm -f docs/*.1 -dist: +dist: rm -f $(DISTNAME) ln -s -f . $(DISTNAME) tar cvf $(DISTNAME).tar \ diff --git a/xmldumps-backup/mwbzutils/README b/xmldumps-backup/mwbzutils/README index 6762049..a377a96 100644 --- a/xmldumps-backup/mwbzutils/README +++ b/xmldumps-backup/mwbzutils/README @@ -7,10 +7,10 @@ quickly instead of requiring a serial read/decompress of the file. Some of these files range from 2 to 30 GB in size, so serial access is too slow. -The files bz2libfuncs.c, bzlib.h and bzlib_private.h are taken from bzip2/libbzip2 -version 1.0.6 of 6 September 2010 (Copyright (C) 1996-2010 Julian Seward -) and as such their copyright license is in the file -LICENSE_BZ; all other files in the package are released under the GPL, +The files bz2libfuncs.c, bzlib.h and bzlib_private.h are taken from bzip2/libbzip2 +version 1.0.6 of 6 September 2010 (Copyright (C) 1996-2010 Julian Seward + ) and as such their copyright license is in the file +LICENSE_BZ; all other files in the package are released under the GPL, see the file COPYING for details. Scripts: @@ -30,25 +30,25 @@ dumpbz2filefromoffset - Uncompresses the file from the first bz2 block found after the specified offset, and dumps the results to stdout. -This will first look for and dump the header, +This will first look for and dump the header, up to and including the tag; then it will find the first tag in the first bz2 block after the specified output and dump the contents from that point on. -dumplastbz2block - Finds the last bz2 block marker in a file and dumps whatever - can be decompressed after that point; the header of the file - must be intact in order for any output to be produced. This - will produce output for truncated files as well, as long as - there is "enough" data after the bz2 block marker. +dumplastbz2block - Finds the last bz2 block marker in a file and dumps whatever + can be decompressed after that point; the header of the file + must be intact in order for any output to be produced. This + will produce output for truncated files as well, as long as + there is "enough" data after the bz2 block marker. Exits with 0 if decompression of some data can be done, 1 if decompression fails, and -1 on error. -findpageidinbz2xml- Given a bzipped and possibly truncated file, and a page id, +findpageidinbz2xml- Given a bzipped and possibly truncated file, and a page id, hunt for the page id in the file; this assumes that the bz2 header is intact and that page ids are steadily increasing - throughout the file. It writes the offset of the relevant block -
[MediaWiki-commits] [Gerrit] operations...mwbzutils[master]: trailing whitespace cleanup
ArielGlenn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/338519 ) Change subject: trailing whitespace cleanup .. trailing whitespace cleanup Change-Id: Ifda9eaa02c1edb083ddebd3ba17866e95729bc41 --- M xmldumps-backup/mwbzutils/Makefile M xmldumps-backup/mwbzutils/README M xmldumps-backup/mwbzutils/dumpbz2filefromoffset.c M xmldumps-backup/mwbzutils/dumplastbz2block.c M xmldumps-backup/mwbzutils/findpageidinbz2xml.c M xmldumps-backup/mwbzutils/httptiny.c M xmldumps-backup/mwbzutils/mwbzlib.c M xmldumps-backup/mwbzutils/recompressxml.c M xmldumps-backup/mwbzutils/writeuptopageid.c 9 files changed, 96 insertions(+), 96 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dumps/mwbzutils refs/changes/19/338519/1 diff --git a/xmldumps-backup/mwbzutils/Makefile b/xmldumps-backup/mwbzutils/Makefile index 0b869ee..be1a905 100644 --- a/xmldumps-backup/mwbzutils/Makefile +++ b/xmldumps-backup/mwbzutils/Makefile @@ -1,7 +1,7 @@ # -- # This Makefile builds binaries which rely on three source files -# from libbzip2 version 1.0.6. (See bz2libfuncs.c, bzlib.h and -# bzlib_private.h; the first is slightly modified while the +# from libbzip2 version 1.0.6. (See bz2libfuncs.c, bzlib.h and +# bzlib_private.h; the first is slightly modified while the # second is unchanged from the library version.) # # The copyright for those two files is as follows: @@ -142,7 +142,7 @@ rm -f $(DOCDIR)LICENSE_BZ rm -f $(DOCDIR)COPYING -clean: +clean: rm -f *.o *.a dumplastbz2block findpageidinbz2xml \ getlastidinbz2xml \ checkforbz2footer dumpbz2filefromoffset \ @@ -155,7 +155,7 @@ reallyclean: distclean rm -f docs/*.1 -dist: +dist: rm -f $(DISTNAME) ln -s -f . $(DISTNAME) tar cvf $(DISTNAME).tar \ diff --git a/xmldumps-backup/mwbzutils/README b/xmldumps-backup/mwbzutils/README index 6762049..a377a96 100644 --- a/xmldumps-backup/mwbzutils/README +++ b/xmldumps-backup/mwbzutils/README @@ -7,10 +7,10 @@ quickly instead of requiring a serial read/decompress of the file. Some of these files range from 2 to 30 GB in size, so serial access is too slow. -The files bz2libfuncs.c, bzlib.h and bzlib_private.h are taken from bzip2/libbzip2 -version 1.0.6 of 6 September 2010 (Copyright (C) 1996-2010 Julian Seward -) and as such their copyright license is in the file -LICENSE_BZ; all other files in the package are released under the GPL, +The files bz2libfuncs.c, bzlib.h and bzlib_private.h are taken from bzip2/libbzip2 +version 1.0.6 of 6 September 2010 (Copyright (C) 1996-2010 Julian Seward + ) and as such their copyright license is in the file +LICENSE_BZ; all other files in the package are released under the GPL, see the file COPYING for details. Scripts: @@ -30,25 +30,25 @@ dumpbz2filefromoffset - Uncompresses the file from the first bz2 block found after the specified offset, and dumps the results to stdout. -This will first look for and dump the header, +This will first look for and dump the header, up to and including the tag; then it will find the first tag in the first bz2 block after the specified output and dump the contents from that point on. -dumplastbz2block - Finds the last bz2 block marker in a file and dumps whatever - can be decompressed after that point; the header of the file - must be intact in order for any output to be produced. This - will produce output for truncated files as well, as long as - there is "enough" data after the bz2 block marker. +dumplastbz2block - Finds the last bz2 block marker in a file and dumps whatever + can be decompressed after that point; the header of the file + must be intact in order for any output to be produced. This + will produce output for truncated files as well, as long as + there is "enough" data after the bz2 block marker. Exits with 0 if decompression of some data can be done, 1 if decompression fails, and -1 on error. -findpageidinbz2xml- Given a bzipped and possibly truncated file, and a page id, +findpageidinbz2xml- Given a bzipped and possibly truncated file, and a page id, hunt for the page id in the file; this assumes that the bz2 header is intact and that page ids are steadily increasing - throughout the file. It writes the offset of the relevant
[MediaWiki-commits] [Gerrit] operations...mwbzutils[master]: add function to dump parts of bz_info_t structure
ArielGlenn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/338407 ) Change subject: add function to dump parts of bz_info_t structure .. add function to dump parts of bz_info_t structure Change-Id: I4987992be432f0a1daa7b401cf45e17e0857 --- M xmldumps-backup/mwbzutils/mwbzlib.c 1 file changed, 13 insertions(+), 0 deletions(-) Approvals: ArielGlenn: Verified; Looks good to me, approved diff --git a/xmldumps-backup/mwbzutils/mwbzlib.c b/xmldumps-backup/mwbzutils/mwbzlib.c index 16bc409..1a1e5c6 100644 --- a/xmldumps-backup/mwbzutils/mwbzlib.c +++ b/xmldumps-backup/mwbzutils/mwbzlib.c @@ -110,11 +110,24 @@ } } +void dump_bfile_info(bz_info_t *bfile) { + fprintf(stderr, "bfile->bufin_size: %d\n", bfile->bufin_size); + fprintf(stderr, "bfile->buffout_size: %d\n", bfile->bufout_size); + fprintf(stderr, "bfile->initialized: %d\n", bfile->initialized); + fprintf(stderr, "bfile->block_start: %"PRId64"\n", bfile->block_start); + fprintf(stderr, "bfile->something: %d\n", bfile->bits_shifted); + fprintf(stderr, "bfile->position: %"PRId64"\n", bfile->position); + fprintf(stderr, "bfile->bytes_written: %d\n", bfile->bytes_written); + fprintf(stderr, "bfile->eof: %d\n", bfile->eof); + fprintf(stderr, "bfile->file_size: %"PRId64"\n", bfile->file_size); +} + /* return -1 if no match return number of bits rightshifted otherwise */ int check_buffer_for_bz2_block_marker(bz_info_t *bfile) { int result, i; + /* dump_bfile_info(bfile); */ result = bytes_compare(bfile->marker[0],bfile->marker_buffer+1,6,0); if (!result) { return(0); -- To view, visit https://gerrit.wikimedia.org/r/338407 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4987992be432f0a1daa7b401cf45e17e0857 Gerrit-PatchSet: 1 Gerrit-Project: operations/dumps/mwbzutils Gerrit-Branch: master Gerrit-Owner: ArielGlennGerrit-Reviewer: ArielGlenn ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations...mwbzutils[master]: remove page_info_t now that we have id_info_t, and convert u...
ArielGlenn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/338405 ) Change subject: remove page_info_t now that we have id_info_t, and convert utils using it .. remove page_info_t now that we have id_info_t, and convert utils using it Change-Id: Icf133ccb79707ef621436414335ce3497e592a4d --- M xmldumps-backup/mwbzutils/findpageidinbz2xml.c M xmldumps-backup/mwbzutils/mwbzutils.h 2 files changed, 15 insertions(+), 21 deletions(-) Approvals: ArielGlenn: Verified; Looks good to me, approved diff --git a/xmldumps-backup/mwbzutils/findpageidinbz2xml.c b/xmldumps-backup/mwbzutils/findpageidinbz2xml.c index 4218660..9553f88 100644 --- a/xmldumps-backup/mwbzutils/findpageidinbz2xml.c +++ b/xmldumps-backup/mwbzutils/findpageidinbz2xml.c @@ -308,7 +308,7 @@ 0 if no pageid found, -1 on error */ -int get_first_page_id_after_offset(int fin, off_t position, page_info_t *pinfo, int use_api, int use_stub, char *stubfilename, int verbose) { +int get_first_page_id_after_offset(int fin, off_t position, id_info_t *pinfo, int use_api, int use_stub, char *stubfilename, int verbose) { int res; regmatch_t *match_page, *match_page_id, *match_rev, *match_rev_id; regex_t compiled_page, compiled_page_id, compiled_rev, compiled_rev_id; @@ -342,7 +342,7 @@ pinfo->bits_shifted = -1; pinfo->position = (off_t)-1; - pinfo->page_id = -1; + pinfo->id = -1; bfile.bytes_read = 0; @@ -363,7 +363,7 @@ fwrite(b->next_to_read+match_page_id[2].rm_so, sizeof(unsigned char), match_page_id[2].rm_eo - match_page_id[2].rm_so, stderr); fwrite("\n",1,1,stderr); } - pinfo->page_id = atoi((char *)(b->next_to_read+match_page_id[2].rm_so)); + pinfo->id = atoi((char *)(b->next_to_read+match_page_id[2].rm_so)); pinfo->position = bfile.block_start; pinfo->bits_shifted = bfile.bits_shifted; return(1); @@ -405,7 +405,7 @@ else { /* use_stub */ page_id_found = get_page_id_from_rev_id_via_stub(rev_id, stubfilename); } - pinfo->page_id = page_id_found +1; /* want the page after this offset, not the one we're in */ + pinfo->id = page_id_found +1; /* want the page after this offset, not the one we're in */ pinfo->position = bfile.block_start; pinfo->bits_shifted = bfile.bits_shifted; return(1); @@ -482,7 +482,7 @@ return value from guess, or -1 on error. */ -int do_iteration(iter_info_t *iinfo, int fin, page_info_t *pinfo, int use_api, int use_stub, char *stubfilename, int verbose) { +int do_iteration(iter_info_t *iinfo, int fin, id_info_t *pinfo, int use_api, int use_stub, char *stubfilename, int verbose) { int res; off_t new_position; off_t interval; @@ -523,9 +523,9 @@ res = get_first_page_id_after_offset(fin, new_position, pinfo, use_api, use_stub, stubfilename, verbose); if (res >0) { /* caller wants the new value */ -iinfo->last_value = pinfo->page_id; +iinfo->last_value = pinfo->id; iinfo->last_position = new_position; -return(pinfo->page_id); +return(pinfo->id); } else { /* here is the tough case, if we didn't find anything then we are prolly too close to the end, truncation or @@ -546,7 +546,7 @@ int main(int argc, char **argv) { int fin, res, page_id=0; off_t position, interval, file_size; - page_info_t pinfo; + id_info_t pinfo; iter_info_t iinfo; char *filename = NULL; int optindex=0; @@ -612,7 +612,7 @@ position = (off_t)0; pinfo.bits_shifted = -1; pinfo.position = (off_t)-1; - pinfo.page_id = -1; + pinfo.id = -1; iinfo.left_end = (off_t)0; iinfo.right_end = file_size; @@ -620,19 +620,19 @@ res = get_first_page_id_after_offset(fin, (off_t)0, , use_api, use_stub, stubfile, verbose); if (res > 0) { -iinfo.last_value = pinfo.page_id; +iinfo.last_value = pinfo.id; iinfo.last_position = (off_t)0; } else { fprintf(stderr,"Failed to find any page from start of file, exiting\n"); exit(1); } - if (pinfo.page_id == page_id) { + if (pinfo.id == page_id) { if (verbose) fprintf(stderr,"found the page id right away, no iterations needed.\n"); -fprintf(stdout,"position:%"PRId64" page_id:%d\n",pinfo.position, pinfo.page_id); +fprintf(stdout,"position:%"PRId64" page_id:%d\n",pinfo.position, pinfo.id); exit(0); } - if (pinfo.page_id > page_id) { + if (pinfo.id > page_id) { fprintf(stderr,"Page requested is less than first page id in file\n"); exit(-1); } @@ -643,8 +643,8 @@ exit(-1); } else if (iinfo.left_end == iinfo.right_end) { - if ( pinfo.page_id <= page_id) { - fprintf(stdout,"position:%"PRId64" page_id:%d\n",pinfo.position, pinfo.page_id); + if ( pinfo.id <= page_id) { + fprintf(stdout,"position:%"PRId64" page_id:%d\n",pinfo.position,
[MediaWiki-commits] [Gerrit] operations...mwbzutils[master]: remove getlastpageid and getlastrevid source files, fix up M...
ArielGlenn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/338404 ) Change subject: remove getlastpageid and getlastrevid source files, fix up Makefile .. remove getlastpageid and getlastrevid source files, fix up Makefile also clean up .gitignore which no longer needs to ignore those binaries Change-Id: I4a7ef996a901e16ffc8067c8b192e9b5ab20bd3e --- M xmldumps-backup/mwbzutils/.gitignore M xmldumps-backup/mwbzutils/Makefile D xmldumps-backup/mwbzutils/getlastpageidinbz2xml.c D xmldumps-backup/mwbzutils/getlastrevidinbz2xml.c 4 files changed, 7 insertions(+), 604 deletions(-) Approvals: ArielGlenn: Verified; Looks good to me, approved diff --git a/xmldumps-backup/mwbzutils/.gitignore b/xmldumps-backup/mwbzutils/.gitignore index f75aa8f..137373c 100644 --- a/xmldumps-backup/mwbzutils/.gitignore +++ b/xmldumps-backup/mwbzutils/.gitignore @@ -6,5 +6,4 @@ findpageidinbz2xml recompressxml writeuptopageid -getlastpageidinbz2xml -getlastrevidinbz2xml +getlastidinbz2xml diff --git a/xmldumps-backup/mwbzutils/Makefile b/xmldumps-backup/mwbzutils/Makefile index e07c1aa..0b869ee 100644 --- a/xmldumps-backup/mwbzutils/Makefile +++ b/xmldumps-backup/mwbzutils/Makefile @@ -25,7 +25,7 @@ build: checkforbz2footer dumpbz2filefromoffset \ dumplastbz2block findpageidinbz2xml \ recompressxml writeuptopageid compressedmanpages \ - getlastpageidinbz2xml getlastidinbz2xml + getlastidinbz2xml NAME_CHECKFORBZ2FOOTER = "Check if bzip2 file ends with bz2 magic footer" @@ -63,9 +63,6 @@ findpageidinbz2xml: $(OBJSBZ) mwbzlib.o httptiny.o findpageidinbz2xml.o $(CC) $(LDFLAGS) -o findpageidinbz2xml findpageidinbz2xml.o httptiny.o $(OBJS) $(LIBS) -lz -getlastpageidinbz2xml: $(OBJSBZ) mwbzlib.o getlastpageidinbz2xml.o - $(CC) $(LDFLAGS) -o getlastpageidinbz2xml getlastpageidinbz2xml.o $(OBJS) $(LIBS) - getlastidinbz2xml: $(OBJSBZ) mwbzlib.o getlastidinbz2xml.o $(CC) $(LDFLAGS) -o getlastidinbz2xml getlastidinbz2xml.o $(OBJS) $(LIBS) @@ -90,7 +87,7 @@ manpages: dumplastbz2block.1 findpageidinbz2xml.1 \ checkforbz2footer.1 dumpbz2filefromoffset.1 \ recompressxml.1 writeuptopageid.1 \ - getlastpageidinbz2xml.1 getlastidinbz2xml.1 + getlastidinbz2xml.1 echo "Don't forget to commit your manpage changes to the repo" checkforbz2footer.1 : checkforbz2footer @@ -105,11 +102,8 @@ findpageidinbz2xml.1 : findpageidinbz2xml $(HELP2MAN) --section 1 --no-info --name $(NAME_FINDPAGEIDINBZ2XML) \ --no-discard-stderr ./findpageidinbz2xml > docs/findpageidinbz2xml.1 -getlastpageidinbz2xml.1 : getlastpageidinbz2xml - $(HELP2MAN) --section 1 --no-info --name $(NAME_GETLASTPAGEIDINBZ2XML) \ - --no-discard-stderr ./getlastpageidinbz2xml > docs/getlastpageidinbz2xml.1 getlastidinbz2xml.1 : getlastidinbz2xml - $(HELP2MAN) --section 1 --no-info --name $(NAME_GETLASTPAGEIDINBZ2XML) \ + $(HELP2MAN) --section 1 --no-info --name $(NAME_GETLASTIDINBZ2XML) \ --no-discard-stderr ./getlastidinbz2xml > docs/getlastidinbz2xml.1 recompressxml.1 : recompressxml $(HELP2MAN) --section 1 --no-info --name $(NAME_RECOMPRESSXML) \ @@ -119,15 +113,13 @@ --no-discard-stderr ./writeuptopageid > docs/writeuptopageid.1 install: dumplastbz2block findpageidinbz2xml checkforbz2footer dumpbz2filefromoffset \ - recompressxml writeuptopageid compressedmanpages getlastpageidinbz2xml \ - getlastidinbz2xml + recompressxml writeuptopageid compressedmanpages getlastidinbz2xml install --directory $(BINDIR) install --mode=755 checkforbz2footer $(BINDIR) install --mode=755 dumplastbz2block $(BINDIR) install --mode=755 dumpbz2filefromoffset $(BINDIR) install --mode=755 findpageidinbz2xml $(BINDIR) - install --mode=755 getlastpageidinbz2xml $(BINDIR) - install --mode=755 getlastidinbz2xml $(BINDIR) + install --mode=755 getlastidinbz2xml $(BINDIR) install --mode=755 recompressxml $(BINDIR) install --mode=755 writeuptopageid$(BINDIR) install --directory $(MANDIR) @@ -140,7 +132,6 @@ uninstall: rm -f $(BINDIR)dumplastbz2block rm -f $(BINDIR)findpageidinbz2xml - rm -f $(BINDIR)getlastpageidinbz2xml rm -f $(BINDIR)getlastidinbz2xml rm -f $(BINDIR)checkforbz2footer rm -f $(BINDIR)dumpbz2filefromoffset @@ -153,7 +144,7 @@ clean: rm -f *.o *.a dumplastbz2block findpageidinbz2xml \ - getlastpageidinbz2xml getlastidinbz2xml \ + getlastidinbz2xml \ checkforbz2footer dumpbz2filefromoffset \ recompressxml writeuptopageid
[MediaWiki-commits] [Gerrit] operations...mwbzutils[master]: update .gitignore with the binaries for the new utilities
ArielGlenn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/338281 ) Change subject: update .gitignore with the binaries for the new utilities .. update .gitignore with the binaries for the new utilities Change-Id: Ie96449ddc3d65a3a2030810786935e4715b860be --- M xmldumps-backup/mwbzutils/.gitignore 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: ArielGlenn: Verified; Looks good to me, approved diff --git a/xmldumps-backup/mwbzutils/.gitignore b/xmldumps-backup/mwbzutils/.gitignore index 5535828..f75aa8f 100644 --- a/xmldumps-backup/mwbzutils/.gitignore +++ b/xmldumps-backup/mwbzutils/.gitignore @@ -6,3 +6,5 @@ findpageidinbz2xml recompressxml writeuptopageid +getlastpageidinbz2xml +getlastrevidinbz2xml -- To view, visit https://gerrit.wikimedia.org/r/338281 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie96449ddc3d65a3a2030810786935e4715b860be Gerrit-PatchSet: 2 Gerrit-Project: operations/dumps/mwbzutils Gerrit-Branch: master Gerrit-Owner: ArielGlennGerrit-Reviewer: ArielGlenn ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations...mwbzutils[master]: write results from getlastpageid and getlastrevid to stdout, ...
ArielGlenn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/338280 ) Change subject: write results from getlastpageid and getlastrevid to stdout, not stderr .. write results from getlastpageid and getlastrevid to stdout, not stderr Change-Id: If04eace215ad0df25c3305395a2a386020d71ebd --- M xmldumps-backup/mwbzutils/getlastpageidinbz2xml.c M xmldumps-backup/mwbzutils/getlastrevidinbz2xml.c 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: ArielGlenn: Verified; Looks good to me, approved diff --git a/xmldumps-backup/mwbzutils/getlastpageidinbz2xml.c b/xmldumps-backup/mwbzutils/getlastpageidinbz2xml.c index b10974c..0cd9bae 100644 --- a/xmldumps-backup/mwbzutils/getlastpageidinbz2xml.c +++ b/xmldumps-backup/mwbzutils/getlastpageidinbz2xml.c @@ -291,7 +291,7 @@ } if (!page_id) giveup(fin); - fprintf(stderr, "page_id:%d\n", page_id); + fprintf(stdout, "page_id:%d\n", page_id); close(fin); exit(0); } diff --git a/xmldumps-backup/mwbzutils/getlastrevidinbz2xml.c b/xmldumps-backup/mwbzutils/getlastrevidinbz2xml.c index 187db21..e82ae5a 100644 --- a/xmldumps-backup/mwbzutils/getlastrevidinbz2xml.c +++ b/xmldumps-backup/mwbzutils/getlastrevidinbz2xml.c @@ -284,7 +284,7 @@ } if (!rev_id) giveup(fin); - fprintf(stderr, "rev_id:%d\n", rev_id); + fprintf(stdout, "rev_id:%d\n", rev_id); close(fin); exit(0); } -- To view, visit https://gerrit.wikimedia.org/r/338280 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If04eace215ad0df25c3305395a2a386020d71ebd Gerrit-PatchSet: 2 Gerrit-Project: operations/dumps/mwbzutils Gerrit-Branch: master Gerrit-Owner: ArielGlennGerrit-Reviewer: ArielGlenn ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations...mwbzutils[master]: set bfile.marker to NULL in a bunch of places
ArielGlenn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/338402 ) Change subject: set bfile.marker to NULL in a bunch of places .. set bfile.marker to NULL in a bunch of places because we don't re-initialize this every time (as there's space allocation involved), we need to explcitly set it to NULL before the structure is used the first time. also clean up a few dead comments Change-Id: I568516687d272792dcf1b4694c8fe5313e9f049d --- M xmldumps-backup/mwbzutils/checkforbz2footer.c M xmldumps-backup/mwbzutils/dumpbz2filefromoffset.c M xmldumps-backup/mwbzutils/dumplastbz2block.c M xmldumps-backup/mwbzutils/findpageidinbz2xml.c M xmldumps-backup/mwbzutils/getlastpageidinbz2xml.c M xmldumps-backup/mwbzutils/mwbzlib.c 6 files changed, 11 insertions(+), 16 deletions(-) Approvals: ArielGlenn: Verified; Looks good to me, approved diff --git a/xmldumps-backup/mwbzutils/checkforbz2footer.c b/xmldumps-backup/mwbzutils/checkforbz2footer.c index 2595181..1ad6781 100644 --- a/xmldumps-backup/mwbzutils/checkforbz2footer.c +++ b/xmldumps-backup/mwbzutils/checkforbz2footer.c @@ -96,6 +96,7 @@ exit(-1); } + bfile.marker = NULL; bfile.footer = init_footer(); result = check_file_for_footer(fin, ); close(fin); diff --git a/xmldumps-backup/mwbzutils/dumpbz2filefromoffset.c b/xmldumps-backup/mwbzutils/dumpbz2filefromoffset.c index a7f38b7..ae76de7 100644 --- a/xmldumps-backup/mwbzutils/dumpbz2filefromoffset.c +++ b/xmldumps-backup/mwbzutils/dumpbz2filefromoffset.c @@ -80,6 +80,7 @@ int firstpage = 1; int done = 0; bfile.initialized = 0; + bfile.marker = NULL; res = regcomp(_siteinfo, siteinfo, REG_EXTENDED); @@ -186,6 +187,7 @@ int firstpage = 1; bfile.initialized = 0; + bfile.marker = NULL; res = regcomp(_page, page, REG_EXTENDED); diff --git a/xmldumps-backup/mwbzutils/dumplastbz2block.c b/xmldumps-backup/mwbzutils/dumplastbz2block.c index ab16dfb..82978e3 100644 --- a/xmldumps-backup/mwbzutils/dumplastbz2block.c +++ b/xmldumps-backup/mwbzutils/dumplastbz2block.c @@ -104,6 +104,8 @@ bfile.file_size = get_file_size(fin); bfile.footer = init_footer(); + bfile.marker = NULL; + result = check_file_for_footer(fin, ); if (result == -1) { bfile.position = bfile.file_size; diff --git a/xmldumps-backup/mwbzutils/findpageidinbz2xml.c b/xmldumps-backup/mwbzutils/findpageidinbz2xml.c index 1053fdf..4218660 100644 --- a/xmldumps-backup/mwbzutils/findpageidinbz2xml.c +++ b/xmldumps-backup/mwbzutils/findpageidinbz2xml.c @@ -123,6 +123,7 @@ static char hostname[256]; bfile.initialized = 0; + bfile.marker = NULL; res = regcomp(_base_expr, base_expr, REG_EXTENDED); match_base_expr = (regmatch_t *)malloc(sizeof(regmatch_t)*2); @@ -325,6 +326,7 @@ int buffer_count = 0; bfile.initialized = 0; + bfile.marker = NULL; res = regcomp(_page, page, REG_EXTENDED); res = regcomp(_page_id, page_id, REG_EXTENDED); diff --git a/xmldumps-backup/mwbzutils/getlastpageidinbz2xml.c b/xmldumps-backup/mwbzutils/getlastpageidinbz2xml.c index 89ef61d..b10974c 100644 --- a/xmldumps-backup/mwbzutils/getlastpageidinbz2xml.c +++ b/xmldumps-backup/mwbzutils/getlastpageidinbz2xml.c @@ -237,6 +237,7 @@ bfile.file_size = get_file_size(fin); bfile.footer = init_footer(); + bfile.marker = NULL; bfile.marker = init_marker(); result = check_file_for_footer(fin, ); if (result == -1) { diff --git a/xmldumps-backup/mwbzutils/mwbzlib.c b/xmldumps-backup/mwbzutils/mwbzlib.c index 3bdc1a3..16bc409 100644 --- a/xmldumps-backup/mwbzutils/mwbzlib.c +++ b/xmldumps-backup/mwbzutils/mwbzlib.c @@ -141,7 +141,6 @@ } /* must be after 4 byte file header, and we add a leftmost byte to the buffer of data read in case some bits have been shifted into it */ - /* fprintf(stderr,"position is %"PRId64" and file size is %"PRId64"\n",bfile->position, bfile->file_size); */ while (bfile->position <= bfile->file_size - 6 && bfile->position >= 0 && bfile->bits_shifted < 0) { bfile->bits_shifted = check_buffer_for_bz2_block_marker(bfile); if (bfile->bits_shifted < 0) { @@ -158,7 +157,6 @@ } res = read(fin, bfile->marker_buffer, 7); if (res < 7) { - /* fprintf(stderr,"read of file failed\n"); */ return(-1); } } @@ -320,7 +318,6 @@ find_next_bz2_block_marker(fin, bfile, direction); if (bfile->bits_shifted >= 0) { -/*fprintf(stderr,"marker bits shifted by is %d\n",bfile->bits_shifted); */ init_decompress(bfile); decompress_header(fin, bfile); setup_first_buffer_to_decompress(fin, bfile); @@ -443,8 +440,6 @@ ret = BZ_OK; while (BZ_OK == ret && bfile->bytes_written == 0) { ret = BZ2_bzDecompress_mine ( &(bfile->strm) ); -/* FIXME testing only, does stuff actually get written or not? */ -/*if (BZ_OK == ret || BZ_STREAM_END == ret ||
[MediaWiki-commits] [Gerrit] operations...mwbzutils[master]: tiny util to get last revision id from bz2 xml content dump ...
ArielGlenn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/337863 ) Change subject: tiny util to get last revision id from bz2 xml content dump file .. tiny util to get last revision id from bz2 xml content dump file yep sure it should be combined with the util to get the last page and that will be the next commit. Change-Id: I50b879644060a598e86235db9e922e9fb60cce67 --- M xmldumps-backup/mwbzutils/Makefile A xmldumps-backup/mwbzutils/getlastrevidinbz2xml.c M xmldumps-backup/mwbzutils/mwbzutils.h 3 files changed, 325 insertions(+), 19 deletions(-) Approvals: ArielGlenn: Verified; Looks good to me, approved diff --git a/xmldumps-backup/mwbzutils/Makefile b/xmldumps-backup/mwbzutils/Makefile index 5106c4e..cfe60ed 100644 --- a/xmldumps-backup/mwbzutils/Makefile +++ b/xmldumps-backup/mwbzutils/Makefile @@ -16,7 +16,7 @@ # 2010-2013: see the file COPYING for details. # -- -VERSION= "0.0.6" +VERSION= "0.0.5" CC?= gcc BIGFILES = -D_FILE_OFFSET_BITS=64 CPPFLAGS += $(BIGFILES) -DVERSION=\"$(VERSION)\" @@ -25,7 +25,7 @@ build: checkforbz2footer dumpbz2filefromoffset \ dumplastbz2block findpageidinbz2xml \ recompressxml writeuptopageid compressedmanpages \ - getlastpageidinbz2xml + getlastpageidinbz2xml getlastrevidinbz2xml NAME_CHECKFORBZ2FOOTER = "Check if bzip2 file ends with bz2 magic footer" @@ -66,6 +66,9 @@ getlastpageidinbz2xml: $(OBJSBZ) mwbzlib.o getlastpageidinbz2xml.o $(CC) $(LDFLAGS) -o getlastpageidinbz2xml getlastpageidinbz2xml.o $(OBJS) $(LIBS) +getlastrevidinbz2xml: $(OBJSBZ) mwbzlib.o getlastrevidinbz2xml.o + $(CC) $(LDFLAGS) -o getlastrevidinbz2xml getlastrevidinbz2xml.o $(OBJS) $(LIBS) + recompressxml: $(OBJSBZ) recompressxml.o $(CC) $(LDFLAGS) -o recompressxml recompressxml.o $(LIBS) @@ -86,7 +89,8 @@ # or the usage mssages change manpages: dumplastbz2block.1 findpageidinbz2xml.1 \ checkforbz2footer.1 dumpbz2filefromoffset.1 \ - recompressxml.1 writeuptopageid.1 + recompressxml.1 writeuptopageid.1 \ + getlastpageidinbz2xml.1 getlastrevidinbz2xml.1 echo "Don't forget to commit your manpage changes to the repo" checkforbz2footer.1 : checkforbz2footer @@ -104,6 +108,9 @@ getlastpageidinbz2xml.1 : getlastpageidinbz2xml $(HELP2MAN) --section 1 --no-info --name $(NAME_GETLASTPAGEIDINBZ2XML) \ --no-discard-stderr ./getlastpageidinbz2xml > docs/getlastpageidinbz2xml.1 +getlastrevidinbz2xml.1 : getlastrevidinbz2xml + $(HELP2MAN) --section 1 --no-info --name $(NAME_GETLASTPAGEIDINBZ2XML) \ + --no-discard-stderr ./getlastrevidinbz2xml > docs/getlastrevidinbz2xml.1 recompressxml.1 : recompressxml $(HELP2MAN) --section 1 --no-info --name $(NAME_RECOMPRESSXML) \ --no-discard-stderr ./recompressxml > docs/recompressxml.1 @@ -112,26 +119,29 @@ --no-discard-stderr ./writeuptopageid > docs/writeuptopageid.1 install: dumplastbz2block findpageidinbz2xml checkforbz2footer dumpbz2filefromoffset \ - recompressxml writeuptopageid compressedmanpages getlastpageidinbz2xml - install --directory $(BINDIR) - install --mode=755 checkforbz2footer $(BINDIR) - install --mode=755 dumplastbz2block $(BINDIR) - install --mode=755 dumpbz2filefromoffset $(BINDIR) - install --mode=755 findpageidinbz2xml $(BINDIR) - install --mode=755 getlastpageidinbz2xml $(BINDIR) - install --mode=755 recompressxml $(BINDIR) - install --mode=755 writeuptopageid$(BINDIR) - install --directory $(MANDIR) - install --mode=644 docs/*.1.gz$(MANDIR) - install --directory $(DOCDIR) - install --mode=644 README $(DOCDIR) - install --mode=644 LICENSE_BZ $(DOCDIR) - install --mode=644 COPYING$(DOCDIR) + recompressxml writeuptopageid compressedmanpages getlastpageidinbz2xml \ + getlastrevidinbz2xml + install --directory $(BINDIR) + install --mode=755 checkforbz2footer $(BINDIR) + install --mode=755 dumplastbz2block $(BINDIR) + install --mode=755 dumpbz2filefromoffset $(BINDIR) + install --mode=755 findpageidinbz2xml $(BINDIR) + install --mode=755 getlastpageidinbz2xml $(BINDIR) + install --mode=755 getlastrevidinbz2xml $(BINDIR) + install --mode=755 recompressxml $(BINDIR) + install --mode=755 writeuptopageid$(BINDIR) + install --directory $(MANDIR) + install --mode=644