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

fixes #801 show logs in --verbose mode for source packages

pull/837/head
Robert Schönthal 2012-06-25 15:23:54 +02:00
parent adaa788955
commit 68d80e162a
4 changed files with 60 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Composer/Downloader/GitDownloader.php Normal file → Executable file
View File

@ -224,4 +224,15 @@ class GitDownloader extends VcsDownloader
$this->process->execute($cmd, $ignoredOutput, $path);
}
}
protected function getCommitLogs($sourceReference, $targetReference, $path)
{
$command = sprintf('cd %s && git log %s..%s --pretty=format:"%%h - %%an: %%s"', escapeshellarg($path), $sourceReference, $targetReference);
if (0 !== $this->process->execute($command, $output)) {
throw new \RuntimeException('Failed to execute ' . $command . "\n\n" . $this->process->getErrorOutput());
}
return $output;
}
}

11
src/Composer/Downloader/HgDownloader.php Normal file → Executable file
View File

@ -59,4 +59,15 @@ class HgDownloader extends VcsDownloader
throw new \RuntimeException('Source directory ' . $path . ' has uncommitted changes');
}
}
protected function getCommitLogs($sourceReference, $targetReference, $path)
{
$command = sprintf('cd %s && hg log -r %s:%s --style compact', escapeshellarg($path), $sourceReference, $targetReference);
if (0 !== $this->process->execute($command, $output)) {
throw new \RuntimeException('Failed to execute ' . $command . "\n\n" . $this->process->getErrorOutput());
}
return $output;
}
}

11
src/Composer/Downloader/SvnDownloader.php Normal file → Executable file
View File

@ -79,4 +79,15 @@ class SvnDownloader extends VcsDownloader
);
}
}
protected function getCommitLogs($sourceReference, $targetReference, $path)
{
$command = sprintf('cd %s && svn log -r%s:%s --incremental', escapeshellarg($path), $sourceReference, $targetReference);
if (0 !== $this->process->execute($command, $output)) {
throw new \RuntimeException('Failed to execute ' . $command . "\n\n" . $this->process->getErrorOutput());
}
return $output;
}
}

28
src/Composer/Downloader/VcsDownloader.php Normal file → Executable file
View File

@ -65,9 +65,25 @@ abstract class VcsDownloader implements DownloaderInterface
throw new \InvalidArgumentException('Package '.$target->getPrettyName().' is missing reference information');
}
$this->io->write(" - Updating <info>" . $target->getName() . "</info> (<comment>" . $target->getPrettyVersion() . "</comment>)");
if ($initial->getPrettyVersion() == $target->getPrettyVersion()) {
$from = $initial->getSourceReference();
$to = $target->getSourceReference();
} else {
$from = $initial->getPrettyVersion();
$to = $target->getPrettyVersion();
}
$this->io->write(" - Updating <info>" . $target->getName() . "</info> from (<comment>" . $from . "</comment>) to (<comment>" . $to . "</comment>)");
$this->enforceCleanDirectory($path);
$this->doUpdate($initial, $target, $path);
//print the commit logs if in verbose mode
if ($this->io->isVerbose()) {
$logs = $this->getCommitLogs($initial->getSourceReference(), $target->getSourceReference(), $path);
$this->io->write($logs);
}
$this->io->write('');
}
@ -106,4 +122,14 @@ abstract class VcsDownloader implements DownloaderInterface
* @throws \RuntimeException if the directory is not clean
*/
abstract protected function enforceCleanDirectory($path);
/**
* fetches the commit logs between to commits
*
* @param string $sourceReference the source reference
* @param string $targetReference the target reference
* @param string $path the package path
* @return string
*/
abstract protected function getCommitLogs($sourceReference, $targetReference, $path);
}