Indefero Commit Details

Date:

2009-05-26 14:47:54 (16 years 5 months ago)

Author:

Loic d'Anterroches

Branch:

develop, feature-issue_links, feature.better-home, feature.content-md5, feature.diff-whitespace, feature.download-md5, feature.issue-links, feature.issue-of-others, feature.issue-summary, feature.search-filter, feature.webrepos, feature.wiki-default-page, master, release-1.1, release-1.2, release-1.3

Commit:

bc434504b177ac0dfedee0cbded44971d85c208e

Parents:

88ce10b8e6b5d744e036e1012ead514df53d5994

Message:

Fixed issue 210, sub-tabs links not follows the active branche in Source view.

Changes:

File differences

-126
127 127
128 128
129 
130 
131 
132 
133 
134 
135 
136 129
130
131
132
137 133
138 134
139 135
... ...
141 137
142 138
143 139
144 
145 
140
146 141
147 
148 
149 
150 
142
151 143
152 144
153 145
154 146
155 
147
156 148
157 149
158 150
+     */␊
    function callbackCommit($m)␊
    {␊
        try {␊
            if ('commit' != $this->scm->testHash($m[0])) {␊
                return $m[0]; // not a commit.␊
            }␊
        } catch (IDF_Scm_Exception $e) {␊
            return $m[0]; // commit not found.␊
        }␊
        $co = $this->scm->getCommit($m[0]);␊
        if (!$co) {␊
            return $m[0]; // not a commit.␊
        }␊
        return '<a href="'␊
            .Pluf_HTTP_URL_urlForView('IDF_Views_Source::commit', array($this->project->shortname, $co->commit))␊
            .'">'.$m[0].'</a>';␊

␊
    function callbackSource($m)␊
    {␊
        $branches = $this->scm->getBranches();␊
        if (count($branches) == 0) return $m[0];␊
        if (!$this->scm->isAvailable()) return $m[0];␊
        $file = $m[2];␊
        if ('commit' != $this->scm->testHash($branches[0], $file)) {␊
            return $m[0];␊
        }␊
        $request_file_info = $this->scm->getFileInfo($file, $branches[0]);␊
        $request_file_info = $this->scm->getPathInfo($file);␊
        if (!$request_file_info) {␊
            return $m[0];␊
        }␊
        if ($request_file_info->type != 'tree') {␊
            return $m[1].'<a href="'.Pluf_HTTP_URL_urlForView('IDF_Views_Source::tree', array($this->project->shortname, $branches[0], $file)).'">'.$m[2].'</a>';␊
            return $m[1].'<a href="'.Pluf_HTTP_URL_urlForView('IDF_Views_Source::tree', array($this->project->shortname, $this->scm->getMainBranch(), $file)).'">'.$m[2].'</a>';␊
        }␊
        return $m[0];␊
    }␊
 ...
      */␊
     function callbackCommit($m)␊
     {␊
-        try {␊
-            if ('commit' != $this->scm->testHash($m[0])) {␊
-                return $m[0]; // not a commit.␊
-            }␊
-        } catch (IDF_Scm_Exception $e) {␊
-            return $m[0]; // commit not found.␊
-        }␊
         $co = $this->scm->getCommit($m[0]);␊
+        if (!$co) {␊
+            return $m[0]; // not a commit.␊
+        }␊
         return '<a href="'␊
             .Pluf_HTTP_URL_urlForView('IDF_Views_Source::commit', array($this->project->shortname, $co->commit))␊
             .'">'.$m[0].'</a>';␊
 ␊
     function callbackSource($m)␊
     {␊
-        $branches = $this->scm->getBranches();␊
-        if (count($branches) == 0) return $m[0];␊
+        if (!$this->scm->isAvailable()) return $m[0];␊
         $file = $m[2];␊
-        if ('commit' != $this->scm->testHash($branches[0], $file)) {␊
-            return $m[0];␊
-        }␊
-        $request_file_info = $this->scm->getFileInfo($file, $branches[0]);␊
+        $request_file_info = $this->scm->getPathInfo($file);␊
         if (!$request_file_info) {␊
             return $m[0];␊
         }␊
         if ($request_file_info->type != 'tree') {␊
-            return $m[1].'<a href="'.Pluf_HTTP_URL_urlForView('IDF_Views_Source::tree', array($this->project->shortname, $branches[0], $file)).'">'.$m[2].'</a>';␊
+            return $m[1].'<a href="'.Pluf_HTTP_URL_urlForView('IDF_Views_Source::tree', array($this->project->shortname, $this->scm->getMainBranch(), $file)).'">'.$m[2].'</a>';␊
         }␊
         return $m[0];␊
     }␊

-88
89 89
90 90
91
91 92
92 93
93 94
... ...
95 96
96 97
97 98
99
98 100
99 101
100 102
... ...
128 130
129 131
130 132
131 
132 133
133 134
134 135
+        }␊
        $rchanges = new Pluf_Template_ContextVars($rchanges);␊
        $scmConf = $request->conf->getVal('scm', 'git');␊
        $in_branches = $scm->inBranches($commit, '');␊
        return Pluf_Shortcuts_RenderToResponse('idf/source/changelog.html',␊
                                               array(␊
                                                     'page_title' => $title,␊

                                                     'changes' => $rchanges,␊
                                                     'commit' => $commit,␊
                                                     'branches' => $branches,␊
                                                     'tree_in' => $in_branches,␊
                                                     'scm' => $scmConf,␊
                                                     ),␊
                                               $request);␊

            $res = new Pluf_Template_ContextVars($scm->getTree($commit));␊
            $cache->set($key, $res);␊
        }␊
        //$tree_in = in_array($commit, $branches);␊
        $scmConf = $request->conf->getVal('scm', 'git');␊
        $props = $scm->getProperties($commit);␊
        return Pluf_Shortcuts_RenderToResponse('idf/source/'.$scmConf.'/tree.html',␊
 ...
 ...
         }␊
         $rchanges = new Pluf_Template_ContextVars($rchanges);␊
         $scmConf = $request->conf->getVal('scm', 'git');␊
+        $in_branches = $scm->inBranches($commit, '');␊
         return Pluf_Shortcuts_RenderToResponse('idf/source/changelog.html',␊
                                                array(␊
                                                      'page_title' => $title,␊
                                                      'changes' => $rchanges,␊
                                                      'commit' => $commit,␊
                                                      'branches' => $branches,␊
+                                                     'tree_in' => $in_branches,␊
                                                      'scm' => $scmConf,␊
                                                      ),␊
                                                $request);␊
             $res = new Pluf_Template_ContextVars($scm->getTree($commit));␊
             $cache->set($key, $res);␊
         }␊
-        //$tree_in = in_array($commit, $branches);␊
         $scmConf = $request->conf->getVal('scm', 'git');␊
         $props = $scm->getProperties($commit);␊
         return Pluf_Shortcuts_RenderToResponse('idf/source/'.$scmConf.'/tree.html',␊

-1
2 2
3 3
4
4 5
5 
6 
6
7
7 8
8 9
9 10
+{extends "idf/base.html"}␊
{block tabsource} class="active"{/block}␊
{block subtabs}␊
{if array_key_exists($commit, $branches)}{assign $currentCommit =  $commit}{else}{assign $currentCommit = $project.getScmRoot()}{/if}␊
<div id="sub-tabs">␊
<a {if $inSourceTree}class="active" {/if}href="{url 'IDF_Views_Source::treeBase', array($project.shortname, $project.getScmRoot())}">{trans 'Source Tree'}</a> |␊
<a {if $inChangeLog}class="active" {/if}href="{url 'IDF_Views_Source::changeLog', array($project.shortname, $project.getScmRoot())}">{trans 'Change Log'}</a>␊
<a {if $inSourceTree}class="active" {/if}href="{url 'IDF_Views_Source::treeBase', array($project.shortname, $currentCommit)}">{trans 'Source Tree'}</a> |␊
<a {if $inChangeLog}class="active" {/if}href="{url 'IDF_Views_Source::changeLog', array($project.shortname, $currentCommit)}">{trans 'Change Log'}</a>␊
{if $inCommit}| {trans 'Commit'}{/if} |␊
<a {if $inHelp}class="active" {/if}href="{url 'IDF_Views_Source::help', array($project.shortname)}">{trans 'How To Get The Code'}</a>␊
</div>␊
 {extends "idf/base.html"}␊
 {block tabsource} class="active"{/block}␊
 {block subtabs}␊
+{if array_key_exists($commit, $branches)}{assign $currentCommit =  $commit}{else}{assign $currentCommit = $project.getScmRoot()}{/if}␊
 <div id="sub-tabs">␊
-<a {if $inSourceTree}class="active" {/if}href="{url 'IDF_Views_Source::treeBase', array($project.shortname, $project.getScmRoot())}">{trans 'Source Tree'}</a> |␊
-<a {if $inChangeLog}class="active" {/if}href="{url 'IDF_Views_Source::changeLog', array($project.shortname, $project.getScmRoot())}">{trans 'Change Log'}</a>␊
+<a {if $inSourceTree}class="active" {/if}href="{url 'IDF_Views_Source::treeBase', array($project.shortname, $currentCommit)}">{trans 'Source Tree'}</a> |␊
+<a {if $inChangeLog}class="active" {/if}href="{url 'IDF_Views_Source::changeLog', array($project.shortname, $currentCommit)}">{trans 'Change Log'}</a>␊
 {if $inCommit}| {trans 'Commit'}{/if} |␊
 <a {if $inHelp}class="active" {/if}href="{url 'IDF_Views_Source::help', array($project.shortname)}">{trans 'How To Get The Code'}</a>␊
 </div>␊

-27
28 28
29 29
30
30 31
31 32
32 33
33 
34 
35 
34
35
36
36 37
37 38
38 39
+</tbody>␊
</table>␊
{/block}␊
␊
{block context}␊
{if $scm != 'svn'}␊
<p><strong>{trans 'Branches:'}</strong><br />␊
{foreach $branches as $branch}␊
{aurl 'url', 'IDF_Views_Source::changeLog', array($project.shortname, $branch)}␊
<span class="label{if $commit == $branch} active{/if}"><a href="{$url}" class="label">{$branch}</a></span><br />␊
{foreach $branches as $branch => $path}␊
{aurl 'url', 'IDF_Views_Source::treeBase', array($project.shortname, $branch)}␊
<span class="label{if in_array($branch, $tree_in)} active{/if}"><a href="{$url}" class="label">{$branch}</a></span><br />␊
{/foreach}␊
</p>␊
{else}␊
 </tbody>␊
 </table>␊
 {/block}␊
+␊
 {block context}␊
 {if $scm != 'svn'}␊
 <p><strong>{trans 'Branches:'}</strong><br />␊
-{foreach $branches as $branch}␊
-{aurl 'url', 'IDF_Views_Source::changeLog', array($project.shortname, $branch)}␊
-<span class="label{if $commit == $branch} active{/if}"><a href="{$url}" class="label">{$branch}</a></span><br />␊
+{foreach $branches as $branch => $path}␊
+{aurl 'url', 'IDF_Views_Source::treeBase', array($project.shortname, $branch)}␊
+<span class="label{if in_array($branch, $tree_in)} active{/if}"><a href="{$url}" class="label">{$branch}</a></span><br />␊
 {/foreach}␊
 </p>␊
 {else}␊

Download the corresponding diff file

Indefero

File differences

Branches

Tags