git log loads data in commit

Author: alexandresalome

src/Gitonomy/Git/Commit.php

@@ -47,7 +47,14 @@ public function __construct(Repository $repository, $hash, array $data = array()
 
         parent::__construct($repository, $hash);
 
-        $this->data = $data;
+        $this->setData($data);
+    }
+
+    public function setData(array $data)
+    {
+        foreach ($data as $name => $value) {
+            $this->data[$name] = $value;
+        }
     }
 
     /**

src/Gitonomy/Git/Log.php

@@ -155,7 +155,7 @@ public function getSingleCommit()
      */
     public function getCommits()
     {
-        $args = array('--encoding='.StringHelper::getEncoding(), '--format=format:%H');
+        $args = array('--encoding='.StringHelper::getEncoding(), '--format=raw');
 
         if (null !== $this->offset) {
             $args[] = '--skip='.((int) $this->offset);
@@ -177,17 +177,23 @@ public function getCommits()
         $args = array_merge($args, $this->paths);
 
         try {
-            $exp = explode("\n", $this->repository->run('log', $args));
+            $output = $this->repository->run('log', $args);
         } catch (ProcessException $e) {
             throw new ReferenceNotFoundException(sprintf('Can not find revision "%s"', implode(' ', $this->revisions->getAsTextArray())), null, $e);
         }
 
+        $parser = new Parser\LogParser();
+        $parser->parse($output);
+
         $result = array();
-        foreach ($exp as $hash) {
-            if ($hash == '') {
-                continue;
-            }
-            $result[] = $this->repository->getCommit($hash);
+        foreach ($parser->log as $commitData) {
+            $hash = $commitData['id'];
+            unset($commitData['id']);
+
+            $commit = $this->repository->getCommit($hash);
+            $commit->setData($commitData);
+
+            $result[] = $commit;
         }
 
         return $result;

src/Gitonomy/Git/Parser/LogParser.php

@@ -0,0 +1,67 @@
+<?php
+
+/**
+ * This file is part of Gitonomy.
+ *
+ * (c) Alexandre Salomé <alexandre.salome@gmail.com>
+ * (c) Julien DIDIER <genzo.wm@gmail.com>
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
+namespace Gitonomy\Git\Parser;
+
+use Gitonomy\Git\Exception\RuntimeException;
+
+class LogParser extends CommitParser
+{
+    public $log = array();
+
+    protected function doParse()
+    {
+        $this->log = array();
+
+        while (!$this->isFinished()) {
+            $commit = array();
+            $this->consume('commit ');
+            $commit['id'] = $this->consumeHash();
+            $this->consumeNewLine();
+
+            $this->consume('tree ');
+            $commit['tree'] = $this->consumeHash();
+            $this->consumeNewLine();
+
+            $commit['parentHashes'] = array();
+            while ($this->expects('parent ')) {
+                $commit['parentHashes'][] = $this->consumeHash();
+                $this->consumeNewLine();
+            }
+
+            $this->consume('author ');
+            list($commit['authorName'], $commit['authorEmail'], $commit['authorDate']) = $this->consumeNameEmailDate();
+            $commit['authorDate'] = $this->parseDate($commit['authorDate']);
+            $this->consumeNewLine();
+
+            $this->consume('committer ');
+            list($commit['committerName'], $commit['committerEmail'], $commit['committerDate']) = $this->consumeNameEmailDate();
+            $commit['committerDate'] = $this->parseDate($commit['committerDate']);
+            $this->consumeNewLine();
+            $this->consumeNewLine();
+
+            $message = '';
+            while ($this->expects('    ')) {
+                $message .= $this->consumeTo("\n")."\n";
+                $this->consumeNewLine();
+            }
+
+            if (!$this->isFinished()) {
+                $this->consumeNewLine();
+            }
+
+            $commit['message'] = $message;
+
+            $this->log[] = $commit;
+        }
+    }
+}