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

Remove fallback on missing commit, fixes #3314, fixes #3147

pull/3365/head
Jordi Boggiano 2014-10-17 16:32:48 +01:00
parent 2bb78708b8
commit 332a933e8b
2 changed files with 4 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Composer/Downloader/DownloadManager.php
View File

@ -192,7 +192,7 @@ class DownloadManager
foreach ($sources as $i => $source) { foreach ($sources as $i => $source) {
if (isset($e)) { if (isset($e)) {
$this->io->write('<warning>Now trying to download from ' . $source . '</warning>'); $this->io->write(' <warning>Now trying to download from ' . $source . '</warning>');
} }
$package->setInstallationSource($source); $package->setInstallationSource($source);
try { try {
@ -207,7 +207,7 @@ class DownloadManager
} }
$this->io->write( $this->io->write(
'<warning>Failed to download '. ' <warning>Failed to download '.
$package->getPrettyName(). $package->getPrettyName().
' from ' . $source . ': '. ' from ' . $source . ': '.
$e->getMessage().'</warning>' $e->getMessage().'</warning>'

38
src/Composer/Downloader/GitDownloader.php
View File

@ -256,42 +256,8 @@ class GitDownloader extends VcsDownloader
} }
// reference was not found (prints "fatal: reference is not a tree: $ref") // reference was not found (prints "fatal: reference is not a tree: $ref")
if ($date && false !== strpos($this->process->getErrorOutput(), $reference)) { if (false !== strpos($this->process->getErrorOutput(), $reference)) {
$date = $date->format('U'); $this->io->write(' <warning>'.$reference.' is gone (history was rewritten?)</warning>');
// guess which remote branch to look at first
$command = 'git branch -r';
if (0 !== $this->process->execute($command, $output, $path)) {
throw new \RuntimeException('Failed to execute ' . $command . "\n\n" . $this->process->getErrorOutput());
}
$guessTemplate = 'git log --until=%s --date=raw -n1 --pretty=%%H %s';
foreach ($this->process->splitLines($output) as $line) {
if (preg_match('{^composer/'.preg_quote($branch).'(?:\.x)?$}i', trim($line))) {
// find the previous commit by date in the given branch
if (0 === $this->process->execute(sprintf($guessTemplate, $date, ProcessExecutor::escape(trim($line))), $output, $path)) {
$newReference = trim($output);
}
break;
}
}
if (empty($newReference)) {
// no matching branch found, find the previous commit by date in all commits
if (0 !== $this->process->execute(sprintf($guessTemplate, $date, '--all'), $output, $path)) {
throw new \RuntimeException('Failed to execute ' . GitUtil::sanitizeUrl($command) . "\n\n" . $this->process->getErrorOutput());
}
$newReference = trim($output);
}
// checkout the new recovered ref
$command = sprintf($template, ProcessExecutor::escape($newReference));
if (0 === $this->process->execute($command, $output, $path)) {
$this->io->write(' '.$reference.' is gone (history was rewritten?), recovered by checking out '.$newReference);
return $newReference;
}
} }
throw new \RuntimeException('Failed to execute ' . GitUtil::sanitizeUrl($command) . "\n\n" . $this->process->getErrorOutput()); throw new \RuntimeException('Failed to execute ' . GitUtil::sanitizeUrl($command) . "\n\n" . $this->process->getErrorOutput());