/loggerhead/trunk

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/loggerhead/trunk

« back to all changes in this revision

Viewing changes to loggerhead/templates/annotate.kid

  • Committer: Robey Pointer
  • Date: 2006-12-14 05:25:41 UTC
  • Revision ID: robey@lag.net-20061214052541-8leih2o3lthfxi39
fix a thread-unsafety bug in bzrlib's progress bar system that was vexing
me, and do various cleanups on the ui for consistency.  added lots of
locking to the history object before i figured out about the progress bar
thing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
loggerhead/templates/annotate.kid
27
27
        <tr py:if="len(change.merge_points) > 0">
28
28
            <th class="children"> merged in: </th>
29
29
            <td class="children">
30
 
                <span py:for="child in change.merge_points"> ${revlink(child.revid, '(' + child.revno + ')')} &nbsp; </span>
 
30
                <span py:for="child in change.merge_points">
 
31
                    ${revlink_path(child.revid, child.revid, '(' + child.revno + util.if_present(' %s', child.branch_nick) + ')', None)} &nbsp;
 
32
                </span>
31
33
            </td>
32
34
        </tr>
33
35
        <tr py:if="len(change.parents) > 1">
34
36
                <th class="parents"> merged from: </th>
35
37
                <td class="parents">
36
 
                    <span py:for="parent in change.parents"><span py:if="parent.revid != change.parents[0].revid"> ${revlink(parent.revid, '(' + parent.revno + ')')} &nbsp; </span></span>
 
38
                    <span py:for="parent in change.parents"><span py:if="parent.revid != change.parents[0].revid">
 
39
                        ${revlink_path(parent.revid, parent.revid, '(' + parent.revno + util.if_present(' %s', parent.branch_nick) + ')', None)} &nbsp;
 
40
                </span></span>
37
41
                </td>
38
42
        </tr>
39
43
 
64
68
    </table>
65
69
</div>
66
70
 
67
 
 
68
71
</body>
69
72
</html>