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

Merge pull request #2268 from schmkr/svnDriver-trunkPath-improvements 

Improved the handling of trunkPath
pull/2800/merge
Jordi Boggiano 2014-03-23 23:22:39 +01:00
parent e221757197 c4d7347ec5
commit c96dedd19c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -196,10 +196,10 @@ class SvnDriver extends VcsDriver
if (null === $this->branches) { if (null === $this->branches) {
$this->branches = array(); $this->branches = array();
if (false === strpos($this->trunkPath, '/')) { if (false === $this->trunkPath) {
$trunkParent = $this->baseUrl . '/'; $trunkParent = $this->baseUrl . '/';
} else { } else {
$trunkParent = $this->baseUrl . '/' . dirname($this->trunkPath) . '/'; $trunkParent = $this->baseUrl . '/' . $this->trunkPath;
} }
$output = $this->execute('svn ls --verbose', $trunkParent); $output = $this->execute('svn ls --verbose', $trunkParent);
@ -207,12 +207,12 @@ class SvnDriver extends VcsDriver
foreach ($this->process->splitLines($output) as $line) { foreach ($this->process->splitLines($output) as $line) {
$line = trim($line); $line = trim($line);
if ($line && preg_match('{^\s*(\S+).*?(\S+)\s*$}', $line, $match)) { if ($line && preg_match('{^\s*(\S+).*?(\S+)\s*$}', $line, $match)) {
if (isset($match[1]) && isset($match[2]) && $match[2] === $this->trunkPath . '/') { if (isset($match[1]) && isset($match[2]) && $match[2] === 'composer.json') {
$this->branches[$this->trunkPath] = $this->buildIdentifier( $this->branches['trunk'] = $this->buildIdentifier(
'/' . $this->trunkPath, '/' . $this->trunkPath,
$match[1] $match[1]
); );
$this->rootIdentifier = $this->branches[$this->trunkPath]; $this->rootIdentifier = $this->branches['trunk'];
break; break;
} }
} }