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

Merge branch 'svn-auth-reloaded' of github.com:till/composer into svn-auth-reloaded

pull/410/head
till 2012-03-23 15:52:19 +01:00
parent 2af145338b af8d4212bb
commit 68fa23f5c7
1 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -198,14 +198,17 @@ class SvnDriver extends VcsDriver
public function getTags() public function getTags()
{ {
if (null === $this->tags) { if (null === $this->tags) {
$output = $this->execute('svn ls', $this->baseUrl . '/tags');
$this->tags = array(); $this->tags = array();
$output = $this->execute('svn ls', $this->baseUrl . '/tags');
if ($output) {
foreach ($this->process->splitLines($output) as $tag) { foreach ($this->process->splitLines($output) as $tag) {
if ($tag) { if ($tag) {
$this->tags[rtrim($tag, '/')] = '/tags/'.$tag; $this->tags[rtrim($tag, '/')] = '/tags/'.$tag;
} }
} }
} }
}
return $this->tags; return $this->tags;
} }
@ -216,27 +219,34 @@ class SvnDriver extends VcsDriver
public function getBranches() public function getBranches()
{ {
if (null === $this->branches) { if (null === $this->branches) {
$output = $this->execute('svn ls --verbose', $this->baseUrl . '/');
$this->branches = array(); $this->branches = array();
$output = $this->execute('svn ls --verbose', $this->baseUrl . '/');
if ($output) {
foreach ($this->process->splitLines($output) as $line) { foreach ($this->process->splitLines($output) as $line) {
preg_match('{^\s*(\S+).*?(\S+)\s*$}', $line, $match); $line = trim($line);
if ($match[2] === 'trunk/') { if ($line && preg_match('{^\s*(\S+).*?(\S+)\s*$}', $line, $match)) {
if (isset($match[1]) && isset($match[2]) && $match[2] === 'trunk/') {
$this->branches['trunk'] = '/trunk/@'.$match[1]; $this->branches['trunk'] = '/trunk/@'.$match[1];
break; break;
} }
} }
}
}
unset($output); unset($output);
$output = $this->execute('svn ls --verbose', $this->baseUrl . '/branches'); $output = $this->execute('svn ls --verbose', $this->baseUrl . '/branches');
if ($output) {
foreach ($this->process->splitLines(trim($output)) as $line) { foreach ($this->process->splitLines(trim($output)) as $line) {
preg_match('{^\s*(\S+).*?(\S+)\s*$}', $line, $match); $line = trim($line);
if ($match[2] === './') { if ($line && preg_match('{^\s*(\S+).*?(\S+)\s*$}', $line, $match)) {
continue; if (isset($match[1]) && isset($match[2]) && $match[2] !== './') {
}
$this->branches[rtrim($match[2], '/')] = '/branches/'.$match[2].'@'.$match[1]; $this->branches[rtrim($match[2], '/')] = '/branches/'.$match[2].'@'.$match[1];
} }
} }
}
}
}
return $this->branches; return $this->branches;
} }