Added support for Commit::getIncludingBranches

Author: lyrixx

src/Gitonomy/Git/Commit.php

@@ -302,6 +302,56 @@ public function getShortMessage($length = 50, $preserve = false, $separator = '.
         }
     }
 
+    /**
+     * Find branch containing the commit
+     *
+     * @param boolean $local  set true to try to locate a commit on local repository
+     * @param boolean $remote set true to try to locate a commit on remote repository
+     *
+     * @return array An array of Reference\Branch
+     */
+    public function getIncludingBranches($local = true, $remote = true)
+    {
+        $arguments = array('--contains', $this->hash);
+
+        if ($local && $remote) {
+            $arguments[] = '-a';
+        } elseif (!$local && $remote) {
+            $arguments[] = '-r';
+        } elseif (!$local && !$remote) {
+            throw new \InvalidArgumentException('You should a least set one argument to true');
+        }
+
+        try {
+            $result = $this->repository->run('branch', $arguments);
+        } catch (\Exception $e) {
+            return array();
+        }
+
+        if (!$result) {
+            return array();
+        }
+
+        $branchesName = explode("\n", trim(str_replace('*', '', $result)));
+        $branchesName = array_filter($branchesName, function($v) { return false === strpos($v, '->');});
+        $branchesName = array_map('trim', $branchesName);
+
+        $references = $this->repository->getReferences();
+
+        $branches = array();
+        foreach ($branchesName as $branchName) {
+            if (false === $local) {
+                $branches[] = $references->getRemoteBranch($branchName);
+            } elseif (0 === strrpos($branchName, 'remotes/')) {
+                $branches[] = $references->getRemoteBranch(str_replace('remotes/', '', $branchName));
+            } else {
+                $branches[] = $references->getBranch($branchName);
+            }
+        }
+
+        return $branches;
+    }
+
     /**
      * Returns the author name.
      *

tests/Gitonomy/Git/Tests/CommitTest.php

@@ -207,6 +207,34 @@ public function testGetBodyMessage($repository)
         $this->assertEquals('', $commit->getBodyMessage());
     }
 
+    /**
+     * @expectedException InvalidArgumentException
+     * @dataProvider provideFoobar
+     */
+    public function testGetIncludingBranchesException($repository)
+    {
+        $commit = $repository->getCommit(self::INITIAL_COMMIT);
+
+        $commit->getIncludingBranches(false, false);
+    }
+
+    /**
+     * @dataProvider provideFoobar
+     */
+    public function testGetIncludingBranches($repository)
+    {
+        $commit = $repository->getCommit(self::INITIAL_COMMIT);
+
+        $branches = $commit->getIncludingBranches(true, false);
+        $this->assertCount(count($repository->getReferences()->getLocalBranches()), $branches);
+
+        $branches = $commit->getIncludingBranches(true, true);
+        $this->assertCount(count($repository->getReferences()->getBranches()), $branches);
+
+        $branches = $commit->getIncludingBranches(false, true);
+        $this->assertCount(count($repository->getReferences()->getRemoteBranches()), $branches);
+    }
+
     /**
      * @dataProvider provideFoobar
      */

tests/Gitonomy/Git/Tests/HooksTest.php

@@ -12,8 +12,6 @@
 
 namespace Gitonomy\Git\Tests;
 
-use Gitonomy\Git\Admin;
-
 class HooksTest extends AbstractTest
 {
     public function hookPath($repository, $hook)

tests/Gitonomy/Git/Tests/ReferenceTest.php

@@ -19,7 +19,6 @@ class ReferenceTest extends AbstractTest
 {
     private $references;
 
-
     /**
      * @dataProvider provideFoobar
      */