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

Realpath hg paths to avoid problems after a chdir, fixes #2096

pull/2157/merge
Jordi Boggiano 2013-08-10 14:17:52 +02:00
parent b453b6655b
commit 22369fd3ae
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Composer/Downloader/HgDownloader.php
View File

@ -32,7 +32,7 @@ class HgDownloader extends VcsDownloader
throw new \RuntimeException('Failed to execute ' . $command . "\n\n" . $this->process->getErrorOutput()); throw new \RuntimeException('Failed to execute ' . $command . "\n\n" . $this->process->getErrorOutput());
} }
$command = sprintf('hg up %s', $ref); $command = sprintf('hg up %s', $ref);
if (0 !== $this->process->execute($command, $ignoredOutput, $path)) { if (0 !== $this->process->execute($command, $ignoredOutput, realpath($path))) {
throw new \RuntimeException('Failed to execute ' . $command . "\n\n" . $this->process->getErrorOutput()); throw new \RuntimeException('Failed to execute ' . $command . "\n\n" . $this->process->getErrorOutput());
} }
} }
@ -51,7 +51,7 @@ class HgDownloader extends VcsDownloader
} }
$command = sprintf('hg pull %s && hg up %s', $url, $ref); $command = sprintf('hg pull %s && hg up %s', $url, $ref);
if (0 !== $this->process->execute($command, $ignoredOutput, $path)) { if (0 !== $this->process->execute($command, $ignoredOutput, realpath($path))) {
throw new \RuntimeException('Failed to execute ' . $command . "\n\n" . $this->process->getErrorOutput()); throw new \RuntimeException('Failed to execute ' . $command . "\n\n" . $this->process->getErrorOutput());
} }
} }
@ -65,7 +65,7 @@ class HgDownloader extends VcsDownloader
return; return;
} }
$this->process->execute('hg st', $output, $path); $this->process->execute('hg st', $output, realpath($path));
return trim($output) ?: null; return trim($output) ?: null;
} }
@ -77,7 +77,7 @@ class HgDownloader extends VcsDownloader
{ {
$command = sprintf('hg log -r %s:%s --style compact', $fromReference, $toReference); $command = sprintf('hg log -r %s:%s --style compact', $fromReference, $toReference);
if (0 !== $this->process->execute($command, $output, $path)) { if (0 !== $this->process->execute($command, $output, realpath($path))) {
throw new \RuntimeException('Failed to execute ' . $command . "\n\n" . $this->process->getErrorOutput()); throw new \RuntimeException('Failed to execute ' . $command . "\n\n" . $this->process->getErrorOutput());
} }