[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] oojs/ui[master]: DropdownInputWidget: Align appearance of PHP DropdownWidget ...
VolkerE has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/338612 )
Change subject: DropdownInputWidget: Align appearance of PHP DropdownWidget to
JS
..
DropdownInputWidget: Align appearance of PHP DropdownWidget to JS
Making PHP DropdownInputWidget appear as similar as possible to
JS DropdownWidget variant.
Change-Id: I9a41035fca8006e4d376aa6bb42f59d63877c36f
---
M src/themes/mediawiki/widgets.less
1 file changed, 29 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/12/338612/1
diff --git a/src/themes/mediawiki/widgets.less
b/src/themes/mediawiki/widgets.less
index ee884a9..a50a697 100644
--- a/src/themes/mediawiki/widgets.less
+++ b/src/themes/mediawiki/widgets.less
@@ -537,14 +537,13 @@
max-width: @max-width-input;
select {
- background-color: @background-color-default;
- height: 2.275em;
- font-size: inherit;
- font-family: inherit;
.oo-ui-box-sizing( border-box );
+ height: 2.275em;
border: @border-default;
border-radius: @border-radius-default;
padding-left: 1em;
+ font-size: inherit;
+ font-family: inherit;
vertical-align: middle;
}
@@ -556,17 +555,39 @@
}
&.oo-ui-widget-enabled {
- select:hover,
- select:focus {
- outline: 0;
+ select {
+ background-color: @background-color-framed;
+ color: @color-default;
+ .oo-ui-transition(
+ background-color @transition-ease-quick,
+ border-color @transition-ease-quick,
+ box-shadow @transition-ease-quick
+ );
+
+ &:hover {
+ background-color:
@background-color-framed-hover;
+ color: @color-default-hover;
+ border-color: @border-color-default-hover;
+ }
+
+ &:active {
+ color: @color-default-active;
+ border-color: @border-color-default-active;
+ }
+
+ &:focus {
+ border-color: @border-color-default-focus;
+ outline: 0;
+ box-shadow: @box-shadow-widget-focus;
+ }
}
}
&.oo-ui-widget-disabled {
select {
+ background-color: @background-color-disabled;
color: @color-disabled;
border-color: @border-color-disabled;
- background-color: @background-color-disabled;
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/338612
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9a41035fca8006e4d376aa6bb42f59d63877c36f
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: demos: Replace `table` in button style showcase with respons...
VolkerE has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/338611 )
Change subject: demos: Replace `table` in button style showcase with responsive
layout
..
demos: Replace `table` in button style showcase with responsive layout
Replacing `table` in button style showcase with `div` based layout,
which doesn't cause horizontal scrollbar on small viewports.
Also unifying `margin`s of example buttons with widgets elsewhere.
Change-Id: Ia8f7a36604cf50b87eabcf5e32ef516e56acff92
---
M demos/pages/widgets.js
M demos/pages/widgets.php
M demos/styles/demo.css
3 files changed, 17 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/11/338611/1
diff --git a/demos/pages/widgets.js b/demos/pages/widgets.js
index 3ab813a..261f163 100644
--- a/demos/pages/widgets.js
+++ b/demos/pages/widgets.js
@@ -253,19 +253,16 @@
}
];
buttonStyleShowcaseWidget = new OO.ui.Widget();
- $table = $( '' );
+ buttonStyleShowcaseWidget.$element.addClass(
'oo-ui-demoButtonStyleShowcaseWidget' );
$.each( styles, function ( i, style ) {
- var $tableRow = $( '' );
+ var $buttonRow = $( '' );
$.each( states, function ( j, state ) {
- var $tableCell = $( '' );
- $tableCell.append(
+ $buttonRow.append(
new OO.ui.ButtonWidget( $.extend( {}, style,
state ) ).$element
);
- $tableRow.append( $tableCell );
} );
- $table.append( $tableRow );
+ buttonStyleShowcaseWidget.$element.append( $buttonRow );
} );
- buttonStyleShowcaseWidget.$element.append( $table );
fieldsets = [
new OO.ui.FieldsetLayout( {
diff --git a/demos/pages/widgets.php b/demos/pages/widgets.php
index c2c5567..4ec5196 100644
--- a/demos/pages/widgets.php
+++ b/demos/pages/widgets.php
@@ -74,19 +74,16 @@
],
];
$buttonStyleShowcaseWidget = new OOUI\Widget();
-$table = new OOUI\Tag( 'table' );
+$buttonStyleShowcaseWidget->addClasses( [
'oo-ui-demoButtonStyleShowcaseWidget' ] );
foreach ( $styles as $style ) {
- $tableRow = new OOUI\Tag( 'tr' );
+ $buttonRow = new OOUI\Tag( 'div' );
foreach ( $states as $state ) {
- $tableCell = new OOUI\Tag( 'td' );
- $tableCell->appendContent(
+ $buttonRow->appendContent(
new OOUI\ButtonWidget( array_merge( $style, $state, [
'infusable' => true ] ) )
);
- $tableRow->appendContent( $tableCell );
}
- $table->appendContent( $tableRow );
+ $buttonStyleShowcaseWidget->appendContent( $buttonRow );
}
-$buttonStyleShowcaseWidget->appendContent( $table );
$demoContainer->appendContent( new OOUI\FieldsetLayout( [
'infusable' => true,
diff --git a/demos/styles/demo.css b/demos/styles/demo.css
index 6dadc41..0ad81bb 100644
--- a/demos/styles/demo.css
+++ b/demos/styles/demo.css
@@ -82,6 +82,10 @@
/* Widgets demo */
+.oo-ui-demoButtonStyleShowcaseWidget > div {
+ margin-bottom: 0.5em;
+}
+
.oo-ui-horizontalLayout > .oo-ui-textInputWidget,
.oo-ui-horizontalLayout > .oo-ui-dropdownInputWidget {
max-width: 10em;
@@ -287,6 +291,11 @@
.oo-ui-demo-console-toggle {
margin-right: -2em;
}
+
+ /* Widgets */
+ .oo-ui-demoButtonStyleShowcaseWidget .oo-ui-buttonWidget {
+ margin-bottom: 0.5em;
+ }
}
@media ( min-width: 751px ) {
--
To view, visit https://gerrit.wikimedia.org/r/338611
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia8f7a36604cf50b87eabcf5e32ef516e56acff92
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[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 Landscheidt Gerrit-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] oojs/ui[master]: demos: Further improve responsive layout
VolkerE has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/338609 )
Change subject: demos: Further improve responsive layout
..
demos: Further improve responsive layout
Explicitely set `margin` on `body` and apply `margin-bottom` on
widgets on top independentely from viewport size.
Also increase available size for demoed widgets on smaller screen
by removing border on all, but toolbar examples and unify their
`padding`s/`margin`s.
Change-Id: I20764fdac4b4b56cc8dcc5b91be9ff120db975c9
---
M demos/styles/demo.css
1 file changed, 13 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/09/338609/1
diff --git a/demos/styles/demo.css b/demos/styles/demo.css
index d8bd637..6dadc41 100644
--- a/demos/styles/demo.css
+++ b/demos/styles/demo.css
@@ -1,5 +1,6 @@
body {
color: #222;
+ margin: 1em;
font-size: 0.8em;
font-family: sans-serif;
}
@@ -14,10 +15,15 @@
margin: 0 auto;
}
+.oo-ui-demo-menu {
+ margin-bottom: 1em;
+}
+
.oo-ui-demo-menu > .oo-ui-widget {
display: inline-block;
vertical-align: middle;
margin-right: 1em;
+ margin-bottom: 1em;
}
.oo-ui-demo-menu .oo-ui-demo-pageDropdown {
@@ -264,16 +270,18 @@
font-size: 1em;
}
- .oo-ui-demo-menu {
- margin-bottom: 1em;
- }
-
.oo-ui-demo-menu > .oo-ui-widget {
margin-bottom: 1em;
}
.oo-ui-demo-container {
- padding: 1em 2.5em 1em 1em;
+ border-radius: 0;
+ border-width: 1px 0 0;
+ padding: 1.5em 2.5em 1em 0em;
+ }
+
+ .oo-ui-demo-container.oo-ui-demo-toolbars {
+ border-width: 1px;
}
.oo-ui-demo-console-toggle {
@@ -282,10 +290,6 @@
}
@media ( min-width: 751px ) {
- .oo-ui-demo-menu {
- margin-bottom: 2em;
- }
-
.oo-ui-demo-container {
padding: 2em;
}
--
To view, visit https://gerrit.wikimedia.org/r/338609
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I20764fdac4b4b56cc8dcc5b91be9ff120db975c9
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Fix typo in realm.pp
Andrew Bogott has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/335548 )
Change subject: Fix typo in realm.pp
..
Fix typo in realm.pp
Change-Id: I4377b58b2bb8a844fb2c2e29fe1eb502a5cece58
---
M manifests/realm.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Andrew Bogott: Looks good to me, approved
Zppix: Looks good to me, but someone else must approve
jenkins-bot: Verified
Juniorsys: Looks good to me, but someone else must approve
diff --git a/manifests/realm.pp b/manifests/realm.pp
index 6a6bbac..b1b1bbf 100644
--- a/manifests/realm.pp
+++ b/manifests/realm.pp
@@ -50,7 +50,7 @@
}
if $::labsproject == undef {
-fail('Failed to determined $::labsproject')
+fail('Failed to determine $::labsproject')
}
if $::projectgroup == undef {
--
To view, visit https://gerrit.wikimedia.org/r/335548
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4377b58b2bb8a844fb2c2e29fe1eb502a5cece58
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt
Gerrit-Reviewer: Andrew Bogott
Gerrit-Reviewer: Juniorsys
Gerrit-Reviewer: Reedy
Gerrit-Reviewer: Zppix
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...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: Umherirrender Gerrit-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] mediawiki...TranslateSvg[master]: Add missing apihelp messages to TranslateSvg
Umherirrender has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332524 )
Change subject: Add missing apihelp messages to TranslateSvg
..
Add missing apihelp messages to TranslateSvg
Extension TranslateSvg keeps failing tests otherwise.
Bug: T155501
Change-Id: I3a942a99e607479a2a4ed5a4a11bcf7460efda2f
---
M i18n/en.json
M i18n/qqq.json
2 files changed, 6 insertions(+), 2 deletions(-)
Approvals:
Umherirrender: Verified; Looks good to me, approved
diff --git a/i18n/en.json b/i18n/en.json
index 27da2cd..a82fd8b 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -50,5 +50,7 @@
"translate-js-label-bold": "Bold",
"translate-js-label-italic": "Italic",
"translate-js-label-underline": "Underline",
- "translate-js-font-family-inherit": "(inherit)"
+ "translate-js-font-family-inherit": "(inherit)",
+ "apihelp-query+messagegroups-param-inprogress": "Possible array of
in-progress translations (unsaved translations that should take preference over
saved ones). SVG message groups only.",
+ "apihelp-query+messagegroups-param-language": "Language to render the
thumbnail in. SVG message groups only."
}
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 900bba6..f1fb7b6 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -56,5 +56,7 @@
"translate-js-label-bold": "Label for a checkbox governing the
formatting of a string.\n{{Identical|Bold}}",
"translate-js-label-italic": "Label for a checkbox governing the
formatting of a string.\n{{Identical|Italic}}",
"translate-js-label-underline": "Label for a checkbox governing the
formatting of a string.\n{{Identical|Underline}}",
- "translate-js-font-family-inherit": "Label used to imply that no
specific typeface will be set for a string; instead, it will be inherited from
the document default."
+ "translate-js-font-family-inherit": "Label used to imply that no
specific typeface will be set for a string; instead, it will be inherited from
the document default.",
+ "apihelp-query+messagegroups-param-inprogress":
"{{doc-apihelp-param|query+messagegroups|inprogress}}",
+ "apihelp-query+messagegroups-param-language":
"{{doc-apihelp-param|query+messagegroups|language}}"
}
--
To view, visit https://gerrit.wikimedia.org/r/332524
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3a942a99e607479a2a4ed5a4a11bcf7460efda2f
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/TranslateSvg
Gerrit-Branch: master
Gerrit-Owner: DatGuy
Gerrit-Reviewer: DatGuy
Gerrit-Reviewer: Jarry1250
Gerrit-Reviewer: Nemo bis
Gerrit-Reviewer: Nikerabbit
Gerrit-Reviewer: Siebrand
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] VisualEditor/VisualEditor[master]: Show annotation changes as blue
Esanders has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/338547 )
Change subject: Show annotation changes as blue
..
Show annotation changes as blue
Instead of showing removed and inserted text (identical) just
show the new text in blue.
TODO: Consider showing semantic annotation change information
somewhere (e.g. link href was changed).
Change-Id: I60916f9857102906f05058bb6ff40ea9d7d8b9bf
---
M src/ui/styles/elements/ve.ui.DiffElement.css
1 file changed, 11 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/47/338547/1
diff --git a/src/ui/styles/elements/ve.ui.DiffElement.css
b/src/ui/styles/elements/ve.ui.DiffElement.css
index dbb063e..b8c34c8 100644
--- a/src/ui/styles/elements/ve.ui.DiffElement.css
+++ b/src/ui/styles/elements/ve.ui.DiffElement.css
@@ -17,20 +17,25 @@
border-radius: 0.15em;
}
-/* -change-insert will have a different background color eventually */
-.ve-ui-diffElement-insert,
-.ve-ui-diffElement-change-insert {
+.ve-ui-diffElement-insert {
background-color: #7fd7c4 !important; /* stylelint-disable-line
declaration-no-important */
box-shadow: 0 0 0 0.1em #7fd7c4;
}
-/* -change-remove may not be visible eventually */
-.ve-ui-diffElement-remove,
-.ve-ui-diffElement-change-remove {
+.ve-ui-diffElement-change-insert {
+ background-color: #8ab4e8 !important; /* stylelint-disable-line
declaration-no-important */
+ box-shadow: 0 0 0 0.1em #8ab4e8;
+}
+
+.ve-ui-diffElement-remove {
background-color: #e88e89 !important; /* stylelint-disable-line
declaration-no-important */
box-shadow: 0 0 0 0.1em #e88e89;
}
+.ve-ui-diffElement-change-remove {
+ display: none;
+}
+
.ve-ui-diffElement-remove + .ve-ui-diffElement-insert,
.ve-ui-diffElement-insert + .ve-ui-diffElement-remove,
.ve-ui-diffElement-remove + .ve-ui-diffElement-change-insert,
--
To view, visit https://gerrit.wikimedia.org/r/338547
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I60916f9857102906f05058bb6ff40ea9d7d8b9bf
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
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] VisualEditor/VisualEditor[master]: DiffElement: CSS fix for figcaptions
Esanders has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/338546 )
Change subject: DiffElement: CSS fix for figcaptions
..
DiffElement: CSS fix for figcaptions
They need their own background as they are display:table-caption.
Change-Id: I8dc6e03bc4621711ef183f7c56f38917a9d4f39c
---
M src/ui/styles/elements/ve.ui.DiffElement.css
1 file changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/46/338546/1
diff --git a/src/ui/styles/elements/ve.ui.DiffElement.css
b/src/ui/styles/elements/ve.ui.DiffElement.css
index dbb063e..5ffbd2b 100644
--- a/src/ui/styles/elements/ve.ui.DiffElement.css
+++ b/src/ui/styles/elements/ve.ui.DiffElement.css
@@ -19,6 +19,8 @@
/* -change-insert will have a different background color eventually */
.ve-ui-diffElement-insert,
+/* figcaptions are display:table-caption so need separate backgrounds */
+figure.ve-ui-diffElement-insert > figcaption,
.ve-ui-diffElement-change-insert {
background-color: #7fd7c4 !important; /* stylelint-disable-line
declaration-no-important */
box-shadow: 0 0 0 0.1em #7fd7c4;
@@ -26,6 +28,8 @@
/* -change-remove may not be visible eventually */
.ve-ui-diffElement-remove,
+/* figcaptions are display:table-caption so need separate backgrounds */
+figure.ve-ui-diffElement-remove > figcaption,
.ve-ui-diffElement-change-remove {
background-color: #e88e89 !important; /* stylelint-disable-line
declaration-no-important */
box-shadow: 0 0 0 0.1em #e88e89;
--
To view, visit https://gerrit.wikimedia.org/r/338546
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8dc6e03bc4621711ef183f7c56f38917a9d4f39c
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
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] VisualEditor/VisualEditor[master]: VisualDiff: Use more robust check for ClassAttributeNodes
Esanders has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/338544 )
Change subject: VisualDiff: Use more robust check for ClassAttributeNodes
..
VisualDiff: Use more robust check for ClassAttributeNodes
The unrecognizedClasses attribute might not exist yet, so check
the model registry instead.
Bonus: Fix core block image to not preserve class attribute as
that is handled by ClassAttributeNode.
Change-Id: I2f90de78ba21580d3a5a751e01c05074171b7e97
---
M src/dm/nodes/ve.dm.BlockImageNode.js
M src/ui/elements/ve.ui.DiffElement.js
M tests/ui/ve.ui.DiffElement.test.js
3 files changed, 13 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/44/338544/1
diff --git a/src/dm/nodes/ve.dm.BlockImageNode.js
b/src/dm/nodes/ve.dm.BlockImageNode.js
index fff74cd..81358a3 100644
--- a/src/dm/nodes/ve.dm.BlockImageNode.js
+++ b/src/dm/nodes/ve.dm.BlockImageNode.js
@@ -41,7 +41,7 @@
ve.dm.BlockImageNode.static.name = 'blockImage';
ve.dm.BlockImageNode.static.preserveHtmlAttributes = function ( attribute ) {
- var attributes = [ 'src', 'width', 'height', 'href' ];
+ var attributes = [ 'class', 'src', 'width', 'height', 'href' ];
return attributes.indexOf( attribute ) === -1;
};
diff --git a/src/ui/elements/ve.ui.DiffElement.js
b/src/ui/elements/ve.ui.DiffElement.js
index c59b86b..33d746b 100644
--- a/src/ui/elements/ve.ui.DiffElement.js
+++ b/src/ui/elements/ve.ui.DiffElement.js
@@ -441,10 +441,12 @@
delete node.internal.generated;
}
- if ( ve.getProp( node, 'attributes', 'unrecognizedClasses' ) ) {
+ if ( ve.dm.modelRegistry.lookup( node.type ).static.classAttributes ) {
// ClassAttributeNodes don't copy over original classes, so
// add to the unrecognizedClasses list instead
// TODO: Other node types may take control of their class lists
+ node.attributes = node.attributes || {};
+ node.attributes.unrecognizedClasses =
node.attributes.unrecognizedClasses || [];
node.attributes.unrecognizedClasses.push( classes );
} else {
if ( node.originalDomElementsIndex ) {
diff --git a/tests/ui/ve.ui.DiffElement.test.js
b/tests/ui/ve.ui.DiffElement.test.js
index 33d7134..5d05f74 100644
--- a/tests/ui/ve.ui.DiffElement.test.js
+++ b/tests/ui/ve.ui.DiffElement.test.js
@@ -86,6 +86,15 @@
},
{
msg: 'Classes added to ClassAttributeNodes',
+ oldDoc: 'bar',
+ newDoc: 'bar',
+ expected:
+ '' +
+ 'bar' +
+ ''
+ },
+ {
+ msg: 'Classes added to ClassAttributeNodes with
classes',
oldDoc: 'bar',
newDoc: 'bar',
expected:
--
To view, visit https://gerrit.wikimedia.org/r/338544
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2f90de78ba21580d3a5a751e01c05074171b7e97
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
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...MobileFrontend[master]: Remove unused message keys from MobileFrontEnd.
MtDu has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/338543 )
Change subject: Remove unused message keys from MobileFrontEnd.
..
Remove unused message keys from MobileFrontEnd.
Jdlrobson ran a script with a silver searcher,
which identified keys that are not reffered to
in either resources or includes folders.
Bug: T157739
Change-Id: I249e57f12b30cb74061cf9dc2c5b7dee96e2dd80
---
M i18n/en.json
M i18n/qqq.json
2 files changed, 0 insertions(+), 121 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/43/338543/1
diff --git a/i18n/en.json b/i18n/en.json
index 5864d40..95c3de1 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -41,10 +41,6 @@
"beta-feature-minerva": "Enable mobile skin ({{int:skinname-minerva}})
on desktop",
"beta-feature-minerva-description": "Make the skin used on mobile
devices a selectable desktop skin under the \"{{int:prefs-rendering}}\"
preferences tab.",
"mobile-frontend-account-create-captcha-placeholder": "Enter
confirmation code",
- "mobile-frontend-account-create-email-placeholder": "Email address
(optional)",
- "mobile-frontend-account-create-submit": "Sign up",
- "mobile-frontend-app-title": "Mobile App",
- "mobile-frontend-back-to-top-of-section": "Jump back a section",
"mobile-frontend-categories-heading": "Categories",
"mobile-frontend-categories-subheading": "The page belongs to the
following categories:",
"mobile-frontend-categories-nocat": "This page doesn't belong to any
category, yet.",
@@ -57,16 +53,13 @@
"mobile-frontend-categories-add-wait": "Saving categories, please
wait.",
"mobile-frontend-categories-normal": "Content based",
"mobile-frontend-categories-hidden": "Organizational",
- "mobile-frontend-changeslist-ip": "Anonymous user",
"mobile-frontend-changeslist-nocomment": "no edit summary",
"mobile-frontend-cite-error-title": "Error loading citations",
"mobile-frontend-cite-error": "A problem occurred while attempting to
load citations due to a bad revision identifier.",
"mobile-frontend-cite-none-available": "There are no citations
available for this page.",
"mobile-frontend-clear-search": "Clear",
- "mobile-frontend-contribution-summary": "All edits made by
{{GENDER:$1|[[User:$1|$1]]}}",
"mobile-frontend-cookies-required": "Cookies are required to switch
view modes. Please enable them and try again.",
"mobile-frontend-copyright": "Content is available under $1 unless
otherwise noted.",
- "mobile-frontend-current-language": "{{#language:{{CONTENTLANG",
"mobile-frontend-desc": "Mobile Frontend",
"mobile-frontend-diffview-404-desc": "The ID for the revision you
requested does not exist.",
"mobile-frontend-diffview-404-title": "Bad revision",
@@ -76,19 +69,13 @@
"mobile-frontend-diffview-bytesremoved": "$1 {{PLURAL:$1|byte|bytes}}
removed",
"mobile-frontend-diffview-comma": "$1, $2",
"mobile-frontend-diffview-editcount": "$1
{{PLURAL:$1|edit|edits}}",
- "mobile-frontend-diffview-explained": "The following lines were added
(+) and removed (-):",
"mobile-frontend-diffview-title": "Changes",
- "mobile-frontend-disable-images": "Disable images on mobile site",
- "mobile-frontend-dismiss-notification": "dismiss this notification",
"mobile-frontend-donate-image-anon": "Please log in to view the uploads
page.",
- "mobile-frontend-donate-image-heading": "Your recent contributions",
"mobile-frontend-donate-image-login-action": "Media on
{{SITENAME}} is donated by people like you.Log in to share your
media.",
"mobile-frontend-donate-image-nouploads": "No uploads.",
- "mobile-frontend-donate-image-signup-action": "Sign up to share your
media with the world.",
"mobile-frontend-donate-image-title": "Uploads",
"mobile-frontend-donate-image-title-username": "Uploads by $1",
"mobile-frontend-donate-image-title-you": "Uploads by you",
- "mobile-frontend-drawer-cancel": "Cancel",
"mobile-frontend-pointer-dismiss": "Dismiss",
"mobile-frontend-edit-login-action": "Help improve
{{SITENAME}}.Log in to edit.",
"mobile-frontend-edit-signup-action": "Help improve
{{SITENAME}}.Sign up to edit.",
@@ -117,7 +104,6 @@
"mobile-frontend-editor-licensing-with-terms": "By saving changes, you
agree to the $1 and agree to release your contribution under the $2
{{PLURAL:$3|license|licenses}}.",
"mobile-frontend-editor-terms-link": "[$1 Terms of Use]",
"mobile-frontend-editor-new-page-confirm": "{{GENDER:$1|Are you sure
you want to create}} a new page on {{SITENAME}}?",
- "mobile-frontend-editor-newpage-prompt": "This page doesn't exist. Why
not be bold and create it?"
[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] mediawiki...SocialProfile[master]: [WIP] Replace duplicated i18n messages with core-provided i1...
SamanthaNguyen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/338541 ) Change subject: [WIP] Replace duplicated i18n messages with core-provided i18n messages .. [WIP] Replace duplicated i18n messages with core-provided i18n messages This commit replaces the following: * 'ga-cancel' in favor of 'cancel' Bug: T158485 Change-Id: I750dea7c7e874560976e56199d2ab648fd27902d --- M SystemGifts/SpecialRemoveMasterSystemGift.php M SystemGifts/i18n/az.json M SystemGifts/i18n/be-tarask.json M SystemGifts/i18n/br.json M SystemGifts/i18n/de.json M SystemGifts/i18n/en.json M SystemGifts/i18n/es.json M SystemGifts/i18n/fi.json M SystemGifts/i18n/frp.json M SystemGifts/i18n/gl.json M SystemGifts/i18n/gsw.json M SystemGifts/i18n/ia.json M SystemGifts/i18n/mk.json M SystemGifts/i18n/ms.json M SystemGifts/i18n/nl.json M SystemGifts/i18n/pt.json M SystemGifts/i18n/qqq.json 17 files changed, 1 insertion(+), 17 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SocialProfile refs/changes/41/338541/1 diff --git a/SystemGifts/SpecialRemoveMasterSystemGift.php b/SystemGifts/SpecialRemoveMasterSystemGift.php index 72650ce..96ef3d2 100644 --- a/SystemGifts/SpecialRemoveMasterSystemGift.php +++ b/SystemGifts/SpecialRemoveMasterSystemGift.php @@ -143,7 +143,7 @@ - + '; diff --git a/SystemGifts/i18n/az.json b/SystemGifts/i18n/az.json index 1af94ae..b79ec6e 100644 --- a/SystemGifts/i18n/az.json +++ b/SystemGifts/i18n/az.json @@ -9,7 +9,6 @@ "ga-new": "Yeni", "ga-next": "Növbəti", "ga-small": "Kiçik", - "ga-cancel": "İmtina", "ga-remove": "Çıxar", "ga-remove-title": "Çıxar \"$1\"?", "topawards-edits": "Redaktələr", diff --git a/SystemGifts/i18n/be-tarask.json b/SystemGifts/i18n/be-tarask.json index a42da8d..41badf9 100644 --- a/SystemGifts/i18n/be-tarask.json +++ b/SystemGifts/i18n/be-tarask.json @@ -45,7 +45,6 @@ "ga-title": "Узнагароды $1", "ga-uploadsuccess": "Пасьпяховая загрузка", "ga-viewlist": "Паказаць сьпіс падарункаў", - "ga-cancel": "Скасаваць", "ga-remove": "Выдаліць", "ga-remove-title": "Выдаліць «$1»?", "ga-delete-message": "Вы ўпэўненыя, што жадаеце выдаліць падарунак «$1»?\nЁн будзе выдалены і ва ўдзельнікаў, якія маглі яго атрымаць.", diff --git a/SystemGifts/i18n/br.json b/SystemGifts/i18n/br.json index fa48edb..6c285da 100644 --- a/SystemGifts/i18n/br.json +++ b/SystemGifts/i18n/br.json @@ -43,7 +43,6 @@ "ga-title": "Garedon $1", "ga-uploadsuccess": "Kaset eo bet mat", "ga-viewlist": "Gwelet roll ar profoù", - "ga-cancel": "Nullañ", "ga-remove": "Dilemel", "ga-remove-title": "Dilemel \"$1\" ?", "topawards-edits": "Kemmoù", diff --git a/SystemGifts/i18n/de.json b/SystemGifts/i18n/de.json index 10adb49..3de0b41 100644 --- a/SystemGifts/i18n/de.json +++ b/SystemGifts/i18n/de.json @@ -43,7 +43,6 @@ "ga-title": "Auszeichnungen von $1", "ga-uploadsuccess": "Hochladen erfolgreich", "ga-viewlist": "Geschenkeliste ansehen", - "ga-cancel": "Abbrechen", "ga-remove": "Entfernen", "ga-remove-title": "„$1“ entfernen?", "ga-delete-message": "Bist du dir sicher, das du das Geschenk „$1“ löschen möchtest?\nDies wird es auch bei Benutzern löschen, die es bereits erhalten haben.", diff --git a/SystemGifts/i18n/en.json b/SystemGifts/i18n/en.json index a05241a..c3c3fef 100644 --- a/SystemGifts/i18n/en.json +++ b/SystemGifts/i18n/en.json @@ -42,7 +42,6 @@ "ga-title": "$1's awards", "ga-uploadsuccess": "Upload successful", "ga-viewlist": "View gift list", - "ga-cancel": "Cancel", "ga-remove": "Remove", "ga-remove-title": "Remove \"$1\"?", "ga-delete-message": "Are you sure you want to delete the gift \"$1\"?\nThis will also delete it from users who may have received it.", diff --git a/SystemGifts/i18n/es.json b/SystemGifts/i18n/es.json index 2a263f5..49d06d2 100644 --- a/SystemGifts/i18n/es.json +++ b/SystemGifts/i18n/es.json @@ -43,7 +43,6 @@ "ga-title": "premios de $1", "ga-uploadsuccess": "Carga exitosa", "ga-viewlist": "Ver lista de regalos", - "ga-cancel": "Cancelar", "ga-remove": "Eliminar", "ga-remove-title": "¿Eliminar \"$1\"?", "ga-delete-message": "¿Está seguro de que desea eliminar el regalo \"$1\"?\nTambién lo eliminará de los usuarios que puedan haberlo recibido.", diff --git a/SystemGifts/i18n/fi.json b/SystemGifts/i18n/fi.json index e75f227..490627e 100644 --- a/SystemGifts/i18n/fi.json +++ b/SystemGifts/i18n/fi.json @@ -42,7 +42,6 @@ "ga-title": "Käyttäjän $1 palkinnot", "ga-u
[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.29.0-wmf.12]: Add "Unknown user" to $wgReservedUsernames
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/338539 ) Change subject: Add "Unknown user" to $wgReservedUsernames .. Add "Unknown user" to $wgReservedUsernames Used in WikiImporter when importing revisions with no author (e.g. when the author of the exported edit was revision-deleted). Follow-up to changes related to T121338. Bug: T158474 Change-Id: I49f3d5b9a23a0535c51a733d8837a681f6e51959 --- M RELEASE-NOTES-1.29 M includes/DefaultSettings.php 2 files changed, 2 insertions(+), 0 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29 index 3ba6577..e044101 100644 --- a/RELEASE-NOTES-1.29 +++ b/RELEASE-NOTES-1.29 @@ -31,6 +31,7 @@ * A temporary feature flag, $wgDisableUserGroupExpiry, is provided to disable new features that rely on the schema changes to the user_groups table. This feature flag will likely be removed before 1.29 is released. +* (T158474) "Unknown user" has been added to $wgReservedUsernames. === New features in 1.29 === * (T5233) A cookie can now be set when a user is autoblocked, to track that user diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index c7eeeab..005fa87 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -4786,6 +4786,7 @@ 'Maintenance script', // Maintenance scripts which perform editing, image import script 'Template namespace initialisation script', // Used in 1.2->1.3 upgrade 'ScriptImporter', // Default user name used by maintenance/importSiteScripts.php + 'Unknown user', // Used in WikiImporter when importing revisions with no author 'msg:double-redirect-fixer', // Automatic double redirect fix 'msg:usermessage-editor', // Default user for leaving user messages 'msg:proxyblocker', // For $wgProxyList and Special:Blockme (removed in 1.22) -- To view, visit https://gerrit.wikimedia.org/r/338539 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I49f3d5b9a23a0535c51a733d8837a681f6e51959 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.29.0-wmf.12 Gerrit-Owner: Reedy Gerrit-Reviewer: Bartosz Dziewoński Gerrit-Reviewer: Reedy 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/core[master]: Add "Unknown user" to $wgReservedUsernames
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/338538 ) Change subject: Add "Unknown user" to $wgReservedUsernames .. Add "Unknown user" to $wgReservedUsernames Used in WikiImporter when importing revisions with no author (e.g. when the author of the exported edit was revision-deleted). Follow-up to changes related to T121338. Bug: T158474 Change-Id: I49f3d5b9a23a0535c51a733d8837a681f6e51959 --- M RELEASE-NOTES-1.29 M includes/DefaultSettings.php 2 files changed, 2 insertions(+), 0 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29 index 58cc84b..13406d6 100644 --- a/RELEASE-NOTES-1.29 +++ b/RELEASE-NOTES-1.29 @@ -31,6 +31,7 @@ * A temporary feature flag, $wgDisableUserGroupExpiry, is provided to disable new features that rely on the schema changes to the user_groups table. This feature flag will likely be removed before 1.29 is released. +* (T158474) "Unknown user" has been added to $wgReservedUsernames. === New features in 1.29 === * (T5233) A cookie can now be set when a user is autoblocked, to track that user diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index c483366..791d024 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -4786,6 +4786,7 @@ 'Maintenance script', // Maintenance scripts which perform editing, image import script 'Template namespace initialisation script', // Used in 1.2->1.3 upgrade 'ScriptImporter', // Default user name used by maintenance/importSiteScripts.php + 'Unknown user', // Used in WikiImporter when importing revisions with no author 'msg:double-redirect-fixer', // Automatic double redirect fix 'msg:usermessage-editor', // Default user for leaving user messages 'msg:proxyblocker', // For $wgProxyList and Special:Blockme (removed in 1.22) -- To view, visit https://gerrit.wikimedia.org/r/338538 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I49f3d5b9a23a0535c51a733d8837a681f6e51959 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Bartosz Dziewoński Gerrit-Reviewer: Bartosz Dziewoński Gerrit-Reviewer: Reedy Gerrit-Reviewer: jenkins-bot <> ___ 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/core[wmf/1.29.0-wmf.12]: Add "Unknown user" to $wgReservedUsernames
Reedy has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/338539 ) Change subject: Add "Unknown user" to $wgReservedUsernames .. Add "Unknown user" to $wgReservedUsernames Used in WikiImporter when importing revisions with no author (e.g. when the author of the exported edit was revision-deleted). Follow-up to changes related to T121338. Bug: T158474 Change-Id: I49f3d5b9a23a0535c51a733d8837a681f6e51959 --- M RELEASE-NOTES-1.29 M includes/DefaultSettings.php 2 files changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/39/338539/1 diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29 index 3ba6577..e044101 100644 --- a/RELEASE-NOTES-1.29 +++ b/RELEASE-NOTES-1.29 @@ -31,6 +31,7 @@ * A temporary feature flag, $wgDisableUserGroupExpiry, is provided to disable new features that rely on the schema changes to the user_groups table. This feature flag will likely be removed before 1.29 is released. +* (T158474) "Unknown user" has been added to $wgReservedUsernames. === New features in 1.29 === * (T5233) A cookie can now be set when a user is autoblocked, to track that user diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index c7eeeab..005fa87 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -4786,6 +4786,7 @@ 'Maintenance script', // Maintenance scripts which perform editing, image import script 'Template namespace initialisation script', // Used in 1.2->1.3 upgrade 'ScriptImporter', // Default user name used by maintenance/importSiteScripts.php + 'Unknown user', // Used in WikiImporter when importing revisions with no author 'msg:double-redirect-fixer', // Automatic double redirect fix 'msg:usermessage-editor', // Default user for leaving user messages 'msg:proxyblocker', // For $wgProxyList and Special:Blockme (removed in 1.22) -- To view, visit https://gerrit.wikimedia.org/r/338539 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I49f3d5b9a23a0535c51a733d8837a681f6e51959 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.29.0-wmf.12 Gerrit-Owner: Reedy Gerrit-Reviewer: Bartosz Dziewoński ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add "Unknown user" to $wgReservedUsernames
Bartosz Dziewoński has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/338538 ) Change subject: Add "Unknown user" to $wgReservedUsernames .. Add "Unknown user" to $wgReservedUsernames Used in WikiImporter when importing revisions with no author (e.g. when the author of the exported edit was revision-deleted). Follow-up to changes related to T121338. Bug: T158474 Change-Id: I49f3d5b9a23a0535c51a733d8837a681f6e51959 --- M includes/DefaultSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/38/338538/1 diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index c483366..791d024 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -4786,6 +4786,7 @@ 'Maintenance script', // Maintenance scripts which perform editing, image import script 'Template namespace initialisation script', // Used in 1.2->1.3 upgrade 'ScriptImporter', // Default user name used by maintenance/importSiteScripts.php + 'Unknown user', // Used in WikiImporter when importing revisions with no author 'msg:double-redirect-fixer', // Automatic double redirect fix 'msg:usermessage-editor', // Default user for leaving user messages 'msg:proxyblocker', // For $wgProxyList and Special:Blockme (removed in 1.22) -- To view, visit https://gerrit.wikimedia.org/r/338538 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I49f3d5b9a23a0535c51a733d8837a681f6e51959 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Bartosz Dziewoński ___ 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
jenkins-bot has submitted this change and it was merged. ( 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(-) Approvals: MarcoAurelio: Looks good to me, approved jenkins-bot: Verified 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 system data, 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 Foundation's 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: merged Gerrit-Change-Id: Ic3e0262b96192c2ddf3afceaa6f6cdf837030528 Gerrit-PatchSet: 1 Gerrit-Project: labs/tools/stewardbots Gerrit-Branch: master Gerrit-Owner: MarcoAurelio Gerrit-Reviewer: MarcoAurelio Gerrit-Reviewer: jenkins-bot <> ___ 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 system data, 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 Foundation's 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
--- a/resources/src/mediawiki.widgets.datetime/DateTimeInput
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: build: Enable selector-pseudo-class-parentheses-space-inside...
VolkerE has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/338533 )
Change subject: build: Enable selector-pseudo-class-parentheses-space-inside
stylelint rule
..
build: Enable selector-pseudo-class-parentheses-space-inside stylelint rule
Enabling selector-pseudo-class-parentheses-space-inside stylelint rule and
making it pass.
Change-Id: I6676d743b4375c250377a5b7582251e83f761d10
Depends-on: I3859e04797203a64d82206a379dbb320e5e113d5
---
M .stylelintrc
M resources/src/mediawiki.legacy/shared.css
M resources/src/mediawiki.skinning/elements.css
M resources/src/mediawiki.widgets/mw.widgets.TitleWidget.less
M resources/src/mediawiki/mediawiki.debug.less
5 files changed, 68 insertions(+), 69 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/33/338533/1
diff --git a/.stylelintrc b/.stylelintrc
index dc8edd9..70732fa 100644
--- a/.stylelintrc
+++ b/.stylelintrc
@@ -12,7 +12,6 @@
"selector-list-comma-newline-after": null,
"selector-no-id": null,
- "selector-pseudo-class-parentheses-space-inside": null,
"string-quotes": null,
diff --git a/resources/src/mediawiki.legacy/shared.css
b/resources/src/mediawiki.legacy/shared.css
index 2b79a57..3238e5a 100644
--- a/resources/src/mediawiki.legacy/shared.css
+++ b/resources/src/mediawiki.legacy/shared.css
@@ -83,7 +83,7 @@
cursor: help;
}
-@supports (text-decoration: underline dotted) {
+@supports ( text-decoration: underline dotted ) {
abbr[title],
.explain[title] {
border-bottom: 0;
@@ -578,88 +578,88 @@
/* Language specific height correction for titles. Ref Bug 29405 and Bug 30809
*/
/* Languages like hi or ml require slightly more vertical space to show
diacritics properly */
-h1:lang(anp),
-h1:lang(as),
-h1:lang(bh), /* Macrolanguage, used on bh.wikipedia.org, should be removed one
day */
-h1:lang(bho),
-h1:lang(bn),
-h1:lang(gu),
-h1:lang(hi),
-h1:lang(kn),
-h1:lang(ks),
-h1:lang(ml),
-h1:lang(mr),
-h1:lang(my),
-h1:lang(mai),
-h1:lang(ne),
-h1:lang(new),
-h1:lang(or),
-h1:lang(pa),
-h1:lang(pi),
-h1:lang(sa),
-h1:lang(ta),
-h1:lang(te) {
+h1:lang( anp ),
+h1:lang( as ),
+h1:lang( bh ), /* Macrolanguage, used on bh.wikipedia.org, should be removed
one day */
+h1:lang( bho ),
+h1:lang( bn ),
+h1:lang( gu ),
+h1:lang( hi ),
+h1:lang( kn ),
+h1:lang( ks ),
+h1:lang( ml ),
+h1:lang( mr ),
+h1:lang( my ),
+h1:lang( mai ),
+h1:lang( ne ),
+h1:lang( new ),
+h1:lang( or ),
+h1:lang( pa ),
+h1:lang( pi ),
+h1:lang( sa ),
+h1:lang( ta ),
+h1:lang( te ) {
line-height: 1.6em !important;
}
-h2:lang(anp), h3:lang(anp), h4:lang(anp), h5:lang(anp), h6:lang(anp),
-h2:lang(as), h3:lang(as), h4:lang(as), h5:lang(as), h6:lang(as),
-h2:lang(bho), h3:lang(bho), h4:lang(bho), h5:lang(bho), h6:lang(bho),
-h2:lang(bh), h3:lang(bh), h4:lang(bh), h5:lang(bh), h6:lang(bh),
-h2:lang(bn), h3:lang(bn), h4:lang(bn), h5:lang(bn), h6:lang(bn),
-h2:lang(gu), h3:lang(gu), h4:lang(gu), h5:lang(gu), h6:lang(gu),
-h2:lang(hi), h3:lang(hi), h4:lang(hi), h5:lang(hi), h6:lang(hi),
-h2:lang(kn), h3:lang(kn), h4:lang(kn), h5:lang(kn), h6:lang(kn),
-h2:lang(ks), h3:lang(ks), h4:lang(ks), h5:lang(ks), h6:lang(ks),
-h2:lang(ml), h3:lang(ml), h4:lang(ml), h5:lang(ml), h6:lang(ml),
-h2:lang(mr), h3:lang(mr), h4:lang(mr), h5:lang(mr), h6:lang(mr),
-h2:lang(my), h3:lang(my), h4:lang(my), h5:lang(my), h6:lang(my),
-h2:lang(mai), h3:lang(mai), h4:lang(mai), h5:lang(mai), h6:lang(mai),
-h2:lang(ne), h3:lang(ne), h4:lang(ne), h5:lang(ne), h6:lang(ne),
-h2:lang(new), h3:lang(new), h4:lang(new), h5:lang(new), h6:lang(new),
-h2:lang(or), h3:lang(or), h4:lang(or), h5:lang(or), h6:lang(or),
-h2:lang(pa), h3:lang(pa), h4:lang(pa), h5:lang(pa), h6:lang(pa),
-h2:lang(pi), h3:lang(pi), h4:lang(pi), h5:lang(pi), h6:lang(pi),
-h2:lang(sa), h3:lang(sa), h4:lang(sa), h5:lang(sa), h6:lang(sa),
-h2:lang(ta), h3:lang(ta), h4:lang(ta), h5:lang(ta), h6:lang(ta),
-h2:lang(te), h3:lang(te), h4:lang(te), h5:lang(te), h6:lang(te) {
+h2:lang( anp ), h3:lang( anp ), h4:lang( anp ), h5:lang( anp ), h6:lang( anp ),
+h2:lang( as ), h3:lang( as ), h4:lang( as ), h5:lang( as ), h6:lang( as ),
+h2:lang( bho ), h3:lang( bho ), h4:lang( bho ), h5:lang( bho ), h6:lang( bho ),
+h2:lang( bh ), h3:lang( bh ), h4:lang( bh ), h5:lang( bh ), h6:lang( bh ),
+h2:lang( bn ), h3:lang( bn ), h4:lang( bn ), h5:lang( bn ), h6:lang( bn ),
+h2:lang( gu ), h3:lang( gu ), h4:lang( gu ), h5:lang( gu ), h6:lang( gu ),
+h2:lang( hi ), h3:lang( hi ), h4:lang( hi ), h5:lang( hi ), h6:lang( hi ),
+h2:lang( kn ), h3:lang( kn ), h4:lang( kn ), h5:lang( kn ), h6:lang( kn ),
+h2:lang( ks ), h3:lang( ks ), h4:lang( ks ), h5:lang( ks ), h6:lang( ks ),
+h2:lang( ml ), h3:lang( ml ), h4:lang( ml ), h5:lang( ml ), h6:lang( ml ),
+h2:lang( mr ), h3:lang( mr ), h4:lang( mr ), h5:lang( mr ), h6:lang( mr ),
+h2:lang( my ), h3:lang(
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fixed documentation on Parser::getVariableValue
EddieGP has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/338532 ) Change subject: Fixed documentation on Parser::getVariableValue .. Fixed documentation on Parser::getVariableValue $index is definitely not a int here, see the big switch( $index )-case statement below. It switches for strings, not numbers. Also, note that this is lowercase, one might expect it to be uppercase as this is how magic words are written in wikitext. Bug: T96633 Change-Id: Iea93c3796fdee4ed7abbb7608e89b627ca95aead --- M includes/parser/Parser.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/32/338532/1 diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php index 1d55c98..3d419d1 100644 --- a/includes/parser/Parser.php +++ b/includes/parser/Parser.php @@ -2483,7 +2483,7 @@ * * @private * -* @param int $index +* @param string $index Magic variable identifier. Note that it's lowercase by the time this function is called. * @param bool|PPFrame $frame * * @throws MWException -- To view, visit https://gerrit.wikimedia.org/r/338532 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iea93c3796fdee4ed7abbb7608e89b627ca95aead Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: EddieGP ___ 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 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/core[master]: build: Enable use of stylelint-config-wikimedia and make pass
VolkerE has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/338530 )
Change subject: build: Enable use of stylelint-config-wikimedia and make pass
..
build: Enable use of stylelint-config-wikimedia and make pass
Enabling stylelint-config-wikimedia for Grunt stylelint,
which was already introduced in 3bf6f429295e, but has not yet
been actively used to enforce Wikimedia CSS Coding Standards.
For this first patch nullifying several options, which will be enabled
in follow-up patches in order to be easier reviewable.
Change-Id: I3859e04797203a64d82206a379dbb320e5e113d5
---
M .stylelintrc
M resources/src/jquery/jquery.arrowSteps.css
M resources/src/jquery/jquery.suggestions.css
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.less/mediawiki.mixins.animation.less
M resources/src/mediawiki.less/mediawiki.mixins.less
M resources/src/mediawiki.skinning/content.css
M resources/src/mediawiki.skinning/content.parsoid.less
M resources/src/mediawiki.skinning/elements.css
M resources/src/mediawiki.skinning/interface.css
M resources/src/mediawiki.special/mediawiki.special.apisandbox.css
M
resources/src/mediawiki.special/mediawiki.special.search.interwikiwidget.styles.less
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
M resources/src/mediawiki.widgets/mw.widgets.StashedFileWidget.less
M resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.less
M resources/src/mediawiki/mediawiki.Upload.BookletLayout.css
M resources/src/mediawiki/mediawiki.apihelp.css
M resources/src/mediawiki/mediawiki.debug.less
M resources/src/mediawiki/mediawiki.diff.styles.css
24 files changed, 63 insertions(+), 69 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/30/338530/1
diff --git a/.stylelintrc b/.stylelintrc
index 62dbeb6..f9663fc 100644
--- a/.stylelintrc
+++ b/.stylelintrc
@@ -1,26 +1,22 @@
{
+ "extends": "stylelint-config-wikimedia",
"rules": {
- "color-hex-case": [ "lower" ],
- "color-hex-length": [ "short" ],
- "color-named": [ "never" ],
- "color-no-invalid-hex": true,
+ "declaration-block-no-duplicate-properties": null,
+ "declaration-no-important": null,
- "declaration-bang-space-after": [ "never" ],
- "declaration-bang-space-before": [ "always" ],
- "declaration-colon-space-after": [ "always" ],
- "declaration-colon-space-before": [ "never" ],
+ "indentation": null,
- "font-family-name-quotes": [ "always-unless-keyword" ],
- "font-weight-notation": [ "named-where-possible" ],
+ "no-descending-specificity": null,
+ "no-duplicate-selectors": null,
- "function-calc-no-unspaced-operator": true,
- "function-comma-newline-after": "never-multi-line",
- "function-comma-newline-before": "never-multi-line",
- "function-comma-space-after": [ "always" ],
- "function-comma-space-before": [ "never" ],
- "function-parentheses-newline-inside": [ "never-multi-line" ],
- "function-parentheses-space-inside": [ "always" ],
- "function-url-quotes": [ "never" ],
- "function-whitespace-after": [ "always" ],
+ "number-leading-zero": null,
+
+ "selector-list-comma-newline-after": null,
+ "selector-no-id": null,
+ "selector-pseudo-class-parentheses-space-inside": null,
+
+ "string-quotes": null,
+
+ "value-keyword-case": null
}
}
diff --git a/resources/src/jquery/jquery.arrowSteps.css
b/resources/src/jquery/jquery.arrowSteps.css
index d24fcc9..92c6c43 100644
--- a/resources/src/jquery/jquery.arrowSteps.css
+++ b/resources/src/jquery/jquery.arrowSteps.css
@@ -7,9 +7,9 @@
.arrowSteps li {
float: left;
- padding: 0px;
- margin: 0px;
- border: 0 none;
+ padding: 0;
+ margin: 0;
+ border: 0;
}
.arrowSteps li div {
diff --git a/resources/src/jquery/jquery.suggestions.css
b/resources/src/jquery/jquery.suggestions.css
index f6b4fd1..c32f25a 100644
--- a/resources/src/jquery/jquery.suggestions.css
+++ b/resources/src/jquery/jquery.suggestions.css
@@ -6,7 +6,7 @@
top: 0;
left: 0;
width: 0;
- border: none;
+ border: 0;
z-index: 1099;
padding: 0;
margin: -1px 0 0 0;
diff --git a/resources/src/mediawiki.action/mediawiki.action.view.filepage.css
[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: I2f25d95bb231dccb239a722dde3f391d375b
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Split RCFilter's RL modules
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/337206 )
Change subject: Split RCFilter's RL modules
..
Split RCFilter's RL modules
Create 'dm' / 'ui' and 'controller' modules for ResourceLoader,
make sure that Special:RecentChanges loads 'ui' module (that
depends on the other two) and yet the qunit tests only load
the dm module.
Bug: T156532
Change-Id: If53a735458703f0bd2c094349edf86f38f05ccd7
---
M includes/specials/SpecialRecentchanges.php
M resources/Resources.php
M tests/qunit/QUnitTestResources.php
3 files changed, 13 insertions(+), 5 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/specials/SpecialRecentchanges.php
b/includes/specials/SpecialRecentchanges.php
index b2e5674..975e210 100644
--- a/includes/specials/SpecialRecentchanges.php
+++ b/includes/specials/SpecialRecentchanges.php
@@ -532,7 +532,7 @@
/*ignoreHidden=*/ true
)
) {
- $out->addModules( 'mediawiki.rcfilters.filters' );
+ $out->addModules( 'mediawiki.rcfilters.filters.ui' );
}
}
diff --git a/resources/Resources.php b/resources/Resources.php
index 02487ea..2f0311f 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1751,13 +1751,22 @@
/* MediaWiki Special pages */
- 'mediawiki.rcfilters.filters' => [
+ 'mediawiki.rcfilters.filters.dm' => [
'scripts' => [
'resources/src/mediawiki.rcfilters/mw.rcfilters.js',
'resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterItem.js',
'resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js',
'resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js',
'resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.ChangesListViewModel.js',
+
'resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js',
+ ],
+ 'dependencies' => [
+ 'oojs',
+ 'mediawiki.Uri',
+ ],
+ ],
+ 'mediawiki.rcfilters.filters.ui' => [
+ 'scripts' => [
'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.CheckboxInputWidget.js',
'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FiltersListWidget.js',
'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterGroupWidget.js',
@@ -1767,7 +1776,6 @@
'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js',
'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js',
'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FormWrapperWidget.js',
-
'resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js',
'resources/src/mediawiki.rcfilters/mw.rcfilters.init.js',
],
'styles' => [
@@ -1828,7 +1836,7 @@
],
'dependencies' => [
'oojs-ui',
- 'mediawiki.Uri',
+ 'mediawiki.rcfilters.filters.dm',
'oojs-ui.styles.icons-moderation'
],
],
diff --git a/tests/qunit/QUnitTestResources.php
b/tests/qunit/QUnitTestResources.php
index f31a646..1278ecb 100644
--- a/tests/qunit/QUnitTestResources.php
+++ b/tests/qunit/QUnitTestResources.php
@@ -137,7 +137,7 @@
'mediawiki.util',
'mediawiki.viewport',
'mediawiki.special.recentchanges',
- 'mediawiki.rcfilters.filters',
+ 'mediawiki.rcfilters.filters.dm',
'mediawiki.language',
'mediawiki.cldr',
'mediawiki.cookie',
--
To view, visit https://gerrit.wikimedia.org/r/337206
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If53a735458703f0bd2c094349edf86f38f05ccd7
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo
Gerrit-Reviewer: Catrope
Gerrit-Reviewer: Gergő Tisza
Gerrit-Reviewer: Mooeypoo
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...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: Jforrester Gerrit-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...DeepSea[master]: Add missing qqq message documentation
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/338527 )
Change subject: Add missing qqq message documentation
..
Add missing qqq message documentation
Added missing qqq.json with 7 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: I713ab4fb2a9e3153d8d6fd2161b6c75b9a4b77e9
---
A i18n/qqq.json
1 file changed, 10 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/DeepSea
refs/changes/27/338527/1
diff --git a/i18n/qqq.json b/i18n/qqq.json
new file mode 100644
index 000..fcabc43
--- /dev/null
+++ b/i18n/qqq.json
@@ -0,0 +1,10 @@
+{
+ "@metadata": {},
+ "deepsea-advertisement": "Link text in navigation bar",
+ "deepsea-chat": "Link text in navigation bar",
+ "deepsea-desc":
"{{desc|what=skin|name=DeepSea|url=https://www.mediawiki.org/wiki/Skin:DeepSea}}";,
+ "deepsea-forums": "Link text in navigation bar",
+ "deepsea-my-talk": "Link text in navigation bar",
+ "deepsea-this-page": "Link text in navigation bar",
+ "skinname-deepsea": "{{name}}"
+}
--
To view, visit https://gerrit.wikimedia.org/r/338527
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I713ab4fb2a9e3153d8d6fd2161b6c75b9a4b77e9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/DeepSea
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...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...Gamepress[master]: Add missing qqq message documentation
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/338525 )
Change subject: Add missing qqq message documentation
..
Add missing qqq message documentation
Added missing 6 message keys to qqq.json 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: I8c03978c394f0da909204c08ca2ca357e291990a
---
A i18n/qqq.json
1 file changed, 9 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Gamepress
refs/changes/25/338525/1
diff --git a/i18n/qqq.json b/i18n/qqq.json
new file mode 100644
index 000..bb3d95c
--- /dev/null
+++ b/i18n/qqq.json
@@ -0,0 +1,9 @@
+{
+ "@metadata": {},
+ "gamepress-desc":
"{{desc|name=Gamepress|url=https://www.mediawiki.org/wiki/Skin:Gamepress}}";,
+ "gamepress-back-to-top": "Text for a link in the footer of each
page\n{{Identical|Back}}",
+ "gamepress-navigation": "{{ignored}}",
+ "gamepress-prefooter-1": "{{ignored}}",
+ "gamepress-prefooter-2": "{{ignored}}",
+ "gamepress-prefooter-3": "{{ignored}}"
+}
--
To view, visit https://gerrit.wikimedia.org/r/338525
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8c03978c394f0da909204c08ca2ca357e291990a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Gamepress
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...WPtouch[master]: Add missing qqq message documentation
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/338524 )
Change subject: Add missing qqq message documentation
..
Add missing qqq message documentation
Added missing 2 message keys to qqq.json 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: Ieacd2d2db7deb446be8b646f94369b9a5da4fac9
---
M i18n/qqq.json
1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/WPtouch
refs/changes/24/338524/1
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 1c8b0cb..1138879 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -1,4 +1,6 @@
{
"@metadata": {},
- "wptouch-desc":
"{{desc|name=WPtouch|url=https://www.mediawiki.org/wiki/Skin:WPtouch}}";
+ "wptouch-desc":
"{{desc|name=WPtouch|url=https://www.mediawiki.org/wiki/Skin:WPtouch}}";,
+ "wptouch-noscript-body": "Hint for users without javascript or with
disabled javascript",
+ "wptouch-noscript-title": "Used as header of
{{msg-mw|wptouch-noscript-body}}"
}
--
To view, visit https://gerrit.wikimedia.org/r/338524
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieacd2d2db7deb446be8b646f94369b9a5da4fac9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/WPtouch
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/puppet[production]: dumps: Centralize CSS in one file, make it wider and apply t...
ArielGlenn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/337264 ) Change subject: dumps: Centralize CSS in one file, make it wider and apply to more files .. dumps: Centralize CSS in one file, make it wider and apply to more files also update rsync filelist generator to include css (and json, coming soon) in list of files to sync out to mirrors and others Bug: T155697 Change-Id: I3101f6100502e0e2c89508be5a8c8329d6f5f118 --- M modules/dataset/files/html/analytics_index.html M modules/dataset/files/html/archive_index.html A modules/dataset/files/html/dumps.css M modules/dataset/files/html/legal.html M modules/dataset/files/html/other_index.html M modules/dataset/files/html/pagecounts-ez_index.html M modules/dataset/files/html/public_index.html M modules/dataset/files/html/public_mirrors.html M modules/dataset/manifests/html.pp M modules/snapshot/files/cron/list-last-n-good-dumps.py M modules/snapshot/files/dumps/templates/download-index.html M modules/snapshot/files/dumps/templates/dvd.html M modules/snapshot/files/dumps/templates/legal.html 13 files changed, 133 insertions(+), 771 deletions(-) Approvals: ArielGlenn: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/dataset/files/html/analytics_index.html b/modules/dataset/files/html/analytics_index.html index 98e3ff4..dfedbb9 100644 --- a/modules/dataset/files/html/analytics_index.html +++ b/modules/dataset/files/html/analytics_index.html @@ -2,109 +2,10 @@ http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en" dir="ltr"> - - - -Wikimedia Downloads: Analytics -/**/ - + + +Wikimedia Downloads: Analytics + diff --git a/modules/dataset/files/html/archive_index.html b/modules/dataset/files/html/archive_index.html index db365e8..ea41b0e 100644 --- a/modules/dataset/files/html/archive_index.html +++ b/modules/dataset/files/html/archive_index.html @@ -2,109 +2,10 @@ http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en" dir="ltr"> - - + Wikimedia Downloads -/*
[MediaWiki-commits] [Gerrit] mediawiki...Truglass[master]: Add missing qqq message documentation
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/338523 )
Change subject: Add missing qqq message documentation
..
Add missing qqq message documentation
Added missing 3 message keys to qqq.json 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: I163a8f11f7b15ef52cf06e629af9c0365b980f54
---
M i18n/qqq.json
1 file changed, 4 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Truglass
refs/changes/23/338523/1
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 39b2994..aa29aec 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -1,4 +1,7 @@
{
"@metadata": {},
- "truglass-desc":
"{{desc|name=Truglass|url=https://www.mediawiki.org/wiki/Skin:Truglass}}";
+ "truglass-desc":
"{{desc|name=Truglass|url=https://www.mediawiki.org/wiki/Skin:Truglass}}";,
+ "truglass-footertext": "{{ignored}}",
+ "truglass-links": "This is shown as a section header in the sidebar.",
+ "truglass-welcome": "Welcome text shown as sitenotice on each page."
}
--
To view, visit https://gerrit.wikimedia.org/r/338523
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I163a8f11f7b15ef52cf06e629af9c0365b980f54
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Truglass
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...DuskToDawn[master]: Add missing qqq message documentation
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/338522 )
Change subject: Add missing qqq message documentation
..
Add missing qqq message documentation
Added missing 2 message keys to qqq.json 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: I5e42c4d299edbc7ca02226286d2f8acdee2f773a
---
M i18n/qqq.json
1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/DuskToDawn
refs/changes/22/338522/1
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 7037d2c..173dbaa 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -1,4 +1,6 @@
{
"@metadata": {},
- "dusktodawn-desc":
"{{desc|name=DuskToDawn|url=https://www.mediawiki.org/wiki/Skin:DuskToDawn}}";
+ "dusktodawn-desc":
"{{desc|name=DuskToDawn|url=https://www.mediawiki.org/wiki/Skin:DuskToDawn}}";,
+ "dusktodawn-page-edited": "This message is shown in header of each page
when no user is knwon.\n\nParameters:\n* $1 - date and time\nSee also:\n*
{{msg-mw|dusktodawn-page-edited-user}}",
+ "dusktodawn-page-edited-user": "This message is shown in header of each
page.\n\nParameters:\n* $1 - date and time\n* $2 - user name\nSee also:\n*
{{msg-mw|dusktodawn-page-edited}}"
}
--
To view, visit https://gerrit.wikimedia.org/r/338522
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5e42c4d299edbc7ca02226286d2f8acdee2f773a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/DuskToDawn
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...Wikidata[master]: New Wikidata Build - 2017-02-18T10:00:01+0000
WikidataBuilder has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/338521 ) Change subject: New Wikidata Build - 2017-02-18T10:00:01+ .. New Wikidata Build - 2017-02-18T10:00:01+ Change-Id: I2d933ccdb3970ad8fe27644b26e4120b914cf852 --- M composer.lock M extensions/ArticlePlaceholder/includes/SearchHookHandler.php M extensions/ArticlePlaceholder/includes/specials/SpecialAboutTopic.php M extensions/ArticlePlaceholder/tests/phpunit/includes/specials/SpecialAboutTopicTest.php M extensions/Constraints/.travis.yml M extensions/Constraints/includes/ConstraintCheck/Helper/RangeCheckerHelper.php M extensions/Constraints/tests/phpunit/Checker/RangeChecker/RangeCheckerHelperTest.php M extensions/MediaInfo/src/Content/MediaInfoContent.php M extensions/MediaInfo/tests/phpunit/mediawiki/Content/MissingMediaInfoHandlerTest.php M extensions/Quality/i18n/oc.json M extensions/Wikibase/.rubocop_todo.yml M extensions/Wikibase/.scrutinizer.yml M extensions/Wikibase/README.md M extensions/Wikibase/client/config/WikibaseClient.default.php M extensions/Wikibase/client/i18n/bg.json M extensions/Wikibase/client/i18n/bn.json M extensions/Wikibase/client/i18n/es.json M extensions/Wikibase/client/i18n/oc.json M extensions/Wikibase/client/i18n/sty.json M extensions/Wikibase/client/includes/DataAccess/PropertyIdResolver.php M extensions/Wikibase/client/includes/DataAccess/PropertyParserFunction/LanguageAwareRenderer.php M extensions/Wikibase/client/includes/DataAccess/PropertyParserFunction/VariantsAwareRenderer.php M extensions/Wikibase/client/includes/DataAccess/Scribunto/EntityAccessor.php M extensions/Wikibase/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibrary.php M extensions/Wikibase/client/includes/DispatchingServiceFactory.php M extensions/Wikibase/client/includes/DispatchingServiceWiring.php M extensions/Wikibase/client/includes/EntityDataRetrievalServiceFactory.php M extensions/Wikibase/client/includes/Hooks/ParserFunctionRegistrant.php M extensions/Wikibase/client/includes/Hooks/ParserOutputUpdateHookHandlers.php M extensions/Wikibase/client/includes/Hooks/SidebarHookHandlers.php M extensions/Wikibase/client/includes/Specials/SpecialPagesWithBadges.php M extensions/Wikibase/client/includes/Store/RepositoryServiceWiring.php M extensions/Wikibase/client/includes/Store/Sql/DirectSqlStore.php M extensions/Wikibase/client/includes/WikibaseClient.php M extensions/Wikibase/client/resources/images/wb-otherprojects-beta-ltr.svg M extensions/Wikibase/client/resources/images/wb-otherprojects-beta-rtl.svg M extensions/Wikibase/client/tests/phpunit/includes/DispatchingServiceFactoryTest.php M extensions/Wikibase/client/tests/phpunit/includes/DispatchingServiceWiringTest.php M extensions/Wikibase/client/tests/phpunit/includes/Hooks/ParserFunctionRegistrantTest.php M extensions/Wikibase/client/tests/phpunit/includes/RecentChanges/ChangeLineFormatterTest.php M extensions/Wikibase/client/tests/phpunit/includes/Store/RepositoryServiceContainerTest.php M extensions/Wikibase/client/tests/phpunit/includes/Store/RepositoryServiceWiringTest.php M extensions/Wikibase/client/tests/phpunit/includes/Store/Sql/DirectSqlStoreTest.php M extensions/Wikibase/client/tests/phpunit/includes/Usage/UsageTrackerContractTester.php M extensions/Wikibase/client/tests/phpunit/includes/WikibaseClientTest.php M extensions/Wikibase/composer.json M extensions/Wikibase/docs/hooks.txt M extensions/Wikibase/docs/rdf-binding.txt M extensions/Wikibase/lib/i18n/oc.json M extensions/Wikibase/lib/includes/Formatters/AutoCommentFormatter.php A extensions/Wikibase/lib/includes/Interactors/DispatchingTermSearchInteractorFactory.php A extensions/Wikibase/lib/includes/Interactors/TermIndexSearchInteractorFactory.php A extensions/Wikibase/lib/includes/Interactors/TermSearchInteractorFactory.php M extensions/Wikibase/lib/includes/Modules/SitesModuleWorker.php A extensions/Wikibase/lib/includes/RepositoryDefinitions.php M extensions/Wikibase/lib/includes/Store/Sql/TermSqlIndex.php A extensions/Wikibase/lib/tests/phpunit/Interactors/DispatchingTermSearchInteractorFactoryTest.php A extensions/Wikibase/lib/tests/phpunit/Interactors/TermIndexSearchInteractorFactoryTest.php M extensions/Wikibase/lib/tests/phpunit/LanguageNameLookupTest.php A extensions/Wikibase/lib/tests/phpunit/RepositoryDefinitionsTest.php M extensions/Wikibase/lib/tests/phpunit/Store/DispatchingTermBufferTest.php M extensions/Wikibase/lib/tests/phpunit/Store/EntityContentDataCodecTest.php M extensions/Wikibase/repo/Wikibase.hooks.php M extensions/Wikibase/repo/Wikibase.php M extensions/Wikibase/repo/i18n/bg.json M extensions/Wikibase/repo/i18n/bn.json M extensions/Wikibase/repo/i18n/bs.json M extensions/Wikibase/repo/i18n/es.json M extensions/Wikibase/repo/i18n/eu.json M extensions/Wikibase/repo/i18n/fi.json M extensions/Wikibase/repo/i18n/he.json M extensions/Wikibase/repo/i18n/oc.json M ex
[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: ArielGlenn Gerrit-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 - (from beginning of file) and the f
[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 block - (from be
[MediaWiki-commits] [Gerrit] operations...mwbzutils[master]: clean up some gcc warnings from unused variables and such
ArielGlenn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/338408 )
Change subject: clean up some gcc warnings from unused variables and such
..
clean up some gcc warnings from unused variables and such
Change-Id: I97f144aef6a1379392f882e42f35e7fc3c0afdad
---
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/writeuptopageid.c
5 files changed, 18 insertions(+), 38 deletions(-)
Approvals:
ArielGlenn: Verified; Looks good to me, approved
diff --git a/xmldumps-backup/mwbzutils/dumpbz2filefromoffset.c
b/xmldumps-backup/mwbzutils/dumpbz2filefromoffset.c
index ae76de7..9197c61 100644
--- a/xmldumps-backup/mwbzutils/dumpbz2filefromoffset.c
+++ b/xmldumps-backup/mwbzutils/dumpbz2filefromoffset.c
@@ -68,7 +68,6 @@
-1 on error
*/
int dump_mw_header(int fin) {
- int res;
regmatch_t *match_siteinfo;
regex_t compiled_siteinfo;
int length=5000; /* output buffer size */
@@ -82,7 +81,7 @@
bfile.initialized = 0;
bfile.marker = NULL;
- res = regcomp(&compiled_siteinfo, siteinfo, REG_EXTENDED);
+ regcomp(&compiled_siteinfo, siteinfo, REG_EXTENDED);
match_siteinfo = (regmatch_t *)malloc(sizeof(regmatch_t)*1);
@@ -175,7 +174,6 @@
-1 on error
*/
int dump_from_first_page_id_after_offset(int fin, off_t position) {
- int res;
regmatch_t *match_page;
regex_t compiled_page;
int length=5000; /* output buffer size */
@@ -189,7 +187,7 @@
bfile.initialized = 0;
bfile.marker = NULL;
- res = regcomp(&compiled_page, page, REG_EXTENDED);
+ regcomp(&compiled_page, page, REG_EXTENDED);
match_page = (regmatch_t *)malloc(sizeof(regmatch_t)*1);
diff --git a/xmldumps-backup/mwbzutils/dumplastbz2block.c
b/xmldumps-backup/mwbzutils/dumplastbz2block.c
index 82978e3..0ef1696 100644
--- a/xmldumps-backup/mwbzutils/dumplastbz2block.c
+++ b/xmldumps-backup/mwbzutils/dumplastbz2block.c
@@ -65,7 +65,6 @@
int result;
buf_info_t *b;
- int firstblock = 1;
int length = 5000; /* output buffer size */
int optc;
@@ -118,9 +117,6 @@
b = init_buffer(length);
bfile.bytes_read = 0;
- /* init_bz2_file(&bfile, fin, BACKWARD); */
- firstblock = 1;
-
if (find_first_bz2_block_from_offset(&bfile, fin, bfile.position, BACKWARD)
<= (off_t)0) {
fprintf(stderr,"failed to find block in bz2file\n");
exit(-1);
@@ -133,7 +129,6 @@
b->next_to_fill = b->buffer; /* empty */
bfile.strm.next_out = (char *)b->next_to_fill;
bfile.strm.avail_out = b->end - b->next_to_fill;
- firstblock = 0;
}
else {
/* should never happen */
diff --git a/xmldumps-backup/mwbzutils/findpageidinbz2xml.c
b/xmldumps-backup/mwbzutils/findpageidinbz2xml.c
index 9553f88..4968eb2 100644
--- a/xmldumps-backup/mwbzutils/findpageidinbz2xml.c
+++ b/xmldumps-backup/mwbzutils/findpageidinbz2xml.c
@@ -106,7 +106,6 @@
extern char * geturl(char *hostname, int port, char *url);
char *get_hostname_from_xml_header(int fin) {
- int res;
regmatch_t *match_base_expr;
regex_t compiled_base_expr;
/*http://el.wiktionary.org/wiki/... */
@@ -119,13 +118,13 @@
int hostname_length = 0;
- off_t old_position, seek_result;
+ off_t old_position;
static char hostname[256];
bfile.initialized = 0;
bfile.marker = NULL;
- res = regcomp(&compiled_base_expr, base_expr, REG_EXTENDED);
+ regcomp(&compiled_base_expr, base_expr, REG_EXTENDED);
match_base_expr = (regmatch_t *)malloc(sizeof(regmatch_t)*2);
b = init_buffer(length);
@@ -133,7 +132,7 @@
bfile.position = (off_t)0;
old_position = lseek(fin,(off_t)0,SEEK_CUR);
- seek_result = lseek(fin,(off_t)0,SEEK_SET);
+ lseek(fin,(off_t)0,SEEK_SET);
while ((get_buffer_of_uncompressed_data(b, fin, &bfile, FORWARD)>=0) && (!
bfile.eof)) {
/* so someday the header might grow enough that isn't in the first
1000 characters but we'll ignore that for now */
@@ -160,8 +159,8 @@
b->next_to_fill = b->buffer; /* empty */
bfile.strm.next_out = (char *)b->next_to_fill;
bfile.strm.avail_out = b->end - b->next_to_fill;
- res = BZ2_bzDecompressEnd ( &(bfile.strm) );
- seek_result = lseek(fin,old_position,SEEK_SET);
+ BZ2_bzDecompressEnd ( &(bfile.strm) );
+ lseek(fin,old_position,SEEK_SET);
free_buffer(b);
return(hostname);
}
@@ -172,8 +171,8 @@
}
}
}
- res = BZ2_bzDecompressEnd ( &(bfile.strm) );
- seek_result = lseek(fin,old_position,SEEK_SET);
+ BZ2_bzDecompressEnd ( &(bfile.strm) );
+ lseek(fin,old_position,SEEK_SET);
free_buffer(b);
return(NULL);
}
@@ -259,7 +258,6 @@
regmatch_t *match_page_id_expr;
regex_t compiled_page_id_expr;
char *page_id_expr = "
*/
match_page
[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: ArielGlenn
Gerrit-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]: update README with docs on the new utility and script
ArielGlenn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/338406 ) Change subject: update README with docs on the new utility and script .. update README with docs on the new utility and script Change-Id: I4839c34b8e908c88de65cb0e883afd93aab5a152 --- M xmldumps-backup/mwbzutils/README 1 file changed, 15 insertions(+), 0 deletions(-) Approvals: ArielGlenn: Verified; Looks good to me, approved diff --git a/xmldumps-backup/mwbzutils/README b/xmldumps-backup/mwbzutils/README index 4cac1b6..6762049 100644 --- a/xmldumps-backup/mwbzutils/README +++ b/xmldumps-backup/mwbzutils/README @@ -13,11 +13,21 @@ LICENSE_BZ; all other files in the package are released under the GPL, see the file COPYING for details. +Scripts: + +check_bz2_pagerange.py - Checks that the first and last page of a bz2 content + checkpoint filename match the contents in the file, +i.e. the first page id in the name is the first page +id contained in the file, and the same for the last +page id. This uses the MediaWiki api as well as +the getlastidinbz2xml utility for which see below. + Utilities: checkforbz2footer - Tests to see if the bz2 file specified on the command line has a bz2 footer (if it does it is likely to be intact). Exits with 0 if found, 1 otherwise. + 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, @@ -25,6 +35,7 @@ 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 @@ -42,6 +53,10 @@ position:x pageid:nnn It exits with 0 on success, -1 on error. +getlastidinbz2xml - Given a bzipped xml content file and a page or rev id and the +type (either 'page' or 'rev'), return the last such id in the + xml file. + recompresszml - Reads an xml stream of pages and writes multiple bz2 compressed streams, concatenated, to stdout, with the specified number of pages per stream. The mediawiki site info header is in its -- To view, visit https://gerrit.wikimedia.org/r/338406 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4839c34b8e908c88de65cb0e883afd93aab5a152 Gerrit-PatchSet: 1 Gerrit-Project: operations/dumps/mwbzutils Gerrit-Branch: master Gerrit-Owner: ArielGlenn Gerrit-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, &pinfo, 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 docs/*.1.gz
[MediaWiki-commits] [Gerrit] operations...mwbzutils[master]: combine the getlastpageid and getlastrevid utils into one
ArielGlenn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/338403 ) Change subject: combine the getlastpageid and getlastrevid utils into one .. combine the getlastpageid and getlastrevid utils into one also update the check_bz2_range_py script to use this new util Change-Id: I6e079d6163a3b25d5ef3150b5aaab1fb0f31d9e7 --- M xmldumps-backup/mwbzutils/Makefile M xmldumps-backup/mwbzutils/check_bz2_pagerange.py A xmldumps-backup/mwbzutils/getlastidinbz2xml.c M xmldumps-backup/mwbzutils/mwbzutils.h 4 files changed, 317 insertions(+), 13 deletions(-) Approvals: ArielGlenn: Verified; Looks good to me, approved diff --git a/xmldumps-backup/mwbzutils/Makefile b/xmldumps-backup/mwbzutils/Makefile index cfe60ed..e07c1aa 100644 --- a/xmldumps-backup/mwbzutils/Makefile +++ b/xmldumps-backup/mwbzutils/Makefile @@ -25,7 +25,7 @@ build: checkforbz2footer dumpbz2filefromoffset \ dumplastbz2block findpageidinbz2xml \ recompressxml writeuptopageid compressedmanpages \ - getlastpageidinbz2xml getlastrevidinbz2xml + getlastpageidinbz2xml getlastidinbz2xml NAME_CHECKFORBZ2FOOTER = "Check if bzip2 file ends with bz2 magic footer" @@ -66,8 +66,8 @@ 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) +getlastidinbz2xml: $(OBJSBZ) mwbzlib.o getlastidinbz2xml.o + $(CC) $(LDFLAGS) -o getlastidinbz2xml getlastidinbz2xml.o $(OBJS) $(LIBS) recompressxml: $(OBJSBZ) recompressxml.o $(CC) $(LDFLAGS) -o recompressxml recompressxml.o $(LIBS) @@ -90,7 +90,7 @@ manpages: dumplastbz2block.1 findpageidinbz2xml.1 \ checkforbz2footer.1 dumpbz2filefromoffset.1 \ recompressxml.1 writeuptopageid.1 \ - getlastpageidinbz2xml.1 getlastrevidinbz2xml.1 + getlastpageidinbz2xml.1 getlastidinbz2xml.1 echo "Don't forget to commit your manpage changes to the repo" checkforbz2footer.1 : checkforbz2footer @@ -108,9 +108,9 @@ getlastpageidinbz2xml.1 : getlastpageidinbz2xml $(HELP2MAN) --section 1 --no-info --name $(NAME_GETLASTPAGEIDINBZ2XML) \ --no-discard-stderr ./getlastpageidinbz2xml > docs/getlastpageidinbz2xml.1 -getlastrevidinbz2xml.1 : getlastrevidinbz2xml +getlastidinbz2xml.1 : getlastidinbz2xml $(HELP2MAN) --section 1 --no-info --name $(NAME_GETLASTPAGEIDINBZ2XML) \ - --no-discard-stderr ./getlastrevidinbz2xml > docs/getlastrevidinbz2xml.1 + --no-discard-stderr ./getlastidinbz2xml > docs/getlastidinbz2xml.1 recompressxml.1 : recompressxml $(HELP2MAN) --section 1 --no-info --name $(NAME_RECOMPRESSXML) \ --no-discard-stderr ./recompressxml > docs/recompressxml.1 @@ -120,14 +120,14 @@ install: dumplastbz2block findpageidinbz2xml checkforbz2footer dumpbz2filefromoffset \ recompressxml writeuptopageid compressedmanpages getlastpageidinbz2xml \ - getlastrevidinbz2xml + 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 getlastrevidinbz2xml $(BINDIR) + install --mode=755 getlastidinbz2xml $(BINDIR) install --mode=755 recompressxml $(BINDIR) install --mode=755 writeuptopageid$(BINDIR) install --directory $(MANDIR) @@ -141,7 +141,7 @@ rm -f $(BINDIR)dumplastbz2block rm -f $(BINDIR)findpageidinbz2xml rm -f $(BINDIR)getlastpageidinbz2xml - rm -f $(BINDIR)getlastrevidinbz2xml + rm -f $(BINDIR)getlastidinbz2xml rm -f $(BINDIR)checkforbz2footer rm -f $(BINDIR)dumpbz2filefromoffset rm -f $(BINDIR)recompressxml @@ -153,7 +153,7 @@ clean: rm -f *.o *.a dumplastbz2block findpageidinbz2xml \ - getlastpageidinbz2xml getlastrevidinbz2xml \ + getlastpageidinbz2xml getlastidinbz2xml \ checkforbz2footer dumpbz2filefromoffset \ recompressxml writeuptopageid docs/*.1.gz diff --git a/xmldumps-backup/mwbzutils/check_bz2_pagerange.py b/xmldumps-backup/mwbzutils/check_bz2_pagerange.py index 426eaf9..7e36556 100644 --- a/xmldumps-backup/mwbzutils/check_bz2_pagerange.py +++ b/xmldumps-backup/mwbzutils/check_bz2_pagerange.py @@ -118,7 +118,7 @@ def get_last_revid_from_file(filename): # FIXME get thi
[MediaWiki-commits] [Gerrit] operations...mwbzutils[master]: script to check whether page range of bz2 checkpoint file is...
ArielGlenn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/338282 )
Change subject: script to check whether page range of bz2 checkpoint file is
correct
..
script to check whether page range of bz2 checkpoint file is correct
Checks the filename first and last pageid against the contents.
Change-Id: I8fb05f1632ddc0d87ed9fe39968eb55fcb4750f2
---
A xmldumps-backup/mwbzutils/check_bz2_pagerange.py
1 file changed, 226 insertions(+), 0 deletions(-)
Approvals:
ArielGlenn: Verified; Looks good to me, approved
diff --git a/xmldumps-backup/mwbzutils/check_bz2_pagerange.py
b/xmldumps-backup/mwbzutils/check_bz2_pagerange.py
new file mode 100644
index 000..426eaf9
--- /dev/null
+++ b/xmldumps-backup/mwbzutils/check_bz2_pagerange.py
@@ -0,0 +1,226 @@
+"""
+check that bz2 checkpoint content file has the pages
+in it that the filename says it does, by checking
+first and last pageid of actual content against
+those in the filename
+"""
+
+import os
+import sys
+import getopt
+import bz2
+from subprocess import Popen, PIPE
+import requests
+
+
+def usage(message=None):
+if message is not None:
+sys.stderr.write(message)
+sys.stderr.write("\n")
+usage_message = """
+Usage: check_bz2_pagerange.py --wiki --date [--renames]
+
+Arguments:
+--wiki(-w): name of wiki as it appears in dblists
+--date(-d): date of dump run in MMDD format
+--renames (-r): instead of regular output, generate commands for renames of
bad files
+
+Example:
+ python check_bz2_pagerange.py -w enwiki -d 20170201
+"""
+sys.stderr.write(usage_message)
+sys.exit(1)
+
+
+def get_pageid_from_filename(path, which):
+basename = os.path.basename(path)
+
+# enwiki-20170201-pages-meta-history9.xml-p001888020p001938728.bz2
+pages = basename.split('-')[5]
+# p001888020p001938728.bz2
+last = pages.split('p')[which]
+# 001938728.bz2
+return last.split('.')[0].lstrip('0')
+
+
+def get_last_pageid_from_name(name):
+return get_pageid_from_filename(name, 2)
+
+
+def get_first_pageid_from_name(name):
+return get_pageid_from_filename(name, 1)
+
+
+def get_basename(path):
+filename = os.path.basename(path)
+# enwiki-20170201-pages-meta-history9.xml-p001888020p001938728.bz2
+fields = filename.split('-')
+return '-'.join(fields[0:5])
+
+
+def get_ext(path):
+#
/blah/.../enwiki-20170201-pages-meta-history9.xml-p001888020p001938728.bz2
+return path.split('.')[-1]
+
+
+def assemble_name(basename, first_id, last_id, ext):
+# enwiki-20170201-pages-meta-history9.xml-p001888020p001938728.bz2
+return (basename + "-p{first}p{last}." + ext).format(first=first_id,
last=last_id)
+
+
+def get_args():
+wikiname = None
+date = None
+renames = False
+
+try:
+(options, remainder) = getopt.gnu_getopt(
+sys.argv[1:], "w:d:rh",
+["wiki=", "date=", "renames", "help"])
+
+except getopt.GetoptError as err:
+usage("Unknown option specified: " + str(err))
+
+for (opt, val) in options:
+if opt in ["-w", "--wiki"]:
+wikiname = val
+elif opt in ["-d", "--date"]:
+date = val
+elif opt in ["-r", "--renames"]:
+renames = True
+elif opt in ["-h", "--help"]:
+usage('Help for this script\n')
+else:
+usage("Unknown option specified: <%s>" % opt)
+
+if remainder:
+usage("Unknown option specified: <%s>" % remainder[0])
+
+if not wikiname or not date:
+usage("One of the mandatory arguments 'wikiname' or 'date' was not
specified")
+if not date.isdigit() and len(date) != 8:
+usage("Date argument must be of the form MMDD")
+
+return wikiname, date, renames
+
+
+def get_dumpdir(wikiname, date):
+# FIXME get this from config file
+return os.path.join("/mnt/data/xmldatadumps/public", wikiname, date)
+
+
+def get_bz2_content_files(wikiname, date):
+dumpdir = get_dumpdir(wikiname, date)
+files = os.listdir(dumpdir)
+return [os.path.join(dumpdir, filename) for filename in files if
filename.endswith('.bz2')
+and 'meta-history' in filename]
+
+
+def get_last_revid_from_file(filename):
+# FIXME get this from config file too
+command = ["/usr/local/bin/getlastrevidinbz2xml", "-f", filename]
+proc = Popen(command, stdout=PIPE, stderr=PIPE)
+output, error = proc.communicate()
+if proc.returncode:
+sys.stderr.write("failed to get revid from filename %s\n" % filename)
+if error:
+sys.stderr.write(error)
+return None
+else:
+if not output.startswith("rev_id:"):
+# bad output line, who knows
+sys.stderr.write("failed to get revid from filename, got %s\n" %
output)
+return None
+return output.strip().split(':')[1]
+
+
+def get_content(url):
+headers =
[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: ArielGlenn Gerrit-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: ArielGlenn Gerrit-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, &bfile);
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(&compiled_siteinfo, siteinfo, REG_EXTENDED);
@@ -186,6 +187,7 @@
int firstpage = 1;
bfile.initialized = 0;
+ bfile.marker = NULL;
res = regcomp(&compiled_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, &bfile);
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(&compiled_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(&compiled_page, page, REG_EXTENDED);
res = regcomp(&compiled_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, &bfile);
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? */
-
[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
[MediaWiki-commits] [Gerrit] operations...mwbzutils[master]: little tool that displays the last page id in bz2 xml conten...
ArielGlenn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/337341 )
Change subject: little tool that displays the last page id in bz2 xml content
file
..
little tool that displays the last page id in bz2 xml content file
Change-Id: I2688e461dec59d6d742de93da317c0c80c4d90e4
---
M xmldumps-backup/mwbzutils/Makefile
A xmldumps-backup/mwbzutils/getlastpageidinbz2xml.c
M xmldumps-backup/mwbzutils/mwbzlib.c
3 files changed, 321 insertions(+), 12 deletions(-)
Approvals:
ArielGlenn: Verified; Looks good to me, approved
diff --git a/xmldumps-backup/mwbzutils/Makefile
b/xmldumps-backup/mwbzutils/Makefile
index b67f09c..5106c4e 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)\"
@@ -24,12 +24,15 @@
build: checkforbz2footer dumpbz2filefromoffset \
dumplastbz2block findpageidinbz2xml \
- recompressxml writeuptopageid compressedmanpages
+ recompressxml writeuptopageid compressedmanpages \
+ getlastpageidinbz2xml
+
NAME_CHECKFORBZ2FOOTER = "Check if bzip2 file ends with bz2 magic footer"
NAME_DUMPBZ2FILEFROMOFFSET = "Write MediaWiki XML pages from bzip2 file
starting from offset"
NAME_DUMPLASTBZ2BLOCK= "Find last bz2 block in bzip2 file and dump
contents"
NAME_FINDPAGEIDINBZ2XML = "Display offset of bz2 block for given page id
in bzip2 MediaWiki XML file"
+NAME_FINDLASTPAGEIDINBZ2XML = "Display last page id bzip2 MediaWiki XML file"
NAME_RECOMPRESSXML = "Bz2 compress MediaWiki XML input in batches of
pages"
NAME_WRITEUPTOPAGEID = "Write range of page content from MediaWiki XML
input"
@@ -59,6 +62,9 @@
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)
recompressxml: $(OBJSBZ) recompressxml.o
$(CC) $(LDFLAGS) -o recompressxml recompressxml.o $(LIBS)
@@ -95,6 +101,9 @@
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
recompressxml.1 : recompressxml
$(HELP2MAN) --section 1 --no-info --name $(NAME_RECOMPRESSXML) \
--no-discard-stderr ./recompressxml > docs/recompressxml.1
@@ -103,12 +112,13 @@
--no-discard-stderr ./writeuptopageid > docs/writeuptopageid.1
install: dumplastbz2block findpageidinbz2xml checkforbz2footer
dumpbz2filefromoffset \
- recompressxml writeuptopageid compressedmanpages
+ 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)
@@ -121,6 +131,7 @@
uninstall:
rm -f $(BINDIR)dumplastbz2block
rm -f $(BINDIR)findpageidinbz2xml
+ rm -f $(BINDIR)getlastpageidinbz2xml
rm -f $(BINDIR)checkforbz2footer
rm -f $(BINDIR)dumpbz2filefromoffset
rm -f $(BINDIR)recompressxml
@@ -132,6 +143,7 @@
clean:
rm -f *.o *.a dumplastbz2block findpageidinbz2xml \
+ getlastpageidinbz2xml \
checkforbz2footer dumpbz2filefromoffset \
recompressxml writeuptopageid docs/*.1.gz
diff --git a/xmldumps-backup/mwbzutils/getlastpageidinbz2xml.c
b/xmldumps-backup/mwbzutils/getlastpageidinbz2xml.c
new file mode 100644
index 000..89ef61d
--- /dev/null
+++ b/xmldumps-backup/mwbzutils/getlastpageidinbz2xml.c
@@ -0,0 +1,296 @@
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include "mwbzutils.h"
+
+void usage(char *message) {
+ char *
