Single file editing

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

diff --git a/src/phorkie/Repository.php b/src/phorkie/Repository.php
index f45c76f72a7e8317ed15f23ba5e48d9a99cfbbf0..467456b96821e81cd919927c734f098e2212bdb0 100644 (file)
--- a/src/phorkie/Repository.php
+++ b/src/phorkie/Repository.php
@@ -144,7 +144,7 @@ class Repository
     /**
      * Loads the list of files in this repository
      *
-     * @return File[] Array of files
+     * @return File[] Array of file objects
      */
     public function getFiles()
     {
@@ -156,6 +156,41 @@ class Repository
         return $arFiles;
     }
 
+    /**
+     * Decodes unicode characters in git filenames
+     * They begin and end with double quote characters, and may contain
+     * backslash + 3 letter octal code numbers representing the character.
+     *
+     * For example,
+     * > "t\303\244st.txt"
+     * means
+     * > täst.txt
+     *
+     * On the shell, you can pipe them into "printf" and have them decoded.
+     *
+     * @param string Encoded git file name
+     *
+     * @return string Decoded file name
+     */
+    protected function decodeFileName($name)
+    {
+        $name = substr($name, 1, -1);
+        $name = str_replace('\"', '"', $name);
+        $name = preg_replace_callback(
+            '#\\\\[0-7]{3}#',
+            function ($ar) {
+                return chr(octdec(substr($ar[0], 1)));
+            },
+            $name
+        );
+        return $name;
+    }
+
+    /**
+     * Return array with all file paths in this repository
+     *
+     * @return array
+     */
     protected function getFilePaths()
     {
         if ($this->hash === null) {
@@ -168,7 +203,13 @@ class Repository
             ->setOption('name-only')
             ->addArgument($hash)
             ->execute();
-        return explode("\n", trim($output));
+        $files = explode("\n", trim($output));
+        foreach ($files as &$file) {
+            if ($file{0} == '"') {
+                $file = $this->decodeFileName($file);
+            }
+        }
+        return $files;
     }
 
     public function getFileByName($name, $bHasToExist = true)
@@ -280,6 +321,9 @@ class Repository
     {
         if ($type == 'edit') {
             $link = $this->id . '/edit';
+            if ($option !== null) {
+                $link .= '/' . urlencode($option);
+            }
         } else if ($type == 'display') {
             $link = $this->id;
         } else if ($type == 'fork') {
@@ -290,8 +334,12 @@ class Repository
             $link = $this->id . '/delete';
         } else if ($type == 'delete-confirm') {
             $link = $this->id . '/delete/confirm';
+        } else if ($type == 'remotefork') {
+            return 'web+fork:' . $this->getLink('display', null, true);
         } else if ($type == 'revision') {
             $link = $this->id . '/rev/' . $option;
+        } else if ($type == 'linkback') {
+            $link = $this->id . '/linkback';
         } else {
             throw new Exception('Unknown link type');
         }