[MediaWiki-commits] [Gerrit] mediawiki...release[master]: make-wmf-branch: Remove patching support

2018-01-12 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/403154 )

Change subject: make-wmf-branch: Remove patching support
..


make-wmf-branch: Remove patching support

Patching is a post-branching activity. Plus this feature
encourages poor master/release behaviors.

Change-Id: I50dfea77ce86cea4550e7e4fcce39e9cc95bfda1
---
M make-wmf-branch/MakeWmfBranch.php
M make-wmf-branch/default.conf
2 files changed, 1 insertion(+), 18 deletions(-)

Approvals:
  Chad: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/make-wmf-branch/MakeWmfBranch.php 
b/make-wmf-branch/MakeWmfBranch.php
index ab8761d..3cce03d 100644
--- a/make-wmf-branch/MakeWmfBranch.php
+++ b/make-wmf-branch/MakeWmfBranch.php
@@ -3,7 +3,7 @@
 class MakeWmfBranch {
public $dryRun;
public $newVersion, $oldVersion, $buildDir;
-   public $specialExtensions, $branchedExtensions, $patches;
+   public $specialExtensions, $branchedExtensions;
public $repoPath;
public $noisy;
 
@@ -32,7 +32,6 @@
$this->specialExtensions = $branchLists['special_extensions'];
$this->alreadyBranched = array();
$this->noisy = $noisy;
-   $this->patches = $patches;
$this->repoPath = $repoPath;
$this->branchPrefix = $branchPrefix;
}
@@ -228,14 +227,6 @@
 
# Do intermediate commit
$this->runCmd( 'git', 'commit', '-a', '-q', '-m', "Creating new 
WMF {$this->newVersion} branch" );
-
-   # Apply patches
-   foreach ( $this->patches as $patch => $subpath ) {
-   // git fetch https://gerrit.wikimedia.org/mediawiki/core
-   // refs/changes/06/7606/1 && git cherry-pick FETCH_HEAD
-   $this->runCmd( 'git', 'fetch', $this->repoPath . '/' . 
$subpath, $patch );
-   $this->runCmd( 'git', 'cherry-pick', 'FETCH_HEAD' );
-   }
 
$this->runWriteCmd(
'git', 'push', 'origin', 'wmf/' . $this->newVersion );
diff --git a/make-wmf-branch/default.conf b/make-wmf-branch/default.conf
index 7b0bb46..4eadc97 100644
--- a/make-wmf-branch/default.conf
+++ b/make-wmf-branch/default.conf
@@ -12,13 +12,5 @@
 
 $branchPrefix = 'wmf/';
 
-# Map of custom patches (refs/*) to gerrit /mediawiki/ relative base paths 
(repos)
-# Example:
-# $patches = array(
-#  'refs/changes/65/274165/3' => 'core' // 
https://gerrit.wikimedia.org/r/#/c/274165/
-# );
-$patches = array(
-);
-
 $dryRun = false; // Don't actually push anything
 $noisy = false; // Output git commands

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I50dfea77ce86cea4550e7e4fcce39e9cc95bfda1
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: Chad 
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...release[master]: make-wmf-branch: Remove patching support

2018-01-09 Thread Chad (Code Review) 
Chad has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403154 )

Change subject: make-wmf-branch: Remove patching support
..

make-wmf-branch: Remove patching support

Patching is a post-branching activity. Plus this feature
encourages poor master/release behaviors.

Change-Id: I50dfea77ce86cea4550e7e4fcce39e9cc95bfda1
---
M make-wmf-branch/MakeWmfBranch.php
M make-wmf-branch/default.conf
2 files changed, 1 insertion(+), 18 deletions(-)


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

diff --git a/make-wmf-branch/MakeWmfBranch.php 
b/make-wmf-branch/MakeWmfBranch.php
index f1b4f98..ee49c3b 100644
--- a/make-wmf-branch/MakeWmfBranch.php
+++ b/make-wmf-branch/MakeWmfBranch.php
@@ -3,7 +3,7 @@
 class MakeWmfBranch {
public $dryRun;
public $newVersion, $oldVersion, $buildDir;
-   public $specialExtensions, $branchedExtensions, $patches;
+   public $specialExtensions, $branchedExtensions;
public $repoPath;
public $noisy;
 
@@ -32,7 +32,6 @@
$this->specialExtensions = $branchLists['special_extensions'];
$this->alreadyBranched = array();
$this->noisy = $noisy;
-   $this->patches = $patches;
$this->repoPath = $repoPath;
$this->branchPrefix = $branchPrefix;
}
@@ -233,14 +232,6 @@
 
# Do intermediate commit
$this->runCmd( 'git', 'commit', '-a', '-q', '-m', "Creating new 
WMF {$this->newVersion} branch" );
-
-   # Apply patches
-   foreach ( $this->patches as $patch => $subpath ) {
-   // git fetch https://gerrit.wikimedia.org/mediawiki/core
-   // refs/changes/06/7606/1 && git cherry-pick FETCH_HEAD
-   $this->runCmd( 'git', 'fetch', $this->repoPath . '/' . 
$subpath, $patch );
-   $this->runCmd( 'git', 'cherry-pick', 'FETCH_HEAD' );
-   }
 
$this->runWriteCmd(
'git', 'push', 'origin', 'wmf/' . $this->newVersion );
diff --git a/make-wmf-branch/default.conf b/make-wmf-branch/default.conf
index 7b0bb46..4eadc97 100644
--- a/make-wmf-branch/default.conf
+++ b/make-wmf-branch/default.conf
@@ -12,13 +12,5 @@
 
 $branchPrefix = 'wmf/';
 
-# Map of custom patches (refs/*) to gerrit /mediawiki/ relative base paths 
(repos)
-# Example:
-# $patches = array(
-#  'refs/changes/65/274165/3' => 'core' // 
https://gerrit.wikimedia.org/r/#/c/274165/
-# );
-$patches = array(
-);
-
 $dryRun = false; // Don't actually push anything
 $noisy = false; // Output git commands

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I50dfea77ce86cea4550e7e4fcce39e9cc95bfda1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Chad 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits