← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to loggerhead/templates/revisionfilechanges.pt

  • Committer: Danilo Segan
  • Date: 2011-09-02 10:22:52 UTC
  • mfrom: (455.1.2 bug-839395)
  • Revision ID: danilo@canonical.com-20110902102252-phc11upmjw8tz1mg
[r=jam][bug=839395] Do not crash when someone asks to look at per-revision changes for a file when file is not changed in a certain revision.

Show diffs side-by-side

added added

removed removed

Lines of Context:
loggerhead/templates/revisionfilechanges.pt
1
1
<tal:block>
2
 
 
3
 
<div tal:repeat="added entry/changes/added">
 
2
  <ul tal:repeat="added file_changes/added">
4
3
    <tal:block condition="repeat/added/start">
5
 
        <li class="desc">files added:</li>
 
4
      <li class="desc">files added:</li>
6
5
    </tal:block>
7
 
    <li class="files"
8
 
        tal:define="filename python:added[0];
9
 
                    file_id  python:added[1]">
10
 
        <a tal:attributes="href  python:url(['/annotate', entry.revno], file_id=file_id);
11
 
                           title string:Annotate ${filename}"
12
 
           tal:content="filename" class="link"></a>
 
6
    <li class="files">
 
7
      <tal:revision condition="python:added.kind == 'file'"
 
8
                    content="structure python:file_link(added.filename)" />
 
9
      <tal:revision condition="python:added.kind != 'file'"
 
10
                    content="added/filename" />
13
11
    </li>
14
 
</div>
 
12
  </ul>
15
13
 
16
 
<div tal:repeat="removed entry/changes/removed">
 
14
  <ul tal:repeat="removed file_changes/removed">
17
15
    <tal:block condition="repeat/removed/start">
18
 
        <li class="desc">files removed:</li>
 
16
      <li class="desc">files removed:</li>
19
17
    </tal:block>
20
 
    <li class="files"
21
 
        tal:define="filename python:removed[0];
22
 
                    file_id  python:removed[1]">
23
 
      <a tal:attributes="href  python:url(['/annotate', entry.revno], file_id=file_id);
24
 
                         title string:Annotate ${filename}"
25
 
                         tal:content="filename" class="link"></a>
 
18
    <li class="files">
 
19
      <tal:revision condition="python:removed.kind == 'file'"
 
20
                    content="structure python:file_link(removed.filename)" />
 
21
      <tal:revision condition="python:removed.kind != 'file'"
 
22
                    content="removed/filename" />
26
23
    </li>
27
 
</div>
 
24
  </ul>
28
25
 
29
 
<div tal:repeat="renamed entry/changes/renamed">
 
26
  <ul tal:repeat="renamed file_changes/renamed">
30
27
    <tal:block condition="repeat/renamed/start">
31
 
        <li class="desc">files renamed:</li>
 
28
      <li class="desc">files renamed:</li>
32
29
    </tal:block>
33
 
    <li class="files"
34
 
        tal:define="old_filename python:renamed[0];
35
 
                    new_filename python:renamed[1];
36
 
                    file_id      python:renamed[2]">
37
 
      <a tal:attributes="href  python:url(['/annotate', entry.revno], file_id=file_id);
38
 
                         title string:Annotate ${old_filename}"
39
 
         tal:content="old_filename" class="filename">
 
30
    <li class="files">
 
31
      <tal:old-name content="renamed/old_filename" class="filename">
40
32
        old_filename
41
 
      </a>
42
 
      =>
43
 
      <a tal:attributes="href  python:url(['/annotate', entry.revno], file_id=file_id);
44
 
                         title string:Annotate ${new_filename}"
45
 
         tal:content="new_filename">
 
33
      </tal:old-name>
 
34
      =&gt;
 
35
      <tal:revision condition="renamed/text_modified" content="structure python:file_link(renamed.new_filename)" />
 
36
      <tal:old-name condition="not:renamed/text_modified" content="renamed/new_filename" class="filename">
46
37
        new_filename
47
 
      </a>
 
38
      </tal:old-name>
48
39
    </li>
49
 
</div>
 
40
  </ul>
50
41
 
51
 
<div tal:repeat="item entry/changes/modified">
 
42
  <ul tal:repeat="item file_changes/modified">
52
43
    <tal:block condition="repeat/item/start">
53
 
        <li class="desc">files modified:</li>
 
44
      <li class="desc">files modified:</li>
54
45
    </tal:block>
55
 
    <tal:b content="structure python:modified_file_link(url, entry, item)" />
56
 
</div>
57
 
 
 
46
    <li class="files">
 
47
      <tal:revision content="structure python:file_link(item.filename)" />
 
48
    </li>
 
49
  </ul>
58
50
</tal:block>