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

Shorten git hashes to 10chars to avoid long lines, refs #5946

pull/5636/merge
Jordi Boggiano 2016-12-11 16:29:13 +01:00
parent 4d77ffcb4a
commit 58b94b66e5
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,7 +49,7 @@ class GitDownloader extends VcsDownloader implements DvcsDownloaderInterface
// --dissociate option is only available since git 2.3.0-rc0 // --dissociate option is only available since git 2.3.0-rc0
$gitVersion = $this->gitUtil->getVersion(); $gitVersion = $this->gitUtil->getVersion();
$msg = " Cloning ".$ref; $msg = " Cloning ".$this->getShortHash($ref);
if ($gitVersion && version_compare($gitVersion, '2.3.0-rc0', '>=')) { if ($gitVersion && version_compare($gitVersion, '2.3.0-rc0', '>=')) {
$this->io->writeError('', true, IOInterface::DEBUG); $this->io->writeError('', true, IOInterface::DEBUG);
$this->io->writeError(sprintf(' Cloning to cache at %s', ProcessExecutor::escape($cachePath)), true, IOInterface::DEBUG); $this->io->writeError(sprintf(' Cloning to cache at %s', ProcessExecutor::escape($cachePath)), true, IOInterface::DEBUG);
@ -57,7 +57,7 @@ class GitDownloader extends VcsDownloader implements DvcsDownloaderInterface
$this->gitUtil->syncMirror($url, $cachePath); $this->gitUtil->syncMirror($url, $cachePath);
if (is_dir($cachePath)) { if (is_dir($cachePath)) {
$cacheOptions = sprintf('--dissociate --reference %s ', ProcessExecutor::escape($cachePath)); $cacheOptions = sprintf('--dissociate --reference %s ', ProcessExecutor::escape($cachePath));
$msg = " Cloning ".$ref.' from cache'; $msg = " Cloning ".$this->getShortHash($ref).' from cache';
} }
} catch (\RuntimeException $e) {} } catch (\RuntimeException $e) {}
} }
@ -105,7 +105,7 @@ class GitDownloader extends VcsDownloader implements DvcsDownloaderInterface
} }
$ref = $target->getSourceReference(); $ref = $target->getSourceReference();
$this->io->writeError(" Checking out ".$ref); $this->io->writeError(" Checking out ".$this->getShortHash($ref));
$command = 'git remote set-url composer %s && git rev-parse --quiet --verify %s^{commit} || (git fetch composer && git fetch --tags composer)'; $command = 'git remote set-url composer %s && git rev-parse --quiet --verify %s^{commit} || (git fetch composer && git fetch --tags composer)';
$commandCallable = function ($url) use ($command, $ref) { $commandCallable = function ($url) use ($command, $ref) {
@ -492,4 +492,13 @@ class GitDownloader extends VcsDownloader implements DvcsDownloaderInterface
return is_dir($path.'/.git'); return is_dir($path.'/.git');
} }
protected function getShortHash($reference)
{
if (!$this->io->isVerbose() && preg_match('{^[0-9a-f]{40}$}', $reference)) {
return substr($reference, 10);
}
return $reference;
}
} }