Browse Source

Merge pull request #400 from kostiklv/descriptive-exception

More descriptive exceptions wording
Jordi Boggiano 13 years ago
parent
commit
91411a3dd4

+ 2 - 2
src/Composer/Compiler.php

@@ -35,9 +35,9 @@ class Compiler
             unlink($pharFile);
         }
 
-        $process = new Process('git log --pretty="%h" -n1 HEAD');
+        $process = new Process('git log --pretty="%h" -n1 HEAD', __DIR__);
         if ($process->run() != 0) {
-            throw new \RuntimeException('The git binary cannot be found.');
+            throw new \RuntimeException('Can\'t run git log. You must ensure to run compile from composer git repository clone and that git binary is available.');
         }
         $this->version = trim($process->getOutput());
 

+ 1 - 1
src/Composer/Downloader/GitDownloader.php

@@ -74,7 +74,7 @@ class GitDownloader extends VcsDownloader
         }
 
         if (trim($output)) {
-            throw new \RuntimeException('Source directory has uncommitted changes');
+            throw new \RuntimeException('Source directory ' . $path . ' has uncommitted changes');
         }
     }
 }

+ 1 - 1
src/Composer/Downloader/HgDownloader.php

@@ -50,7 +50,7 @@ class HgDownloader extends VcsDownloader
     {
         $this->process->execute(sprintf('cd %s && hg st', escapeshellarg($path)), $output);
         if (trim($output)) {
-            throw new \RuntimeException('Source directory has uncommitted changes');
+            throw new \RuntimeException('Source directory ' . $path . ' has uncommitted changes');
         }
     }
 }

+ 1 - 1
src/Composer/Downloader/SvnDownloader.php

@@ -51,7 +51,7 @@ class SvnDownloader extends VcsDownloader
     {
         $this->process->execute(sprintf('cd %s && svn status', escapeshellarg($path)), $output);
         if (trim($output)) {
-            throw new \RuntimeException('Source directory has uncommitted changes');
+            throw new \RuntimeException('Source directory ' . $path . ' has uncommitted changes');
         }
     }
 }