public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

* do svnCommand() in execute() to be able to restart the dance in case it failed

pull/410/head
till 2012-03-08 16:52:36 +01:00
parent a3e0a0805c
commit 44470da804
1 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/Composer/Repository/Vcs/SvnDriver.php
View File

@ -54,18 +54,22 @@ class SvnDriver extends VcsDriver implements VcsDriverInterface
/** /**
* Execute an SVN command and try to fix up the process with credentials * Execute an SVN command and try to fix up the process with credentials
* if necessary. * if necessary. The command is 'fixed up' with {@link self::getSvnCommand()}.
* *
* @param string $command The svn command to run. * @param string $command The svn command to run.
* @param string $url The SVN URL.
* *
* @return string * @return string
* @uses self::getSvnCommand()
* @uses parent::$process * @uses parent::$process
* @see ProcessExecutor::execute() * @see ProcessExecutor::execute()
*/ */
public function execute($command) public function execute($command, $url)
{ {
$svnCommand = $this->getSvnCommand($command, $url);
$status = $this->process->execute( $status = $this->process->execute(
$command, $svnCommand,
$output $output
); );
return $output; return $output;
@ -127,9 +131,7 @@ class SvnDriver extends VcsDriver implements VcsDriverInterface
$rev = ''; $rev = '';
} }
$output = $this->execute( $output = $this->execute('svn cat', $this->baseUrl . $identifier . 'composer.json' . $rev);
$this->getSvnCommand('svn cat', $this->baseUrl . $identifier . 'composer.json' . $rev)
);
if (!trim($output)) { if (!trim($output)) {
throw new \UnexpectedValueException( throw new \UnexpectedValueException(
@ -140,9 +142,7 @@ class SvnDriver extends VcsDriver implements VcsDriverInterface
$composer = JsonFile::parseJson($output); $composer = JsonFile::parseJson($output);
if (!isset($composer['time'])) { if (!isset($composer['time'])) {
$output = $this->execute( $output = $this->execute('svn info', $this->baseUrl . $identifier . $rev);
$this->getSvnCommand('svn info', $this->baseUrl . $identifier . $rev)
);
foreach ($this->process->splitLines($output) as $line) { foreach ($this->process->splitLines($output) as $line) {
if ($line && preg_match('{^Last Changed Date: ([^(]+)}', $line, $match)) { if ($line && preg_match('{^Last Changed Date: ([^(]+)}', $line, $match)) {
$date = new \DateTime($match[1]); $date = new \DateTime($match[1]);
@ -163,9 +163,7 @@ class SvnDriver extends VcsDriver implements VcsDriverInterface
public function getTags() public function getTags()
{ {
if (null === $this->tags) { if (null === $this->tags) {
$output = $this->execute( $output = $this->execute('svn ls', $this->baseUrl . '/tags');
$this->getSvnCommand('svn ls', $this->baseUrl . '/tags')
);
$this->tags = array(); $this->tags = array();
foreach ($this->process->splitLines($output) as $tag) { foreach ($this->process->splitLines($output) as $tag) {
if ($tag) { if ($tag) {
@ -183,10 +181,7 @@ class SvnDriver extends VcsDriver implements VcsDriverInterface
public function getBranches() public function getBranches()
{ {
if (null === $this->branches) { if (null === $this->branches) {
$output = $this->execute( $output = $this->execute('svn ls --verbose', $this->baseUrl . '/');
$this->getSvnCommand('svn ls --verbose', $this->baseUrl . '/')
);
$this->branches = array(); $this->branches = array();
foreach ($this->process->splitLines($output) as $line) { foreach ($this->process->splitLines($output) as $line) {
preg_match('{^\s*(\S+).*?(\S+)\s*$}', $line, $match); preg_match('{^\s*(\S+).*?(\S+)\s*$}', $line, $match);
@ -197,9 +192,8 @@ class SvnDriver extends VcsDriver implements VcsDriverInterface
} }
unset($output); unset($output);
$output = $this->execute( $output = $this->execute('svn ls --verbose', $this->baseUrl . '/branches');
$this->getSvnCommand('svn ls --verbose', $this->baseUrl . '/branches')
);
foreach ($this->process->splitLines(trim($output)) as $line) { foreach ($this->process->splitLines(trim($output)) as $line) {
preg_match('{^\s*(\S+).*?(\S+)\s*$}', $line, $match); preg_match('{^\s*(\S+).*?(\S+)\s*$}', $line, $match);
if ($match[2] === './') { if ($match[2] === './') {