← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to loggerhead/templates/changelog.kid

  • Committer: Robey Pointer
  • Date: 2006-12-12 03:50:13 UTC
  • Revision ID: robey@lag.net-20061212035013-gtyh3npcck6ezy53
figured out what the merge points logic was about, and yes it was important, and yes i was using it in a totally wrong way before, and yes i had incompetently tried to roll my own equivalent without fully understanding it.  so switch to merge points.

Show diffs side-by-side

added added

removed removed

Lines of Context:
loggerhead/templates/changelog.kid
6
6
    <title> ${branch_name} : changes </title>
7
7
    <link rel="alternate" type="application/atom+xml" href="${tg.url('/atom')}" title="RSS feed for ${branch_name}" />
8
8
    
9
 
    <span py:def="revlink(revid, text)">
10
 
        <a title="Show revision" href="${tg.url([ '/revision', revid ])}" class="revlink"> ${text} </a>
11
 
    </span>
12
 
 
13
9
    <span py:def="loglink(revid, text)">
14
 
        <a title="Show revision" href="${tg.url([ '/changes', revid ])}" class="revlink"> ${text} </a>
 
10
        <a title="Show history" href="${tg.url([ '/changes', revid ])}" class="revlink"> ${text} </a>
15
11
    </span>
16
12
</head>
17
13
 
21
17
 
22
18
<h1> <span class="branch-name">${branch_name}</span> : changes </h1>
23
19
    
24
 
<!-- i don't understand this -->
25
 
<!--!span py:if="len(merge_points) > 0">
26
 
    <table class="info-entry">
27
 
        <tr> <th> merged in: </th>
28
 
        <td> 
29
 
            <span py:for="merge in merge_points" class="revision">
30
 
                ${revision_link(merge.revid, merge.revno)} <br />
31
 
                </span>
32
 
            </td>
33
 
            </tr>
34
 
    </table>
35
 
</span-->
36
 
 
37
20
<div class="log-entries">
38
21
    <div py:for="entry in changes" class="revision">
39
22
        <div class="revision-header">
56
39
                    <th class="date">date:</th>
57
40
                    <td class="date"> ${entry.date.strftime('%d %b %Y %H:%M')} &nbsp; (${entry.age}) </td>
58
41
                </tr>
59
 
                <tr py:if="len(entry.children) > 1">
 
42
                <tr py:if="len(entry.merge_points) > 0">
60
43
                    <th class="children"> merged in: </th>
61
44
                    <td class="children">
62
 
                        <span py:for="child in entry.children">  <span py:if="child.revid != entry.left_child"> ${loglink(child.revid, '(' + child.revno + ')')} &nbsp; </span></span>
 
45
                        <span py:for="child in entry.merge_points"> ${loglink(child.revid, '(' + child.revno + ')')} &nbsp; </span>
63
46
                    </td>
64
47
                </tr>
65
48
                <tr py:if="len(entry.parents) > 1">