natalie/indefero
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Take into account if in one branch but listing another.

Browse Source 
Need to check how this is working on a bar repository.
This commit is contained in:
Loic d'Anterroches 2008-07-27 01:51:08 +02:00
parent c915f8fccf
commit 789c7ed43d
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/IDF/Git.php
View File

@ -69,9 +69,11 @@ class IDF_Git
$cmd = sprintf('GIT_DIR=%s git-ls-tree -t -l %s', $this->repo, $base->hash); $cmd = sprintf('GIT_DIR=%s git-ls-tree -t -l %s', $this->repo, $base->hash);
exec($cmd, &$out); exec($cmd, &$out);
$rawlog = array(); $rawlog = array();
$cmd = sprintf('GIT_DIR=%s git log --raw --abbrev=40 --pretty=oneline', foreach ($this->getBranches() as $br) {
$this->repo); $cmd = sprintf('GIT_DIR=%s git log --raw --abbrev=40 --pretty=oneline %s',
exec($cmd, &$rawlog); $this->repo, $br);
exec($cmd, &$rawlog);
}
$rawlog = implode("\n", array_reverse($rawlog)); $rawlog = implode("\n", array_reverse($rawlog));
$current_dir = getcwd(); $current_dir = getcwd();
chdir(substr($this->repo, 0, -5)); chdir(substr($this->repo, 0, -5));
@ -193,6 +195,7 @@ class IDF_Git
escapeshellarg($this->repo), $n, $format, $tree); escapeshellarg($this->repo), $n, $format, $tree);
$out = array(); $out = array();
exec($cmd, &$out); exec($cmd, &$out);
//print_r($cmd);
return self::parseLog($out, 4); return self::parseLog($out, 4);
} }

18
src/IDF/Views/Source.php
View File

@ -58,9 +58,12 @@ class IDF_Views_Source
$tree = $match[2]; $tree = $match[2];
$cobject = ''; $cobject = '';
$tree_in = in_array($tree, $branches); $tree_in = in_array($tree, $branches);
foreach ($git->getChangeLog('', null) as $change) { foreach ($branches as $br) {
if ($change->tree == $tree) { foreach ($git->getChangeLog($br, null) as $change) {
$cobject = $change; if ($change->tree == $tree) {
$cobject = $change;
break 2;
}
} }
} }
return Pluf_Shortcuts_RenderToResponse('source/tree.html', return Pluf_Shortcuts_RenderToResponse('source/tree.html',
@ -98,9 +101,12 @@ class IDF_Views_Source
$prev = split('/', $request_file); $prev = split('/', $request_file);
$l = array_pop($prev); $l = array_pop($prev);
$previous = substr($request_file, 0, -strlen($l.' ')); $previous = substr($request_file, 0, -strlen($l.' '));
foreach ($git->getChangeLog('', null) as $change) { foreach ($branches as $br) {
if ($change->tree == $tree) { foreach ($git->getChangeLog($br, null) as $change) {
$cobject = $change; //$git->getCommit($tree); if ($change->tree == $tree) {
$cobject = $change;
break 2;
}
} }
} }
return Pluf_Shortcuts_RenderToResponse('source/tree.html', return Pluf_Shortcuts_RenderToResponse('source/tree.html',