Skip to content

Commit f824e52

Browse files
author
rjollos
committed
1.1.2dev: Reverse merge unintended change from [12877]. Refs #11342.
git-svn-id: http://trac.edgewall.org/intertrac/log:/trunk@12878 af82e41b-90c4-0310-8c96-b1721e28e2e2
1 parent c65ad40 commit f824e52

File tree

1 file changed

+15
-16
lines changed

1 file changed

+15
-16
lines changed

trac/versioncontrol/templates/repository_index.html

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,38 +17,37 @@
1717
<xi:include href="dirlist_thead.html" />
1818
<tbody>
1919
<py:for each="idx, (reponame, repoinfo, repos, change, err, raw_href) in enumerate(repo.repositories)"
20-
py:with="chgset_context = entry.change and context.child('changeset', entry.change.rev, parent=repos.resource);
21-
chgset_view = entry.change and entry.change.is_viewable(perm)">
20+
py:with="chgset_context = change and context.child('changeset', change.rev, parent=repos.resource);
21+
chgset_view = change and change.is_viewable(perm)">
2222
<tr class="${'odd' if idx % 2 else 'even'}">
2323
<td class="name">
24-
<em py:strip="not entry.error">
24+
<em py:strip="not err">
2525
<strong py:strip="repoinfo.alias != ''">
2626
<a class="dir" title="View Root Directory"
27-
href="${href.browser(entry.repos.reponame if entry.repos else entry.reponame,
27+
href="${href.browser(repos.reponame if repos else reponame,
2828
order=order if order != 'name' else None, desc=desc)}">$reponame</a>
2929
</strong>
3030
</em>
3131
</td>
3232
<td class="size">
33-
<a py:if="entry.raw_href" class="trac-ziplink" href="$entry.raw_href"
34-
title="Download as Zip archive">&#8203;</a>
33+
<a py:if="raw_href" class="trac-ziplink" href="$raw_href" title="Download as Zip archive">&#8203;</a>
3534
</td>
3635
<td class="rev">
37-
<py:if test="entry.change and not entry.error">
38-
<a title="View Revision Log" href="${href.log(repos.reponame)}">${repos.display_rev(entry.change.rev)}</a>
36+
<py:if test="change and not err">
37+
<a title="View Revision Log" href="${href.log(repos.reponame)}">${repos.display_rev(change.rev)}</a>
3938
<a title="View Changeset" class="chgset" href="${href.changeset(change.rev, repos.reponame)}">&nbsp;</a>
4039
</py:if>
4140
</td>
42-
<td class="age" style="${chgset_view and entry.change and repo.timerange and 'border-color: rgb(%s,%s,%s)' %
43-
repo.colorize_age(repo.timerange.relative(entry.change.date)) or None}">
44-
${pretty_dateinfo(entry.change.date, dateonly=True) if chgset_view else '&ndash;'}
41+
<td class="age" style="${chgset_view and change and repo.timerange and 'border-color: rgb(%s,%s,%s)' %
42+
repo.colorize_age(repo.timerange.relative(change.date)) or None}">
43+
${pretty_dateinfo(change.date, dateonly=True) if chgset_view else '&ndash;'}
4544
</td>
46-
<td class="author">${authorinfo_short(entry.change.author) if chgset_view else '&ndash;'}</td>
47-
<td class="entry.change" py:choose="">
48-
<py:when test="entry.error"><em py:content="entry.error"></em></py:when>
45+
<td class="author">${authorinfo_short(change.author) if chgset_view else '&ndash;'}</td>
46+
<td class="change" py:choose="">
47+
<py:when test="err"><em py:content="err"></em></py:when>
4948
<py:when test="chgset_view" py:choose="">
50-
<py:when test="wiki_format_messages">${wiki_to_oneliner(chgset_context, entry.change.message, shorten=True)}</py:when>
51-
<py:otherwise>${shorten_line(entry.change.message)}</py:otherwise>
49+
<py:when test="wiki_format_messages">${wiki_to_oneliner(chgset_context, change.message, shorten=True)}</py:when>
50+
<py:otherwise>${shorten_line(change.message)}</py:otherwise>
5251
</py:when>
5352
<py:otherwise>&ndash;</py:otherwise>
5453
</td>

0 commit comments

Comments
 (0)