add methods to get diff of staged and pending modifications

Author: alexandresalome

doc/api/workingcopy.rst

@@ -9,7 +9,6 @@ can access this object using the *getWorkingCopy* on a *Repository* object:
     $repo = new Repository('/path/to/working-dir');
     $wc = $repo->getWorkingCopy();
 
-
 Checkout a revision
 -------------------
 
@@ -25,3 +24,22 @@ second argument, which will be passed as argument with ``-b``:
     $wc->checkout('origin/master', 'master');
 
 You can also pass a *Reference* or a *Commit*.
+
+Staged modifications
+--------------------
+
+You can get a diff of modifications pending in staging area. To get the ``Diff`` object,
+call method ``getDiffStaged()``:
+
+.. code-block:: php
+
+    $diff = $wc->getDiffStaged();
+
+Pending modifications
+---------------------
+
+You can get pending modifications on tracked files by calling method ``getDiffPending()``:
+
+.. code-block:: php
+
+    $diff = $wc->getDiffPending();

src/Gitonomy/Git/Diff/File.php

@@ -219,4 +219,9 @@ public static function fromArray(array $array)
 
         return $file;
     }
+
+    public function getAnchor()
+    {
+        return substr($this->newIndex, 0, 12);
+    }
 }

src/Gitonomy/Git/WorkingCopy.php

@@ -12,6 +12,8 @@
 
 namespace Gitonomy\Git;
 
+use Gitonomy\Git\Diff\Diff;
+
 /**
  * @author Alexandre Salomé <[email protected]>
  */
@@ -31,6 +33,26 @@ public function __construct(Repository $repository)
         }
     }
 
+    public function getStatus()
+    {
+        return WorkingStatus::parseOutput();
+    }
+
+    public function getUntrackedFiles()
+    {
+        return array();
+    }
+
+    public function getDiffPending()
+    {
+        return Diff::parse($this->run('diff', array('-r', '-p', '-m', '-M', '--full-index')));
+    }
+
+    public function getDiffStaged()
+    {
+        return Diff::parse($this->run('diff', array('-r', '-p', '-m', '-M', '--full-index', '--staged')));
+    }
+
     /**
      * @return WorkingCopy
      */

tests/Gitonomy/Git/Tests/WorkingCopyTest.php

@@ -39,6 +39,37 @@ public function testCheckout()
         $this->assertEquals("new-feature", $head->getName(), "HEAD is branch new-feature");
     }
 
+    public function testDiffStaged()
+    {
+        $repository = self::createFoobarRepository(false);
+        $wc = $repository->getWorkingCopy();
+
+        $diffStaged = $wc->getDiffStaged();
+        $this->assertCount(0, $diffStaged->getFiles());
+
+        $file = $repository->getWorkingDir().'/foobar-test';
+        file_put_contents($file, 'test');
+        $repository->run('add', array($file));
+
+        $diffStaged = $wc->getDiffStaged();
+        $this->assertCount(1, $diffStaged->getFiles());
+    }
+
+    public function testDiffPending()
+    {
+        $repository = self::createFoobarRepository(false);
+        $wc = $repository->getWorkingCopy();
+
+        $diffPending = $wc->getDiffPending();
+        $this->assertCount(0, $diffPending->getFiles());
+
+        $file = $repository->getWorkingDir().'/test.sh';
+        file_put_contents($file, 'test');
+
+        $diffPending = $wc->getDiffPending();
+        $this->assertCount(1, $diffPending->getFiles());
+    }
+
     /**
      * @expectedException RuntimeException
      */