else:

            fid = h.FID(diff2, node2.path)

            line_context_lcl = get_line_ctx(fid, request.GET)

            ign_whitespace_lcl = get_ignore_ws(fid, request.GET)

            lim = request.GET.get('fulldiff') or self.cut_off_limit

            _, cs1, cs2, diff, st = diffs.wrapped_diff(filenode_old=node1,

                                         filenode_new=node2,

                                         cut_off_limit=lim,

                                         ignore_whitespace=ign_whitespace_lcl,

                                         line_context=line_context_lcl,

                                         enable_comments=False)

            op = ''

            filename = node1.path

            cs_changes = {

                'fid': [cs1, cs2, op, filename, diff, st]

            }

            c.changes = cs_changes

        return render('files/file_diff.html')

    @LoginRequired()

    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',

                                   'repository.admin')

    def diff_2way(self, repo_name, f_path):

        diff1 = request.GET.get('diff1', '')

        diff2 = request.GET.get('diff2', '')

        try:

            if diff1 not in ['', None, 'None', '0' * 12, '0' * 40]:

                c.changeset_1 = c.db_repo_scm_instance.get_changeset(diff1)

                try:

                    node1 = c.changeset_1.get_node(f_path)

                    if node1.is_dir():

                        raise NodeError('%s path is a %s not a file'

                                        % (node1, type(node1)))

                except NodeDoesNotExistError:

                    c.changeset_1 = EmptyChangeset(cs=diff1,

                                                   revision=c.changeset_1.revision,

                                                   repo=c.db_repo_scm_instance)

                    node1 = FileNode(f_path, '', changeset=c.changeset_1)

            else:

                c.changeset_1 = EmptyChangeset(repo=c.db_repo_scm_instance)

                node1 = FileNode(f_path, '', changeset=c.changeset_1)

            if diff2 not in ['', None, 'None', '0' * 12, '0' * 40]:

                c.changeset_2 = c.db_repo_scm_instance.get_changeset(diff2)

                try:

                    node2 = c.changeset_2.get_node(f_path)

                    if node2.is_dir():

                        raise NodeError('%s path is a %s not a file'

                                        % (node2, type(node2)))

                except NodeDoesNotExistError:

                    c.changeset_2 = EmptyChangeset(cs=diff2,

                                                   revision=c.changeset_2.revision,

                                                   repo=c.db_repo_scm_instance)

                    node2 = FileNode(f_path, '', changeset=c.changeset_2)

            else:

                c.changeset_2 = EmptyChangeset(repo=c.db_repo_scm_instance)

                node2 = FileNode(f_path, '', changeset=c.changeset_2)

        except (RepositoryError, NodeError):

            log.error(traceback.format_exc())

            return redirect(url('files_home', repo_name=c.repo_name,

                                f_path=f_path))

        c.node1 = node1

        c.node2 = node2

        c.cs1 = c.changeset_1

        c.cs2 = c.changeset_2

        return render('files/diff_2way.html')

    def _get_node_history(self, cs, f_path, changesets=None):

        """

        get changesets history for given node

        :param cs: changeset to calculate history

        :param f_path: path for node to calculate history for

        :param changesets: if passed don't calculate history and take

            changesets defined in this list

        """

        # calculate history based on tip

        tip_cs = c.db_repo_scm_instance.get_changeset()

        if changesets is None:

            try:

                changesets = tip_cs.get_file_history(f_path)

            except (NodeDoesNotExistError, ChangesetError):

                #this node is not present at tip !

                changesets = cs.get_file_history(f_path)

        hist_l = []

        changesets_group = ([], _("Changesets"))

        branches_group = ([], _("Branches"))

        tags_group = ([], _("Tags"))

        _hg = cs.repository.alias == 'hg'

        for chs in changesets:

            #_branch = '(%s)' % chs.branch if _hg else ''

            _branch = chs.branch

            changesets_group[0].append((chs.raw_id, n_desc,))

        hist_l.append(changesets_group)

        for name, chs in c.db_repo_scm_instance.branches.items():

            branches_group[0].append((chs, name),)

        hist_l.append(branches_group)

        for name, chs in c.db_repo_scm_instance.tags.items():

            tags_group[0].append((chs, name),)

        hist_l.append(tags_group)

        return hist_l, changesets

    @LoginRequired()

    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',

                                   'repository.admin')

    @jsonify

    def nodelist(self, repo_name, revision, f_path):

        if request.environ.get('HTTP_X_PARTIAL_XHR'):

            cs = self.__get_cs_or_redirect(revision, repo_name)

            _d, _f = ScmModel().get_nodes(repo_name, cs.raw_id, f_path,

                                          flat=False)

            return {'nodes': _d + _f}

        yield 0, dummyoutfile.getvalue()

        yield 0, '</td></tr></table>'

_whitespace_re = re.compile(r'(\t)|( )(?=\n|</div>)')

def _markup_whitespace(m):

    groups = m.groups()

    if groups[0]:

        return '<u>\t</u>'

    if groups[1]:

        return ' <i></i>'

def markup_whitespace(s):

    return _whitespace_re.sub(_markup_whitespace, s)

def pygmentize(filenode, **kwargs):

    """

    pygmentize function using pygments

    :param filenode:

    """

    lexer = get_custom_lexer(filenode.extension) or filenode.lexer

    return literal(markup_whitespace(

        code_highlight(filenode.content, lexer, CodeHtmlFormatter(**kwargs))))

def pygmentize_annotation(repo_name, filenode, **kwargs):

    """

    pygmentize function for annotation

    :param filenode:

    """

    color_dict = {}

    def gen_color(n=10000):

        """generator for getting n of evenly distributed colors using

        hsv color and golden ratio. It always return same order of colors

        :returns: RGB tuple

        """

        def hsv_to_rgb(h, s, v):

            if s == 0.0:

                return v, v, v

            i = int(h * 6.0)  # XXX assume int() truncates!

            f = (h * 6.0) - i

            p = v * (1.0 - s)

            q = v * (1.0 - s * f)

            t = v * (1.0 - s * (1.0 - f))

            i = i % 6

            if i == 0:

                return v, t, p

            if i == 1:

                return q, v, p

            if i == 2:

                return p, v, t

            if i == 3:

                return p, q, v

            if i == 4:

                return t, p, v

            if i == 5:

                return v, p, q

        golden_ratio = 0.618033988749895

        h = 0.22717784590367374

        for _ in xrange(n):

            h += golden_ratio

            h %= 1

            HSV_tuple = [h, 0.95, 0.95]

            RGB_tuple = hsv_to_rgb(*HSV_tuple)

            yield map(lambda x: str(int(x * 256)), RGB_tuple)

    cgenerator = gen_color()

    def get_color_string(cs):

        if cs in color_dict:

            col = color_dict[cs]

        else:

            col = color_dict[cs] = cgenerator.next()

        return "color: rgb(%s)! important;" % (', '.join(col))

    def url_func(repo_name):

        def _url_func(changeset):

            author = changeset.author

            date = changeset.date

            message = tooltip(changeset.message)

            tooltip_html = ("<div style='font-size:0.8em'><b>Author:</b>"

                            " %s<br/><b>Date:</b> %s</b><br/><b>Message:"

                            "</b> %s<br/></div>")

            tooltip_html = tooltip_html % (author, date, message)

            uri = link_to(

                    lnk_format,

                    url('changeset_home', repo_name=repo_name,

                        revision=changeset.raw_id),

                    style=get_color_string(changeset.raw_id),

                    class_='tooltip',

                    title=tooltip_html

                  )

            uri += '\n'

            return uri

        return _url_func

    return literal(markup_whitespace(annotate_highlight(filenode, url_func(repo_name), **kwargs)))

def is_following_repo(repo_name, user_id):

    from kallithea.model.scm import ScmModel

    return ScmModel().is_following_repo(repo_name, user_id)

class _Message(object):

    """A message returned by ``Flash.pop_messages()``.

    Converting the message to a string returns the message text. Instances

    also have the following attributes:

    * ``message``: the message text.

    * ``category``: the category specified when the message was created.

    """

    def __init__(self, category, message):

        self.category = category

        self.message = message

    def __str__(self):

        return self.message

    __unicode__ = __str__

    def __html__(self):

        return escape(safe_unicode(self.message))

class Flash(_Flash):

    def pop_messages(self):

        """Return all accumulated messages and delete them from the session.

        The return value is a list of ``Message`` objects.

        """

        from pylons import session

        messages = session.pop(self.session_key, [])

        session.save()

        return [_Message(*m) for m in messages]

flash = Flash()

#==============================================================================

# SCM FILTERS available via h.

#==============================================================================

from kallithea.lib.vcs.utils import author_name, author_email

from kallithea.lib.utils2 import credentials_filter, age as _age

from kallithea.model.db import User, ChangesetStatus

age = lambda  x, y=False: _age(x, y)

capitalize = lambda x: x.capitalize()

email = author_email

short_id = lambda x: x[:12]

hide_credentials = lambda x: ''.join(credentials_filter(x))

def show_id(cs):

    """

    Configurable function that shows ID

    by default it's r123:fffeeefffeee

    :param cs: changeset instance

    """

    from kallithea import CONFIG

    def_len = safe_int(CONFIG.get('show_sha_length', 12))

    show_rev = str2bool(CONFIG.get('show_revision_number', True))

    raw_id = cs.raw_id[:def_len]

    if show_rev:

        return 'r%s:%s' % (cs.revision, raw_id)

    else:

        return '%s' % (raw_id)

def fmt_date(date):

    if date:

        _fmt = u"%a, %d %b %Y %H:%M:%S".encode('utf8')

        return date.strftime(_fmt).decode('utf8')

    return ""

%if c.repo_bookmarks:

   <div id="table_wrap" class="yui-skin-sam">

    <table id="bookmarks_data">

    <thead>

        <tr>

            <th class="left">Raw name</th> ##notranslation

            <th class="left">${_('Name')}</th>

            <th class="left">Raw date</th> ##notranslation

            <th class="left">${_('Date')}</th>

            <th class="left">${_('Author')}</th>

            <th class="left">Raw rev</th> ##notranslation

            <th class="left">${_('Revision')}</th>

            <th class="left">${_('Compare')}</th>

        </tr>

    </thead>

    %for cnt,book in enumerate(c.repo_bookmarks.items()):

        <tr class="parity${cnt%2}">

            <td>${book[0]}</td>

            <td>

                <span class="logbooks">

                    <span class="booktag">${h.link_to(book[0],

                    h.url('changeset_home',repo_name=c.repo_name,revision=book[1].raw_id))}</span>

                </span>

            </td>

            <td>${book[1]._timestamp}</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>${book[1].revision}</td>

            <td>

              <div>

              </div>

            </td>

            <td>

                <input class="branch-compare" type="radio" name="compare_org" value="${book[0]}"/>

                <input class="branch-compare" type="radio" name="compare_other" value="${book[0]}"/>

            </td>

        </tr>

    %endfor

    </table>

    </div>

%else:

    ${_('There are no bookmarks yet')}

%endif

%if c.repo_branches:

   <div id="table_wrap" class="yui-skin-sam">

    <table id="branches_data">

      <thead>

        <tr>

            <th class="left">Raw name</th> ##notranslation

            <th class="left">${_('Name')}</th>

            <th class="left">Raw date</th> ##notranslation

            <th class="left">${_('Date')}</th>

            <th class="left">${_('Author')}</th>

            <th class="left">Raw rev</th> ##notranslation

            <th class="left">${_('Revision')}</th>

            <th class="left">${_('Compare')}</th>

        </tr>

      </thead>

        %for cnt,branch in enumerate(c.repo_branches.items()):

        <tr class="parity${cnt%2}">

            <td>${branch[0]}</td>

            <td>

                <span class="logtags">

                    <span class="branchtag">

                    ${h.link_to(branch[0],h.url('changelog_home',repo_name=c.repo_name,branch=branch[0]))}

                    </span>

                </span>

            </td>

            <td>${branch[1]._timestamp}</td>

            <td><span class="tooltip" title="${h.tooltip(h.age(branch[1].date))}">${h.fmt_date(branch[1].date)}</span></td>

            <td title="${branch[1].author}">${h.person(branch[1].author)}</td>

            <td>${branch[1].revision}</td>

            <td>

                <div>

                </div>

            </td>

            <td>

                <input class="branch-compare" type="radio" name="compare_org" value="${branch[0]}"/>

                <input class="branch-compare" type="radio" name="compare_other" value="${branch[0]}"/>

            </td>

        </tr>

        %endfor

        ## closed branches if any

        % if hasattr(c,'repo_closed_branches') and c.repo_closed_branches:

          %for cnt,branch in enumerate(c.repo_closed_branches.items()):

          <tr class="parity${cnt%2}">

              <td>${branch[0]}</td>

              <td>

                  <span class="logtags">

                      <span class="branchtag">

                      ${h.link_to(branch[0]+' [closed]',h.url('changelog_home',repo_name=c.repo_name,branch=branch[0]))}

                      </span>

                  </span>

              </td>

              <td>${branch[1]._timestamp}</td>

              <td><span class="tooltip" title="${h.tooltip(h.age(branch[1].date))}">${h.fmt_date(branch[1].date)}</span></td>

              <td title="${branch[1].author}">${h.person(branch[1].author)}</td>

              <td>${branch[1].revision}</td>

              <td>

                <div>

                </div>

              </td>

              <td></td>

          </tr>

          %endfor

        %endif

    </table>

    </div>

%else:

    ${_('There are no branches yet')}

%endif

## -*- coding: utf-8 -*-

<%inherit file="/base/base.html"/>

<%def name="title()">

    ${_('%s Changeset') % c.repo_name} - ${h.show_id(c.changeset)}

    %if c.site_name:

        · ${c.site_name}

    %endif

</%def>

<%def name="breadcrumbs_links()">

</%def>

<%def name="page_nav()">

    ${self.menu('repositories')}

</%def>

<%def name="main()">

${self.repo_context_bar('changelog', c.changeset.raw_id)}

<div class="box">

    <!-- box / title -->

    <div class="title">

        ${self.breadcrumbs()}

    </div>

    <script>

    var _USERS_AC_DATA = ${c.users_array|n};

    var _GROUPS_AC_DATA = ${c.user_groups_array|n};

    AJAX_COMMENT_URL = "${url('changeset_comment',repo_name=c.repo_name,revision=c.changeset.raw_id)}";

    AJAX_COMMENT_DELETE_URL = "${url('changeset_comment_delete',repo_name=c.repo_name,comment_id='__COMMENT_ID__')}";

    </script>

    <div class="table">

        <div class="diffblock">

            <div class="parents">

                <div id="parent_link" class="changeset_hash">

                    <i style="color:#036185" class="icon-chevron-left"></i> <a href="#">${_('parent rev.')}</a>

                </div>

            </div>

            <div class="children">

                <div id="child_link" class="changeset_hash">

                    <a href="#">${_('child rev.')}</a> <i style="color:#036185" class="icon-chevron-right"></i>

                </div>

            </div>

            <div class="code-header banner">

                <div class="changeset-status-container">

                    %if c.statuses:

                        <div class="changeset-status-ico"><img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses[0])}" /></div>

                        <div title="${_('Changeset status')}" class="changeset-status-lbl">[${h.changeset_status_lbl(c.statuses[0])}]</div>

                    %endif

                </div>

                <div class="diff-actions">

                  <a href="${h.url('changeset_raw_home',repo_name=c.repo_name,revision=c.changeset.raw_id)}"  class="tooltip" title="${h.tooltip(_('Raw diff'))}">

                      <img class="icon" src="${h.url('/images/icons/page_white.png')}"/>

                  </a>

                  <a href="${h.url('changeset_patch_home',repo_name=c.repo_name,revision=c.changeset.raw_id)}"  class="tooltip" title="${h.tooltip(_('Patch diff'))}">

                      <img class="icon" src="${h.url('/images/icons/page_add.png')}"/>

                  </a>

                  <a href="${h.url('changeset_download_home',repo_name=c.repo_name,revision=c.changeset.raw_id,diff='download')}" class="tooltip" title="${h.tooltip(_('Download diff'))}">

                      <img class="icon" src="${h.url('/images/icons/page_save.png')}"/>

                  </a>

                  ${c.ignorews_url(request.GET)}

                  ${c.context_url(request.GET)}

                </div>

                <div class="comments-number" style="float:right;padding-right:5px">${ungettext("%d comment", "%d comments", len(c.comments)) % len(c.comments)} ${ungettext("(%d inline)", "(%d inline)", c.inline_cnt) % c.inline_cnt}</div>

            </div>

        </div>

        <div id="changeset_content">

            <div class="container">

                <div class="right">

                    <div class="changes">

                        % if (len(c.changeset.affected_files) <= c.affected_files_cut_off) or c.fulldiff:

                         <span class="removed" title="${_('Removed')}">${len(c.changeset.removed)}</span>

                         <span class="changed" title="${_('Changed')}">${len(c.changeset.changed)}</span>

                         <span class="added" title="${_('Added')}">${len(c.changeset.added)}</span>

                        % else:

                         <span class="removed" title="${_('Affected %s files') % len(c.changeset.affected_files)}">!</span>

                         <span class="changed" title="${_('Affected %s files') % len(c.changeset.affected_files)}">!</span>

                         <span class="added"   title="${_('Affected %s files') % len(c.changeset.affected_files)}">!</span>

                        % endif

                    </div>

                    <span class="logtags">

                        %if len(c.changeset.parents)>1:

                        <span class="merge">${_('merge')}</span>

                        %endif

                        %if h.is_hg(c.db_repo_scm_instance):

                          %for book in c.changeset.bookmarks:

                          <span class="booktag" title="${_('Bookmark %s') % book}">

                             ${h.link_to(book,h.url('changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}

                          </span>

                          %endfor

                        %endif

                        %for tag in c.changeset.tags:

                         <span class="tagtag"  title="${_('Tag %s') % tag}">

                         ${h.link_to(tag,h.url('changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}</span>

                        %endfor

                        %if c.changeset.branch:

                         <span class="branchtag" title="${_('Branch %s') % c.changeset.branch}">

                         ${h.link_to(c.changeset.branch,h.url('changelog_home',repo_name=c.repo_name,branch=c.changeset.branch))}

                         </span>

                        %endif

                    </span>

## -*- coding: utf-8 -*-

<%inherit file="/base/base.html"/>

<%def name="title()">

    %if c.site_name:

        · ${c.site_name}

    %endif

</%def>

<%def name="breadcrumbs_links()">

    ${_('Changesets')} -

    <i class="icon-arrow-right"></i>

</%def>

<%def name="page_nav()">

    ${self.menu('repositories')}

</%def>

<%def name="main()">

${self.repo_context_bar('changelog')}

<div class="box">

    <!-- box / title -->

    <div class="title">

        ${self.breadcrumbs()}

    </div>

    <div class="table">

        <div id="body" class="diffblock">

            <div class="code-header">

                <div>

                    <i class="icon-arrow-right"></i>

                    <a style="font-weight: bold" href="${h.url('compare_url',repo_name=c.repo_name,org_ref_type='rev',org_ref_name=getattr(c.cs_ranges[0].parents[0] if c.cs_ranges[0].parents else h.EmptyChangeset(),'raw_id'),other_ref_type='rev',other_ref_name=c.cs_ranges[-1].raw_id)}" class="btn btn-small"><i class="icon-loop"></i> Compare Revisions</a>

                </div>

            </div>

        </div>

        <div id="changeset_compare_view_content">

            <div class="container">

            <table class="compare_view_commits noborder">

            %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>${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>

                <td>

                  %if c.statuses:

                    <div title="${h.tooltip(_('Changeset status'))}" class="changeset-status-ico"><img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses[cnt])}" /></div>

                  %endif

                </td>

                <td><div class="message">${h.urlify_commit(h.wrap_paragraphs(cs.message),c.repo_name)}</div></td>

                </tr>

            %endfor

            </table>

            </div>

            <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${_('Files affected')}</div>

            <div class="cs_files">

            </div>

        </div>

    </div>

    <%namespace name="comment" file="/changeset/changeset_file_comment.html"/>

    <%namespace name="diff_block" file="/changeset/diff_block.html"/>

     %for cs in c.cs_ranges:

          ##${comment.comment_inline_form(cs)}

          ## diff block

          <div class="h3">

             <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 h.is_hg(c.db_repo_scm_instance):

                  %for book in cs.bookmarks:

                  <span class="booktag" title="${_('Bookmark %s') % book}">

                     ${h.link_to(book,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}

                  </span>

                  %endfor

                %endif

                %for tag in cs.tags:

                    <span class="tagtag" title="${_('Tag %s') % tag}">

                    ${h.link_to(tag,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</span>

                %endfor

                %if cs.branch:

                <span class="branchtag" title="${_('Branch %s') % cs.branch}">

                   ${h.link_to(cs.branch,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}

                </span>

                %endif

              </span>

            </div>

           </div>

          ${diff_block.diff_block(c.changes[cs.raw_id])}

     %endfor

     <script type="text/javascript">

      YUE.onDOMReady(function(){

          YUE.on(YUQ('.diff-menu-activate'),'click',function(e){

              var act = e.currentTarget.nextElementSibling;

              if(YUD.hasClass(act,'active')){

                  YUD.removeClass(act,'active');

                  YUD.setStyle(act,'display','none');

              }else{

                  YUD.addClass(act,'active');

                  YUD.setStyle(act,'display','');

              }

          });

      })

    </script>

    </div>

</%def>

## Changesets table !

<div class="container">

  %if not c.cs_ranges:

    <span class="empty_data">${_('No changesets')}</span>

  %else:

    %if c.ancestor:

    <div class="ancestor">${_('Ancestor')}:

      ${h.link_to(h.short_id(c.ancestor),h.url('changeset_home',repo_name=c.repo_name,revision=c.ancestor))}

    </div>

    %endif

    <table class="compare_view_commits noborder">

    %for cs in reversed(c.cs_ranges):

        <tr id="row-${cs.raw_id}">

        <td style="width:50px">

          %if cs.raw_id in c.statuses:

            <div title="${_('Changeset status: %s') % 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 style="width: 140px"><span class="tooltip" title="${h.tooltip(h.age(cs.date))}">${cs.date}</span></td>

        <td><div class="gravatar" commit_id="${cs.raw_id}"><img alt="gravatar" src="${h.gravatar_url(h.email_or_none(cs.author),14)}"/></div></td>

        <td><div class="author">${h.person(cs.author)}</div></td>

        <td>

        %if cs.branch:

        <span class="branchtag">${cs.branch}</span>

        %endif

        </td>

        <td class="expand_commit" commit_id="${cs.raw_id}" title="${_('Expand commit message')}">

            <i class="icon-resize-vertical" style="color:#DDD"></i>

        </td>

        <td><div id="C-${cs.raw_id}" class="message" style="white-space:normal; height:1.1em; padding:0">${h.urlify_commit(cs.message, c.repo_name)}</div></td>

        </tr>

    %endfor

    </table>

    %if c.as_form:

      <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">

      ## links should perhaps use ('rev', c.org_rev) instead ...

      ${h.link_to(_('Show merge diff'),

        h.url('compare_url',

          repo_name=c.org_repo.repo_name,

          org_ref_type=c.org_ref_type, org_ref_name=c.org_ref_name,

          other_repo=c.other_repo.repo_name,

          other_ref_type=c.other_ref_type, other_ref_name=c.other_ref_name,

          merge='1'),

        )}

      </div>

      <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">

        ${_('Common ancestor')}:

        %if c.ancestor:

        ${h.link_to(h.short_id(c.ancestor),h.url('changeset_home',repo_name=c.repo_name,revision=c.ancestor))}

        %else:

        ${_('No common ancestor found - repositories are unrelated')}

        %endif

      </div>

    %endif

    %if c.cs_ranges_org is not None:

      ## TODO: list actual changesets?

      <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">

        ${h.link_to_ref(c.other_repo.repo_name, c.other_ref_type, c.other_ref_name, c.other_rev)}

        ${_('is')}

        <a href="${c.swap_url}">${_('%s changesets') % (len(c.cs_ranges_org))}</a>

        ${_('behind')}

        ${h.link_to_ref(c.org_repo.repo_name, c.org_ref_type, c.org_ref_name, c.org_rev)}

      </div>

    %endif

  %endif

</div>

<script>

$('.expand_commit').on('click',function(e){

    $(this).children('i').hide();

    var cid = $(this).attr('commit_id');

    $('#C-'+cid).css({'height': 'auto','width': 'auto', 'white-space': 'pre'})

});

$('.gravatar').on('click',function(e){

    var cid = $(this).attr('commit_id');

    $('#row-'+cid).toggleClass('hl', !$('#row-'+cid).hasClass('hl'));

});

</script>

## -*- coding: utf-8 -*-

<%inherit file="/base/base.html"/>

<%def name="js_extra()">

<script type="text/javascript" src="${h.url('/js/codemirror.js')}"></script>

<script type="text/javascript" src="${h.url('/js/mergely.js')}"></script>

</%def>

<%def name="css_extra()">

<link rel="stylesheet" type="text/css" href="${h.url('/css/codemirror.css')}"/>

<link rel="stylesheet" type="text/css" href="${h.url('/css/mergely.css')}"/>

</%def>

<%def name="title()">

    ${_('%s File side-by-side diff') % c.repo_name}

    %if c.site_name:

        · ${c.site_name}

    %endif

</%def>

<%def name="breadcrumbs_links()">

</%def>

<%def name="page_nav()">

    ${self.menu('repositories')}

</%def>

<%def name="main()">

${self.repo_context_bar('changelog')}

<div class="box">

    <!-- box / title -->

    <div class="title">

        ${self.breadcrumbs()}

    </div>

    <div class="diff-container" style="overflow-x: hidden">

        <div class="diffblock comm" style="margin:3px; padding:1px">

            <div class="code-header">

                <div class="changeset_header">

                    <div class="changeset_file">

                        ${h.link_to(h.safe_unicode(c.node1.path),h.url('files_home',repo_name=c.repo_name,

                        revision=c.cs2.raw_id,f_path=h.safe_unicode(c.node1.path)))}

                    </div>

                    <div class="diff-actions">

                      <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(c.node1.path),diff2=c.cs2.raw_id,diff1=c.cs1.raw_id,diff='diff',fulldiff=1)}" class="tooltip" title="${h.tooltip(_('Show full diff for this file'))}">

                          <img class="icon" src="${h.url('/images/icons/page_white_go.png')}"/>

                      </a>

                      <a href="${h.url('files_diff_2way_home',repo_name=c.repo_name,f_path=h.safe_unicode(c.node1.path),diff2=c.cs2.raw_id,diff1=c.cs1.raw_id,diff='diff',fulldiff=1)}" class="tooltip" title="${h.tooltip(_('Show full side-by-side diff for this file'))}">

                          <img class="icon" src="${h.url('/images/icons/application_double.png')}"/>

                      </a>

                      <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(c.node1.path),diff2=c.cs2.raw_id,diff1=c.cs1.raw_id,diff='raw')}" class="tooltip" title="${h.tooltip(_('Raw diff'))}">

                          <img class="icon" src="${h.url('/images/icons/page_white.png')}"/>

                      </a>

                      <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(c.node1.path),diff2=c.cs2.raw_id,diff1=c.cs1.raw_id,diff='download')}" class="tooltip" title="${h.tooltip(_('Download diff'))}">

                          <img class="icon" src="${h.url('/images/icons/page_save.png')}"/>

                      </a>

                      ${h.checkbox('ignorews', label=_('ignore white space'))}

                      ${h.checkbox('edit_mode', label=_('turn on edit mode'))}

                    </div>