Florianschmidtwelzow has uploaded a new change for review.

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

Change subject: Don't generate a log for extensions where the old branch is 
preserved
......................................................................

Don't generate a log for extensions where the old branch is preserved

It doesn't make sense to generate a log of them, they don't have a previous
branch.

Change-Id: I234b45c36b83b33b006e7c13cfe3f4d639417649
---
M make-deploy-notes/make-deploy-notes
1 file changed, 18 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/release 
refs/changes/13/231313/1

diff --git a/make-deploy-notes/make-deploy-notes 
b/make-deploy-notes/make-deploy-notes
index 0952c83..cb9b5c1 100755
--- a/make-deploy-notes/make-deploy-notes
+++ b/make-deploy-notes/make-deploy-notes
@@ -231,12 +231,16 @@
  * @param string $oldbranch
  * @param string $newbranch
  * @param string $type
+ * @param array $disabledExtension
  * @return string
  */
-function get_all_submodule_change_markup( $oldbranch, $newbranch, $type ) {
+function get_all_submodule_change_markup( $oldbranch, $newbranch, $type, 
$disabledExtension = array() ) {
        $retval = '';
        $extrecords = get_submodule_versions( $oldbranch, $newbranch, $type );
        foreach ( $extrecords as $extrecord ) {
+               if ( in_array( $extrecord['name'], $disabledExtension ) ) {
+                       continue;
+               }
                if( !array_key_exists( 'oldrev', $extrecord ) ) {
                        $printType = $type === 'extensions' ? 'extension' : 
'skin';
                        $retval .= get_change_log( $extrecord['name'], "* Newly 
deployed $printType\n" );
@@ -265,6 +269,7 @@
        return '=== ' . $name . " ===\n" . $changes;
 }
 
+
 /**
  * Main program flow
  * Get changes for core (git_cherry_log_output_core + filter_git_output)
@@ -275,6 +280,17 @@
  * @param array $argv
  */
 function main( $argv ) {
+       $disabledExtensions = array();
+       if ( file_exists( __DIR__ . '/../make-wmf-branch/config.json' ) ) {
+               $extensionLists = json_decode(
+                       file_get_contents( __DIR__ . 
'/../make-wmf-branch/config.json' ),
+                       true
+               );
+               if ( isset( $extensionLists['special_extensions'] ) ) {
+                       $disabledExtensions = array_keys( 
$extensionLists['special_extensions'] );
+               }
+       }
+
        list( $oldbranch, $newbranch ) = get_args( $argv );
        print "== Core changes ==\n";
        print filter_git_output( useful_git_log( $oldbranch, $newbranch ) );
@@ -285,7 +301,7 @@
        print filter_git_output( useful_git_log( $vendorVer['oldrev'], 
$vendorVer['newrev'], null, 'vendor' ) );
 
        print "== Extensions ==\n";
-       print get_all_submodule_change_markup( $oldbranch, $newbranch, 
'extensions' );
+       print get_all_submodule_change_markup( $oldbranch, $newbranch, 
'extensions', $disabledExtensions );
 
        print "== Skins ==\n";
        print get_all_submodule_change_markup( $oldbranch, $newbranch, 'skins' 
);

-- 
To view, visit https://gerrit.wikimedia.org/r/231313
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I234b45c36b83b33b006e7c13cfe3f4d639417649
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to