1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258
|
<?php
/*
* $Id: 1333ed9ac0800f5fcbe3d13519aa52a633d4db3c $
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* This software consists of voluntary contributions made by many individuals
* and is licensed under the LGPL. For more information please see
* <http://phing.info>.
*/
require_once 'phing/Task.php';
require_once 'phing/tasks/ext/git/GitBaseTask.php';
/**
* Wrapper aroung git-merge
*
* @author Victor Farazdagi <simple.square@gmail.com>
* @version $Id: 1333ed9ac0800f5fcbe3d13519aa52a633d4db3c $
* @package phing.tasks.ext.git
* @see VersionControl_Git
* @since 2.4.3
* @link http://www.kernel.org/pub/software/scm/git/docs/git-merge.html
*/
class GitMergeTask extends GitBaseTask
{
/**
* <commit> of git-merge
* @var string
*/
private $remote;
/**
* Commit message
* @var string
*/
private $message;
/**
* Merge strategy. See -s <strategy> of git-merge
* Available strategies are: octopus ours recursive resolve subtree
* @var string
*/
private $strategy;
/**
* -X or --strategy-option of git-merge
* @var string
*/
private $strategyOption;
/**
* --commit key of git-merge
* @var boolean
*/
private $commit = false;
/**
* --no-commit key of git-merge
* @var boolean
*/
private $noCommit = false;
/**
* --ff --no-ff keys to git-merge
* @var boolean
*/
private $fastForwardCommit = false;
/**
* --quiet, -q key to git-merge
* @var boolean
*/
private $quiet = false;
/**
* Valid merge strategies
* @var array
*/
private $validStrategies = array(
'octopus', 'ours', 'theirs', 'recursive', 'resolve', 'subtree');
/**
* The main entry point for the task
*/
public function main()
{
if (null === $this->getRepository()) {
throw new BuildException('"repository" is required parameter');
}
$remotes = trim($this->getRemote());
if (null === $remotes || '' === $remotes) {
throw new BuildException('"remote" is required parameter');
}
$client = $this->getGitClient(false, $this->getRepository());
$command = $client->getCommand('merge');
$command
->setOption('commit', $this->isCommit())
->setOption('q', $this->isQuiet());
if ($this->getMessage()) {
$command->setOption('message', $this->getMessage());
}
if (!$this->isCommit()) {
$command->setOption('no-commit', $this->isNoCommit());
}
if ($this->isFastForwardCommit()) {
$command->setOption('no-ff', true);
}
$strategy = $this->getStrategy();
if ($strategy) {
// check if strategy is valid
if (false === in_array($strategy, $this->validStrategies)) {
throw new BuildException(
"Could not find merge strategy '" . $strategy . "'\n".
"Available strategies are: " . implode(', ', $this->validStrategies));
}
$command->setOption('strategy', $strategy);
if ($this->getStrategyOption()) {
$command->setOption(
'strategy-option', $this->getStrategyOption());
}
}
$remotes = explode(' ', $this->getRemote());
foreach ($remotes as $remote) {
$command->addArgument($remote);
}
$this->log('git-merge command: ' . $command->createCommandString(), Project::MSG_INFO);
try {
$output = $command->execute();
} catch (Exception $e) {
throw new BuildException('Task execution failed.', $e);
}
$this->log(
sprintf('git-merge: replaying "%s" commits', $this->getRemote()),
Project::MSG_INFO);
$this->log('git-merge output: ' . trim($output), Project::MSG_INFO);
}
public function setRemote($remote)
{
$this->remote = $remote;
}
public function getRemote()
{
return $this->remote;
}
public function setMessage($message)
{
$this->message = $message;
}
public function getMessage()
{
return $this->message;
}
public function setStrategy($strategy)
{
$this->strategy = $strategy;
}
public function getStrategy()
{
return $this->strategy;
}
public function setStrategyOption($strategyOption)
{
$this->strategyOption = $strategyOption;
}
public function getStrategyOption()
{
return $this->strategyOption;
}
public function setQuiet($flag)
{
$this->quiet = $flag;
}
public function getQuiet()
{
return $this->quiet;
}
public function isQuiet()
{
return $this->getQuiet();
}
public function setCommit($flag)
{
$this->commit = (boolean)$flag;
}
public function getCommit()
{
return $this->commit;
}
public function isCommit()
{
return $this->getCommit();
}
public function setNoCommit($flag)
{
$this->noCommit = (boolean)$flag;
}
public function getNoCommit()
{
return $this->noCommit;
}
public function isNoCommit()
{
return $this->getNoCommit();
}
public function setFastForwardCommit($flag)
{
$this->fastForwardCommit = $flag;
}
public function getFastForwardCommit()
{
return $this->fastForwardCommit;
}
public function isFastForwardCommit()
{
return $this->getFastForwardCommit();
}
}
|