Files
@ a07296564f6b
Branch filter:
Location: kallithea/rhodecode/templates/compare/compare_cs.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.
b262e349a7a5 b262e349a7a5 b262e349a7a5 b262e349a7a5 16af24982e30 b262e349a7a5 b262e349a7a5 b262e349a7a5 c25cc1c7c65f b262e349a7a5 b262e349a7a5 b262e349a7a5 b262e349a7a5 f29469677319 995d938ce14b f29469677319 f29469677319 f29469677319 f29469677319 b262e349a7a5 25d77aef2729 25d77aef2729 b262e349a7a5 b262e349a7a5 25d77aef2729 b262e349a7a5 b262e349a7a5 f29469677319 | ## Changesets table !
<div class="container">
<table class="compare_view_commits noborder">
%if not c.cs_ranges:
<span class="empty_data">${_('No changesets')}</span>
%else:
%for cnt, cs in enumerate(c.cs_ranges):
<tr>
<td><div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(h.email_or_none(cs.author),14)}"/></div></td>
<td>
%if cs.raw_id in c.statuses:
<div title="${c.statuses[cs.raw_id][1]}" class="changeset-status-ico"><img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses[cs.raw_id][0])}" /></div>
%endif
</td>
<td>${h.link_to('r%s:%s' % (cs.revision,h.short_id(cs.raw_id)),h.url('changeset_home',repo_name=c.target_repo,revision=cs.raw_id))}
%if c.as_form:
${h.hidden('revisions',cs.raw_id)}
%endif
</td>
<td><div class="author">${h.person(cs.author)}</div></td>
<td><span class="tooltip" title="${h.tooltip(h.age(cs.date))}">${cs.date}</span></td>
<td><div class="message tooltip" title="${h.tooltip(cs.message)}" style="white-space:normal">${h.urlify_commit(h.shorter(cs.message, 60),c.repo_name)}</div></td>
</tr>
%endfor
%endif
</table>
</div>
|