Added support for remote branches

Author: lyrixx

src/Gitonomy/Git/Reference/Branch.php

@@ -21,15 +21,42 @@
  */
 class Branch extends Reference
 {
+    private $local = null;
+
     /**
      * {@inheritdoc}
      */
     public function getName()
     {
-        if (!preg_match('#^refs/heads/(.*)$#', $this->fullname, $vars)) {
-            throw new \RuntimeException(sprintf('Cannot extract branch name from "%s"', $this->fullname));
+        if (preg_match('#^refs/heads/(?<name>.*)$#', $this->fullname, $vars)) {
+            return $vars['name'];
+        }
+
+        if (preg_match('#^refs/remotes/(?<remote>[^/]*)/(?<name>.*)$#', $this->fullname, $vars)) {
+            return $vars['remote'].'/'.$vars['name'];
         }
 
-        return $vars[1];
+        throw new \RuntimeException(sprintf('Cannot extract branch name from "%s"', $this->fullname));
+    }
+
+    public function isRemote()
+    {
+        $this->detectBranchType();
+
+        return !$this->local;
+    }
+
+    public function isLocal()
+    {
+        $this->detectBranchType();
+
+        return $this->local;
+    }
+
+    private function detectBranchType()
+    {
+        if (null === $this->local) {
+            $this->local = !preg_match('#^refs/remotes/(?<remote>[^/]*)/(?<name>.*)$#', $this->fullname);
+        }
     }
 }

src/Gitonomy/Git/ReferenceBag.php

@@ -143,6 +143,11 @@ public function hasBranch($name)
         return $this->has('refs/heads/'.$name);
     }
 
+    public function hasRemoteBranch($name)
+    {
+        return $this->has('refs/remotes/'.$name);
+    }
+
     public function hasTag($name)
     {
         return $this->has('refs/tags/'.$name);
@@ -250,6 +255,40 @@ public function getBranches()
         return $result;
     }
 
+    /**
+     * Returns all locales branches.
+     *
+     * @return array
+     */
+    public function getLocalBranches()
+    {
+        $result = array();
+        foreach ($this->getBranches() as $branch) {
+            if ($branch->isLocal()) {
+                $result[] = $branch;
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Returns all remote branches.
+     *
+     * @return array
+     */
+    public function getRemoteBranches()
+    {
+        $result = array();
+        foreach ($this->getBranches() as $branch) {
+            if ($branch->isRemote()) {
+                $result[] = $branch;
+            }
+        }
+
+        return $result;
+    }
+
     /**
      * @return array An associative array with fullname as key (refs/heads/master, refs/tags/0.1)
      */
@@ -280,6 +319,16 @@ public function getBranch($name)
         return $this->get('refs/heads/'.$name);
     }
 
+    /**
+     * @return Branch
+     */
+    public function getRemoteBranch($name)
+    {
+        $this->initialize();
+
+        return $this->get('refs/remotes/'.$name);
+    }
+
     protected function initialize()
     {
         if (true === $this->initialized) {
@@ -289,7 +338,7 @@ protected function initialize()
 
         try {
             $parser = new Parser\ReferenceParser();
-            $output = $this->repository->run('show-ref', array('--tags', '--heads'));
+            $output = $this->repository->run('show-ref');
         } catch (\RuntimeException $e) {
             $output = $e->getOutput();
             $error  = $e->getErrorOutput();
@@ -302,11 +351,14 @@ protected function initialize()
         foreach ($parser->references as $row) {
             list($commitHash, $fullname) = $row;
 
-            if (preg_match('#^refs/heads/(.*)$#', $fullname, $vars)) {
+            if (preg_match('#^refs/(heads|remotes)/(.*)$#', $fullname)) {
+                if (preg_match('#.*HEAD$#', $fullname)) {
+                    continue;
+                }
                 $reference = new Reference\Branch($this->repository, $fullname, $commitHash);
                 $this->references[$fullname] = $reference;
                 $this->branches[] = $reference;
-            } elseif (preg_match('#^refs/tags/(.*)$#', $fullname, $vars)) {
+            } elseif (preg_match('#^refs/tags/(.*)$#', $fullname)) {
                 $reference = new Reference\Tag($this->repository, $fullname, $commitHash);
                 $this->references[$fullname] = $reference;
                 $this->tags[] = $reference;

tests/Gitonomy/Git/Tests/ReferenceTest.php

@@ -113,7 +113,12 @@ public function testResolveBranches($repository)
 
         $resolved = $repository->getReferences()->resolveBranches($master->getCommitHash());
 
-        $this->assertEquals(1, count($resolved), "1 revision resolved");
+        if ($repository->isBare()) {
+            $this->assertEquals(1, count($resolved), "1 revision resolved");
+        } else {
+            $this->assertEquals(2, count($resolved), "2 revision resolved");
+        }
+
         $this->assertTrue(reset($resolved) instanceof Branch, "Resolved object is a branch");
     }