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

Add support for alternative structures

pull/1037/head
bboer 2012-08-29 13:26:53 +02:00
parent e2f8098f53
commit 93628c42d8
2 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,6 +32,10 @@ class SvnDriver extends VcsDriver
protected $branches;
protected $infoCache = array();
protected $trunkLocation = 'trunk';
protected $branchesLocation = 'branches';
protected $tagsLocation = 'tags';
/**
* @var \Composer\Util\Svn
*/
@ -44,7 +48,17 @@ class SvnDriver extends VcsDriver
{
$this->url = $this->baseUrl = rtrim(self::normalizeUrl($this->url), '/');
if (false !== ($pos = strrpos($this->url, '/trunk'))) {
if ($this->config->has('trunkLocation')) {
$this->trunkLocation = $this->config->get('trunkLocation');
}
if ($this->config->has('branchesLocation')) {
$this->branchesLocation = $this->config->get('branchesLocation');
}
if ($this->config->has('tagsLocation')) {
$this->tagsLocation = $this->config->get('tagsLocation');
}
if (false !== ($pos = strrpos($this->url, '/' . $this->trunkLocation))) {
$this->baseUrl = substr($this->url, 0, $pos);
}
@ -59,7 +73,7 @@ class SvnDriver extends VcsDriver
*/
public function getRootIdentifier()
{
return 'trunk';
return $this->trunkLocation;
}
/**
@ -145,13 +159,14 @@ class SvnDriver extends VcsDriver
if (null === $this->tags) {
$this->tags = array();
$output = $this->execute('svn ls --verbose', $this->baseUrl . '/tags');
$output = $this->execute('svn ls --verbose', $this->baseUrl . '/' . $this->tagsLocation);
if ($output) {
foreach ($this->process->splitLines($output) as $line) {
$line = trim($line);
if ($line && preg_match('{^\s*(\S+).*?(\S+)\s*$}', $line, $match)) {
if (isset($match[1]) && isset($match[2]) && $match[2] !== './') {
$this->tags[rtrim($match[2], '/')] = '/tags/'.$match[2].'@'.$match[1];
$this->tags[rtrim($match[2], '/')] = '/' . $this->tagsLocation .
'/' . $match[2] . '@' . $match[1];
}
}
}
@ -174,8 +189,9 @@ class SvnDriver extends VcsDriver
foreach ($this->process->splitLines($output) as $line) {
$line = trim($line);
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];
if (isset($match[1]) && isset($match[2]) && $match[2] === $this->trunkLocation . '/') {
$this->branches[$this->trunkLocation] = '/' . $this->trunkLocation .
'/@'.$match[1];
break;
}
}
@ -183,13 +199,14 @@ class SvnDriver extends VcsDriver
}
unset($output);
$output = $this->execute('svn ls --verbose', $this->baseUrl . '/branches');
$output = $this->execute('svn ls --verbose', $this->baseUrl . '/' . $this->branchesLocation);
if ($output) {
foreach ($this->process->splitLines(trim($output)) as $line) {
$line = trim($line);
if ($line && preg_match('{^\s*(\S+).*?(\S+)\s*$}', $line, $match)) {
if (isset($match[1]) && isset($match[2]) && $match[2] !== './') {
$this->branches[rtrim($match[2], '/')] = '/branches/'.$match[2].'@'.$match[1];
$this->branches[rtrim($match[2], '/')] = '/' . $this->branchesLocation .
'/' . $match[2] . '@' . $match[1];
}
}
}

3
src/Composer/Repository/VcsRepository.php
View File

@ -50,6 +50,9 @@ class VcsRepository extends ArrayRepository
$this->type = isset($repoConfig['type']) ? $repoConfig['type'] : 'vcs';
$this->verbose = $io->isVerbose();
$this->config = $config;
if (isset($repoConfig['config']) && is_array($repoConfig['config'])) {
$this->config->merge(array('config' => $repoConfig['config']));
}
}
public function setLoader(LoaderInterface $loader)