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

SvnDriver fixes

pull/1266/merge
Jordi Boggiano 2012-10-26 01:53:34 +02:00
parent 39349cc2df
commit 2b06503027
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,6 +30,7 @@ class SvnDriver extends VcsDriver
protected $baseUrl; protected $baseUrl;
protected $tags; protected $tags;
protected $branches; protected $branches;
protected $rootIdentifier;
protected $infoCache = array(); protected $infoCache = array();
protected $trunkPath = 'trunk'; protected $trunkPath = 'trunk';
@ -73,7 +74,7 @@ class SvnDriver extends VcsDriver
*/ */
public function getRootIdentifier() public function getRootIdentifier()
{ {
return $this->trunkPath; return $this->rootIdentifier ?: $this->trunkPath;
} }
/** /**
@ -117,7 +118,7 @@ class SvnDriver extends VcsDriver
$path = $match[1]; $path = $match[1];
$rev = $match[2]; $rev = $match[2];
} else { } else {
$path = ''; $path = $identifier;
$rev = ''; $rev = '';
} }
@ -190,8 +191,8 @@ class SvnDriver extends VcsDriver
$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] === $this->trunkPath . '/') {
$this->branches[$this->trunkPath] = '/' . $this->trunkPath . $this->branches[$this->trunkPath] = '/' . $this->trunkPath . '/@'.$match[1];
'/@'.$match[1]; $this->rootIdentifier = $this->branches[$this->trunkPath];
break; break;
} }
} }