##// END OF EJS Templates
added some failing tests for compare using cherry pick changesets, to be fixed later
added some failing tests for compare using cherry pick changesets, to be fixed later

File last commit:

r3269:7818c8c3 beta
r3331:0379e15f beta
Show More
changeset_range.html
122 lines | 5.6 KiB | text/html | HtmlLexer
code garden for changeset ranges and comments...
r1787 ## -*- coding: utf-8 -*-
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
r977 <%inherit file="/base/base.html"/>
<%def name="title()">
Mads Kiilerich
html: use &gt; instead of >
r3269 ${_('%s Changesets') % c.repo_name} - r${c.cs_ranges[0].revision}:${h.short_id(c.cs_ranges[0].raw_id)} -&gt; r${c.cs_ranges[-1].revision}:${h.short_id(c.cs_ranges[-1].raw_id)} - ${c.rhodecode_name}
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
r977 </%def>
<%def name="breadcrumbs_links()">
Takumi IINO
i18n 'Home' in breadcrumbs
r2492 ${h.link_to(_(u'Home'),h.url('/'))}
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
r977 &raquo;
${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))}
&raquo;
Mads Kiilerich
html: use &gt; instead of >
r3269 ${_('Changesets')} - r${c.cs_ranges[0].revision}:${h.short_id(c.cs_ranges[0].raw_id)} -&gt; r${c.cs_ranges[-1].revision}:${h.short_id(c.cs_ranges[-1].raw_id)}
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
r977 </%def>
<%def name="page_nav()">
White-space cleanup
r1888 ${self.menu('changelog')}
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
r977 </%def>
<%def name="main()">
<div class="box">
<!-- box / title -->
<div class="title">
${self.breadcrumbs()}
</div>
<div class="table">
Mads Kiilerich
html: don't use tabs
r3197 <div id="body" class="diffblock">
<div class="code-header cv">
<h3 class="code-header-title">${_('Compare View')} / ${h.link_to(_('Show combined compare'),h.url('compare_url',repo_name=c.repo_name,org_ref_type='rev',org_ref=getattr(c.cs_ranges[0].parents[0] if c.cs_ranges[0].parents else h.EmptyChangeset(),'raw_id'),other_ref_type='rev',other_ref=c.cs_ranges[-1].raw_id))}</h3>
changeset ranges use new fileid method.
r1688 <div>
Mads Kiilerich
html: use &gt; instead of >
r3269 ${_('Changesets')} - r${c.cs_ranges[0].revision}:${h.short_id(c.cs_ranges[0].raw_id)} -&gt; r${c.cs_ranges[-1].revision}:${h.short_id(c.cs_ranges[-1].raw_id)}
Mads Kiilerich
html: don't use tabs
r3197 </div>
</div>
</div>
<div id="changeset_compare_view_content">
<div class="container">
<table class="compare_view_commits noborder">
added changeset status into changeset range
r2240 %for cnt,cs in enumerate(c.cs_ranges):
added nicer compare view
r1010 <tr>
again #531 forgot to replace other occurences of h.email call
r2732 <td><div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(h.email_or_none(cs.author),14)}"/></div></td>
added nicer compare view
r1010 <td>${h.link_to('r%s:%s' % (cs.revision,h.short_id(cs.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</td>
<td><div class="author">${h.person(cs.author)}</div></td>
<td><span class="tooltip" title="${h.age(cs.date)}">${cs.date}</span></td>
added changeset status into changeset range
r2240 <td>
%if c.statuses:
merge with beta
r2430 <div title="${h.tooltip(_('Changeset status'))}" class="changeset-status-ico"><img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses[cnt])}" /></div>
added changeset status into changeset range
r2240 %endif
</td>
added repository name into issue tracker link to support different projects issues tracker mapping
r1868 <td><div class="message">${h.urlify_commit(h.wrap_paragraphs(cs.message),c.repo_name)}</div></td>
added nicer compare view
r1010 </tr>
%endfor
</table>
Mads Kiilerich
html: don't use tabs
r3197 </div>
<div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${_('Files affected')}</div>
<div class="cs_files">
%for cs in c.cs_ranges:
<div class="cur_cs">${h.link_to('r%s:%s' % (cs.revision,h.short_id(cs.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</div>
%for FID, (cs1, cs2, change, path, diff, stats) in c.changes[cs.raw_id].iteritems():
<div class="cs_${change}">${h.link_to(h.safe_unicode(path),h.url.current(anchor=FID))}</div>
%endfor
%endfor
</div>
</div>
White-space cleanup
r1888
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
r977 </div>
code garden for changeset ranges and comments...
r1787 <%namespace name="comment" file="/changeset/changeset_file_comment.html"/>
<%namespace name="diff_block" file="/changeset/diff_block.html"/>
%for cs in c.cs_ranges:
White-space cleanup
r1888 ##${comment.comment_inline_form(cs)}
code garden for changeset ranges and comments...
r1787 ## diff block
Changeset range shows branch/tags/bookmarks
r2926 <div class="h3">
add commit messaged and gravatar to split compare view
r2591 <a class="tooltip" title="${h.tooltip(cs.message)}" href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id)}">${'r%s:%s' % (cs.revision,h.short_id(cs.raw_id))}</a>
Changeset range shows branch/tags/bookmarks
r2926 <div class="gravatar">
<img alt="gravatar" src="${h.gravatar_url(h.email_or_none(cs.author),20)}"/>
</div>
<div class="right">
<span class="logtags">
%if len(cs.parents)>1:
<span class="merge">${_('merge')}</span>
%endif
%if cs.branch:
<span class="branchtag" title="${'%s %s' % (_('branch'),cs.branch)}">
${h.link_to(h.shorter(cs.branch),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
</span>
%endif
%if h.is_hg(c.rhodecode_repo):
%for book in cs.bookmarks:
<span class="bookbook" title="${'%s %s' % (_('bookmark'),book)}">
${h.link_to(h.shorter(book),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
</span>
%endfor
%endif
%for tag in cs.tags:
<span class="tagtag" title="${'%s %s' % (_('tag'),tag)}">
${h.link_to(h.shorter(tag),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}</span>
%endfor
whitespace cleanup
r2973 </span>
</div>
white space cleanup
r2673 </div>
code garden for changeset ranges and comments...
r1787 ${diff_block.diff_block(c.changes[cs.raw_id])}
##${comment.comments(cs)}
White-space cleanup
r1888 %endfor
code garden for changeset ranges and comments...
r1787 <script type="text/javascript">
YUE.onDOMReady(function(){
White-space cleanup
r1888
code garden for changeset ranges and comments...
r1787 YUE.on(YUQ('.diff-menu-activate'),'click',function(e){
var act = e.currentTarget.nextElementSibling;
White-space cleanup
r1888
code garden for changeset ranges and comments...
r1787 if(YUD.hasClass(act,'active')){
YUD.removeClass(act,'active');
YUD.setStyle(act,'display','none');
}else{
YUD.addClass(act,'active');
YUD.setStyle(act,'display','');
}
});
})
White-space cleanup
r1888 </script>
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
r977 </div>
White-space cleanup
r1888 </%def>