Files
@ a07296564f6b
Branch filter:
Location: kallithea/rhodecode/templates/bookmarks/bookmarks_data.html - annotation
a07296564f6b
1.2 KiB
text/html
compare: show aggregated diff of what will be merged to other repo, using merge ancestor
pull_request.get_compare_data will also now return the ancestor that would be
used for actual merging. Showing a diff from that ancestor instead of the first
'new' changeset will give a more realistic diff that doesn't include merges.
pull_request.get_compare_data will also now return the ancestor that would be
used for actual merging. Showing a diff from that ancestor instead of the first
'new' changeset will give a more realistic diff that doesn't include merges.
eaf09acf6872 f91d3f9b7230 eaf09acf6872 c20adbaf16af b4f401524060 eaf09acf6872 eaf09acf6872 eaf09acf6872 eaf09acf6872 b4f401524060 c20adbaf16af c20adbaf16af b4f401524060 a3ee2611e6e8 a3ee2611e6e8 a3ee2611e6e8 184557472f5c a3ee2611e6e8 184557472f5c f467c75544af b4f401524060 b4f401524060 184557472f5c 184557472f5c 184557472f5c f91d3f9b7230 b4f401524060 c20adbaf16af a3ee2611e6e8 eaf09acf6872 a3ee2611e6e8 b4f401524060 f91d3f9b7230 | %if c.repo_bookmarks:
<div id="table_wrap" class="yui-skin-sam">
<table id="bookmarks_data">
<thead>
<tr>
<th class="left">${_('Name')}</th>
<th class="left">${_('Date')}</th>
<th class="left">${_('Author')}</th>
<th class="left">${_('Revision')}</th>
</tr>
</thead>
%for cnt,book in enumerate(c.repo_bookmarks.items()):
<tr class="parity${cnt%2}">
<td>
<span class="logbooks">
<span class="bookbook">${h.link_to(book[0],
h.url('files_home',repo_name=c.repo_name,revision=book[1].raw_id))}</span>
</span>
</td>
<td><span class="tooltip" title="${h.tooltip(h.age(book[1].date))}">${h.fmt_date(book[1].date)}</span></td>
<td title="${book[1].author}">${h.person(book[1].author)}</td>
<td>
<div>
<pre><a href="${h.url('files_home',repo_name=c.repo_name,revision=book[1].raw_id)}">r${book[1].revision}:${h.short_id(book[1].raw_id)}</a></pre>
</div>
</td>
</tr>
%endfor
</table>
</div>
%else:
${_('There are no bookmarks yet')}
%endif
|