Indefero Commit Details

Date:

2011-06-10 17:47:54 (14 years 5 months ago)

Author:

Thomas Keller

Branch:

develop, feature.content-md5, feature.diff-whitespace, feature.issue-of-others, feature.issue-summary, feature.search-filter, feature.webrepos, feature.wiki-default-page, release-1.2, release-1.3

Commit:

11a234e135b38ad414f96d419e13bde1629f07d5

Parents:

2f30e4e2f6670bdb25fdf2bc45cf54b42a8dd643

Message:

Fix the branch links users of the Subversion frontend get when they enter a wrong revision and only display this list if there are any branches available for all SCMs.

Changes:

File differences

-31
32 32
33 33
34
35
34 36
35 37
36 38
+  a new project or monotone key, in case an error popped up in the middle (issue 697)␊
- Better error detection and reporting in the SyncMonotone plugin␊
  ATTENTION: This needs Pluf 46b7f251 or newer!␊
- Fix the branch links users of the Subversion frontend get when they enter a wrong revision␊
  and only display this list if there are any branches available for all SCMs␊
␊
## Documentation␊
␊
   a new project or monotone key, in case an error popped up in the middle (issue 697)␊
 - Better error detection and reporting in the SyncMonotone plugin␊
   ATTENTION: This needs Pluf 46b7f251 or newer!␊
+- Fix the branch links users of the Subversion frontend get when they enter a wrong revision␊
+  and only display this list if there are any branches available for all SCMs␊
 ␊
 ## Documentation␊
 ␊

-66
67 67
68 68
69 
69
70
70 71
71 72
72 73
+                        'commit' => $commit,␊
                        'branches' => $branches,␊
                        );␊
        return Pluf_Shortcuts_RenderToResponse('idf/source/invalid_revision.html',␊
        $scmConf = $request->conf->getVal('scm', 'git');␊
        return Pluf_Shortcuts_RenderToResponse('idf/source/'.$scmConf.'/invalid_revision.html',␊
                                               $params, $request);␊
    }␊
␊
                         'commit' => $commit,␊
                         'branches' => $branches,␊
                         );␊
-        return Pluf_Shortcuts_RenderToResponse('idf/source/invalid_revision.html',␊
+        $scmConf = $request->conf->getVal('scm', 'git');␊
+        return Pluf_Shortcuts_RenderToResponse('idf/source/'.$scmConf.'/invalid_revision.html',␊
                                                $params, $request);␊
     }␊
 ␊

-5
6 6
7 7
8
8 9
9 10
10 11
... ...
14 15
15 16
16 17
18
17 19
18 20
19 21
+<p>{blocktrans}The branch or revision <b>{$commit}</b> is not valid or does not exist␊
in this repository.{/blocktrans}</p>␊
␊
{if count($branches) > 0}␊
<p>{blocktrans}The following list shows all available branches:{/blocktrans}</p>␊
<ul>␊
{foreach $branches as $branch => $path}␊

</li>␊
{/foreach}␊
</ul>␊
{/if}␊
␊
{if $isOwner or $isMember}␊
{aurl 'url', 'IDF_Views_Source::help', array($project.shortname)}␊
 ...
 <p>{blocktrans}The branch or revision <b>{$commit}</b> is not valid or does not exist␊
 in this repository.{/blocktrans}</p>␊
 ␊
+{if count($branches) > 0}␊
 <p>{blocktrans}The following list shows all available branches:{/blocktrans}</p>␊
 <ul>␊
 {foreach $branches as $branch => $path}␊
 </li>␊
 {/foreach}␊
 </ul>␊
+{/if}␊
 ␊
 {if $isOwner or $isMember}␊
 {aurl 'url', 'IDF_Views_Source::help', array($project.shortname)}␊

-
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
+{extends "idf/source/base.html"}␊
{block docclass}yui-t2{assign $inError=true}{/block}␊
{block body}␊
␊
<p>{blocktrans}The revision <b>{$commit}</b> is not valid or does not exist␊
in this repository.{/blocktrans}</p>␊
␊
{if count($branches) > 0}␊
<p>{blocktrans}The following list shows all available branches:{/blocktrans}</p>␊
<ul>␊
{foreach $branches as $branch => $path}␊
{if $path}{aurl 'url', 'IDF_Views_Source::tree', array($project.shortname, 'HEAD', $path)}␊
{else}{aurl 'url', 'IDF_Views_Source::treeBase', array($project.shortname, 'HEAD')}{/if}␊
<li class="label">␊
  <a href="{$url}" class="label">{$branch}</a>␊
</li>␊
{/foreach}␊
</ul>␊
{/if}␊
␊
{if $isOwner or $isMember}␊
{aurl 'url', 'IDF_Views_Source::help', array($project.shortname)}␊
<p>{blocktrans}If this is a new repository, the reason for this error␊
could be that you have not committed and / or pushed any change so far.␊
In this case please take a look at the <a href="{$url}">Help</a> page␊
how to access your repository.{/blocktrans}</p>␊
{/if}␊
␊
{/block}␊
␊
+{extends "idf/source/base.html"}␊
+{block docclass}yui-t2{assign $inError=true}{/block}␊
+{block body}␊
+␊
+<p>{blocktrans}The revision <b>{$commit}</b> is not valid or does not exist␊
+in this repository.{/blocktrans}</p>␊
+␊
+{if count($branches) > 0}␊
+<p>{blocktrans}The following list shows all available branches:{/blocktrans}</p>␊
+<ul>␊
+{foreach $branches as $branch => $path}␊
+{if $path}{aurl 'url', 'IDF_Views_Source::tree', array($project.shortname, 'HEAD', $path)}␊
+{else}{aurl 'url', 'IDF_Views_Source::treeBase', array($project.shortname, 'HEAD')}{/if}␊
+<li class="label">␊
+  <a href="{$url}" class="label">{$branch}</a>␊
+</li>␊
+{/foreach}␊
+</ul>␊
+{/if}␊
+␊
+{if $isOwner or $isMember}␊
+{aurl 'url', 'IDF_Views_Source::help', array($project.shortname)}␊
+<p>{blocktrans}If this is a new repository, the reason for this error␊
+could be that you have not committed and / or pushed any change so far.␊
+In this case please take a look at the <a href="{$url}">Help</a> page␊
+how to access your repository.{/blocktrans}</p>␊
+{/if}␊
+␊
+{/block}␊
+␊

Download the corresponding diff file

Indefero

File differences

Branches

Tags