| Index: trunk/tools/make-wmf-branch/default.conf |
| — | — | @@ -18,7 +18,6 @@ |
| 19 | 19 | 'cldr', |
| 20 | 20 | 'ClickTracking', |
| 21 | 21 | 'ClientSide', |
| 22 | | - 'CodeReview', |
| 23 | 22 | 'Collection', |
| 24 | 23 | 'CommunityApplications', |
| 25 | 24 | 'CommunityHiring', |
| — | — | @@ -37,7 +36,7 @@ |
| 38 | 37 | 'ExpandTemplates', |
| 39 | 38 | 'ExtensionDistributor', |
| 40 | 39 | 'FlaggedRevs', |
| 41 | | - 'FormPreloadPostCache', |
| | 40 | + 'FormPreloadPostCache', // Foundation wiki |
| 42 | 41 | 'Gadgets', |
| 43 | 42 | 'GlobalBlocking', |
| 44 | 43 | 'GlobalUsage', |
| — | — | @@ -46,12 +45,10 @@ |
| 47 | 46 | 'InputBox', |
| 48 | 47 | 'intersection', |
| 49 | 48 | 'LabeledSectionTransclusion', |
| | 49 | + 'LiquidThreads', |
| 50 | 50 | 'LocalisationUpdate', |
| 51 | 51 | 'MWSearch', |
| 52 | 52 | 'Math', |
| 53 | | - 'MobileFrontend', |
| 54 | | - 'Moodbar', |
| 55 | | - 'Narayam', |
| 56 | 53 | 'NewUserMessage', |
| 57 | 54 | 'normal', |
| 58 | 55 | 'Nuke', |
| — | — | @@ -72,12 +69,12 @@ |
| 73 | 70 | 'Renameuser', |
| 74 | 71 | 'RSS', |
| 75 | 72 | 'ScanSet', |
| 76 | | - 'SecurePoll', |
| | 73 | + 'SecurePoll', // Maybe move to specials? |
| 77 | 74 | 'SimpleAntiSpam', |
| 78 | 75 | 'SimpleSurvey', |
| 79 | 76 | 'SiteMatrix', |
| 80 | | - 'SkinPerPage', |
| 81 | | - 'skins', |
| | 77 | + 'SkinPerPage', // Foundation wiki |
| | 78 | + 'skins', // Foundation wiki |
| 82 | 79 | 'SlippyMap', |
| 83 | 80 | 'SpamBlacklist', |
| 84 | 81 | 'StrategyWiki', |
| — | — | @@ -92,7 +89,6 @@ |
| 93 | 90 | 'TrustedXFF', |
| 94 | 91 | 'UnicodeConverter', |
| 95 | 92 | 'UploadBlacklist', |
| 96 | | - 'UploadWizard', |
| 97 | 93 | 'UserDailyContribs', |
| 98 | 94 | 'UserThrottle', |
| 99 | 95 | 'Vector', |
| — | — | @@ -100,20 +96,30 @@ |
| 101 | 97 | 'wikidiff2', |
| 102 | 98 | 'wikihiero', |
| 103 | 99 | 'WikiEditor', |
| 104 | | - 'WikiLove', |
| 105 | | - 'WikimediaIncubator', |
| 106 | 100 | 'WikimediaMessages', |
| 107 | 101 | ); |
| 108 | 102 | |
| | 103 | +# Extensions that are updated to trunk in deployment, so we want to keep that version |
| | 104 | +# into the new branch |
| 109 | 105 | $specialExtensions = array( |
| 110 | | - 'LiquidThreads' => '^/branches/wmf/1.16wmf4/extensions/LiquidThreads', |
| 111 | | - 'CentralNotice' => '^/branches/wmf/1.16wmf4/extensions/CentralNotice', |
| 112 | | - 'ContributionReporting' => '^/branches/wmf/1.16wmf4/extensions/ContributionReporting', |
| 113 | | - 'ContributionTracking' => '^/branches/wmf/1.16wmf4/extensions/ContributionTracking', |
| 114 | | - 'DonationInterface' => '^/branches/wmf/1.16wmf4/extensions/DonationInterface', |
| 115 | | - 'FundraiserPortal' => '^/branches/wmf/1.16wmf4/extensions/FundraiserPortal', |
| 116 | | - 'LandingCheck' => '^/branches/wmf/1.16wmf4/extensions/LandingCheck', |
| 117 | | - 'VariablePage' => '^/branches/wmf/1.16wmf4/extensions/VariablePage', |
| | 106 | + |
| | 107 | + // Fundraising |
| | 108 | + 'CentralNotice' => '^/branches/wmf/1.17wmf1/extensions/CentralNotice', // Updated in 1.17wmf1 |
| | 109 | + 'ContributionReporting' => '^/branches/wmf/1.17wmf1/extensions/ContributionReporting', // NOT updated in 1.17wmf1 |
| | 110 | + 'ContributionTracking' => '^/branches/wmf/1.17wmf1/extensions/ContributionTracking', // Updated in 1.17wmf1 |
| | 111 | + 'DonationInterface' => '^/branches/wmf/1.17wmf1/extensions/DonationInterface', // NOT updated in 1.17wmf1 |
| | 112 | + 'FundraiserPortal' => '^/branches/wmf/1.17wmf1/extensions/FundraiserPortal', // NOT updated in 1.17wmf1 |
| | 113 | + 'LandingCheck' => '^/branches/wmf/1.17wmf1/extensions/LandingCheck', // Updated in 1.17wmf1 |
| | 114 | + 'VariablePage' => '^/branches/wmf/1.17wmf1/extensions/VariablePage', // NOT updated in 1.17wmf1 |
| | 115 | + |
| | 116 | + 'CodeReview' => '^/branches/wmf/1.17wmf1/extensions/CodeReview', |
| | 117 | + 'MobileFrontend' => '^/branches/wmf/1.17wmf1/extensions/MobileFrontend', |
| | 118 | + 'MoodBar' => '^/branches/wmf/1.17wmf1/extensions/MoodBar', |
| | 119 | + 'Narayam' => '^/branches/wmf/1.17wmf1/extensions/Narayam', |
| | 120 | + 'TitleBlacklist' => '^/branches/wmf/1.17wmf1/extensions/TitleBlacklist', |
| | 121 | + 'UploadWizard' => '^/branches/wmf/1.17wmf1/extensions/UploadWizard', |
| | 122 | + 'WikiLove' => '^/branches/wmf/1.17wmf1/extensions/WikiLove', |
| | 123 | + 'WikimediaIncubator' => '^/branches/wmf/1.17wmf1/extensions/WikimediaIncubator', |
| 118 | 124 | ); |
| 119 | 125 | |
| 120 | 126 | $preservedItems = array( |
| — | — | @@ -134,23 +140,16 @@ |
| 135 | 141 | $destBaseUrl = 'svn+ssh://svn.wikimedia.org/svnroot/mediawiki/branches/wmf'; |
| 136 | 142 | $mainSourceUrl = '^/branches/REL1_17'; |
| 137 | 143 | $patches = array( |
| 138 | | - # Needs conflict resolution |
| 139 | | - # array( 'rev' => 56394, 'base' => '^/branches/wmf/1.16wmf3' ), |
| 140 | | - |
| | 144 | + // NOTE: r81460 is a big rev |
| 141 | 145 | // memcached->APC in LanguageConverter. TODO: Ask Tim if this is needed |
| 142 | | - array( 'rev' => 60970, 'base' => '^/branches/wmf/1.16wmf3' ), |
| | 146 | + array( 'rev' => 81460, 'base' => '^/branches/wmf/1.17wmf1' ), |
| 143 | 147 | |
| 144 | | - // Suppress logging DB reconnections if more than 5 mins have elapsed |
| 145 | | - array( 'rev' => 67177, 'base' => '^/branches/wmf/1.16wmf4' ), |
| 146 | | - |
| 147 | 148 | // Reduce cache size for RepoGroup cache |
| 148 | | - array( 'rev' => 69199, 'base' => '^/branches/wmf/1.16wmf4' ), |
| | 149 | + array( 'rev' => 81460, 'base' => '^/branches/wmf/1.17wmf1' ), |
| 149 | 150 | |
| | 151 | + // Is this still needed? |
| 150 | 152 | // Protect against fatals in Profiler.php |
| 151 | 153 | array( 'rev' => 76243, 'base' => '^/branches/wmf/1.16wmf4' ), |
| 152 | | - |
| 153 | | - // thumb.php hack for thumbs of temp files |
| 154 | | - array( 'rev' => 77266, 'base' => '^/branches/wmf/1.16wmf4' ), |
| 155 | 154 | ); |
| 156 | 155 | |
| 157 | 156 | $dryRun = false; |