Mercurial > kallithea

comparison pylons_app/templates/changelog/changelog.html @ 212:671931f082c3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
added merge and parents indicators to changelog
author Marcin Kuzminski <marcin@python-works.com>
date Mon, 24 May 2010 00:58:40 +0200
parents 50a39f923f31
children 3a1b921ce51c
comparison
equal deleted inserted replaced
211:a3a7c3e03b76 212:671931f082c3
38 <div class="left"> 38 <div class="left">
39 <div class="date">${_('commit')} ${cs.revision}: ${cs.raw_id}@${cs.date}</div> 39 <div class="date">${_('commit')} ${cs.revision}: ${cs.raw_id}@${cs.date}</div>
40 <div class="author">${cs.author}</div> 40 <div class="author">${cs.author}</div>
41 <div id="chg_${cnt}" class="message"> 41 <div id="chg_${cnt}" class="message">
42 ${h.link_to(cs.message, 42 ${h.link_to(cs.message,
43 h.url('changeset_home',repo_name=c.repo_name,revision=cs._short), 43 h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id),
44 title=cs.message)} 44 title=cs.message)}
45 </div> 45 </div>
46 <span class="logtags"> 46 <span class="logtags">
47 <span class="branchtag">${cs.branch}</span> 47 <span class="branchtag">${cs.branch}</span>
48 %for tag in cs.tags: 48 %for tag in cs.tags:
53 <div class="right"> 53 <div class="right">
54 <span class="removed" title="${_('removed')}">${len(cs.removed)}</span> 54 <span class="removed" title="${_('removed')}">${len(cs.removed)}</span>
55 <span class="changed" title="${_('changed')}">${len(cs.changed)}</span> 55 <span class="changed" title="${_('changed')}">${len(cs.changed)}</span>
56 <span class="added" title="${_('added')}">${len(cs.added)}</span> 56 <span class="added" title="${_('added')}">${len(cs.added)}</span>
57 </div> 57 </div>
58 <div class="right">
59 %if len(cs.parents)>1:
60 <div class="merge">
61 ${_('merge')}
62 <img alt="merge" src="/images/icons/arrow_join.png">
63 </div>
64 %endif
65 %for p_cs in reversed(cs.parents):
66 <div class="parent">${_('Parrent')} ${p_cs.revision}: ${h.link_to(p_cs.raw_id,
67 h.url('changeset_home',repo_name=c.repo_name,revision=p_cs.raw_id),
68 title=p_cs.message)}</div>
69 %endfor
70 </div>
58 </div> 71 </div>
59 72
60 %endfor 73 %endfor
61 </div> 74 </div>
62 </div> 75 </div>