First work on the git browser.
This commit is contained in:
parent
2e711bee8d
commit
876e206742
137
src/IDF/Git.php
Normal file
137
src/IDF/Git.php
Normal file
@ -0,0 +1,137 @@
|
|||||||
|
<?php
|
||||||
|
/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
||||||
|
/*
|
||||||
|
# ***** BEGIN LICENSE BLOCK *****
|
||||||
|
# This file is part of InDefero, an open source project management application.
|
||||||
|
# Copyright (C) 2008 Céondo Ltd and contributors.
|
||||||
|
#
|
||||||
|
# InDefero is free software; you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation; either version 2 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# InDefero is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program; if not, write to the Free Software
|
||||||
|
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
|
#
|
||||||
|
# ***** END LICENSE BLOCK ***** */
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Git utils.
|
||||||
|
*/
|
||||||
|
class IDF_Git
|
||||||
|
{
|
||||||
|
public $repo = '';
|
||||||
|
|
||||||
|
public function __construct($repo)
|
||||||
|
{
|
||||||
|
$this->repo = $repo;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Given a commit hash (or a branch) returns an array of files in
|
||||||
|
* it.
|
||||||
|
*
|
||||||
|
* A file is a class with the following properties:
|
||||||
|
*
|
||||||
|
* 'perm', 'type', 'size', 'hash', 'file'
|
||||||
|
*
|
||||||
|
* @param string Commit/Branch ('HEAD')
|
||||||
|
* @param string Base folder ('')
|
||||||
|
* @return array
|
||||||
|
*/
|
||||||
|
public function filesInTree($commit='HEAD', $basefolder='')
|
||||||
|
{
|
||||||
|
if (is_object($basefolder)) {
|
||||||
|
$base = $basefolder;
|
||||||
|
} else if ($basefolder != ''
|
||||||
|
and
|
||||||
|
(
|
||||||
|
(false === ($base=$this->getFileInfo($basefolder, $commit)))
|
||||||
|
or
|
||||||
|
($base->type != 'tree')
|
||||||
|
)) {
|
||||||
|
throw new Exception(sprintf('Base folder "%s" not found.', $basefolder));
|
||||||
|
} else {
|
||||||
|
// no base
|
||||||
|
$base = (object) array('file' => '',
|
||||||
|
'hash' => $commit);
|
||||||
|
}
|
||||||
|
|
||||||
|
$res = array();
|
||||||
|
$out = array();
|
||||||
|
$cmd = sprintf('GIT_DIR=%s git-ls-tree -t -l %s', $this->repo, $base->hash);
|
||||||
|
exec($cmd, &$out);
|
||||||
|
$current_dir = getcwd();
|
||||||
|
chdir(substr($this->repo, 0, -5));
|
||||||
|
foreach ($out as $line) {
|
||||||
|
list($perm, $type, $hash, $size, $file) = preg_split('/ |\t/', $line, 5, PREG_SPLIT_NO_EMPTY);
|
||||||
|
$cm = array();
|
||||||
|
$cmd = sprintf('GIT_DIR=%s git log -1 --pretty=format:\'%%H %%at %%s\' %s -- %s', $this->repo, $commit, ($base->file) ? $base->file.'/'.$file : $file);
|
||||||
|
exec($cmd, &$cm);
|
||||||
|
list($h, $time, $log) = explode(' ', $cm[0], 3);
|
||||||
|
$res[] = (object) array('perm' => $perm, 'type' => $type,
|
||||||
|
'size' => $size, 'hash' => $hash,
|
||||||
|
'fullpath' => ($base->file) ? $base->file.'/'.$file : $file,
|
||||||
|
'log' => $log, 'time' => $time,
|
||||||
|
'file' => $file);
|
||||||
|
}
|
||||||
|
chdir($current_dir);
|
||||||
|
return $res;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the file info.
|
||||||
|
*
|
||||||
|
* @param string Tree to test
|
||||||
|
* @param string Commit/Branch ('HEAD')
|
||||||
|
* @return false or Tree information
|
||||||
|
*/
|
||||||
|
public function getFileInfo($totest, $commit='HEAD')
|
||||||
|
{
|
||||||
|
$cmd_tmpl = 'GIT_DIR=%s git-ls-tree -r -t -l %s';
|
||||||
|
$cmd = sprintf($cmd_tmpl, $this->repo, $commit);
|
||||||
|
$out = array();
|
||||||
|
exec($cmd, &$out);
|
||||||
|
foreach ($out as $line) {
|
||||||
|
list($perm, $type, $hash, $size, $file) = preg_split('/ |\t/', $line, 5, PREG_SPLIT_NO_EMPTY);
|
||||||
|
if ($totest == $file) {
|
||||||
|
return (object) array('perm' => $perm, 'type' => $type,
|
||||||
|
'size' => $size, 'hash' => $hash,
|
||||||
|
'file' => $file);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get a blob.
|
||||||
|
*
|
||||||
|
* @param string Blob hash
|
||||||
|
* @return string Raw blob
|
||||||
|
*/
|
||||||
|
public function getBlob($hash)
|
||||||
|
{
|
||||||
|
return shell_exec(sprintf('GIT_DIR=%s git-cat-file blob %s',
|
||||||
|
$this->repo, $hash));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the branches.
|
||||||
|
*/
|
||||||
|
public function getBranches()
|
||||||
|
{
|
||||||
|
$out = array();
|
||||||
|
exec(sprintf('GIT_DIR=%s git branch', $this->repo), &$out);
|
||||||
|
$res = array();
|
||||||
|
foreach ($out as $b) {
|
||||||
|
$res[] = substr($b, 2);
|
||||||
|
}
|
||||||
|
return $res;
|
||||||
|
}
|
||||||
|
}
|
111
src/IDF/Views/Source.php
Normal file
111
src/IDF/Views/Source.php
Normal file
@ -0,0 +1,111 @@
|
|||||||
|
<?php
|
||||||
|
/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
||||||
|
/*
|
||||||
|
# ***** BEGIN LICENSE BLOCK *****
|
||||||
|
# This file is part of InDefero, an open source project management application.
|
||||||
|
# Copyright (C) 2008 Céondo Ltd and contributors.
|
||||||
|
#
|
||||||
|
# InDefero is free software; you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation; either version 2 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# InDefero is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program; if not, write to the Free Software
|
||||||
|
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
|
#
|
||||||
|
# ***** END LICENSE BLOCK ***** */
|
||||||
|
|
||||||
|
Pluf::loadFunction('Pluf_HTTP_URL_urlForView');
|
||||||
|
Pluf::loadFunction('Pluf_Shortcuts_RenderToResponse');
|
||||||
|
Pluf::loadFunction('Pluf_Shortcuts_GetObjectOr404');
|
||||||
|
Pluf::loadFunction('Pluf_Shortcuts_GetFormForModel');
|
||||||
|
|
||||||
|
/**
|
||||||
|
* View git repository.
|
||||||
|
*/
|
||||||
|
class IDF_Views_Source
|
||||||
|
{
|
||||||
|
public function index($request, $match)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
public function treeBase($request, $match)
|
||||||
|
{
|
||||||
|
$title = sprintf('%s Git Source Tree', (string) $request->project);
|
||||||
|
$git = new IDF_Git(Pluf::f('git_repository'));
|
||||||
|
$branches = $git->getBranches();
|
||||||
|
$res = $git->filesInTree($match[2]);
|
||||||
|
$commit = $match[2];
|
||||||
|
return Pluf_Shortcuts_RenderToResponse('source/tree.html',
|
||||||
|
array(
|
||||||
|
'page_title' => $title,
|
||||||
|
'files' => $res,
|
||||||
|
'commit' => $commit,
|
||||||
|
'branches' => $branches,
|
||||||
|
),
|
||||||
|
$request);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function tree($request, $match)
|
||||||
|
{
|
||||||
|
$title = sprintf('%s Git Source Tree', (string) $request->project);
|
||||||
|
$git = new IDF_Git(Pluf::f('git_repository'));
|
||||||
|
$branches = $git->getBranches();
|
||||||
|
$commit = $match[2];
|
||||||
|
$request_file = $match[3];
|
||||||
|
$request_file_info = $git->getFileInfo($request_file);
|
||||||
|
if (!$request_file_info) throw new Pluf_HTTP_Error404();
|
||||||
|
$bc = self::makeBreadCrumb($request->project, $commit, $request_file_info->file);
|
||||||
|
$page_title = $bc.' - '.$title;
|
||||||
|
if ($request_file_info->type != 'tree') {
|
||||||
|
return new Pluf_HTTP_Response($git->getBlob($request_file_info->hash),
|
||||||
|
'application/octet-stream');
|
||||||
|
}
|
||||||
|
$res = $git->filesInTree($commit, $request_file_info);
|
||||||
|
// try to find the previous level if it exists.
|
||||||
|
$prev = split('/', $request_file);
|
||||||
|
$l = array_pop($prev);
|
||||||
|
$previous = substr($request_file, 0, -strlen($l.' '));
|
||||||
|
return Pluf_Shortcuts_RenderToResponse('source/tree.html',
|
||||||
|
array(
|
||||||
|
'page_title' => $page_title,
|
||||||
|
'title' => $title,
|
||||||
|
'breadcrumb' => $bc,
|
||||||
|
'files' => $res,
|
||||||
|
'commit' => $commit,
|
||||||
|
'base' => $request_file_info->file,
|
||||||
|
'prev' => $previous,
|
||||||
|
'branches' => $branches,
|
||||||
|
),
|
||||||
|
$request);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function makeBreadCrumb($project, $commit, $file, $sep='/')
|
||||||
|
{
|
||||||
|
$elts = split('/', $file);
|
||||||
|
$out = array();
|
||||||
|
$stack = '';
|
||||||
|
$i = 0;
|
||||||
|
foreach ($elts as $elt) {
|
||||||
|
$stack .= ($i==0) ? $elt : '/'.$elt;
|
||||||
|
$url = Pluf_HTTP_URL_urlForView('IDF_Views_Source::tree',
|
||||||
|
array($project->shortname,
|
||||||
|
$commit, $stack));
|
||||||
|
$out[] = '<a href="'.$url.'">'.Pluf_esc($elt).'</a>';
|
||||||
|
$i++;
|
||||||
|
}
|
||||||
|
return '<span class="breadcrumb">'.implode('<span class="sep">'.$sep.'</span>', $out).'</span>';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function IDF_Views_Source_PrettySize($size)
|
||||||
|
{
|
||||||
|
return Pluf_Template::markSafe(Pluf_Utils::prettySize($size));
|
||||||
|
}
|
||||||
|
|
@ -51,8 +51,8 @@ $ctl[] = array('regex' => '#^/help/$#',
|
|||||||
$ctl[] = array('regex' => '#^/p/(\w+)/$#',
|
$ctl[] = array('regex' => '#^/p/(\w+)/$#',
|
||||||
'base' => $base,
|
'base' => $base,
|
||||||
'priority' => 4,
|
'priority' => 4,
|
||||||
'model' => 'IDF_Views',
|
'model' => 'IDF_Views_Project',
|
||||||
'method' => 'projectHome');
|
'method' => 'home');
|
||||||
|
|
||||||
$ctl[] = array('regex' => '#^/p/(\w+)/issues/$#',
|
$ctl[] = array('regex' => '#^/p/(\w+)/issues/$#',
|
||||||
'base' => $base,
|
'base' => $base,
|
||||||
@ -90,6 +90,29 @@ $ctl[] = array('regex' => '#^/p/(\w+)/issues/my/(\w+)/$#',
|
|||||||
'model' => 'IDF_Views_Issue',
|
'model' => 'IDF_Views_Issue',
|
||||||
'method' => 'myIssues');
|
'method' => 'myIssues');
|
||||||
|
|
||||||
|
// ---------- GIT ----------------------------------------
|
||||||
|
|
||||||
|
$ctl[] = array('regex' => '#^/p/(\w+)/source/$#',
|
||||||
|
'base' => $base,
|
||||||
|
'priority' => 4,
|
||||||
|
'model' => 'IDF_Views_Source',
|
||||||
|
'method' => 'index');
|
||||||
|
|
||||||
|
$ctl[] = array('regex' => '#^/p/(\w+)/source/tree/(\w+)/$#',
|
||||||
|
'base' => $base,
|
||||||
|
'priority' => 4,
|
||||||
|
'model' => 'IDF_Views_Source',
|
||||||
|
'method' => 'treeBase');
|
||||||
|
|
||||||
|
$ctl[] = array('regex' => '#^/p/(\w+)/source/tree/(\w+)/(.*)$#',
|
||||||
|
'base' => $base,
|
||||||
|
'priority' => 4,
|
||||||
|
'model' => 'IDF_Views_Source',
|
||||||
|
'method' => 'tree');
|
||||||
|
|
||||||
|
|
||||||
|
// ---------- ADMIN --------------------------------------
|
||||||
|
|
||||||
$ctl[] = array('regex' => '#^/p/(\w+)/admin/$#',
|
$ctl[] = array('regex' => '#^/p/(\w+)/admin/$#',
|
||||||
'base' => $base,
|
'base' => $base,
|
||||||
'priority' => 4,
|
'priority' => 4,
|
||||||
|
@ -41,7 +41,9 @@
|
|||||||
<div id="header">
|
<div id="header">
|
||||||
<div id="main-tabs">
|
<div id="main-tabs">
|
||||||
{if $project}
|
{if $project}
|
||||||
|
{* <a href="{url 'IDF_Views_Project::home', array($project.shortname)}"{block tabhome}{/block}>{trans 'Project Home'}</a> *}
|
||||||
<a href="{url 'IDF_Views_Issue::index', array($project.shortname)}"{block tabissues}{/block}>{trans 'Issues'}</a>
|
<a href="{url 'IDF_Views_Issue::index', array($project.shortname)}"{block tabissues}{/block}>{trans 'Issues'}</a>
|
||||||
|
<a href="{url 'IDF_Views_Source::index', array($project.shortname)}"{block tabsource}{/block}>{trans 'Source'}</a>
|
||||||
{if $isOwner}
|
{if $isOwner}
|
||||||
<a href="{url 'IDF_Views_Project::admin', array($project.shortname)}"{block tabadmin}{/block}>{trans 'Administer'}</a>{/if}{/if}
|
<a href="{url 'IDF_Views_Project::admin', array($project.shortname)}"{block tabadmin}{/block}>{trans 'Administer'}</a>{/if}{/if}
|
||||||
</div>
|
</div>
|
||||||
|
8
src/IDF/templates/source/base.html
Normal file
8
src/IDF/templates/source/base.html
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
{extends "base.html"}
|
||||||
|
{block tabsource} class="active"{/block}
|
||||||
|
{block subtabs}
|
||||||
|
<div id="sub-tabs">
|
||||||
|
{trans 'Source Tree'}
|
||||||
|
</div>
|
||||||
|
{/block}
|
||||||
|
{block title}{$title}{/block}
|
44
src/IDF/templates/source/tree.html
Normal file
44
src/IDF/templates/source/tree.html
Normal file
@ -0,0 +1,44 @@
|
|||||||
|
{extends "source/base.html"}
|
||||||
|
{block docclass}yui-t1{/block}
|
||||||
|
{block body}
|
||||||
|
<h2><a href="{url 'IDF_Views_Source::treeBase', array($project.shortname, $commit)}">{trans 'Root'}</a><span class="sep">/</span>{if $breadcrumb}{$breadcrumb|safe}{/if}</h2>
|
||||||
|
<table summary="" class="tree-list">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th colspan="2">{trans 'File'}</th>
|
||||||
|
<th>{trans 'Age'}</th>
|
||||||
|
<th>{trans 'Message'}</th>
|
||||||
|
<th>{trans 'Size'}</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
{if $base}
|
||||||
|
<tr>
|
||||||
|
<td> </td>
|
||||||
|
<td colspan="4">
|
||||||
|
<a href="{url 'IDF_Views_Source::tree', array($project.shortname, $commit, $prev)}">..</a></td>
|
||||||
|
</tr>
|
||||||
|
{/if}
|
||||||
|
{foreach $files as $file}
|
||||||
|
{aurl 'url', 'IDF_Views_Source::tree', array($project.shortname, $commit, $file.fullpath)}
|
||||||
|
<tr>
|
||||||
|
<td><img src="{media '/idf/img/'~$file.type~'.png'}" alt="{$file.type}" /></td>
|
||||||
|
<td><a href="{$url}">{$file.file}</a></td>
|
||||||
|
<td><span class="smaller">{$file.time|timeago:"wihtout"}</span></td>
|
||||||
|
<td{if $file.type != 'blob'} colspan="2"{/if}><span class="smaller">{$file.log}</span></td>
|
||||||
|
{if $file.type == 'blob'}
|
||||||
|
<td>{$file.size|size}</td>{/if}
|
||||||
|
</tr>
|
||||||
|
{/foreach}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
|
||||||
|
{/block}
|
||||||
|
{block context}
|
||||||
|
<p><strong>{trans 'Branches:'}</strong><br />
|
||||||
|
{foreach $branches as $branch}
|
||||||
|
{aurl 'url', 'IDF_Views_Source::treeBase', array($project.shortname, $branch)}
|
||||||
|
<span class="label"><a href="{$url}" class="label">{$branch}</a></span><br />
|
||||||
|
{/foreach}
|
||||||
|
</p>
|
||||||
|
{/block}
|
@ -210,6 +210,10 @@ div.container {
|
|||||||
clear: both;
|
clear: both;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.sep {
|
||||||
|
margin: 0 0.3em;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Tabs
|
* Tabs
|
||||||
*/
|
*/
|
||||||
@ -241,6 +245,31 @@ div.container {
|
|||||||
#sub-tabs a.active {
|
#sub-tabs a.active {
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
}
|
}
|
||||||
|
/**
|
||||||
|
* Tree list
|
||||||
|
*/
|
||||||
|
table.tree-list {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
table.tree-list th {
|
||||||
|
background-color: #e4e8E0;
|
||||||
|
vertical-align: top;
|
||||||
|
border-color: #d3d7cf;
|
||||||
|
}
|
||||||
|
|
||||||
|
table.tree-list tr {
|
||||||
|
border-left: 1px solid #d3d7cf;
|
||||||
|
border-right: 1px solid #d3d7cf;
|
||||||
|
border-bottom: 1px solid #d3d7cf;
|
||||||
|
}
|
||||||
|
|
||||||
|
table.tree-list td {
|
||||||
|
border: none;
|
||||||
|
vertical-align: top;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Autocomplete.
|
* Autocomplete.
|
||||||
|
BIN
www/media/idf/img/blob.png
Normal file
BIN
www/media/idf/img/blob.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 333 B |
BIN
www/media/idf/img/home.png
Normal file
BIN
www/media/idf/img/home.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 528 B |
BIN
www/media/idf/img/tree.png
Normal file
BIN
www/media/idf/img/tree.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 498 B |
Loading…
Reference in New Issue
Block a user