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

"""

    rhodecode.controllers.compare

    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

    compare controller for pylons showing differences between two

    repos, branches, bookmarks or tips

    :created_on: May 6, 2012

    :author: marcink

    :copyright: (C) 2010-2012 Marcin Kuzminski <marcin@python-works.com>

    :license: GPLv3, see COPYING for more details.

"""

# This program is free software: you can redistribute it and/or modify

# it under the terms of the GNU General Public License as published by

# the Free Software Foundation, either version 3 of the License, or

# (at your option) any later version.

#

# This program is distributed in the hope that it will be useful,

# but WITHOUT ANY WARRANTY; without even the implied warranty of

# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

# GNU General Public License for more details.

#

# You should have received a copy of the GNU General Public License

# along with this program.  If not, see <http://www.gnu.org/licenses/>.

import logging

import traceback

from webob.exc import HTTPNotFound

from pylons import request, response, session, tmpl_context as c, url

from pylons.controllers.util import abort, redirect

from pylons.i18n.translation import _

from rhodecode.lib.vcs.exceptions import EmptyRepositoryError, RepositoryError

from rhodecode.lib import helpers as h

from rhodecode.lib.base import BaseRepoController, render

from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator

from rhodecode.lib import diffs

from rhodecode.model.db import Repository

from rhodecode.model.pull_request import PullRequestModel

from webob.exc import HTTPBadRequest

from rhodecode.lib.diffs import LimitedDiffContainer

log = logging.getLogger(__name__)

class CompareController(BaseRepoController):

    @LoginRequired()

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

                                   'repository.admin')

    def __before__(self):

        super(CompareController, self).__before__()

    def __get_cs_or_redirect(self, rev, repo, redirect_after=True,

                             partial=False):

        """

        Safe way to get changeset if error occur it redirects to changeset with

        proper message. If partial is set then don't do redirect raise Exception

        instead

        :param rev: revision to fetch

        :param repo: repo instance

        """

        try:

            type_, rev = rev

            return repo.scm_instance.get_changeset(rev)

        except EmptyRepositoryError, e:

            if not redirect_after:

                return None

            h.flash(h.literal(_('There are no changesets yet')),

                    category='warning')

            redirect(url('summary_home', repo_name=repo.repo_name))

        except RepositoryError, e:

            log.error(traceback.format_exc())

            h.flash(str(e), category='warning')

            if not partial:

                redirect(h.url('summary_home', repo_name=repo.repo_name))

            raise HTTPBadRequest()

    def index(self, org_ref_type, org_ref, other_ref_type, other_ref):

        org_repo = c.rhodecode_db_repo.repo_name

        org_ref = (org_ref_type, org_ref)

        other_ref = (other_ref_type, other_ref)

        other_repo = request.GET.get('other_repo', org_repo)

        c.fulldiff = fulldiff = request.GET.get('fulldiff')

        rev_start = request.GET.get('rev_start')

        rev_end = request.GET.get('rev_end')

        c.swap_url = h.url('compare_url', as_form=request.GET.get('as_form'),

            repo_name=other_repo,

            org_ref_type=other_ref[0], org_ref=other_ref[1],

            other_repo=org_repo,

            other_ref_type=org_ref[0], other_ref=org_ref[1])

            log.error('Could not find org repo %s' % org_repo)

            raise HTTPNotFound

            log.error('Could not find other repo %s' % other_repo)

            raise HTTPNotFound

            log.error('compare of two remote repos not available for GIT REPOS')

            raise HTTPNotFound

            log.error('compare of two different kind of remote repos not available')

            raise HTTPNotFound

        if rev_start and rev_end:

            org_ref = ('rev', rev_start)

            other_ref = ('rev', rev_end)

        c.cs_ranges, ancestor = PullRequestModel().get_compare_data(

            org_repo, org_ref, other_repo, other_ref)

        c.statuses = c.rhodecode_db_repo.statuses([x.raw_id for x in

                                                   c.cs_ranges])

        # defines that we need hidden inputs with changesets

        c.as_form = request.GET.get('as_form', False)

        if partial:

            return render('compare/compare_cs.html')

            # case we want a simple diff without incoming changesets,

            # previewing what will be merged.

            # Make the diff on the forked repo, with

            # revision that is common ancestor

            org_ref = ('rev', ancestor)

            org_repo = other_repo

        diff_limit = self.cut_off_limit if not fulldiff else None

        _diff = diffs.differ(org_repo, org_ref, other_repo, other_ref)

        diff_processor = diffs.DiffProcessor(_diff or '', format='gitdiff',

                                             diff_limit=diff_limit)

        _parsed = diff_processor.prepare()

        c.limited_diff = False

        if isinstance(_parsed, LimitedDiffContainer):

            c.limited_diff = True

        c.files = []

        c.changes = {}

        c.lines_added = 0

        c.lines_deleted = 0

        for f in _parsed:

            st = f['stats']

            if st[0] != 'b':

                c.lines_added += st[0]

                c.lines_deleted += st[1]

            fid = h.FID('', f['filename'])

            c.files.append([fid, f['operation'], f['filename'], f['stats']])

            diff = diff_processor.as_html(enable_comments=False, parsed_lines=[f])

            c.changes[fid] = [f['operation'], f['filename'], diff]

        return render('compare/compare_diff.html')

from rhodecode.lib.utils2 import safe_unicode

from rhodecode.lib.vcs.utils.hgcompat import scmutil

from rhodecode.lib.vcs.utils import safe_str

log = logging.getLogger(__name__)

class PullRequestModel(BaseModel):

    cls = PullRequest

    def __get_pull_request(self, pull_request):

        return self._get_instance(PullRequest, pull_request)

    def get_all(self, repo):

        repo = self._get_repo(repo)

        return PullRequest.query()\

                .filter(PullRequest.other_repo == repo)\

                .order_by(PullRequest.created_on)\

                .all()

    def create(self, created_by, org_repo, org_ref, other_repo, other_ref,

               revisions, reviewers, title, description=None):

        from rhodecode.model.changeset_status import ChangesetStatusModel

        created_by_user = self._get_user(created_by)

        org_repo = self._get_repo(org_repo)

        other_repo = self._get_repo(other_repo)

        new = PullRequest()

        new.org_repo = org_repo

        new.org_ref = org_ref

        new.other_repo = other_repo

        new.other_ref = other_ref

        new.revisions = revisions

        new.title = title

        new.description = description

        new.author = created_by_user

        self.sa.add(new)

        Session().flush()

        #members

        for member in reviewers:

            _usr = self._get_user(member)

            reviewer = PullRequestReviewers(_usr, new)

            self.sa.add(reviewer)

        #reset state to under-review

        ChangesetStatusModel().set_status(

            repo=org_repo,

            status=ChangesetStatus.STATUS_UNDER_REVIEW,

            user=created_by_user,

            pull_request=new

        )

        #notification to reviewers

        notif = NotificationModel()

        pr_url = h.url('pullrequest_show', repo_name=other_repo.repo_name,

                       pull_request_id=new.pull_request_id,

                       qualified=True,

        )

        subject = safe_unicode(

            h.link_to(

              _('%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s') % \

                {'user': created_by_user.username,

                 'pr_title': new.title,

                 'pr_id': new.pull_request_id},

                pr_url

            )

        )

        body = description

        kwargs = {

            'pr_title': title,

            'pr_user_created': h.person(created_by_user.email),

            'pr_repo_url': h.url('summary_home', repo_name=other_repo.repo_name,

                                 qualified=True,),

            'pr_url': pr_url,

            'pr_revisions': revisions

        }

        notif.create(created_by=created_by_user, subject=subject, body=body,

                     recipients=reviewers,

                     type_=Notification.TYPE_PULL_REQUEST, email_kwargs=kwargs)

        return new

    def update_reviewers(self, pull_request, reviewers_ids):

        reviewers_ids = set(reviewers_ids)

        pull_request = self.__get_pull_request(pull_request)

        current_reviewers = PullRequestReviewers.query()\

                            .filter(PullRequestReviewers.pull_request==

                                   pull_request)\

                            .all()

        current_reviewers_ids = set([x.user.user_id for x in current_reviewers])

        to_add = reviewers_ids.difference(current_reviewers_ids)

        to_remove = current_reviewers_ids.difference(reviewers_ids)

        log.debug("Adding %s reviewers" % to_add)

        log.debug("Removing %s reviewers" % to_remove)

        for uid in to_add:

            _usr = self._get_user(uid)

            reviewer = PullRequestReviewers(_usr, pull_request)

            self.sa.add(reviewer)

        for uid in to_remove:

            reviewer = PullRequestReviewers.query()\

                    .filter(PullRequestReviewers.user_id==uid,

                            PullRequestReviewers.pull_request==pull_request)\

                    .scalar()

            if reviewer:

                self.sa.delete(reviewer)

    def delete(self, pull_request):

        pull_request = self.__get_pull_request(pull_request)

        Session().delete(pull_request)

    def close_pull_request(self, pull_request):

        pull_request = self.__get_pull_request(pull_request)

        pull_request.status = PullRequest.STATUS_CLOSED

        pull_request.updated_on = datetime.datetime.now()

        self.sa.add(pull_request)

    def _get_changesets(self, alias, org_repo, org_ref, other_repo, other_ref):

        """

        Returns a list of changesets that can be merged from org_repo@org_ref

        to other_repo@other_ref ... and the ancestor that would be used for merge

        :param org_repo:

        :param org_ref:

        :param other_repo:

        :param other_ref:

        :param tmp:

        """

        ancestor = None

        if alias == 'hg':

            # lookup up the exact node id

            _revset_predicates = {

                    'branch': 'branch',

                    'book': 'bookmark',

                    'tag': 'tag',

                    'rev': 'id',

                }

            org_rev_spec = "%s('%s')" % (_revset_predicates[org_ref[0]],

                                         safe_str(org_ref[1]))

            org_rev = scmutil.revsingle(org_repo._repo,

                                         org_rev_spec)

            other_rev_spec = "%s('%s')" % (_revset_predicates[other_ref[0]],

                                           safe_str(other_ref[1]))

            other_rev = scmutil.revsingle(other_repo._repo, other_rev_spec)

            #case two independent repos

            if org_repo != other_repo:

                hgrepo = unionrepo.unionrepository(other_repo.baseui,

                                                   other_repo.path,

                                                   org_repo.path)

                # all the changesets we are looking for will be in other_repo,

                # so rev numbers from hgrepo can be used in other_repo

            #no remote compare do it on the same repository

            else:

                hgrepo = other_repo._repo

            revs = ["ancestors(id('%s')) and not ancestors(id('%s'))" %

                    (other_rev, org_rev)]

            changesets = [other_repo.get_changeset(cs)

                          for cs in scmutil.revrange(hgrepo, revs)]

            if org_repo != other_repo:

                ancestors = scmutil.revrange(hgrepo,

                     ["ancestor(id('%s'), id('%s'))" % (org_rev, other_rev)])

                if len(ancestors) == 1:

                    ancestor = hgrepo[ancestors[0]].hex()

        elif alias == 'git':

            assert org_repo == other_repo, (org_repo, other_repo) # no git support for different repos

            so, se = org_repo.run_git_command(

                'log --reverse --pretty="format: %%H" -s -p %s..%s' % (org_ref[1],

                                                                       other_ref[1])

            )

            changesets = [org_repo.get_changeset(cs)

                          for cs in re.findall(r'[0-9a-fA-F]{40}', so)]

        return changesets, ancestor

    def get_compare_data(self, org_repo, org_ref, other_repo, other_ref):

        """

        Returns incoming changesets for mercurial repositories

        :param org_repo:

        :param org_ref:

        :param other_repo:

        :param other_ref:

        """

        if len(org_ref) != 2 or not isinstance(org_ref, (list, tuple)):

            raise Exception('org_ref must be a two element list/tuple')

        if len(other_ref) != 2 or not isinstance(org_ref, (list, tuple)):

            raise Exception('other_ref must be a two element list/tuple')

        org_repo_scm = org_repo.scm_instance

        other_repo_scm = other_repo.scm_instance

        alias = org_repo.scm_instance.alias

        cs_ranges, ancestor = self._get_changesets(alias,

                                                   org_repo_scm, org_ref,

                                                   other_repo_scm, other_ref)

        return cs_ranges, ancestor

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

<%def name="title()">

    ${c.repo_name} ${_('New pull request')}

</%def>

<%def name="breadcrumbs_links()">

    ${h.link_to(_(u'Home'),h.url('/'))}

    »

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

    »

    ${_('New pull request')}

</%def>

<%def name="main()">

<div class="box">

    <!-- box / title -->

    <div class="title">

        ${self.breadcrumbs()}

    </div>

    ${h.form(url('pullrequest', repo_name=c.repo_name), method='post', id='pull_request_form')}

    <div style="float:left;padding:0px 30px 30px 30px">

        <input type="hidden" name="rev_start" value="${request.GET.get('rev_start')}" />

        <input type="hidden" name="rev_end" value="${request.GET.get('rev_end')}" />

        ##ORG

        <div style="float:left">

            <div>

                <span style="font-size: 20px">

                ${h.select('org_repo','',c.org_repos,class_='refs')}:${h.select('org_ref',c.default_org_ref,c.org_refs,class_='refs')}

                </span>

                 <div style="padding:5px 3px 3px 42px;">${c.rhodecode_db_repo.description}</div>

            </div>

            <div style="clear:both;padding-top: 10px"></div>

        </div>

          <div style="float:left;font-size:24px;padding:0px 20px">

          <img height=32 width=32 src="${h.url('/images/arrow_right_64.png')}"/>

          </div>

        ##OTHER, most Probably the PARENT OF THIS FORK

        <div style="float:left">

            <div>

                <span style="font-size: 20px">

                ${h.select('other_repo',c.default_other_repo,c.other_repos,class_='refs')}:${h.select('other_ref',c.default_other_ref,c.default_other_refs,class_='refs')}

                </span>

                 <div id="other_repo_desc" style="padding:5px 3px 3px 42px;"></div>

            </div>

            <div style="clear:both;padding-top: 10px"></div>

        </div>

       <div style="clear:both;padding-top: 10px"></div>

       ## overview pulled by ajax

       <div style="float:left" id="pull_request_overview"></div>

       <div style="float:left;clear:both;padding:10px 10px 10px 0px;display:none">

            <a id="pull_request_overview_url" href="#">${_('Detailed compare view')}</a>

       </div>

     </div>

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

        <h4>${_('Pull request reviewers')}</h4>

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

          ## members goes here !

          <div class="group_members_wrap">

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

            %for member in c.review_members:

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

                <div class="reviewers_member">

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

                  <div style="float:left">${member.full_name} (${_('owner')})</div>

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

                  <span class="delete_icon action_button" onclick="removeReviewer(${member.user_id})"></span>

                </div>

              </li>

            %endfor

            </ul>

          </div>

          <div class='ac'>

            <div class="reviewer_ac">

               ${h.text('user', class_='yui-ac-input')}

               <span class="help-block">${_('Add reviewer to this pull request.')}</span>

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

            </div>

          </div>

        </div>

    </div>

    <h3>${_('Create new pull request')}</h3>

    <div class="form">

        <!-- fields -->

        <div class="fields">

             <div class="field">

                <div class="label">

                    <label for="pullrequest_title">${_('Title')}:</label>

                </div>

                <div class="input">

                    ${h.text('pullrequest_title',size=30)}

                </div>

             </div>

            <div class="field">

                <div class="label label-textarea">

                    <label for="pullrequest_desc">${_('description')}:</label>

                </div>

                <div class="textarea text-area editor">

                    ${h.textarea('pullrequest_desc',size=30)}

                </div>

            </div>

            <div class="buttons">

                ${h.submit('save',_('Send pull request'),class_="ui-btn large")}

                ${h.reset('reset',_('Reset'),class_="ui-btn large")}

           </div>

        </div>

    </div>

    ${h.end_form()}

</div>

<script type="text/javascript">

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

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

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

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

  var loadPreview = function(){

      YUD.setStyle(YUD.get('pull_request_overview_url').parentElement,'display','none');

      //url template

      var url = "${h.url('compare_url',

                         repo_name='__other_repo__',

                         org_ref_type='__other_ref_type__',

                         org_ref='__other_ref__',

                         other_repo='__org_repo__',

                         other_ref_type='__org_ref_type__',

                         other_ref='__org_ref__',

                         as_form=True,

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

                         rev_end=request.GET.get('rev_end',''))}";

      var org_repo = YUQ('#pull_request_form #org_repo')[0].value;

      var org_ref = YUQ('#pull_request_form #org_ref')[0].value.split(':');

      var other_repo = YUQ('#pull_request_form #other_repo')[0].value;

      var other_ref = YUQ('#pull_request_form #other_ref')[0].value.split(':');

      var select_refs = YUQ('#pull_request_form select.refs')

      var rev_data = {

    	  'org_repo': org_repo,

    	  'org_ref': org_ref[1],

    	  'org_ref_type': org_ref[0],

    	  'other_repo': other_repo,

          'other_ref': other_ref[1],

          'other_ref_type': other_ref[0],

      }; // gather the org/other ref and repo here

      for (k in rev_data){

    	  url = url.replace('__'+k+'__',rev_data[k]);

      }

      ypjax(url,'pull_request_overview', function(data){

          var sel_box = YUQ('#pull_request_form #other_repo')[0];

          var repo_name = sel_box.options[sel_box.selectedIndex].value;

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

          YUD.setStyle(YUD.get('pull_request_overview_url').parentElement,'display','');

          YUD.get('other_repo_desc').innerHTML = other_repos_info[repo_name]['description'];

          YUD.get('other_ref').innerHTML = other_repos_info[repo_name]['revs'];

          // select back the revision that was just compared

          setSelectValue(YUD.get('other_ref'), rev_data['other_ref']);

      })

  }

  ## refresh automatically when something changes (org_repo can't change)

  YUE.on('org_ref', 'change', function(e){

     loadPreview();

  });

  YUE.on('other_repo', 'change', function(e){

      var repo_name = e.currentTarget.value;

      // replace the <select> of changed repo

      YUD.get('other_ref').innerHTML = other_repos_info[repo_name]['revs'];

      loadPreview();

  });

  YUE.on('other_ref', 'change', function(e){

     loadPreview();

  });

  //lazy load overview after 0.5s

  setTimeout(loadPreview, 500)

</script>

</%def>

from rhodecode.tests import *

from rhodecode.model.repo import RepoModel

from rhodecode.model.meta import Session

from rhodecode.model.db import Repository

from rhodecode.model.scm import ScmModel

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

def _fork_repo(fork_name, vcs_type, parent=None):

    if vcs_type =='hg':

        _REPO = HG_REPO

    elif vcs_type == 'git':

        _REPO = GIT_REPO

    if parent:

        _REPO = parent

    form_data = dict(

        repo_name=fork_name,

        repo_name_full=fork_name,

        repo_group=None,

        repo_type=vcs_type,

        description='',

        private=False,

        copy_permissions=False,

        landing_rev='tip',

        update_after_clone=False,

        fork_parent_id=Repository.get_by_repo_name(_REPO),

    )

    Session().commit()

    return Repository.get_by_repo_name(fork_name)

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:

        cs = ScmModel().create_node(

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

            cs=_cs, user=TEST_USER_ADMIN_LOGIN,

            author=TEST_USER_ADMIN_LOGIN,

            message=message,

            content=content,

            f_path=filename

        )

    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

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 = RepoModel().create_repo(repo_name='one', repo_type='hg',

                                        description='diff-test',

                                        owner=TEST_USER_ADMIN_LOGIN)

        Session().commit()

        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 = _fork_repo('one-fork', 'hg', parent='one')

        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(controller='compare', action='index',

                                    repo_name=repo1.repo_name,

                                    org_ref_type="branch",

                                    org_ref=rev2,

                                    other_repo=repo2.repo_name,

                                    other_ref_type="branch",

                                    other_ref=rev1,

                                    ))

        response.mustcontain('%s@%s -> %s@%s' % (repo1.repo_name, rev2, repo2.repo_name, rev1))

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

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

        response.mustcontain("""<div class="message tooltip" title="commit2" style="white-space:normal">commit2</div>""")

        response.mustcontain("""<div class="message tooltip" title="commit3" style="white-space:normal">commit3</div>""")

        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#C--826e8142e6ba">file1</a>""" % (repo1.repo_name, rev2, rev1, repo2.repo_name))

        #swap

        response.mustcontain("""<a href="/%s/compare/branch@%s...branch@%s?as_form=None&amp;other_repo=%s">[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 = RepoModel().create_repo(repo_name='one', repo_type='hg',

                                        description='diff-test',

                                        owner=TEST_USER_ADMIN_LOGIN)

        Session().commit()

        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 = _fork_repo('one-fork', 'hg', parent='one')

        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(controller='compare', action='index',

                                    repo_name=repo1.repo_name,

                                    org_ref_type="branch",

                                    org_ref=rev2,

                                    other_repo=repo2.repo_name,

                                    other_ref_type="branch",

                                    other_ref=rev1,

                                    ))

        response.mustcontain('%s@%s -> %s@%s' % (repo1.repo_name, rev2, repo2.repo_name, rev1))

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

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

        response.mustcontain("""<div class="message tooltip" title="commit2" style="white-space:normal">commit2</div>""")

        response.mustcontain("""<div class="message tooltip" title="commit3" style="white-space:normal">commit3</div>""")

        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#C--826e8142e6ba">file1</a>""" % (repo1.repo_name, rev2, rev1, repo2.repo_name))

        #swap

        response.mustcontain("""<a href="/%s/compare/branch@%s...branch@%s?as_form=None&amp;other_repo=%s">[swap]</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name))

    def test_compare_cherry_pick_changesets_from_bottom(self):

        #make repo1, and cs1+cs2

        self.log_user()

        repo1 = RepoModel().create_repo(repo_name='repo1', repo_type='hg',

                                        description='diff-test',

                                        owner=TEST_USER_ADMIN_LOGIN)

        Session().commit()

        self.r1_id = repo1.repo_id

        #commit something !

                             message='commit1', vcs_type='hg', parent=None,

                             newfile=True)

        #fork this repo

        repo2 = _fork_repo('repo1-fork', 'hg', parent='repo1')

        self.r2_id = repo2.repo_id

        #now make cs3-6