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

Bugfixes in the local git repos handling

pull/258/head
Jordi Boggiano 2012-02-23 22:08:16 +01:00
parent ab9fe9f331
commit c0b18bddb9
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/Composer/Repository/Vcs/GitDriver.php
View File

@ -14,13 +14,12 @@ class GitDriver extends VcsDriver implements VcsDriverInterface
protected $tags; protected $tags;
protected $branches; protected $branches;
protected $rootIdentifier; protected $rootIdentifier;
protected $repoDir;
protected $infoCache = array(); protected $infoCache = array();
protected $isLocal = false; protected $isLocal = false;
public function __construct($url, IOInterface $io, ProcessExecutor $process = null) public function __construct($url, IOInterface $io, ProcessExecutor $process = null)
{ {
$this->tmpDir = sys_get_temp_dir() . '/composer-' . preg_replace('{[^a-z0-9]}i', '-', $url) . '/';
parent::__construct($url, $io, $process); parent::__construct($url, $io, $process);
} }
@ -30,15 +29,17 @@ class GitDriver extends VcsDriver implements VcsDriverInterface
public function initialize() public function initialize()
{ {
$url = escapeshellarg($this->url); $url = escapeshellarg($this->url);
$tmpDir = escapeshellarg($this->tmpDir);
if (static::isLocalUrl($url)) { if (static::isLocalUrl($this->url)) {
$this->isLocal = true; $this->isLocal = true;
$this->repoDir = $this->url;
} else { } else {
if (is_dir($this->tmpDir)) { $this->repoDir = sys_get_temp_dir() . '/composer-' . preg_replace('{[^a-z0-9]}i', '-', $url) . '/';
$this->process->execute(sprintf('cd %s && git fetch origin', $tmpDir), $output); $repoDir = escapeshellarg($this->repoDir);
if (is_dir($this->repoDir)) {
$this->process->execute(sprintf('cd %s && git fetch origin', $repoDir), $output);
} else { } else {
$this->process->execute(sprintf('git clone %s %s', $url, $tmpDir), $output); $this->process->execute(sprintf('git clone %s %s', $url, $repoDir), $output);
} }
} }
@ -56,7 +57,7 @@ class GitDriver extends VcsDriver implements VcsDriverInterface
if ($this->isLocal) { if ($this->isLocal) {
// select currently checked out branch if master is not available // select currently checked out branch if master is not available
$this->process->execute(sprintf('cd %s && git branch --no-color', escapeshellarg($this->tmpDir)), $output); $this->process->execute(sprintf('cd %s && git branch --no-color', escapeshellarg($this->repoDir)), $output);
$branches = $this->process->splitLines($output); $branches = $this->process->splitLines($output);
if (!in_array('* master', $branches)) { if (!in_array('* master', $branches)) {
foreach ($branches as $branch) { foreach ($branches as $branch) {
@ -68,7 +69,7 @@ class GitDriver extends VcsDriver implements VcsDriverInterface
} }
} else { } else {
// try to find a non-master remote HEAD branch // try to find a non-master remote HEAD branch
$this->process->execute(sprintf('cd %s && git branch --no-color -r', escapeshellarg($this->tmpDir)), $output); $this->process->execute(sprintf('cd %s && git branch --no-color -r', escapeshellarg($this->repoDir)), $output);
foreach ($this->process->splitLines($output) as $branch) { foreach ($this->process->splitLines($output) as $branch) {
if ($branch && preg_match('{/HEAD +-> +[^/]+/(\S+)}', $branch, $match)) { if ($branch && preg_match('{/HEAD +-> +[^/]+/(\S+)}', $branch, $match)) {
$this->rootIdentifier = $match[1]; $this->rootIdentifier = $match[1];
@ -113,7 +114,7 @@ class GitDriver extends VcsDriver implements VcsDriverInterface
public function getComposerInformation($identifier) public function getComposerInformation($identifier)
{ {
if (!isset($this->infoCache[$identifier])) { if (!isset($this->infoCache[$identifier])) {
$this->process->execute(sprintf('cd %s && git show %s:composer.json', escapeshellarg($this->tmpDir), escapeshellarg($identifier)), $composer); $this->process->execute(sprintf('cd %s && git show %s:composer.json', escapeshellarg($this->repoDir), escapeshellarg($identifier)), $composer);
if (!trim($composer)) { if (!trim($composer)) {
throw new \UnexpectedValueException('Failed to retrieve composer information for identifier '.$identifier.' in '.$this->getUrl()); throw new \UnexpectedValueException('Failed to retrieve composer information for identifier '.$identifier.' in '.$this->getUrl());
@ -122,7 +123,7 @@ class GitDriver extends VcsDriver implements VcsDriverInterface
$composer = JsonFile::parseJson($composer); $composer = JsonFile::parseJson($composer);
if (!isset($composer['time'])) { if (!isset($composer['time'])) {
$this->process->execute(sprintf('cd %s && git log -1 --format=%%at %s', escapeshellarg($this->tmpDir), escapeshellarg($identifier)), $output); $this->process->execute(sprintf('cd %s && git log -1 --format=%%at %s', escapeshellarg($this->repoDir), escapeshellarg($identifier)), $output);
$date = new \DateTime('@'.trim($output)); $date = new \DateTime('@'.trim($output));
$composer['time'] = $date->format('Y-m-d H:i:s'); $composer['time'] = $date->format('Y-m-d H:i:s');
} }
@ -138,7 +139,7 @@ class GitDriver extends VcsDriver implements VcsDriverInterface
public function getTags() public function getTags()
{ {
if (null === $this->tags) { if (null === $this->tags) {
$this->process->execute(sprintf('cd %s && git tag', escapeshellarg($this->tmpDir)), $output); $this->process->execute(sprintf('cd %s && git tag', escapeshellarg($this->repoDir)), $output);
$output = $this->process->splitLines($output); $output = $this->process->splitLines($output);
$this->tags = $output ? array_combine($output, $output) : array(); $this->tags = $output ? array_combine($output, $output) : array();
} }
@ -156,12 +157,12 @@ class GitDriver extends VcsDriver implements VcsDriverInterface
$this->process->execute(sprintf( $this->process->execute(sprintf(
'cd %s && git branch --no-color --no-abbrev -v %s', 'cd %s && git branch --no-color --no-abbrev -v %s',
escapeshellarg($this->tmpDir), escapeshellarg($this->repoDir),
$this->isLocal ? '' : '-r' $this->isLocal ? '' : '-r'
), $output); ), $output);
foreach ($this->process->splitLines($output) as $branch) { foreach ($this->process->splitLines($output) as $branch) {
if ($branch && !preg_match('{^ *[^/]+/HEAD }', $branch)) { if ($branch && !preg_match('{^ *[^/]+/HEAD }', $branch)) {
preg_match('{^ *[^/]+/(\S+) *([a-f0-9]+) .*$}', $branch, $match); preg_match('{^(?:\* )? *(?:[^/]+/)?(\S+) *([a-f0-9]+) .*$}', $branch, $match);
$branches[$match[1]] = $match[2]; $branches[$match[1]] = $match[2];
} }
} }