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

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

<%def name="title()">

    %if c.compare_home:

        ${_('%s Compare') % c.repo_name}

    %else:

        ${_('%s Compare') % c.repo_name} - ${'%s@%s' % (c.org_repo.repo_name, c.org_ref_name)} > ${'%s@%s' % (c.other_repo.repo_name, c.other_ref_name)}

    %endif

    %if c.site_name:

        · ${c.site_name}

    %endif

</%def>

<%def name="breadcrumbs_links()">

  ${_('Compare revisions')}

</%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>

                    ${h.hidden('compare_org')} <i class="icon-ellipsis-horizontal" style="color: #999; vertical-align: -12px; padding: 0px 0px 0px 2px"></i> ${h.hidden('compare_other')}

                    %if not c.compare_home:

                        <a class="btn btn-small" href="${c.swap_url}"><i class="icon-refresh"></i> ${_('Swap')}</a>

                    %endif

                    <div id="compare_revs" class="btn btn-small"><i class="icon-loop"></i> ${_('Compare Revisions')}</div>

                </div>

            </div>

        </div>

    %if c.compare_home:

        <div id="changeset_compare_view_content">

         <div style="color:#999;font-size: 18px">${_('Compare revisions, branches, bookmarks or tags.')}</div>

        </div>

    %else:

        <div id="changeset_compare_view_content">

                ##CS

                <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>

                <%include file="compare_cs.html" />

                ## FILES

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

                % if c.limited_diff:

                    ${ungettext('%s file changed', '%s files changed', len(c.files)) % len(c.files)}

                % else:

                    ${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)}:

                %endif

                ${c.ignorews_url(request.GET)}

                ${c.context_url(request.GET)}

                </div>

                <div class="cs_files">

                  %if not c.files:

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

                  %endif

                  %for fid, change, f, stat in c.files:

                      <div class="cs_${change}">

                        <div class="changes">${h.fancy_file_stats(stat)}</div>

                      </div>

                  %endfor

                </div>

                % if c.limited_diff:

                  <h5>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}">${_('Show full diff')}</a></h5>

                % endif

         </div>

        ## diff block

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

        %for fid, change, f, stat in c.files:

          ${diff_block.diff_block_simple([c.changes[fid]])}

        %endfor

        % if c.limited_diff:

          <h4>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}">${_('Show full diff')}</a></h4>

        % endif

    %endif

    </div>

</div>

    <script type="text/javascript">

   $(document).ready(function(){

    var cache = {}

    $("#compare_org").select2({

        placeholder: "${'%s@%s' % (c.org_repo.repo_name, c.org_ref_name)}",

        formatSelection: function(obj){

            return '{0}@{1}'.format("${c.org_repo.repo_name}", obj.text)

        },

        dropdownAutoWidth: true,

        query: function(query){

          var key = 'cache';

          var cached = cache[key] ;

          if(cached) {

            var data = {results: []};

            //filter results

            $.each(cached.results, function(){

                var section = this.text;

                var children = [];

                $.each(this.children, function(){

                    if(query.term.length == 0 || this.text.toUpperCase().indexOf(query.term.toUpperCase()) >= 0 ){

                        children.push({'id': this.id, 'text': this.text})

                    }

                })

                data.results.push({'text': section, 'children': children})

            });

            //push the typed in changeset

            data.results.push({'text':_TM['Specify changeset'],

                               'children': [{'id': query.term, 'text': query.term, 'type': 'rev'}]})

            query.callback(data);

          }else{

              $.ajax({

                url: pyroutes.url('repo_refs_data', {'repo_name': '${c.org_repo.repo_name}'}),

                data: {},

                dataType: 'json',

                type: 'GET',

                success: function(data) {

                  cache[key] = data;

                  query.callback(data);

                }

              })

          }

        },

    });

    $("#compare_other").select2({

        placeholder: "${'%s@%s' % (c.other_repo.repo_name, c.other_ref_name)}",

        dropdownAutoWidth: true,

        formatSelection: function(obj){

            return '{0}@{1}'.format("${c.other_repo.repo_name}", obj.text)

        },

        query: function(query){

          var key = 'cache2';

          var cached = cache[key] ;

          if(cached) {

            var data = {results: []};

            //filter results

            $.each(cached.results, function(){

                var section = this.text;

                var children = [];

                $.each(this.children, function(){

                    if(query.term.length == 0 || this.text.toUpperCase().indexOf(query.term.toUpperCase()) >= 0 ){

                        children.push({'id': this.id, 'text': this.text})

                    }

                })

                data.results.push({'text': section, 'children': children})

            });

            //push the typed in changeset

            data.results.push({'text':_TM['Specify changeset'],

                               'children': [{'id': query.term, 'text': query.term, 'type': 'rev'}]})

            query.callback(data);

          }else{

              $.ajax({

                url: pyroutes.url('repo_refs_data', {'repo_name': '${c.other_repo.repo_name}'}),

                data: {},

                dataType: 'json',

          <div class="input">

              <div>${h.fmt_date(c.pull_request.created_on)}</div>

          </div>

        </div>

        <div class="field">

          <div class="label-summary">

              <label>${_('Created by')}:</label>

          </div>

          <div class="input">

              <div class="author">

                  <div class="gravatar">

                      <img alt="gravatar" src="${h.gravatar_url(c.pull_request.author.email,20)}"/>

                  </div>

                  <span>${c.pull_request.author.username_and_name}</span><br/>

                  <span><a href="mailto:${c.pull_request.author.email}">${c.pull_request.author.email}</a></span><br/>

              </div>

          </div>

        </div>

      </div>

    </div>

    ## REVIEWERS

    <div style="float:left; border-left:1px dashed #eee">

       <div class="pr-details-title">${_('Pull request reviewers')}</div>

        <div id="reviewers" style="padding:0px 0px 5px 10px">

          ## members goes here !

          <div>

            <ul id="review_members" class="group_members">

            %for member,status in c.pull_request_reviewers:

              <li id="reviewer_${member.user_id}">

                <div class="reviewers_member">

                    <div class="reviewer_status tooltip" title="${h.tooltip(h.changeset_status_lbl(status.status if status else 'not_reviewed'))}">

                      <img src="${h.url(str('/images/icons/flag_status_%s.png' % (status.status if status else 'not_reviewed')))}"/>

                    </div>

                  <div class="reviewer_gravatar gravatar"><img alt="gravatar" src="${h.gravatar_url(member.email,14)}"/> </div>

                  <div style="float:left;">${member.full_name} (${_('owner') if c.pull_request.user_id == member.user_id else _('reviewer')})</div>

                  <input type="hidden" value="${member.user_id}" name="review_members" />

                  %if not c.pull_request.is_closed() and (h.HasPermissionAny('hg.admin')() or h.HasRepoPermissionAny('repository.admin')(c.repo_name) or c.pull_request.user_id == c.authuser.user_id):

                  <div class="reviewer_member_remove action_button" onclick="removeReviewMember(${member.user_id})" title="${_('Remove reviewer')}">

                      <i class="icon-remove-sign" style="color: #FF4444;"></i>

                  </div>

                  %endif

                </div>

              </li>

            %endfor

            </ul>

          </div>

          %if not c.pull_request.is_closed():

          <div class='ac'>

            %if h.HasPermissionAny('hg.admin')() or h.HasRepoPermissionAny('repository.admin')(c.repo_name) or c.pull_request.author.user_id == c.authuser.user_id:

            <div class="reviewer_ac">

               ${h.text('user', class_='yui-ac-input',placeholder=_('Type name of reviewer to add'))}

               <div id="reviewers_container"></div>

            </div>

            <div style="padding:0px 10px">

             <span id="update_pull_request" class="btn btn-mini">${_('Save Changes')}</span>

            </div>

            %endif

          </div>

          %endif

        </div>

       </div>

    <div style="overflow: auto; clear: both">

      ##DIFF

      <div class="table" style="float:left;clear:none">

          <div class="diffblock">

              <div style="padding:5px">

                ${_('Compare view')}

              </div>

          </div>

          <div id="changeset_compare_view_content">

              ##CS

              <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>

              <%include file="/compare/compare_cs.html" />

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

              ${_('Common ancestor')}:

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

              </div>

              ## FILES

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

              % if c.limited_diff:

                  ${ungettext('%s file changed', '%s files changed', len(c.files)) % len(c.files)}

              % else:

                  ${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)}:

              %endif

              </div>

              <div class="cs_files">

                %if not c.files:

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

                %endif

                %for fid, change, f, stat in c.files:

                    <div class="cs_${change}">

                      <div class="changes">${h.fancy_file_stats(stat)}</div>

                    </div>

                %endfor

              </div>

              <div class="comments-number pr-comments-number">${ungettext("%d comment", "%d comments", len(c.comments)) % len(c.comments)} ${ungettext("(%d inline)", "(%d inline)", c.inline_cnt) % c.inline_cnt} <span class="firstlink"></span> </div>

              % if c.limited_diff:

                <h5>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}">${_('Show full diff anyway')}</a></h5>

              % endif

          </div>

      </div>

    </div>

    <script>

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

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

    // TODO: switch this to pyroutes

    AJAX_COMMENT_URL = "${url('pullrequest_comment',repo_name=c.repo_name,pull_request_id=c.pull_request.pull_request_id)}";

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

    pyroutes.register('pullrequest_comment', "${url('pullrequest_comment',repo_name='%(repo_name)s',pull_request_id='%(pull_request_id)s')}", ['repo_name', 'pull_request_id']);

    pyroutes.register('pullrequest_comment_delete', "${url('pullrequest_comment_delete',repo_name='%(repo_name)s',comment_id='%(comment_id)s')}", ['repo_name', 'comment_id']);

    pyroutes.register('pullrequest_update', "${url('pullrequest_update',repo_name='%(repo_name)s',pull_request_id='%(pull_request_id)s')}", ['repo_name', 'pull_request_id']);

    </script>

    ## diff block

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

    %for fid, change, f, stat in c.files:

      ${diff_block.diff_block_simple([c.changes[fid]])}

    %endfor

    % if c.limited_diff:

      <h4>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}">${_('Show full diff anyway')}</a></h4>

    % endif

    ## template for inline comment form

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

    ${comment.comment_inline_form()}

    ## render comments and inlines

    ${comment.generate_comments()}

    % if not c.pull_request.is_closed():

      ## main comment form and it status

      ${comment.comments(h.url('pullrequest_comment', repo_name=c.repo_name,

                                pull_request_id=c.pull_request.pull_request_id),

                         c.current_voting_result,

                         is_pr=True, change_status=c.allowed_to_change_status)}

    %endif

    <script type="text/javascript">

      YUE.onDOMReady(function(){

          PullRequestAutoComplete('user', 'reviewers_container', _USERS_AC_DATA, _GROUPS_AC_DATA);

          YUE.on(YUQ('.show-inline-comments'),'change',function(e){

              var show = 'none';

              var target = e.currentTarget;

              if(target.checked){

                  var show = ''

              }

              var boxid = YUD.getAttribute(target,'id_for');

              var comments = YUQ('#{0} .inline-comments'.format(boxid));

              for(c in comments){

                 YUD.setStyle(comments[c],'display',show);

              }

              var btns = YUQ('#{0} .inline-comments-button'.format(boxid));

              for(c in btns){

                  YUD.setStyle(btns[c],'display',show);

               }

          })

          YUE.on(YUQ('.line'),'click',function(e){

              var tr = e.currentTarget;

              injectInlineForm(tr);

          });

          // inject comments into they proper positions

          var file_comments = YUQ('.inline-comment-placeholder');

          renderInlineComments(file_comments);

          linkInlineComments(document.getElementsByClassName('firstlink'), document.getElementsByClassName("inline-comment"));

          YUE.on(YUD.get('update_pull_request'),'click',function(e){

              updateReviewers(undefined, "${c.repo_name}", "${c.pull_request.pull_request_id}");

          })

      })

    </script>

</div>

</%def>

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):

    return """<div id="C-%s" class="message">%s</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

        #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

        #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_origin_has_incomming_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

        #now commit something to origin repo

        cs1_prim = _commit_change(repo1.repo_name, filename='file2', content='line1file2\n',

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

        #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

        #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_origin_has_incomming_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

        #now commit something to origin repo

        cs1_prim = _commit_change(repo1.repo_name, filename='file2', content='line1file2\n',

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

        #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

        #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_cherry_pick_changesets_from_bottom(self):

#        repo1:

#            cs0:

#            cs1:

#        repo1-fork- in which we will cherry pick bottom changesets

#            cs0:

#            cs1:

#            cs2: x

#            cs3: x

#            cs4: x

#            cs5:

        #make repo1, and cs1+cs2

        self.log_user()

        repo1 = fixture.create_repo('repo1', 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)

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

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

        #fork this repo

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

        self.r2_id = repo2.repo_id

        #now make cs3-6

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

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

        cs3 = _commit_change(repo1.repo_name, filename='file1', content='line1\nline2\nline3\nline4\n',

                             message='commit4', vcs_type='hg', parent=cs2)

        cs4 = _commit_change(repo1.repo_name, filename='file1', content='line1\nline2\nline3\nline4\nline5\n',

                             message='commit5', vcs_type='hg', parent=cs3)

        cs5 = _commit_change(repo1.repo_name, filename='file1', content='line1\nline2\nline3\nline4\nline5\nline6\n',

                             message='commit6', vcs_type='hg', parent=cs4)

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

                                    repo_name=repo2.repo_name,

                                    org_ref_type="rev",

                                    org_ref_name=cs1.short_id,  # parent of cs2, in repo2

                                    other_repo=repo1.repo_name,

                                    other_ref_type="rev",

                                    other_ref_name=cs4.short_id,

                                    merge='True',

                                    ))

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

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

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

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

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

        response.mustcontain(_commit_div(cs3.raw_id, 'commit4'))

        response.mustcontain(_commit_div(cs4.raw_id, 'commit5'))

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

        response.mustcontain("""<a href="/%s/changeset/%s">r3:%s</a>""" % (repo1.repo_name, cs3.raw_id, cs3.short_id))

        response.mustcontain("""<a href="/%s/changeset/%s">r4:%s</a>""" % (repo1.repo_name, cs4.raw_id, cs4.short_id))

        ## files

        response.mustcontain("""#C--826e8142e6ba">file1</a>""")

    def test_compare_cherry_pick_changesets_from_top(self):

#        repo1:

#            cs0:

#            cs1:

#        repo1-fork- in which we will cherry pick bottom changesets

#            cs0:

#            cs1:

#            cs2:

#            cs3: x

#            cs4: x

#            cs5: x

#

        #make repo1, and cs1+cs2

        self.log_user()

        repo1 = fixture.create_repo('repo1', 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)

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

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

        #fork this repo

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

        self.r2_id = repo2.repo_id

        #now make cs3-6

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

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

        cs3 = _commit_change(repo1.repo_name, filename='file1', content='line1\nline2\nline3\nline4\n',

                             message='commit4', vcs_type='hg', parent=cs2)

        cs4 = _commit_change(repo1.repo_name, filename='file1', content='line1\nline2\nline3\nline4\nline5\n',

                             message='commit5', vcs_type='hg', parent=cs3)

        cs5 = _commit_change(repo1.repo_name, filename='file1', content='line1\nline2\nline3\nline4\nline5\nline6\n',

                             message='commit6', vcs_type='hg', parent=cs4)

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

                                    repo_name=repo1.repo_name,

                                    org_ref_type="rev",

                                    org_ref_name=cs2.short_id, # parent of cs3, not in repo2

                                    other_ref_type="rev",

                                    other_ref_name=cs5.short_id,

                                    merge='1',))

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

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

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

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

        response.mustcontain(_commit_div(cs3.raw_id, 'commit4'))

        response.mustcontain(_commit_div(cs4.raw_id, 'commit5'))

        response.mustcontain(_commit_div(cs5.raw_id, 'commit6'))

        response.mustcontain("""<a href="/%s/changeset/%s">r3:%s</a>""" % (repo1.repo_name, cs3.raw_id, cs3.short_id))

        response.mustcontain("""<a href="/%s/changeset/%s">r4:%s</a>""" % (repo1.repo_name, cs4.raw_id, cs4.short_id))

        response.mustcontain("""<a href="/%s/changeset/%s">r5:%s</a>""" % (repo1.repo_name, cs5.raw_id, cs5.short_id))

        ## files

        response.mustcontain("""#C--826e8142e6ba">file1</a>""")

    def test_compare_cherry_pick_changeset_mixed_branches(self):

        #TODO: write this

        assert 1

    def test_compare_remote_branches_hg(self):

        self.log_user()

        repo2 = fixture.create_fork(HG_REPO, HG_FORK)

        self.r2_id = repo2.repo_id

        rev1 = '56349e29c2af'

        rev2 = '7d4bc8ec6be5'

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

                                    repo_name=HG_REPO,

                                    org_ref_type="rev",

                                    org_ref_name=rev1,

                                    other_ref_type="rev",

                                    other_ref_name=rev2,

                                    other_repo=HG_FORK,

                                    merge='1',))

        response.mustcontain('%s@%s' % (HG_REPO, rev1))

        response.mustcontain('%s@%s' % (HG_FORK, rev2))

        ## outgoing changesets between those revisions

        response.mustcontain("""<a href="/%s/changeset/2dda4e345facb0ccff1a191052dd1606dba6781d">r4:2dda4e345fac</a>""" % (HG_FORK))

        response.mustcontain("""<a href="/%s/changeset/6fff84722075f1607a30f436523403845f84cd9e">r5:6fff84722075</a>""" % (HG_FORK))

        response.mustcontain("""<a href="/%s/changeset/7d4bc8ec6be56c0f10425afb40b6fc315a4c25e7">r6:%s</a>""" % (HG_FORK, rev2))

        ## files

    def test_compare_remote_branches_git(self):

        self.log_user()

        repo2 = fixture.create_fork(GIT_REPO, GIT_FORK)

        self.r2_id = repo2.repo_id

        rev1 = '102607b09cdd60e2793929c4f90478be29f85a17'

        rev2 = 'd7e0d30fbcae12c90680eb095a4f5f02505ce501'

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

                                    repo_name=GIT_REPO,

                                    org_ref_type="rev",

                                    org_ref_name=rev1,

                                    other_ref_type="rev",

                                    other_ref_name=rev2,

                                    other_repo=GIT_FORK,

                                    merge='1',))

        response.mustcontain('%s@%s' % (GIT_REPO, rev1))

        response.mustcontain('%s@%s' % (GIT_FORK, rev2))

        ## outgoing changesets between those revisions

        response.mustcontain("""<a href="/%s/changeset/49d3fd156b6f7db46313fac355dca1a0b94a0017">r4:49d3fd156b6f</a>""" % (GIT_FORK))

        response.mustcontain("""<a href="/%s/changeset/2d1028c054665b962fa3d307adfc923ddd528038">r5:2d1028c05466</a>""" % (GIT_FORK))

        response.mustcontain("""<a href="/%s/changeset/d7e0d30fbcae12c90680eb095a4f5f02505ce501">r6:%s</a>""" % (GIT_FORK, rev2[:12]))

        ## files

    def test_org_repo_new_commits_after_forking_simple_diff_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

        r1_name = repo1.repo_name

        cs0 = _commit_change(repo=r1_name, filename='file1',

                       content='line1', message='commit1', vcs_type='hg',

                       newfile=True)

        Session().commit()

        self.assertEqual(repo1.scm_instance.revisions, [cs0.raw_id])

        #fork the repo1

        repo2 = fixture.create_repo('one-fork', repo_type='hg',

                                    repo_description='diff-test',

                                    cur_user=TEST_USER_ADMIN_LOGIN,

                                    clone_uri=repo1.repo_full_path,

                                    fork_of='one')

        Session().commit()

        self.assertEqual(repo2.scm_instance.revisions, [cs0.raw_id])

        self.r2_id = repo2.repo_id

        r2_name = repo2.repo_name

        cs1 = _commit_change(repo=r2_name, filename='file1-fork',

                       content='file1-line1-from-fork', message='commit1-fork',

                       vcs_type='hg', parent=repo2.scm_instance[-1],

                       newfile=True)

        cs2 = _commit_change(repo=r2_name, filename='file2-fork',

                       content='file2-line1-from-fork', message='commit2-fork',

                       vcs_type='hg', parent=cs1,

                       newfile=True)

        cs3 = _commit_change(repo=r2_name, filename='file3-fork',

                       content='file3-line1-from-fork', message='commit3-fork',

                       vcs_type='hg', parent=cs2, newfile=True)

        #compare !

        rev1 = 'default'

        rev2 = 'default'

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

                                    repo_name=r2_name,

                                    org_ref_type="branch",

                                    org_ref_name=rev1,

                                    other_ref_type="branch",

                                    other_ref_name=rev2,

                                    other_repo=r1_name,

                                    merge='1',))