X-Git-Url: https://git.cweiske.de/phorkie.git/blobdiff_plain/9e9f228abdf3f10d369b2699ffef29b59ff2bbf4..35764754559c893569625c115707eb3bf73d1cfd:/src/phorkie/Repository.php diff --git a/src/phorkie/Repository.php b/src/phorkie/Repository.php index 6dec015..c854cf1 100644 --- a/src/phorkie/Repository.php +++ b/src/phorkie/Repository.php @@ -12,11 +12,27 @@ class Repository public $id; /** - * Full path to the git repository + * Full path to the .git repository * * @var string */ - public $repoDir; + public $gitDir; + + /** + * Full path to the work tree directory + * + * @var string + */ + public $workDir; + + /** + * Revision of the repository that shall be shown + * + * @var string + */ + public $hash; + + /** * Load Repository data from GET-Request @@ -33,13 +49,52 @@ class Repository if (!is_numeric($_GET['id'])) { throw new Exception_Input('Paste ID not numeric'); } + if (isset($_GET['rev'])) { + $this->hash = $_GET['rev']; + } + $this->id = (int)$_GET['id']; + $this->loadDirs(); + $this->loadHash(); + } + + protected function loadDirs() + { + $gitDir = $GLOBALS['phorkie']['cfg']['gitdir'] . '/' . $this->id . '.git'; + if (!is_dir($gitDir)) { + throw new Exception_NotFound( + sprintf('Paste %d .git dir not found', $this->id) + ); + } + $this->gitDir = $gitDir; + + $workDir = $GLOBALS['phorkie']['cfg']['workdir'] . '/' . $this->id; + if (!is_dir($workDir)) { + throw new Exception_NotFound( + sprintf('Paste %d work dir not found', $this->id) + ); + } + $this->workDir = $workDir; + } + + public function loadHash() + { + return; + if ($this->hash !== null) { + return; + } - $repoDir = $GLOBALS['phorkie']['cfg']['repos'] . '/' . $this->id; - if (!is_dir($repoDir)) { - throw new Exception_NotFound('Paste not found'); + $output = $this->getVc()->getCommand('log') + ->setOption('pretty', 'format:%H') + ->setOption('max-count', 1) + ->execute(); + $output = trim($output); + if (strlen($output) !== 40) { + throw new Exception( + 'Loading commit hash failed: ' . $output + ); } - $this->repoDir = $repoDir; + $this->hash = $output; } public function loadById($id) @@ -48,17 +103,13 @@ class Repository throw new Exception_Input('Paste ID not numeric'); } $this->id = (int)$id; - - $repoDir = $GLOBALS['phorkie']['cfg']['repos'] . '/' . $this->id; - if (!is_dir($repoDir)) { - throw new Exception_NotFound('Paste not found'); - } - $this->repoDir = $repoDir; + $this->loadDirs(); + $this->loadHash(); } public function getVc() { - return new \VersionControl_Git($this->repoDir); + return new \VersionControl_Git($this->gitDir); } /** @@ -68,28 +119,43 @@ class Repository */ public function getFiles() { - $files = glob($this->repoDir . '/*'); + $files = $this->getFilePaths(); $arFiles = array(); - foreach ($files as $path) { - $arFiles[] = new File($path, $this); + foreach ($files as $name) { + $arFiles[] = new File($name, $this); } return $arFiles; } - public function getFileByName($name, $bHasToExist = true) + protected function getFilePaths() { - $base = basename($name); - if ($base != $name) { - throw new Exception('No directories supported for now'); + if ($this->hash === null) { + $hash = 'HEAD'; + } else { + $hash = $this->hash; } + $output = $this->getVc()->getCommand('ls-tree') + ->setOption('r') + ->setOption('name-only') + ->addArgument($hash) + ->execute(); + return explode("\n", trim($output)); + } + + public function getFileByName($name, $bHasToExist = true) + { + $name = Tools::sanitizeFilename($name); if ($name == '') { throw new Exception_Input('Empty file name given'); } - $path = $this->repoDir . '/' . $base; - if ($bHasToExist && !is_readable($path)) { - throw new Exception_Input('File does not exist'); + + if ($bHasToExist) { + $files = $this->getFilePaths(); + if (array_search($name, $files) === false) { + throw new Exception_Input('File does not exist'); + } } - return new File($path, $this); + return new File($name, $this); } public function hasFile($name) @@ -110,20 +176,21 @@ class Repository */ public function delete() { - return Tools::recursiveDelete($this->repoDir); + return Tools::recursiveDelete($this->workDir) + && Tools::recursiveDelete($this->gitDir); } public function getDescription() { - if (!is_readable($this->repoDir . '/.git/description')) { + if (!is_readable($this->gitDir . '/description')) { return null; } - return file_get_contents($this->repoDir . '/.git/description'); + return file_get_contents($this->gitDir . '/description'); } public function setDescription($description) { - file_put_contents($this->repoDir . '/.git/description', $description); + file_put_contents($this->gitDir . '/description', $description); } /** @@ -131,12 +198,16 @@ class Repository * * @param string $type Link type. Supported are: * - "edit" + * - "delete" + * - "delete-confirm" * - "display" * - "fork" + * - "revision" + * @param string $option * * @return string */ - public function getLink($type) + public function getLink($type, $option = null) { if ($type == 'edit') { return '/' . $this->id . '/edit'; @@ -148,6 +219,8 @@ class Repository return '/' . $this->id . '/delete'; } else if ($type == 'delete-confirm') { return '/' . $this->id . '/delete/confirm'; + } else if ($type == 'revision') { + return '/' . $this->id . '/rev/' . $option; } throw new Exception('Unknown link type'); } @@ -156,10 +229,55 @@ class Repository { $var = $public ? 'public' : 'private'; if (isset($GLOBALS['phorkie']['cfg']['git'][$var])) { - return $GLOBALS['phorkie']['cfg']['git'][$var] . $this->id . '/.git'; + return $GLOBALS['phorkie']['cfg']['git'][$var] . $this->id . '.git'; } return null; } + + /** + * Returns the history of the repository. + * We don't use VersionControl_Git's rev list fetcher since it does not + * give us separate email addresses and names, and it does not give us + * the amount of changed (added/deleted) lines. + * + * @return array Array of history objects + */ + public function getHistory() + { + $output = $this->getVc()->getCommand('log') + ->setOption('pretty', 'format:commit %H%n%at%n%an%n%ae') + ->setOption('max-count', 10) + ->setOption('shortstat') + ->execute(); + + $arCommits = array(); + $arOutput = explode("\n", $output); + $lines = count($arOutput); + $current = 0; + while ($current < $lines) { + $commit = new Repository_Commit(); + list($name,$commit->hash) = explode(' ', $arOutput[$current]); + if ($name !== 'commit') { + throw new Exception( + 'Git log output format not as expected: ' . $arOutput[$current] + ); + } + $commit->committerTime = $arOutput[$current + 1]; + $commit->committerName = $arOutput[$current + 2]; + $commit->committerEmail = $arOutput[$current + 3]; + + $arLineParts = explode(' ', trim($arOutput[$current + 4])); + $commit->filesChanged = $arLineParts[0]; + $commit->linesAdded = $arLineParts[3]; + $commit->linesDeleted = $arLineParts[5]; + + $current += 6; + + $arCommits[] = $commit; + } + + return $arCommits; + } } ?>