Mercurial > kallithea

comparison rhodecode/templates/compare/compare_diff.html @ 3015:16af24982e30 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Multiple changes for compare system - count number of changed lines and files - add combined compare button into the old per changeset compare - fixed some logic for remote & bundle compare system - added few tests for git compare
author Marcin Kuzminski <marcin@python-works.com>
date Sun, 18 Nov 2012 23:17:02 +0100
parents 25d77aef2729
children 685ebc84c2e9
comparison
equal deleted inserted replaced
3014:02bbd574fa14 3015:16af24982e30
32 </div> 32 </div>
33 </div> 33 </div>
34 </div> 34 </div>
35 <div id="changeset_compare_view_content"> 35 <div id="changeset_compare_view_content">
36 ##CS 36 ##CS
37 <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${_('Outgoing changesets')}</div> 37 <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${ungettext('Showing %s commit','Showing %s commits', len(c.cs_ranges)) % len(c.cs_ranges)}</div>
38 <%include file="compare_cs.html" /> 38 <%include file="compare_cs.html" />
39 39
40 ## FILES 40 ## FILES
41 <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${_('Files affected')}</div> 41 <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">
42
43 % if c.limited_diff:
44 ${ungettext('%s file changed', '%s files changed', len(c.files)) % len(c.files)}
45 % else:
46 ${ungettext('%s file changed with %s insertions and %s deletions','%s files changed with %s insertions and %s deletions', len(c.files)) % (len(c.files),c.lines_added,c.lines_deleted)}:
47 %endif
48
49 </div>
42 <div class="cs_files"> 50 <div class="cs_files">
51 %if not c.files:
52 <span class="empty_data">${_('No files')}</span>
53 %endif
43 %for fid, change, f, stat in c.files: 54 %for fid, change, f, stat in c.files:
44 <div class="cs_${change}"> 55 <div class="cs_${change}">
45 <div class="node">${h.link_to(h.safe_unicode(f),h.url.current(anchor=fid))}</div> 56 <div class="node">${h.link_to(h.safe_unicode(f),h.url.current(anchor=fid))}</div>
46 <div class="changes">${h.fancy_file_stats(stat)}</div> 57 <div class="changes">${h.fancy_file_stats(stat)}</div>
47 </div> 58 </div>