Page MenuHomePhabricator
Create Task
Maniphest T231178

General cleanup of initialize settings
Closed, ResolvedPublic
Actions

Description

As a follow up to T231040: Clean up `wgRateLimits` to remove unneeded entries, T231041: Clean up `groupOverrides` to remove unneeded entries, and T230797: Clean up `wgNamespacesToBeSearchedDefault` to remove unneeded entries, there is some more general cleanup that can be done. Rather than doing this piecemeal, I've uploaded a patch that should cover most of it.

Details

SubjectRepoBranchLines +/-
More cleanup of InitialiseSettings.phpoperations/mediawiki-configmaster+15 -17
InitialiseSettings - clean up groupOverrides layout / spacingoperations/mediawiki-configmaster+474 -109
InitialiseSettings - clean up groupOverrides layout / spacingoperations/mediawiki-configmaster+166 -42
Remove `wgImportSources` settings for closed wikisoperations/mediawiki-configmaster+0 -9
Partial cleanup of InitializeSettingsoperations/mediawiki-configmaster+17 -29
Partial cleanup of InitialiseSettingsoperations/mediawiki-configmaster+0 -12
Partial cleanup of InitialiseSettingsoperations/mediawiki-configmaster+59 -109
General cleanup of initialize settingsoperations/mediawiki-configmaster+1 K -1 K
Customize query in gerrit

Related Objects

Event Timeline

DannyS712 created this task.Aug 25 2019, 10:10 PM
Restricted Application added a subscriber: Aklapper. · View Herald TranscriptAug 25 2019, 10:10 PM
DannyS712 updated the task description. (Show Details)Aug 25 2019, 10:10 PM
gerritbot added a comment.Aug 25 2019, 10:11 PM

Change 532280 had a related patch set uploaded (by DannyS712; owner: DannyS712):
[operations/mediawiki-config@master] General cleanup of initialise settings

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

gerritbot added a project: Patch-For-Review.Aug 25 2019, 10:11 PM
DannyS712 updated the task description. (Show Details)Aug 26 2019, 1:36 AM
DannyS712 updated the task description. (Show Details)
DannyS712 moved this task from Unsorted to Awaiting review and deployment on the User-DannyS712 board.Aug 26 2019, 4:14 AM
DannyS712 added a project: User-Urbanecm.
DannyS712 moved this task from Backlog to To deploy on the User-Urbanecm board.
gerritbot added a comment.Sep 2 2019, 6:54 AM

Change 532280 abandoned by DannyS712:
General cleanup of initialize settings

Reason:
Fails to merge cleanly with recent changes, will try again later with smaller-scale patches to speed up deployment and reduce the odds of this happening again

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

DannyS712 moved this task from To deploy to Blocked on others on the User-Urbanecm board.Sep 2 2019, 6:55 AM
DannyS712 moved this task from Awaiting review and deployment to Next on the User-DannyS712 board.
Urbanecm subscribed.Sep 2 2019, 6:56 AM

Thanks Danny. Frel free to move it back once there's something actionable for me (review or deployment, or both :)).

Maintenance_bot removed a project: Patch-For-Review.Sep 2 2019, 7:10 AM
DannyS712 added a comment.Sep 2 2019, 7:59 AM
In T231178#5457818, @Urbanecm wrote:

Thanks Danny. Frel free to move it back once there's something actionable for me (review or deployment, or both :)).

Thanks. Other than Krinkle's comment, which I resolved, was there any other issue you noticed with the final proposal in PS11? The reason I abandoned this was that too many other things were merged in the meanwhile. In theory, this patch should be uncontroversial, since it doesn't change the result of the code.

Dcljr subscribed.Sep 2 2019, 9:29 AM

For what it's worth (which may well be nothing), I think changes such as replacing:

'+brwiki' => [
	'Discussion_Wikipedia' => NS_PROJECT_TALK,
],

with:

'+brwiki' => [ 'Discussion_Wikipedia' => NS_PROJECT_TALK, ],

actually make the file harder to use, since the latter formatting would have to be changed back to the former to add more entries/settings for the same wiki. (In this case, this is under 'wgNamespaceAliases', but the same goes for 'wgExtraNamespaces' and other places in the file.)

This also adversely affects readability (IMO), since most of the wikis do have multiple entries/settings (sorry, I don't know the proper terminology) for those variables, and only a few have a single one.

I would recommend not making this kind of change unless the vast majority (if not all) of the entries can use the single-line format (such the changes made to 'wgProofreadPageNamespaceIds').

DannyS712 added a comment.Sep 2 2019, 9:33 AM
In T231178#5458279, @Dcljr wrote:

For what it's worth (which may well be nothing), I think changes such as replacing:

'+brwiki' => [
	'Discussion_Wikipedia' => NS_PROJECT_TALK,
],

with:

'+brwiki' => [ 'Discussion_Wikipedia' => NS_PROJECT_TALK, ],

actually make the file harder to use, since the latter formatting would have to be changed back to the former to add more entries/settings for the same wiki. (In this case, this is under 'wgNamespaceAliases', but the same goes for 'wgExtraNamespaces' and other places in the file.)

This also adversely affects readability (IMO), since most of the wikis do have multiple entries/settings (sorry, I don't know the proper terminology) for those variables, and only a few have a single one.

I would recommend not making this kind of change unless the vast majority (if not all) of the entries can use the single-line format (such the changes made to 'wgProofreadPageNamespaceIds').

Sure, that makes sense. My rule of thumb is that if an array has 1 or 2 entries, it can be on 1 line, and if it has more than 3, it should be split (if it has 3, ignore it) but I can see where that wouldn't be everyone's views. What about in the group overrides, where many entries are 1 line?

Dcljr added a comment.Sep 2 2019, 9:57 AM
In T231178#5458296, @DannyS712 wrote:

What about in the group overrides, where many entries are 1 line?

Uhh… I don't know. [grin]

Obviously, the views of those who work on the file regularly are more salient, but my idea is if the settings in a variable are "relatively likely" to be added to in the future (as with NSs and NS aliases), the entries should probably be kept in a multiple-line format to aid with those later additions (similarly to how the final entry in an array typically ends with a comma even though it doesn't need to).

Urbanecm triaged this task as Lowest priority.Sep 3 2019, 9:31 AM

The discussion is worth future, I guess. I wonder what to do if I want add an entry to that currently oneline definitions. To solve that, I would like to propose "preferred is multiline, oneline is permitted for entries that are highly unlikely to change". That way, we'll deal with possible future aditions easily, but autopatrolled groups would be more readable, I guess.

Urbanecm removed a project: User-Urbanecm.Sep 14 2019, 3:13 PM
Dcljr added a comment.Sep 17 2019, 3:59 AM

Uh… so now there are no per-wiki settings in InitialiseSettings.php at all! What is going on? (T233069)

Urbanecm added a comment.Sep 17 2019, 4:41 AM

Apparently planned cleanup,, see T223602.

gerritbot added a comment.Oct 17 2019, 9:04 PM

Change 544001 had a related patch set uploaded (by DannyS712; owner: DannyS712):
[operations/mediawiki-config@master] Partial cleanup of InitialiseSettings

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

gerritbot added a project: Patch-For-Review.Oct 17 2019, 9:04 PM
DannyS712 added a comment.Oct 18 2019, 9:36 PM

@Urbanecm can you take a look at the latest patch? Its smaller in scope, and should be easier to review

gerritbot added a comment.Oct 21 2019, 11:59 AM

Change 544001 merged by jenkins-bot:
[operations/mediawiki-config@master] Partial cleanup of InitialiseSettings

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

Stashbot added a comment.Oct 21 2019, 12:01 PM

Mentioned in SAL (#wikimedia-operations) [2019-10-21T12:01:55Z] <urbanecm@deploy1001> Synchronized wmf-config/InitialiseSettings.php: SWAT: e8d70c1: Partial cleanup of InitialiseSettings (T231178) (duration: 01m 00s)

Maintenance_bot removed a project: Patch-For-Review.Oct 21 2019, 12:12 PM
gerritbot added a comment.Oct 21 2019, 5:01 PM

Change 544982 had a related patch set uploaded (by DannyS712; owner: DannyS712):
[operations/mediawiki-config@master] Partial cleanup of InitialiseSettings

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

gerritbot added a project: Patch-For-Review.Oct 21 2019, 5:01 PM
DannyS712 moved this task from Next to Awaiting review and deployment on the User-DannyS712 board.Oct 21 2019, 5:04 PM
gerritbot added a comment.Oct 27 2019, 7:50 PM

Change 544982 abandoned by DannyS712:
Partial cleanup of InitialiseSettings

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

gerritbot added a comment.Oct 27 2019, 7:50 PM

Change 546369 had a related patch set uploaded (by DannyS712; owner: DannyS712):
[operations/mediawiki-config@master] Partial cleanup of InitializeSettings

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

DannyS712 added a comment.Nov 12 2019, 11:26 AM

@Urbanecm can you take a look? Its smaller in scope and should be easier to review - this patch is mostly just formatting.

Kizule moved this task from Backlog to To deploy on the Wikimedia-Site-requests board.Nov 19 2019, 2:21 AM
gerritbot added a comment.Nov 20 2019, 11:44 AM

Change 546369 merged by jenkins-bot:
[operations/mediawiki-config@master] Partial cleanup of InitializeSettings

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

Stashbot added a comment.Nov 20 2019, 11:46 AM

Mentioned in SAL (#wikimedia-operations) [2019-11-20T11:46:15Z] <urbanecm@deploy1001> Synchronized wmf-config/InitialiseSettings.php: SWAT: 51ecd71: Partial cleanup of InitializeSettings (T231178) (duration: 00m 52s)

Urbanecm moved this task from To deploy to Working on on the Wikimedia-Site-requests board.Nov 20 2019, 11:47 AM
Maintenance_bot removed a project: Patch-For-Review.Nov 20 2019, 12:12 PM
DannyS712 moved this task from Awaiting review and deployment to In progress on the User-DannyS712 board.Nov 20 2019, 6:49 PM
gerritbot added a comment.Nov 21 2019, 11:47 PM

Change 552361 had a related patch set uploaded (by DannyS712; owner: DannyS712):
[operations/mediawiki-config@master] Remove wgImportSources settings for closed wikis

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

gerritbot added a project: Patch-For-Review.Nov 21 2019, 11:47 PM
DannyS712 moved this task from In progress to Awaiting review and deployment on the User-DannyS712 board.Nov 27 2019, 8:46 AM
gerritbot added a comment.Dec 3 2019, 10:34 PM

Change 552361 merged by jenkins-bot:
[operations/mediawiki-config@master] Remove wgImportSources settings for closed wikis

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

Stashbot added a comment.Dec 3 2019, 10:36 PM

Mentioned in SAL (#wikimedia-operations) [2019-12-03T22:36:33Z] <jforrester@deploy1001> Synchronized wmf-config/InitialiseSettings.php: Remove settings for closed wikis T231178 (duration: 01m 01s)

Maintenance_bot removed a project: Patch-For-Review.Dec 3 2019, 11:10 PM
DannyS712 added a project: Patch-For-Review.Dec 4 2019, 11:46 PM

https://gerrit.wikimedia.org/r/#/c/operations/mediawiki-config/+/554392/ is part of this

gerritbot added a comment.Jan 7 2020, 1:04 AM

Change 554392 merged by jenkins-bot:
[operations/mediawiki-config@master] InitialiseSettings - clean up groupOverrides layout / spacing

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

gerritbot added a comment.Mar 23 2020, 5:57 PM

Change 582859 had a related patch set uploaded (by DannyS712; owner: DannyS712):
[operations/mediawiki-config@master] InitialiseSettings - clean up groupOverrides layout / spacing

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

gerritbot added a comment.Mar 23 2020, 6:36 PM

Change 582859 merged by jenkins-bot:
[operations/mediawiki-config@master] InitialiseSettings - clean up groupOverrides layout / spacing

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

Stashbot added a comment.Mar 23 2020, 6:39 PM

Mentioned in SAL (#wikimedia-operations) [2020-03-23T18:39:12Z] <urbanecm@deploy1001> Synchronized wmf-config/InitialiseSettings.php: SWAT: 0e535b1: InitialiseSettings - clean up groupOverrides layout / spacing (T231178) (duration: 01m 00s)

Stashbot added a comment.Mar 23 2020, 6:41 PM

Mentioned in SAL (#wikimedia-operations) [2020-03-23T18:41:37Z] <urbanecm@deploy1001> Synchronized wmf-config/InitialiseSettings.php: SWAT: 0e535b1: InitialiseSettings - clean up groupOverrides layout / spacing (T231178; take II) (duration: 00m 59s)

gerritbot added a comment.Mar 23 2020, 6:52 PM

Change 582879 had a related patch set uploaded (by DannyS712; owner: DannyS712):
[operations/mediawiki-config@master] More cleanup of InitialiseSettings.php

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

gerritbot added a comment.Aug 20 2020, 1:21 AM

Change 582879 abandoned by DannyS712:
[operations/mediawiki-config@master] More cleanup of InitialiseSettings.php

Reason:

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

DannyS712 closed this task as Resolved.Aug 20 2020, 1:21 AM

Going to call this done

Content licensed under Creative Commons Attribution-ShareAlike (CC BY-SA) 4.0 unless otherwise noted; code licensed under GNU General Public License (GPL) 2.0 or later and other open source licenses. By using this site, you agree to the Terms of Use, Privacy Policy, and Code of Conduct. · Wikimedia Foundation · Privacy Policy · Code of Conduct · Terms of Use · Disclaimer · CC-BY-SA · GPL · Credits