/*new binary

NEW_FILENODE = 1

DEL_FILENODE = 2

MOD_FILENODE = 3

RENAMED_FILENODE = 4

CHMOD_FILENODE = 5

BIN_FILENODE = 6

*/

.cs_files .changes .bin {

    background-color: #BBFFBB;

    float: left;

    text-align: center;

    font-size: 9px;

    padding: 2px 0px 2px 0px;

}

.cs_files .changes .bin.bin1 {

    background-color: #BBFFBB;

}

/*deleted binary*/

.cs_files .changes .bin.bin2 {

    background-color: #FF8888;

}

/*mod binary*/

.cs_files .changes .bin.bin3 {

    background-color: #DDDDDD;

}

/*rename file*/

.cs_files .changes .bin.bin4 {

    background-color: #6D99FF;

}

/*rename file*/

.cs_files .changes .bin.bin4 {

    background-color: #6D99FF;

}

/*chmod file*/

.cs_files .changes .bin.bin5 {

    background-color: #6D99FF;

}

.cs_files .cs_added, .cs_files .cs_A {

    background: url("../images/icons/page_white_add.png") no-repeat scroll

        3px;

    height: 16px;

    padding-left: 20px;

    margin-top: 7px;

    text-align: left;

}

.cs_files .cs_changed, .cs_files .cs_M {

    background: url("../images/icons/page_white_edit.png") no-repeat scroll

        3px;

    height: 16px;

    padding-left: 20px;

    margin-top: 7px;

    text-align: left;

}

.cs_files .cs_removed, .cs_files .cs_D {

    background: url("../images/icons/page_white_delete.png") no-repeat

        scroll 3px;

    height: 16px;

    padding-left: 20px;

    margin-top: 7px;

    text-align: left;

}

.table {

    position: relative;

}

#graph {

    position: relative;

    overflow: hidden;

}

#graph_nodes {

    position: absolute;

}

#graph_content,

#graph .info_box,

#graph .container_header {

    margin-left: 100px;

}

#graph_content {

    position: relative;

}

#graph .container_header {

    padding: 10px;

    height: 25px;

}

#graph_content #rev_range_container {

    float: left;

    margin: 0px 0px 0px 3px;

}

#graph_content #rev_range_clear {

    float: left;

    margin: 0px 0px 0px 3px;

}

#graph_content #changesets {

    table-layout: fixed;

    border-collapse: collapse;

    border-left: none;

    border-right: none;

    border-color: #cdcdcd;

}

#graph_content #changesets td {

    overflow: hidden;

    text-overflow: ellipsis;

    white-space: nowrap;

    height: 31px;

    border-color: #cdcdcd;

    text-align: left;

}

#graph_content .container .checkbox {

    width: 12px;

    font-size: 0.85em;

}

#graph_content .container .status {

    width: 14px;

    font-size: 0.85em;

}

#graph_content .container .author {

   width: 105px;

}

#graph_content .container .hash {

    width: 100px;

    font-size: 0.85em;

}

#graph_content #changesets .container .date {

    width: 76px;

    color: #666;

    font-size: 10px;

}

#graph_content_pr .compare_view_commits .expand_commit,

#graph_content .container .expand_commit {

    width: 24px;

    cursor: pointer;

}

#graph_content #changesets .container .right {

    width: 120px;

    padding-right: 0px;

    overflow: visible;

    position: relative;

}

#graph_content .container .mid {

    padding: 0;

}

#graph_content .log-container {

    position: relative;

}

#graph_content .container .changeset_range {

    float: left;

    margin: 6px 3px;

}

#graph_content .container .author img {

    vertical-align: middle;

}

#graph_content .container .author .user {

    color: #444444;

}

#graph_content .container .mid .message {

    white-space: pre-wrap;

    padding: 0;

    overflow: hidden;

    height: 1.1em;

}

#graph_content .container .extra-container {

    display: block;

    position: absolute;

    top: -15px;

    right: 0;

    padding-left: 5px;

    background: #FFFFFF;

    height: 41px;

}

#graph_content .comments-container,

#shortlog_data .comments-container,

#graph_content .logtags {

    display: block;

    float: left;

    overflow: hidden;

    padding: 0;

    margin: 0;

}

#graph_content .comments-container {

    margin: 0.8em 0;

    margin-right: 0.5em;

}

#graph_content  .tagcontainer {

    width: 80px;

    position: relative;

    float: right;

    height: 100%;

    top: 7px;

    margin-left: 0.5em;

}

#graph_content .logtags {

    min-width: 80px;

    height: 1.1em;

    position: absolute;

    left: 0px;

    width: auto;

    top: 0px;

}

#graph_content .logtags.tags {

    top: 14px;

}

#graph_content .logtags:hover {

    overflow: visible;

    position: absolute;

    width: auto;

    right: 0;

    left: initial;

}

#graph_content .logtags .booktag,

#graph_content .logtags .tagtag {

    float: left;

    line-height: 1em;

    margin-bottom: 1px;

    margin-right: 1px;

    padding: 1px 3px;

    font-size: 10px;

}

#graph_content .container .mid .message a:hover {

    text-decoration: none;

}

.revision-link {

    color: #3F6F9F;

    font-weight: bold !important;

}

.issue-tracker-link {

    color: #3F6F9F;

    font-weight: bold !important;

}

.changeset-status-container {

    padding-right: 5px;

    margin-top: 1px;

    float: right;

    height: 14px;

}

.code-header .changeset-status-container {

    float: left;

    padding: 2px 0px 0px 2px;

}

.changeset-status-container .changeset-status-lbl {

    float: left;

    padding: 3px 4px 0px 0px

}

.code-header .changeset-status-container .changeset-status-lbl {

    float: left;

    padding: 0px 4px 0px 0px;

}

.changeset-status-container .changeset-status-ico {

    float: left;

}

.code-header .changeset-status-container .changeset-status-ico, .container .changeset-status-ico {

    float: left;

}

#graph_content .comments-cnt {

    color: rgb(136, 136, 136);

    padding: 5px 0;

}

#shortlog_data .comments-cnt {

    color: rgb(136, 136, 136);

    padding: 3px 0;

}

#graph_content .comments-cnt a,

#shortlog_data .comments-cnt a {

    background-image: url('../images/icons/comments.png');

    background-repeat: no-repeat;

    background-position: 100% 50%;

    padding: 5px 0;

    padding-right: 20px;

}

.right .changes {

    clear: both;

}

.right .changes .changed_total {

    display: block;

    float: right;

    text-align: center;

    min-width: 45px;

    cursor: pointer;

    color: #444444;

    background: #FEA;

    -webkit-border-radius: 0px 0px 0px 6px;

    border-radius: 0px 0px 0px 6px;

    padding: 1px;

}

.right .changes .added, .changed, .removed {

    display: block;

    padding: 1px;

    color: #444444;

    float: right;

    text-align: center;

    min-width: 15px;

}

.right .changes .added {

    background: #CFC;

}

.right .changes .changed {

    background: #FEA;

}

.right .changes .removed {

    background: #FAA;

}

.right .merge {

    padding: 1px 3px 1px 3px;

    background-color: #fca062;

    font-size: 10px;

    color: #ffffff;

    text-transform: uppercase;

    white-space: nowrap;

    -webkit-border-radius: 3px;

    border-radius: 3px;

    margin-right: 2px;

}

.right .parent {

    color: #666666;

    clear: both;

}

.right .logtags {

    line-height: 2.2em;

}

.branchtag, .logtags .tagtag, .logtags .booktag {

    margin: 0px 2px;

}

.branchtag,

.tagtag,

.booktag,

.spantag {

    padding: 1px 3px 1px 3px;

    font-size: 10px;

    color: #577632;

    white-space: nowrap;

                </div>

                <div style="clear:both">

                <div id="graph_nodes">

                    <canvas id="graph_canvas"></canvas>

                </div>

                <div id="graph_content" style="${'margin: 0px' if c.changelog_for_path else ''}">

                <table id="changesets">

                <tbody>

                %for cnt,cs in enumerate(c.pagination):

                    <tr id="chg_${cnt+1}" class="container ${'tablerow%s' % (cnt%2)}">

                        <td class="checkbox">

                            %if c.changelog_for_path:

                                ${h.checkbox(cs.raw_id,class_="changeset_range", disabled="disabled")}

                            %else:

                                ${h.checkbox(cs.raw_id,class_="changeset_range")}

                            %endif

                        <td class="status">

                          %if c.statuses.get(cs.raw_id):

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

                            %if c.statuses.get(cs.raw_id)[2]:

                              <a class="tooltip" title="${_('Changeset status: %s\nClick to open associated pull request #%s') % (h.changeset_status_lbl(c.statuses.get(cs.raw_id)[0]), c.statuses.get(cs.raw_id)[2])}" href="${h.url('pullrequest_show',repo_name=c.statuses.get(cs.raw_id)[3],pull_request_id=c.statuses.get(cs.raw_id)[2])}">

                                <img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses.get(cs.raw_id)[0])}" />

                              </a>

                            %else:

                              <a class="tooltip" title="${_('Changeset status: %s') % h.changeset_status_lbl(c.statuses.get(cs.raw_id)[0])}" href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id,anchor='comment-%s' % c.comments[cs.raw_id][0].comment_id)}">

                                  <img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses.get(cs.raw_id)[0])}" />

                              </a>

                            %endif

                            </div>

                          %endif

                        </td>

                        <td class="author">

                            <img alt="gravatar" src="${h.gravatar_url(h.email_or_none(cs.author),16)}"/>

                            <span title="${cs.author}" class="user">${h.shorter(h.person(cs.author),22)}</span>

                        </td>

                        <td class="hash" style="width:${len(h.show_id(cs))*6.5}px">

                            <a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id)}">

                                <span class="changeset_hash">${h.show_id(cs)}</span>

                            </a>

                        </td>

                        <td class="date">

                            <div class="date">${h.age(cs.date,True)}</div>

                        </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 class="mid">

                            <div class="log-container">

                                <div class="message" id="C-${cs.raw_id}">${h.urlify_commit(cs.message, c.repo_name,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</div>

                                <div class="extra-container">

                                    %if c.comments.get(cs.raw_id):

                                        <div class="comments-container">

                                            <div class="comments-cnt" title="${_('Changeset has comments')}">

                                                <a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id,anchor='comment-%s' % c.comments[cs.raw_id][0].comment_id)}">

                                                    ${len(c.comments[cs.raw_id])}

                                                    <i class="icon-comment-alt icon-comment-colored"></i>

                                                </a>

                                            </div>

                                        </div>

                                    %endif

                                    %if h.is_hg(c.db_repo_scm_instance):

                                        %for book in cs.bookmarks:

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

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

                                            </div>

                                        %endfor

                                    %endif

                                    %for tag in cs.tags:

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

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

                                        </div>

                                    %endfor

                                    %if (not c.branch_name) and cs.branch:

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

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

                                        </div>

                                    %endif

                                </div>

                            </div>

                        </td>

                    </tr>

                %endfor

                </tbody>

                </table>

                </div>

                <div class="pagination-wh pagination-left">

                    ${c.pagination.pager('$link_previous ~2~ $link_next')}

                </div>

            </div>

        </div>

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

        <script type="text/javascript">

            YAHOO.util.Event.onDOMReady(function(){

                //Monitor range checkboxes and build a link to changesets ranges

                var checkboxes = YUD.getElementsByClassName('changeset_range');

                // register extra routes needed for this view

                pyroutes.register('changeset_home', "${h.url('changeset_home', repo_name='%(repo_name)s', revision='%(revision)s')}", ['repo_name', 'revision']);

                var checkbox_checker = function(e){

                    var checked_checkboxes = [];

                    for (pos in checkboxes){

                        if(checkboxes[pos].checked){

                            checked_checkboxes.push(checkboxes[pos]);

                        }

                    }

                    if(YUD.get('open_new_pr')){

                        if(checked_checkboxes.length>1){

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

                        } else {

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

                            if(checked_checkboxes.length>0){

                                YUD.get('open_new_pr').innerHTML = _TM['Open new pull request for selected changesets'];

                            }else{

                                YUD.get('open_new_pr').innerHTML = _TM['Open new pull request'];

                            }

                        }

                    }

                    if(checked_checkboxes.length>0){

                        var rev_end = checked_checkboxes[0].name;

                        var rev_start = checked_checkboxes[checked_checkboxes.length-1].name;

                        var url = pyroutes.url('changeset_home', {'repo_name': '${c.repo_name}',

                                                                  'revision': rev_start+'...'+rev_end});

                        var link = (rev_start == rev_end)

                            ? _TM['Show selected changeset __S']

                            : _TM['Show selected changesets __S → __E'];

                        link = link.replace('__S',rev_start.substr(0,6));

                        link = link.replace('__E',rev_end.substr(0,6));

                        YUD.get('rev_range_container').href = url;

                        YUD.get('rev_range_container').innerHTML = link;

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

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

                        YUD.get('open_new_pr').href = pyroutes.url('pullrequest_home',

                                                                   {'repo_name': '${c.repo_name}',

                                                                    'rev_start': rev_start,

                                                                    'rev_end': rev_end})

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

                    }else{

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

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

                        %if c.revision:

                            YUD.get('open_new_pr').href = pyroutes.url('pullrequest_home',

                                                                       {'repo_name': '${c.repo_name}',

                                                                        'rev_end':'${c.first_revision.raw_id}'});

                        %else:

                            YUD.get('open_new_pr').href = pyroutes.url('pullrequest_home',

                                                                       {'repo_name': '${c.repo_name}',

                                                                        'branch':'${c.first_revision.branch}'});

                        %endif

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

                    }

                };

                YUE.onDOMReady(checkbox_checker);

                YUE.on(checkboxes,'click', checkbox_checker);

                YUE.on('rev_range_clear','click',function(e){

                    for (var i=0; i<checkboxes.length; i++){

                        var cb = checkboxes[i];

                        cb.checked = false;

                    }

                    checkbox_checker();

                    YUE.preventDefault(e);

                });

                var msgs = YUQ('.message');

                // get first element height

                var el = YUQ('#graph_content .container')[0];

                var row_h = el.clientHeight;

                for(var i=0;i<msgs.length;i++){

                    var m = msgs[i];

                    var h = m.clientHeight;

                    var pad = YUD.getStyle(m,'padding');

                    if(h > row_h){

                        var offset = row_h - (h+12);

                        YUD.setStyle(m.nextElementSibling,'display','block');

                        YUD.setStyle(m.nextElementSibling,'margin-top',offset+'px');

                    };

                }

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

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

                    //redraw the graph, r and jsdata are bound outside function

                    r.render(jsdata,100);

                });

                // change branch filter

                YUE.on(YUD.get('branch_filter'),'change',function(e){

                    var selected_branch = e.currentTarget.options[e.currentTarget.selectedIndex].value;

                    if(selected_branch != ''){

                        window.location = pyroutes.url('changelog_home', {'repo_name': '${c.repo_name}',

                                                                          'branch':selected_branch});

                    }else{

                        window.location = pyroutes.url('changelog_home', {'repo_name': '${c.repo_name}'});

                    }

                });

                var jsdata = ${c.jsdata|n};

                var r = new BranchRenderer('graph_canvas', 'graph_content');

                r.render(jsdata,100);

            });

        </script>

        %else:

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

        %endif

    </div>

</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 height="16" width="16" 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)}" height="14" width="14"/></div></td>

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

        <td>${h.link_to(h.show_id(cs),h.url('changeset_home',repo_name=c.other_repo.repo_name,revision=cs.raw_id))}</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>

        </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){

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

});

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

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

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

});

</script>

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

from kallithea.tests import *

from kallithea.model.repo import RepoModel

from kallithea.model.meta import Session

from kallithea.model.db import Repository

from kallithea.model.scm import ScmModel

from kallithea.lib.vcs.backends.base import EmptyChangeset

from kallithea.tests.fixture import Fixture

fixture = Fixture()

def _commit_change(repo, filename, content, message, vcs_type, parent=None, newfile=False):

    repo = Repository.get_by_repo_name(repo)

    _cs = parent

    if not parent:

        _cs = EmptyChangeset(alias=vcs_type)

    if newfile:

        nodes = {

            filename: {

                'content': content

            }

        }

        cs = ScmModel().create_nodes(

            user=TEST_USER_ADMIN_LOGIN, repo=repo,

            message=message,

            nodes=nodes,

            parent_cs=_cs,

            author=TEST_USER_ADMIN_LOGIN,

        )

    else:

        cs = ScmModel().commit_change(

            repo=repo.scm_instance, repo_name=repo.repo_name,

            cs=parent, user=TEST_USER_ADMIN_LOGIN,

            author=TEST_USER_ADMIN_LOGIN,

            message=message,

            content=content,

            f_path=filename

        )

    return cs

def _commit_div(sha, msg):

class TestCompareController(TestController):

    def setUp(self):

        self.r1_id = None

        self.r2_id = None

    def tearDown(self):

        if self.r2_id:

            RepoModel().delete(self.r2_id)

        if self.r1_id:

            RepoModel().delete(self.r1_id)

        Session().commit()

        Session.remove()

    def test_compare_forks_on_branch_extra_commits_hg(self):

        self.log_user()

        repo1 = fixture.create_repo('one', repo_type='hg',

                                    repo_description='diff-test',

                                    cur_user=TEST_USER_ADMIN_LOGIN)

        self.r1_id = repo1.repo_id

        #commit something !

        cs0 = _commit_change(repo1.repo_name, filename='file1', content='line1\n',

                             message='commit1', vcs_type='hg', parent=None, newfile=True)

        #fork this repo

        repo2 = fixture.create_fork('one', 'one-fork')

        self.r2_id = repo2.repo_id

        #add two extra commit into fork

        cs1 = _commit_change(repo2.repo_name, filename='file1', content='line1\nline2\n',

                             message='commit2', vcs_type='hg', parent=cs0)

        cs2 = _commit_change(repo2.repo_name, filename='file1', content='line1\nline2\nline3\n',

                             message='commit3', vcs_type='hg', parent=cs1)

        rev1 = 'default'

        rev2 = 'default'

        response = self.app.get(url('compare_url',

                                    repo_name=repo1.repo_name,

                                    org_ref_type="branch",

                                    org_ref_name=rev2,

                                    other_repo=repo2.repo_name,

                                    other_ref_type="branch",

                                    other_ref_name=rev1,

                                    merge='1',))

        response.mustcontain('%s@%s' % (repo1.repo_name, rev2))

        response.mustcontain('%s@%s' % (repo2.repo_name, rev1))

        response.mustcontain("""Showing 2 commits""")

        response.mustcontain("""1 file changed with 2 insertions and 0 deletions""")

        response.mustcontain(_commit_div(cs1.raw_id, 'commit2'))

        response.mustcontain(_commit_div(cs2.raw_id, 'commit3'))

        response.mustcontain("""<a href="/%s/changeset/%s">r1:%s</a>""" % (repo2.repo_name, cs1.raw_id, cs1.short_id))

        response.mustcontain("""<a href="/%s/changeset/%s">r2:%s</a>""" % (repo2.repo_name, cs2.raw_id, cs2.short_id))

        ## files

        response.mustcontain("""<a href="/%s/compare/branch@%s...branch@%s?other_repo=%s&amp;merge=1#C--826e8142e6ba">file1</a>""" % (repo1.repo_name, rev2, rev1, repo2.repo_name))

        #swap

        response.mustcontain("""<a class="btn btn-small" href="/%s/compare/branch@%s...branch@%s?other_repo=%s&amp;merge=True"><i class="icon-refresh"></i> Swap</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name))

    def test_compare_forks_on_branch_extra_commits_git(self):

        self.log_user()

        repo1 = fixture.create_repo('one-git', repo_type='git',

                                    repo_description='diff-test',

                                    cur_user=TEST_USER_ADMIN_LOGIN)

        self.r1_id = repo1.repo_id

        #commit something !

        cs0 = _commit_change(repo1.repo_name, filename='file1', content='line1\n',

                             message='commit1', vcs_type='git', parent=None, newfile=True)

        #fork this repo

        repo2 = fixture.create_fork('one-git', 'one-git-fork')

        self.r2_id = repo2.repo_id

        #add two extra commit into fork

        cs1 = _commit_change(repo2.repo_name, filename='file1', content='line1\nline2\n',

                             message='commit2', vcs_type='git', parent=cs0)

        cs2 = _commit_change(repo2.repo_name, filename='file1', content='line1\nline2\nline3\n',

                             message='commit3', vcs_type='git', parent=cs1)

        rev1 = 'master'

        rev2 = 'master'

        response = self.app.get(url('compare_url',

                                    repo_name=repo1.repo_name,

                                    org_ref_type="branch",

                                    org_ref_name=rev2,

                                    other_repo=repo2.repo_name,

                                    other_ref_type="branch",

                                    other_ref_name=rev1,

                                    merge='1',))

        response.mustcontain('%s@%s' % (repo1.repo_name, rev2))

        response.mustcontain('%s@%s' % (repo2.repo_name, rev1))

        response.mustcontain("""Showing 2 commits""")

        response.mustcontain("""1 file changed with 2 insertions and 0 deletions""")

        response.mustcontain(_commit_div(cs1.raw_id, 'commit2'))

        response.mustcontain(_commit_div(cs2.raw_id, 'commit3'))

        response.mustcontain("""<a href="/%s/changeset/%s">r1:%s</a>""" % (repo2.repo_name, cs1.raw_id, cs1.short_id))

        response.mustcontain("""<a href="/%s/changeset/%s">r2:%s</a>""" % (repo2.repo_name, cs2.raw_id, cs2.short_id))

        ## files

        response.mustcontain("""<a href="/%s/compare/branch@%s...branch@%s?other_repo=%s&amp;merge=1#C--826e8142e6ba">file1</a>""" % (repo1.repo_name, rev2, rev1, repo2.repo_name))

        #swap

        response.mustcontain("""<a class="btn btn-small" href="/%s/compare/branch@%s...branch@%s?other_repo=%s&amp;merge=True"><i class="icon-refresh"></i> Swap</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name))