#

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

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

"""

kallithea.controllers.compare

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

compare controller showing differences between two

repos, branches, bookmarks or tips

This file was forked by the Kallithea project in July 2014.

Original author and date, and relevant copyright and licensing information is below:

:created_on: May 6, 2012

:author: marcink

:copyright: (c) 2013 RhodeCode GmbH, and others.

:license: GPLv3, see LICENSE.md for more details.

"""

import logging

import re

from pylons import request, tmpl_context as c

from pylons.i18n.translation import _

from kallithea.config.routing import url

from kallithea.lib.utils2 import safe_str, safe_int

from kallithea.lib.vcs.utils.hgcompat import unionrepo

from kallithea.lib import helpers as h

from kallithea.lib.base import BaseRepoController, render

from kallithea.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator

from kallithea.lib import diffs

from kallithea.model.db import Repository

from kallithea.lib.diffs import LimitedDiffContainer

from kallithea.controllers.changeset import _ignorews_url, _context_url

from kallithea.lib.graphmod import graph_data

from kallithea.lib.compat import json, OrderedDict

log = logging.getLogger(__name__)

class CompareController(BaseRepoController):

    def __before__(self):

        super(CompareController, self).__before__()

        # The base repository has already been retrieved.

        c.a_repo = c.db_repo

        # Retrieve the "changeset" repository (default: same as base).

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

        if other_repo is None:

            c.cs_repo = c.a_repo

        else:

            c.cs_repo = Repository.get_by_repo_name(other_repo)

            if c.cs_repo is None:

                msg = _('Could not find other repository %s') % other_repo

                h.flash(msg, category='error')

                raise HTTPFound(location=url('compare_home', repo_name=c.a_repo.repo_name))

        # Verify that it's even possible to compare these two repositories.

        if c.a_repo.scm_instance.alias != c.cs_repo.scm_instance.alias:

            msg = _('Cannot compare repositories of different types')

            h.flash(msg, category='error')

            raise HTTPFound(location=url('compare_home', repo_name=c.a_repo.repo_name))

    @staticmethod

    def _get_changesets(alias, org_repo, org_rev, other_repo, other_rev):

        """

        Returns lists of changesets that can be merged from org_repo@org_rev

        to other_repo@other_rev

        ... and the other way

        :param org_repo: repo object, that is most likely the original repo we forked from

        :param org_rev: the revision we want our compare to be made

        :param other_repo: repo object, most likely the fork of org_repo. It has

            all changesets that we need to obtain

        :param other_rev: revision we want out compare to be made on other_repo

        """

        if org_rev == other_rev:

            org_changesets = []

            other_changesets = []

        elif alias == 'hg':

            #case two independent repos

            if org_repo != other_repo:

                hgrepo = unionrepo.unionrepository(other_repo.baseui,

                                                   other_repo.path,

                                                   org_repo.path)

                # all ancestors of other_rev will be in other_repo and

                # rev numbers from hgrepo can be used in other_repo - org_rev ancestors cannot

            #no remote compare do it on the same repository

            else:

                hgrepo = other_repo._repo

                if ancestors:

            other_revs = hgrepo.revs("ancestors(id(%s)) and not ancestors(id(%s)) and not id(%s)",

                                     other_rev, org_rev, org_rev)

            other_changesets = [other_repo.get_changeset(rev) for rev in other_revs]

            org_revs = hgrepo.revs("ancestors(id(%s)) and not ancestors(id(%s)) and not id(%s)",

                                   org_rev, other_rev, other_rev)

            org_changesets = [org_repo.get_changeset(hgrepo[rev].hex()) for rev in org_revs]

        elif alias == 'git':

            if org_repo != other_repo:

                from dulwich.repo import Repo

                from dulwich.client import SubprocessGitClient

                gitrepo = Repo(org_repo.path)

                SubprocessGitClient(thin_packs=False).fetch(safe_str(other_repo.path), gitrepo)

                gitrepo_remote = Repo(other_repo.path)

                SubprocessGitClient(thin_packs=False).fetch(safe_str(org_repo.path), gitrepo_remote)

                revs = []

                for x in gitrepo_remote.get_walker(include=[other_rev],

                                                   exclude=[org_rev]):

                    revs.append(x.commit.id)

                other_changesets = [other_repo.get_changeset(rev) for rev in reversed(revs)]

                if other_changesets:

                else:

                    # no changesets from other repo, ancestor is the other_rev

                # dulwich 0.9.9 doesn't have a Repo.close() so we have to mess with internals:

                gitrepo.object_store.close()

                gitrepo_remote.object_store.close()

            else:

                so, se = org_repo.run_git_command(

                    ['log', '--reverse', '--pretty=format:%H',

                     '-s', '%s..%s' % (org_rev, other_rev)]

                )

                other_changesets = [org_repo.get_changeset(cs)

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

                so, se = org_repo.run_git_command(

                    ['merge-base', org_rev, other_rev]

                )

            org_changesets = []

        else:

            raise Exception('Bad alias only git and hg is allowed')

    @LoginRequired()

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

                                   'repository.admin')

    def index(self, repo_name):

        c.compare_home = True

        c.a_ref_name = c.cs_ref_name = _('Select changeset')

        return render('compare/compare_diff.html')

    @LoginRequired()

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

                                   'repository.admin')

    def compare(self, repo_name, org_ref_type, org_ref_name, other_ref_type, other_ref_name):

        org_ref_name = org_ref_name.strip()

        other_ref_name = other_ref_name.strip()

        # If merge is True:

        #   Show what org would get if merged with other:

        #   List changesets that are ancestors of other but not of org.

        #   New changesets in org is thus ignored.

        #   Diff will be from common ancestor, and merges of org to other will thus be ignored.

        # If merge is False:

        #   Make a raw diff from org to other, no matter if related or not.

        #   Changesets in one and not in the other will be ignored

        # swap url for compare_diff page - never partial and never as_form

        c.swap_url = h.url('compare_url',

            repo_name=c.cs_repo.repo_name,

            org_ref_type=other_ref_type, org_ref_name=other_ref_name,

            other_repo=c.a_repo.repo_name,

            other_ref_type=org_ref_type, other_ref_name=org_ref_name,

            merge=merge or '')

        # set callbacks for generating markup for icons

        c.ignorews_url = _ignorews_url

        c.context_url = _context_url

        ignore_whitespace = request.GET.get('ignorews') == '1'

        line_context = safe_int(request.GET.get('context'), 3)

        c.a_rev = self._get_ref_rev(c.a_repo, org_ref_type, org_ref_name,

            returnempty=True)

        c.cs_rev = self._get_ref_rev(c.cs_repo, other_ref_type, other_ref_name)

        c.compare_home = False

        c.a_ref_name = org_ref_name

        c.a_ref_type = org_ref_type

        c.cs_ref_name = other_ref_name

        c.cs_ref_type = other_ref_type

            c.a_repo.scm_instance.alias, c.a_repo.scm_instance, c.a_rev,

            c.cs_repo.scm_instance, c.cs_rev)

        raw_ids = [x.raw_id for x in c.cs_ranges]

        c.cs_comments = c.cs_repo.get_comments(raw_ids)

        c.statuses = c.cs_repo.statuses(raw_ids)

        revs = [ctx.revision for ctx in reversed(c.cs_ranges)]

        c.jsdata = json.dumps(graph_data(c.cs_repo.scm_instance, revs))

        if partial:

            return render('compare/compare_cs.html')

        org_repo = c.a_repo

        other_repo = c.cs_repo

            # case we want a simple diff without incoming changesets,

            # previewing what will be merged.

            # Make the diff on the other repo (which is known to have other_rev)

            log.debug('Using ancestor %s as rev1 instead of %s',

            org_repo = other_repo

        else: # comparing tips, not necessarily linearly related

            if org_repo != other_repo:

                # TODO: we could do this by using hg unionrepo

                log.error('cannot compare across repos %s and %s', org_repo, other_repo)

                h.flash(_('Cannot compare repositories without using common ancestor'), category='error')

                raise HTTPBadRequest

            rev1 = c.a_rev

        diff_limit = self.cut_off_limit if not c.fulldiff else None

        log.debug('running diff between %s and %s in %s',

                  rev1, c.cs_rev, org_repo.scm_instance.path)

        txtdiff = org_repo.scm_instance.get_diff(rev1=rev1, rev2=c.cs_rev,

                                      ignore_whitespace=ignore_whitespace,

                                      context=line_context)

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

                                             diff_limit=diff_limit)

        _parsed = diff_processor.prepare()

        c.limited_diff = False

        if isinstance(_parsed, LimitedDiffContainer):

            c.limited_diff = True

        c.file_diff_data = OrderedDict()

        # heads up: org and other might seem backward here ...

        org_repo_name = _form['org_repo']

        org_ref = _form['org_ref'] # will have merge_rev as rev but symbolic name

        org_repo = RepoModel()._get_repo(org_repo_name)

        (org_ref_type,

         org_ref_name,

         org_rev) = org_ref.split(':')

        if org_ref_type == 'rev':

            org_ref_type = 'branch'

            cs = org_repo.scm_instance.get_changeset(org_rev)

            org_ref = '%s:%s:%s' % (org_ref_type, cs.branch, cs.raw_id)

        other_repo_name = _form['other_repo']

        other_ref = _form['other_ref'] # will have symbolic name and head revision

        other_repo = RepoModel()._get_repo(other_repo_name)

        (other_ref_type,

         other_ref_name,

         other_rev) = other_ref.split(':')

        if other_ref_type == 'rev':

            cs = other_repo.scm_instance.get_changeset(other_rev)

            other_ref_name = cs.raw_id[:12]

            other_ref = '%s:%s:%s' % (other_ref_type, other_ref_name, cs.raw_id)

            CompareController._get_changesets(org_repo.scm_instance.alias,

                                              other_repo.scm_instance, other_rev, # org and other "swapped"

                                              org_repo.scm_instance, org_rev,

                                              )

        if ancestor_rev is None:

        revisions = [cs_.raw_id for cs_ in cs_ranges]

        # hack: ancestor_rev is not an other_rev but we want to show the

        # requested destination and have the exact ancestor

        other_ref = '%s:%s:%s' % (other_ref_type, other_ref_name, ancestor_rev)

        reviewer_ids = []

        title = _form['pullrequest_title']

        if not title:

            if org_repo_name == other_repo_name:

                title = '%s to %s' % (h.short_ref(org_ref_type, org_ref_name),

                                      h.short_ref(other_ref_type, other_ref_name))

            else:

                title = '%s#%s to %s#%s' % (org_repo_name, h.short_ref(org_ref_type, org_ref_name),

                                            other_repo_name, h.short_ref(other_ref_type, other_ref_name))

        description = _form['pullrequest_desc'].strip() or _('No description')

        try:

            pull_request = PullRequestModel().create(

                self.authuser.user_id, org_repo_name, org_ref, other_repo_name,

                other_ref, revisions, reviewer_ids, title, description

            )

            Session().commit()

            h.flash(_('Successfully opened new pull request'),

                    category='success')

        except UserInvalidException as u:

            h.flash(_('Invalid reviewer "%s" specified') % u, category='error')

            raise HTTPBadRequest()

        except Exception:

            h.flash(_('Error occurred while creating pull request'),

                    category='error')

            log.error(traceback.format_exc())

            raise HTTPFound(location=url('pullrequest_home', repo_name=repo_name))

        raise HTTPFound(location=pull_request.url())

    def create_new_iteration(self, old_pull_request, new_rev, title, description, reviewer_ids):

        org_repo = RepoModel()._get_repo(old_pull_request.org_repo.repo_name)

        org_ref_type, org_ref_name, org_rev = old_pull_request.org_ref.split(':')

        new_org_rev = self._get_ref_rev(org_repo, 'rev', new_rev)

        other_repo = RepoModel()._get_repo(old_pull_request.other_repo.repo_name)

        other_ref_type, other_ref_name, other_rev = old_pull_request.other_ref.split(':') # other_rev is ancestor

        #assert other_ref_type == 'branch', other_ref_type # TODO: what if not?

        new_other_rev = self._get_ref_rev(other_repo, other_ref_type, other_ref_name)

            other_repo.scm_instance, new_other_rev, # org and other "swapped"

            org_repo.scm_instance, new_org_rev)

        old_revisions = set(old_pull_request.revisions)

        revisions = [cs.raw_id for cs in cs_ranges]

        new_revisions = [r for r in revisions if r not in old_revisions]

        lost = old_revisions.difference(revisions)

        infos = ['This is a new iteration of %s "%s".' %

                 (h.canonical_url('pullrequest_show', repo_name=old_pull_request.other_repo.repo_name,

                      pull_request_id=old_pull_request.pull_request_id),

                  old_pull_request.title)]

        if lost:

            infos.append(_('Missing changesets since the previous iteration:'))

            for r in old_pull_request.revisions:

                if r in lost:

                    rev_desc = org_repo.get_changeset(r).message.split('\n')[0]

                    infos.append('  %s %s' % (h.short_id(r), rev_desc))

        if new_revisions:

            infos.append(_('New changesets on %s %s since the previous iteration:') % (org_ref_type, org_ref_name))

            for r in reversed(revisions):

                if r in new_revisions:

                    rev_desc = org_repo.get_changeset(r).message.split('\n')[0]

                    infos.append('  %s %s' % (h.short_id(r), h.shorter(rev_desc, 80)))

                                   'repository.admin')

    def show(self, repo_name, pull_request_id, extra=None):

        repo_model = RepoModel()

        c.users_array = repo_model.get_users_js()

        c.user_groups_array = repo_model.get_user_groups_js()

        c.pull_request = PullRequest.get_or_404(pull_request_id)

        c.allowed_to_change_status = self._get_is_allowed_change_status(c.pull_request)

        cc_model = ChangesetCommentsModel()

        cs_model = ChangesetStatusModel()

        # pull_requests repo_name we opened it against

        # ie. other_repo must match

        if repo_name != c.pull_request.other_repo.repo_name:

            raise HTTPNotFound

        # load compare data into template context

        c.cs_repo = c.pull_request.org_repo

        (c.cs_ref_type,

         c.cs_ref_name,

         c.cs_rev) = c.pull_request.org_ref.split(':')

        c.a_repo = c.pull_request.other_repo

        (c.a_ref_type,

         c.a_ref_name,

        org_scm_instance = c.cs_repo.scm_instance # property with expensive cache invalidation check!!!

        c.cs_repo = c.cs_repo

        try:

            c.cs_ranges = [org_scm_instance.get_changeset(x)

                           for x in c.pull_request.revisions]

        except ChangesetDoesNotExistError:

            c.cs_ranges = []

            h.flash(_('Revision %s not found in %s') % (x, c.cs_repo.repo_name),

                'error')

        c.cs_ranges_org = None # not stored and not important and moving target - could be calculated ...

        revs = [ctx.revision for ctx in reversed(c.cs_ranges)]

        c.jsdata = json.dumps(graph_data(org_scm_instance, revs))

        c.is_range = False

        try:

            if c.a_ref_type == 'rev': # this looks like a free range where target is ancestor

                cs_a = org_scm_instance.get_changeset(c.a_rev)

                root_parents = c.cs_ranges[0].parents

                c.is_range = cs_a in root_parents

                #c.merge_root = len(root_parents) > 1 # a range starting with a merge might deserve a warning

        except ChangesetDoesNotExistError: # probably because c.a_rev not found

            pass

        except IndexError: # probably because c.cs_ranges is empty, probably because revisions are missing

                                          parsed_lines=[f])

            c.file_diff_data[fid] = (None, f['operation'], f['old_filename'], filename, diff, st)

        # inline comments

        c.inline_cnt = 0

        c.inline_comments = cc_model.get_inline_comments(

                                c.db_repo.repo_id,

                                pull_request=pull_request_id)

        # count inline comments

        for __, lines in c.inline_comments:

            for comments in lines.values():

                c.inline_cnt += len(comments)

        # comments

        c.comments = cc_model.get_comments(c.db_repo.repo_id,

                                           pull_request=pull_request_id)

        # (badly named) pull-request status calculation based on reviewer votes

        (c.pull_request_reviewers,

         c.pull_request_pending_reviewers,

         c.current_voting_result,

         ) = cs_model.calculate_pull_request_result(c.pull_request)

        c.changeset_statuses = ChangesetStatus.STATUSES

        c.as_form = False

        return render('/pullrequests/pullrequest_show.html')

    @LoginRequired()

    @NotAnonymous()

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

                                   'repository.admin')

    @jsonify

    def comment(self, repo_name, pull_request_id):

        pull_request = PullRequest.get_or_404(pull_request_id)

        status = request.POST.get('changeset_status')

        close_pr = request.POST.get('save_close')

        delete = request.POST.get('save_delete')

        f_path = request.POST.get('f_path')

        line_no = request.POST.get('line')

        if (status or close_pr or delete) and (f_path or line_no):

            # status votes and closing is only possible in general comments

            raise HTTPBadRequest()

        allowed_to_change_status = self._get_is_allowed_change_status(pull_request)

        if not allowed_to_change_status:

            if status or close_pr:

                h.flash(_('No permission to change pull request status'), 'error')

## Changesets table !

<div class="container">

  %if not c.cs_ranges:

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

  %else:

    </div>

    %endif

    <div id="graph_nodes">

        <canvas id="graph_canvas" style="width:0"></canvas>

    </div>

    <div id="graph_content_pr" style="margin-left: 100px;">

    <table class="compare_view_commits noborder">

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

      <tr id="chg_${cnt+1}" class="${'mergerow' if len(cs.parents) > 1 else ''}">

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

                <i class="icon-circle changeset-status-${c.statuses[cs.raw_id][0]}"></i>

            </div>

          %endif

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

              <div class="comments-container">

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

                      <a href="${c.cs_comments[cs.raw_id][0].url()}">

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

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

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

                    </span>

                %endfor

            </div>

            <div id="C-${cs.raw_id}" class="message">${h.urlify_text(cs.message, c.repo_name)}</div>

        </td>

      </tr>

    %endfor

    </table>

    </div>

    %if c.as_form:

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

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

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

        h.url('compare_url',

          repo_name=c.a_repo.repo_name,

          org_ref_type=c.a_ref_type, org_ref_name=c.a_ref_name,

          other_repo=c.cs_repo.repo_name,

          other_ref_type=c.cs_ref_type, other_ref_name=c.cs_ref_name,

          merge='1')

        )}

      </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.cs_repo.repo_name, c.cs_ref_type, c.cs_ref_name, c.cs_rev)}

        ${_('is')}

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

        ${_('behind')}

        ${h.link_to_ref(c.a_repo.repo_name, c.a_ref_type, c.a_ref_name)}

      </div>

    %endif

  %endif

</div>

%if c.as_form:

<div id="jsdata" style="display:none">${c.jsdata|n}</div>

%else:

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

%endif

<script type="text/javascript">

    $(document).ready(function(){

%if not c.as_form:

        r2_name = repo2.repo_name

        cs1 = fixture.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 = fixture.commit_change(repo=r2_name, filename='file2-fork',

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

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

        cs3 = fixture.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=rev2,

                                    other_ref_type="branch",

                                    other_ref_name=rev1,

                                    other_repo=r1_name,

        cs0 = fixture.commit_change(repo=r1_name, filename='file2',

                content='line1-added-after-fork', message='commit2-parent',

                vcs_type='hg', parent=None, 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=rev2,

                                    other_ref_type="branch",

                                    other_ref_name=rev1,

                                    other_repo=r1_name,

                                    merge='1',

                                    ))

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

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

        response.mustcontain("""commit2-parent""")

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

        response.mustcontain("""line1-added-after-fork""")

        cs1 = fixture.commit_change(repo=r2_name, filename='file1-fork',

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

                vcs_type='git', parent=repo2.scm_instance[-1], newfile=True)

        cs2 = fixture.commit_change(repo=r2_name, filename='file2-fork',

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

                vcs_type='git', parent=cs1, newfile=True)

        cs3 = fixture.commit_change(repo=r2_name, filename='file3-fork',

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

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

        #compare !

        rev1 = 'master'

        rev2 = 'master'

        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,

        cs0 = fixture.commit_change(repo=r1_name, filename='file2',

                content='line1-added-after-fork', message='commit2-parent',

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

        #compare !

        rev1 = 'master'

        rev2 = 'master'

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

                                    ))

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

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

        response.mustcontain("""commit2-parent""")

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

        response.mustcontain("""line1-added-after-fork""")

        response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/38b5fe81f109cb111f549bfe9bb6b267e10bc557">r1:%s</a>""" % (GIT_REPO, rev2[:12]))

        response.mustcontain('1 file changed with 7 insertions and 0 deletions')

        ## files

        response.mustcontain("""<a href="#C--c8e92ef85cd1">.hgignore</a>""")

    def test_compare_revisions_hg_as_form(self):

        self.log_user()

        rev1 = 'b986218ba1c9'

        rev2 = '3d8f361e72ab'

        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,

                                    as_form=True,

                                    ),

                                extra_environ={'HTTP_X_PARTIAL_XHR': '1'},)

        ## outgoing changesets between those revisions

        response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/3d8f361e72ab303da48d799ff1ac40d5ac37c67e">r1:%s</a>""" % (HG_REPO, rev2))

        response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/b986218ba1c9b0d6a259fac9b050b1724ed8e545">%s</a>""" % (HG_REPO, rev1))

    def test_compare_revisions_git_as_form(self):

        self.log_user()

        rev1 = 'c1214f7e79e02fc37156ff215cd71275450cffc3'

        rev2 = '38b5fe81f109cb111f549bfe9bb6b267e10bc557'

        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,

                                    as_form=True,

                                    ),

                                extra_environ={'HTTP_X_PARTIAL_XHR': '1'},)

        ## outgoing changesets between those revisions

        response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/38b5fe81f109cb111f549bfe9bb6b267e10bc557">r1:%s</a>""" % (GIT_REPO, rev2[:12]))

        response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/c1214f7e79e02fc37156ff215cd71275450cffc3">%s</a>""" % (GIT_REPO, rev1[:12]))