Fixed getLocalChanges calls in VCS downloaders to match new function interface
parent
49d89bbbfc
commit
80cebbd4be
|
@ -97,11 +97,11 @@ class GitDownloader extends VcsDownloader
|
||||||
/**
|
/**
|
||||||
* {@inheritDoc}
|
* {@inheritDoc}
|
||||||
*/
|
*/
|
||||||
protected function cleanChanges($path, $update)
|
protected function cleanChanges($path, $update, $package)
|
||||||
{
|
{
|
||||||
$this->cleanEnv();
|
$this->cleanEnv();
|
||||||
$path = $this->normalizePath($path);
|
$path = $this->normalizePath($path);
|
||||||
if (!$changes = $this->getLocalChanges($path)) {
|
if (!$changes = $this->getLocalChanges($path, $package)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -112,13 +112,13 @@ class GitDownloader extends VcsDownloader
|
||||||
}
|
}
|
||||||
if ('stash' === $discardChanges) {
|
if ('stash' === $discardChanges) {
|
||||||
if (!$update) {
|
if (!$update) {
|
||||||
return parent::cleanChanges($path, $update);
|
return parent::cleanChanges($path, $update, $package);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $this->stashChanges($path);
|
return $this->stashChanges($path);
|
||||||
}
|
}
|
||||||
|
|
||||||
return parent::cleanChanges($path, $update);
|
return parent::cleanChanges($path, $update, $package);
|
||||||
}
|
}
|
||||||
|
|
||||||
$changes = array_map(function ($elem) {
|
$changes = array_map(function ($elem) {
|
||||||
|
|
|
@ -90,9 +90,9 @@ class SvnDownloader extends VcsDownloader
|
||||||
/**
|
/**
|
||||||
* {@inheritDoc}
|
* {@inheritDoc}
|
||||||
*/
|
*/
|
||||||
protected function cleanChanges($path, $update)
|
protected function cleanChanges($path, $update, $package)
|
||||||
{
|
{
|
||||||
if (!$changes = $this->getLocalChanges($path)) {
|
if (!$changes = $this->getLocalChanges($path, $package)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -101,7 +101,7 @@ class SvnDownloader extends VcsDownloader
|
||||||
return $this->discardChanges($path);
|
return $this->discardChanges($path);
|
||||||
}
|
}
|
||||||
|
|
||||||
return parent::cleanChanges($path, $update);
|
return parent::cleanChanges($path, $update, $package);
|
||||||
}
|
}
|
||||||
|
|
||||||
$changes = array_map(function ($elem) {
|
$changes = array_map(function ($elem) {
|
||||||
|
|
|
@ -86,7 +86,7 @@ abstract class VcsDownloader implements DownloaderInterface, ChangeReportInterfa
|
||||||
|
|
||||||
$this->io->write(" - Updating <info>" . $name . "</info> (<comment>" . $from . "</comment> => <comment>" . $to . "</comment>)");
|
$this->io->write(" - Updating <info>" . $name . "</info> (<comment>" . $from . "</comment> => <comment>" . $to . "</comment>)");
|
||||||
|
|
||||||
$this->cleanChanges($path, true);
|
$this->cleanChanges($path, true, $initial);
|
||||||
try {
|
try {
|
||||||
$this->doUpdate($initial, $target, $path);
|
$this->doUpdate($initial, $target, $path);
|
||||||
} catch (\Exception $e) {
|
} catch (\Exception $e) {
|
||||||
|
@ -126,7 +126,7 @@ abstract class VcsDownloader implements DownloaderInterface, ChangeReportInterfa
|
||||||
public function remove(PackageInterface $package, $path)
|
public function remove(PackageInterface $package, $path)
|
||||||
{
|
{
|
||||||
$this->io->write(" - Removing <info>" . $package->getName() . "</info> (<comment>" . $package->getPrettyVersion() . "</comment>)");
|
$this->io->write(" - Removing <info>" . $package->getName() . "</info> (<comment>" . $package->getPrettyVersion() . "</comment>)");
|
||||||
$this->cleanChanges($path, false);
|
$this->cleanChanges($path, false, $package);
|
||||||
if (!$this->filesystem->removeDirectory($path)) {
|
if (!$this->filesystem->removeDirectory($path)) {
|
||||||
// retry after a bit on windows since it tends to be touchy with mass removals
|
// retry after a bit on windows since it tends to be touchy with mass removals
|
||||||
if (!defined('PHP_WINDOWS_VERSION_BUILD') || (usleep(250) && !$this->filesystem->removeDirectory($path))) {
|
if (!defined('PHP_WINDOWS_VERSION_BUILD') || (usleep(250) && !$this->filesystem->removeDirectory($path))) {
|
||||||
|
@ -150,12 +150,13 @@ abstract class VcsDownloader implements DownloaderInterface, ChangeReportInterfa
|
||||||
* @param string $path
|
* @param string $path
|
||||||
* @param bool $update if true (update) the changes can be stashed and reapplied after an update,
|
* @param bool $update if true (update) the changes can be stashed and reapplied after an update,
|
||||||
* if false (remove) the changes should be assumed to be lost if the operation is not aborted
|
* if false (remove) the changes should be assumed to be lost if the operation is not aborted
|
||||||
|
* @param PackageInterface $package
|
||||||
* @throws \RuntimeException in case the operation must be aborted
|
* @throws \RuntimeException in case the operation must be aborted
|
||||||
*/
|
*/
|
||||||
protected function cleanChanges($path, $update)
|
protected function cleanChanges($path, $update, $package)
|
||||||
{
|
{
|
||||||
// the default implementation just fails if there are any changes, override in child classes to provide stash-ability
|
// the default implementation just fails if there are any changes, override in child classes to provide stash-ability
|
||||||
if (null !== $this->getLocalChanges($path)) {
|
if (null !== $this->getLocalChanges($path, $package)) {
|
||||||
throw new \RuntimeException('Source directory ' . $path . ' has uncommitted changes.');
|
throw new \RuntimeException('Source directory ' . $path . ' has uncommitted changes.');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue