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

Fix typos and simplify code

pull/1131/head
Jordi Boggiano 2012-09-20 11:03:58 +02:00
parent 35245eb817
commit 6bd7ca0230
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Composer/Repository/Vcs/HgDriver.php
View File

@ -37,7 +37,7 @@ class HgDriver extends VcsDriver
} else { } else {
$this->repoDir = $this->config->get('home') . '/cache.hg/' . preg_replace('{[^a-z0-9]}i', '-', $this->url) . '/'; $this->repoDir = $this->config->get('home') . '/cache.hg/' . preg_replace('{[^a-z0-9]}i', '-', $this->url) . '/';
// update the repo if it is a valid git repository // update the repo if it is a valid hg repository
if (is_dir($this->repoDir) && 0 === $this->process->execute('hg summary', $output, $this->repoDir)) { if (is_dir($this->repoDir) && 0 === $this->process->execute('hg summary', $output, $this->repoDir)) {
if (0 !== $this->process->execute('hg pull -u', $output, $this->repoDir)) { if (0 !== $this->process->execute('hg pull -u', $output, $this->repoDir)) {
$this->io->write('<error>Failed to update '.$this->url.', package information from this repository may be outdated ('.$this->process->getErrorOutput().')</error>'); $this->io->write('<error>Failed to update '.$this->url.', package information from this repository may be outdated ('.$this->process->getErrorOutput().')</error>');
@ -48,12 +48,10 @@ class HgDriver extends VcsDriver
$fs->removeDirectory($this->repoDir); $fs->removeDirectory($this->repoDir);
// ensure parent dir exists // ensure parent dir exists
$dir = dirname($this->repoDir); $cacheDir = dirname($this->repoDir);
if (!is_dir($dir)) { $fs->ensureDirectoryExists($cacheDir);
mkdir($dir, 0777, true);
}
if (0 !== $this->process->execute(sprintf('hg clone %s %s', escapeshellarg($this->url), escapeshellarg($this->repoDir)), $output, $dir)) { if (0 !== $this->process->execute(sprintf('hg clone %s %s', escapeshellarg($this->url), escapeshellarg($this->repoDir)), $output, $cacheDir)) {
$output = $this->process->getErrorOutput(); $output = $this->process->getErrorOutput();
if (0 !== $this->process->execute('hg --version', $ignoredOutput)) { if (0 !== $this->process->execute('hg --version', $ignoredOutput)) {
@ -194,7 +192,7 @@ class HgDriver extends VcsDriver
$process = new ProcessExecutor(); $process = new ProcessExecutor();
$url = str_replace('file://', '', $url); $url = str_replace('file://', '', $url);
// check whether there is a git repo in that path // check whether there is a hg repo in that path
if ($process->execute('hg summary', $output, $url) === 0) { if ($process->execute('hg summary', $output, $url) === 0) {
return true; return true;
} }