make getLink optionally return full urls

[phorkie.git] / src / phorkie / Repository.php

diff --git a/src/phorkie/Repository.php b/src/phorkie/Repository.php
index 6ed380741ee4a2c0c2479887e8adec48ceac817d..d82789d54dc0ef44c26fd9d38acf659b07c7d6b4 100644 (file)
--- a/src/phorkie/Repository.php
+++ b/src/phorkie/Repository.php
@@ -104,6 +104,11 @@ class Repository
         $this->hash = $output;
     }
 
+    /**
+     * Populates $this->message
+     *
+     * @return void
+     */
     public function loadMessage()
     {
         $rev = (isset($this->hash)) ? $this->hash : 'HEAD';
@@ -118,7 +123,7 @@ class Repository
             $this->message = trim($output);
         } else {
             $this->message = "This commit message intentionally left blank.";
-               }
+        }
     }
 
     public function loadById($id)
@@ -230,36 +235,66 @@ class Repository
         file_put_contents($this->gitDir . '/description', $description);
     }
 
+    /**
+     * @return array Array with keys "email" and "name"
+     */
+    public function getOwner()
+    {
+        try {
+            $name = $this->getVc()->getCommand('config')
+                ->addArgument('owner.name')->execute();
+        } catch (\VersionControl_Git_Exception $e) {
+            $name = $GLOBALS['phorkie']['auth']['anonymousName'];
+        }
+        try {
+            $email = $this->getVc()->getCommand('config')
+                ->addArgument('owner.email')->execute();
+        } catch (\VersionControl_Git_Exception $e) {
+            $email = $GLOBALS['phorkie']['auth']['anonymousEmail'];
+        }
+
+        return array('name' => trim($name), 'email' => trim($email));
+    }
+
     /**
      * Get a link to the repository
      *
-     * @param string $type Link type. Supported are:
-     *                     - "edit"
-     *                     - "delete"
-     *                     - "delete-confirm"
-     *                     - "display"
-     *                     - "fork"
-     *                     - "revision"
-     * @param string $option
+     * @param string  $type   Link type. Supported are:
+     *                        - "edit"
+     *                        - "delete"
+     *                        - "delete-confirm"
+     *                        - "display"
+     *                        - "fork"
+     *                        - "revision"
+     * @param string  $option Additional link option, e.g. revision number
+     * @param boolean $full   Return full URL or normal relative
      *
      * @return string
      */
-    public function getLink($type, $option = null)
+    public function getLink($type, $option = null, $full = false)
     {
         if ($type == 'edit') {
-            return '/' . $this->id . '/edit';
+            $link = '/' . $this->id . '/edit';
         } else if ($type == 'display') {
-            return '/' . $this->id;
+            $link = '/' . $this->id;
         } else if ($type == 'fork') {
-            return '/' . $this->id . '/fork';
+            $link = '/' . $this->id . '/fork';
+        } else if ($type == 'doap') {
+            $link = '/' . $this->id . '/doap';
         } else if ($type == 'delete') {
-            return '/' . $this->id . '/delete';
+            $link = '/' . $this->id . '/delete';
         } else if ($type == 'delete-confirm') {
-            return '/' . $this->id . '/delete/confirm';
+            $link = '/' . $this->id . '/delete/confirm';
         } else if ($type == 'revision') {
-            return '/' . $this->id . '/rev/' . $option;
+            $link = '/' . $this->id . '/rev/' . $option;
+        } else {
+            throw new Exception('Unknown link type');
+        }
+
+        if ($full) {
+            $link = Tools::fullUrl($link);
         }
-        throw new Exception('Unknown link type');
+        return $link;
     }
 
     public function getCloneURL($public = true)
@@ -303,6 +338,13 @@ class Repository
             $commit->committerName  = $arOutput[$current + 2];
             $commit->committerEmail = $arOutput[$current + 3];
 
+            if (substr($arOutput[$current + 4], 0, 1) != ' ') {
+                //commit without changed lines
+                $arCommits[] = $commit;
+                $current += 4;
+                continue;
+            }
+
             $arLineParts = explode(' ', trim($arOutput[$current + 4]));
             $commit->filesChanged = $arLineParts[0];
             $commit->linesAdded   = $arLineParts[3];