inject Repository in Diff as an optional attribute

Author: alexandresalome

src/Gitonomy/Git/Commit.php

@@ -164,7 +164,10 @@ public function getDiff()
     {
         $args = array('-r', '-p', '-m', '-M', '--no-commit-id', '--full-index', $this->hash);
 
-        return Diff::parse($this->repository->run('diff-tree', $args));
+        $diff = Diff::parse($this->repository->run('diff-tree', $args));
+        $diff->setRepository($this->repository);
+
+        return $diff;
     }
 
     /**
@@ -474,4 +477,12 @@ public function getBodyMessage()
 
         return implode("\n", $lines);
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function getCommit()
+    {
+        return $this;
+    }
 }

src/Gitonomy/Git/Diff/Diff.php

@@ -13,6 +13,7 @@
 namespace Gitonomy\Git\Diff;
 
 use Gitonomy\Git\Parser\DiffParser;
+use Gitonomy\Git\Repository;
 
 /**
  * Representation of a diff.
@@ -54,6 +55,13 @@ public static function parse($rawDiff)
         return new Diff($parser->files, $rawDiff);
     }
 
+    public function setRepository(Repository $repository)
+    {
+        foreach ($this->files as $file) {
+            $file->setRepository($repository);
+        }
+    }
+
     /**
      * @return array
      */

src/Gitonomy/Git/Diff/File.php

@@ -12,6 +12,8 @@
 
 namespace Gitonomy\Git\Diff;
 
+use Gitonomy\Git\Repository;
+
 /**
  * @author Alexandre Salomé <alexandre.salome@gmail.com>
  */
@@ -57,6 +59,11 @@ class File
      */
     protected $changes;
 
+    /**
+     * @var Repository
+     */
+    protected $repository;
+
     /**
      * Instanciates a new File object.
      */
@@ -224,4 +231,40 @@ public function getAnchor()
     {
         return substr($this->newIndex, 0, 12);
     }
+
+    public function getRepository()
+    {
+        return $this->repository;
+    }
+
+    public function setRepository(Repository $repository)
+    {
+        $this->repository = $repository;
+    }
+
+    public function getOldBlob()
+    {
+        if (null === $this->repository) {
+            throw new \RuntimeException('Repository is missing to return Blob object.');
+        }
+
+        if ($this->isCreation()) {
+            throw new \LogicException('Can\'t return old Blob on a creation');
+        }
+
+        return $this->repository->getBlob($this->oldIndex);
+    }
+
+    public function getNewBlob()
+    {
+        if (null === $this->repository) {
+            throw new \RuntimeException('Repository is missing to return Blob object.');
+        }
+
+        if ($this->isDeletion()) {
+            throw new \LogicException('Can\'t return new Blob on a deletion');
+        }
+
+        return $this->repository->getBlob($this->newIndex);
+    }
 }

src/Gitonomy/Git/Repository.php

@@ -385,11 +385,18 @@ public function getLog($revisions = null, $paths = null, $offset = null, $limit
     /**
      * @return Diff
      */
-    public function getDiff($revision)
+    public function getDiff($revisions)
     {
-        $args = array_merge(array('-r', '-p', '-m', '-M', '--no-commit-id', '--full-index'), (array) $revision);
+        if (null !== $revisions && !$revisions instanceof RevisionList) {
+            $revisions = new RevisionList($repository, $revisions);
+        }
+
+        $args = array_merge(array('-r', '-p', '-m', '-M', '--no-commit-id', '--full-index'), $revisions->getAsTextArray());
+
+        $diff = Diff::parse($this->run('diff', $args));
+        $diff->setRepository($this);
 
-        return Diff::parse($this->run('diff', $args));
+        return $diff;
     }
 
     /**

src/Gitonomy/Git/WorkingCopy.php

@@ -48,12 +48,18 @@ public function getUntrackedFiles()
 
     public function getDiffPending()
     {
-        return Diff::parse($this->run('diff', array('-r', '-p', '-m', '-M', '--full-index')));
+        $diff = Diff::parse($this->run('diff', array('-r', '-p', '-m', '-M', '--full-index')));
+        $diff->setRepository($this->repository);
+
+        return $this;
     }
 
     public function getDiffStaged()
     {
-        return Diff::parse($this->run('diff', array('-r', '-p', '-m', '-M', '--full-index', '--staged')));
+        $diff = Diff::parse($this->run('diff', array('-r', '-p', '-m', '-M', '--full-index', '--staged')));
+        $diff->setRepository($this->repository);
+
+        return $this;
     }
 
     /**