| Index: trunk/tools/make-wmf-branch/make-wmf-branch |
| — | — | @@ -22,6 +22,7 @@ |
| 23 | 23 | var $newVersion, $oldVersion, $codeDir, $buildDir; |
| 24 | 24 | var $normalExtensions, $specialExtensions, $patches, $preservedItems; |
| 25 | 25 | var $destBaseUrl, $mainSourceUrl; |
| | 26 | + var $unwantedExternals; |
| 26 | 27 | |
| 27 | 28 | function __construct( $newVersion, $oldVersion ) { |
| 28 | 29 | $this->newVersion = $newVersion; |
| — | — | @@ -38,6 +39,7 @@ |
| 39 | 40 | $this->buildDir = $buildDir; |
| 40 | 41 | $this->normalExtensions = $normalExtensions; |
| 41 | 42 | $this->specialExtensions = $specialExtensions; |
| | 43 | + $this->unwantedExternals = $unwantedExternals; |
| 42 | 44 | $this->patches = $patches; |
| 43 | 45 | $this->preservedItems = $preservedItems; |
| 44 | 46 | $this->destBaseUrl = $destBaseUrl; |
| — | — | @@ -131,9 +133,14 @@ |
| 132 | 134 | |
| 133 | 135 | # Apply patches |
| 134 | 136 | foreach ( $this->patches as $patch ) { |
| 135 | | - $this->runCmd( 'svn', 'merge', '-c', $patch['rev'], $patch['base'], $destRel ); |
| | 137 | + $this->runCmd( 'svn', 'merge', '-q', '-c', $patch['rev'], $patch['base'], $destRel ); |
| 136 | 138 | } |
| 137 | 139 | |
| | 140 | + # Remove unwanted externals |
| | 141 | + foreach ( $this->unwantedExternals as $external ) { |
| | 142 | + $this->runCmd( 'svn', 'propdel', '-q', 'svn:externals', "$destRel/$external" ); |
| | 143 | + } |
| | 144 | + |
| 138 | 145 | # Do the final commit |
| 139 | 146 | $this->runWriteCmd( 'svn', 'ci', '-q', '-m', |
| 140 | 147 | 'Applied local patches for new WMF branch' ); |
| Index: trunk/tools/make-wmf-branch/default.conf |
| — | — | @@ -88,7 +88,6 @@ |
| 89 | 89 | 'TrustedXFF', |
| 90 | 90 | 'UnicodeConverter', |
| 91 | 91 | 'UploadBlacklist', |
| 92 | | - 'UsabilityInitiative', |
| 93 | 92 | 'wikidiff', |
| 94 | 93 | 'wikidiff2', |
| 95 | 94 | 'wikihiero', |
| — | — | @@ -100,6 +99,7 @@ |
| 101 | 100 | 'LiquidThreads' => '^/branches/wmf/1.16wmf3/extensions/LiquidThreads', |
| 102 | 101 | 'FlaggedRevs_alpha' => '^/branches/wmf/1.16wmf3/extensions/FlaggedRevs_alpha', |
| 103 | 102 | 'FlaggedRevs' => '^/branches/wmf/1.16wmf3/extensions/FlaggedRevs', |
| | 103 | + 'UsabilityInitiative' => '^/branches/1.16wmf3/extensions/UsabilityInitiative', |
| 104 | 104 | ); |
| 105 | 105 | |
| 106 | 106 | $preservedItems = array( |
| — | — | @@ -108,11 +108,16 @@ |
| 109 | 109 | 'maintenance/jobs-loop.sh', |
| 110 | 110 | 'maintenance/storage/recompressTracked.sh', |
| 111 | 111 | 'maintenance/storage/testRctComplete.php', |
| | 112 | + 'maintenance/storage/make-all-blobs', |
| 112 | 113 | |
| 113 | 114 | # Not needed because we copy from 1.16wmf3 for now |
| 114 | 115 | #'extensions/FlaggedRevs/maintenance/wikimedia-periodic-update.sh', |
| 115 | 116 | ); |
| 116 | 117 | |
| | 118 | +$unwantedExternals = array( |
| | 119 | + 'extensions/SyntaxHighlight_GeSHi', |
| | 120 | +); |
| | 121 | + |
| 117 | 122 | $destBaseUrl = 'svn+ssh://svn.wikimedia.org/svnroot/mediawiki/branches/wmf'; |
| 118 | 123 | $mainSourceUrl = '^/trunk'; |
| 119 | 124 | $patches = array( |