Changeset - 84eb5b7b1bac
Parent rev.
Child rev.
[Not reviewed]
default
0 5 0
Mads Kiilerich - 11 years ago 2015-02-11 03:05:00
madski@unity3d.com
pullrequests: prevent creation of invalid pull requests, empty or unrelated or criss cross
5 files changed with 86 insertions and 55 deletions:
kallithea/controllers/compare.py
31
26
kallithea/controllers/pullrequests.py
32
5
kallithea/templates/compare/compare_cs.html
17
12
kallithea/tests/functional/test_compare.py
4
10
kallithea/tests/functional/test_compare_local.py
2
2
0 comments (0 inline, 0 general)
kallithea/controllers/compare.py
➞
Show inline comments
 
@@ -23,25 +23,25 @@ Original author and date, and relevant c
 
: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 webob.exc import HTTPFound, HTTPBadRequest

			




	
	
	
		
 
from webob.exc import HTTPFound, HTTPBadRequest, HTTPNotFound

			




	
	
	
		
 

			




	
	
	
		
 
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

			




	
	
		
 
@@ -72,116 +72,110 @@ class CompareController(BaseRepoControll

			




	
	
	
		
 
        # 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

			




	
	
	
		
 
        ... and the ancestor that would be used for merge

			




	
	
	
		
 
        ... and the ancestors that would be used for merge

			




	
	
	
		
 

			




	
	
	
		
 
        :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

			




	
	
	
		
 
        """

			




	
	
	
		
 
        ancestor = None

			




	
	
	
		
 
        ancestors = None

			




	
	
	
		
 
        if org_rev == other_rev:

			




	
	
	
		
 
            org_changesets = []

			




	
	
	
		
 
            other_changesets = []

			




	
	
	
		
 
            ancestor = org_rev

			




	
	
	
		
 

			




	
	
	
		
 
        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 org_repo.EMPTY_CHANGESET in (org_rev, other_rev):

			




	
	
	
		
 
                # work around unexpected behaviour in Mercurial < 3.4

			




	
	
	
		
 
                ancestor = org_repo.EMPTY_CHANGESET

			




	
	
	
		
 
            ancestors = [hgrepo[ancestor].hex() for ancestor in

			




	
	
	
		
 
                         hgrepo.revs("id(%s) & ::id(%s)", other_rev, org_rev)]

			




	
	
	
		
 
            if ancestors:

			




	
	
	
		
 
                log.debug("shortcut found: %s is already an ancestor of %s", other_rev, org_rev)

			




	
	
	
		
 
            else:

			




	
	
	
		
 
                ancestors = hgrepo.revs("ancestor(id(%s), id(%s))", org_rev, other_rev)

			




	
	
	
		
 
                if ancestors:

			




	
	
	
		
 
                    # FIXME: picks arbitrary ancestor - but there is usually only one

			




	
	
	
		
 
                    try:

			




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

			




	
	
	
		
 
                    except AttributeError:

			




	
	
	
		
 
                        # removed in hg 3.2

			




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

			




	
	
	
		
 
                log.debug("no shortcut found: %s is not an ancestor of %s", other_rev, org_rev)

			




	
	
	
		
 
                ancestors = [hgrepo[ancestor].hex() for ancestor in

			




	
	
	
		
 
                             hgrepo.revs("heads(::id(%s) & ::id(%s))", org_rev, other_rev)] # FIXME: expensive!

			




	
	
	
		
 

			




	
	
	
		
 
            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:

			




	
	
	
		
 
                    ancestor = other_changesets[0].parents[0].raw_id

			




	
	
	
		
 
                    ancestors = [other_changesets[0].parents[0].raw_id]

			




	
	
	
		
 
                else:

			




	
	
	
		
 
                    # no changesets from other repo, ancestor is the other_rev

			




	
	
	
		
 
                    ancestor = other_rev

			




	
	
	
		
 
                    ancestors = [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]

			




	
	
	
		
 
                )

			




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

			




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

			




	
	
	
		
 
            org_changesets = []

			




	
	
	
		
 

			




	
	
	
		
 
        else:

			




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

			




	
	
	
		
 

			




	
	
	
		
 
        return other_changesets, org_changesets, ancestor

			




	
	
	
		
 
        return other_changesets, org_changesets, ancestors

			




	
	
	
		
 

			




	
	
	
		
 
    @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')

			




	
	
		
 
@@ -219,51 +213,62 @@ class CompareController(BaseRepoControll

			




	
	
	
		
 
        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.cs_ranges, c.cs_ranges_org, c.ancestor = self._get_changesets(

			




	
	
	
		
 
        c.cs_ranges, c.cs_ranges_org, c.ancestors = self._get_changesets(

			




	
	
	
		
 
            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

			




	
	
	
		
 

			




	
	
	
		
 
        if merge and c.ancestor:

			




	
	
	
		
 
        if merge:

			




	
	
	
		
 
            rev1 = msg = None

			




	
	
	
		
 
            if not c.cs_ranges:

			




	
	
	
		
 
                msg = _('Cannot show empty diff')

			




	
	
	
		
 
            elif not c.ancestors:

			




	
	
	
		
 
                msg = _('No ancestor found for merge diff')

			




	
	
	
		
 
            elif len(c.ancestors) == 1:

			




	
	
	
		
 
                rev1 = c.ancestors[0]

			




	
	
	
		
 
            else:

			




	
	
	
		
 
                msg = _('Multiple merge ancestors found for merge compare')

			




	
	
	
		
 
            if rev1 is None:

			




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

			




	
	
	
		
 
                log.error(msg)

			




	
	
	
		
 
                raise HTTPNotFound

			




	
	
	
		
 

			




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

			




	
	
	
		
 
                      c.ancestor, c.a_rev)

			




	
	
	
		
 
            rev1 = c.ancestor

			




	
	
	
		
 
                      rev1, c.a_rev)

			




	
	
	
		
 
            org_repo = other_repo

			




	
	
	
		
 
        else: # comparing tips, not necessarily linearly related

			




	
	
	
		
 
            if merge:

			




	
	
	
		
 
                log.error('Unable to find ancestor revision')

			




	
	
	
		
 
            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,

			




        

    


    
    

    

        

                

                    kallithea/controllers/pullrequests.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -334,31 +334,44 @@ class PullrequestsController(BaseRepoCon

			




	
	
	
		
 

			




	
	
	
		
 
        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)

			




	
	
	
		
 

			




	
	
	
		
 
        cs_ranges, _cs_ranges_not, ancestor_rev = \

			




	
	
	
		
 
        cs_ranges, _cs_ranges_not, ancestor_revs = \

			




	
	
	
		
 
            CompareController._get_changesets(org_repo.scm_instance.alias,

			




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

			




	
	
	
		
 
                                              org_repo.scm_instance, org_rev,

			




	
	
	
		
 
                                              )

			




	
	
	
		
 
        ancestor_rev = msg = None

			




	
	
	
		
 
        if not cs_ranges:

			




	
	
	
		
 
            msg = _('Cannot create empty pull request')

			




	
	
	
		
 
        elif not ancestor_revs:

			




	
	
	
		
 
            ancestor_rev = org_repo.scm_instance.EMPTY_CHANGESET

			




	
	
	
		
 
        elif len(ancestor_revs) == 1:

			




	
	
	
		
 
            ancestor_rev = ancestor_revs[0]

			




	
	
	
		
 
        else:

			




	
	
	
		
 
            msg = _('Cannot create pull request - criss cross merge detected, please merge a later %s revision to %s'

			




	
	
	
		
 
                    ) % (other_ref_name, org_ref_name)

			




	
	
	
		
 
        if ancestor_rev is None:

			




	
	
	
		
 
            ancestor_rev = org_repo.scm_instance.EMPTY_CHANGESET

			




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

			




	
	
	
		
 
            log.error(msg)

			




	
	
	
		
 
            raise HTTPNotFound

			




	
	
	
		
 

			




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

			




	
	
		
 
@@ -387,27 +400,41 @@ class PullrequestsController(BaseRepoCon

			




	
	
	
		
 
        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)

			




	
	
	
		
 

			




	
	
	
		
 
        cs_ranges, _cs_ranges_not, ancestor_rev = CompareController._get_changesets(org_repo.scm_instance.alias,

			




	
	
	
		
 
        cs_ranges, _cs_ranges_not, ancestor_revs = CompareController._get_changesets(org_repo.scm_instance.alias,

			




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

			




	
	
	
		
 
            org_repo.scm_instance, new_org_rev)

			




	
	
	
		
 
        ancestor_rev = msg = None

			




	
	
	
		
 
        if not cs_ranges:

			




	
	
	
		
 
            msg = _('Cannot create empty pull request update') # cannot happen!

			




	
	
	
		
 
        elif not ancestor_revs:

			




	
	
	
		
 
            msg = _('Cannot create pull request update - no common ancestor found') # cannot happen

			




	
	
	
		
 
        elif len(ancestor_revs) == 1:

			




	
	
	
		
 
            ancestor_rev = ancestor_revs[0]

			




	
	
	
		
 
        else:

			




	
	
	
		
 
            msg = _('Cannot create pull request update - criss cross merge detected, please merge a later %s revision to %s'

			




	
	
	
		
 
                    ) % (other_ref_name, org_ref_name)

			




	
	
	
		
 
        if ancestor_rev is None:

			




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

			




	
	
	
		
 
            log.error(msg)

			




	
	
	
		
 
            raise HTTPNotFound

			




	
	
	
		
 

			




	
	
	
		
 
        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:

			




	
	
		
 
@@ -577,25 +604,25 @@ class PullrequestsController(BaseRepoCon

			




	
	
	
		
 
        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,

			




	
	
	
		
 
         c.a_rev) = c.pull_request.other_ref.split(':') # other_rev is ancestor

			




	
	
	
		
 
         c.a_rev) = c.pull_request.other_ref.split(':') # a_rev is ancestor

			




	
	
	
		
 

			




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

			




	
	
		
 
@@ -737,25 +764,25 @@ class PullrequestsController(BaseRepoCon

			




	
	
	
		
 
        # 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

			




	
	
	
		
 
        c.ancestor = None # there is one - but right here we don't know which

			




	
	
	
		
 
        c.ancestors = None # [c.a_rev] ... but that is shown in an other way

			




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

			




        

    


    
    

    

        

                

                    kallithea/templates/compare/compare_cs.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
## Changesets table !

			




	
	
	
		
 
<div class="container">

			




	
	
	
		
 
  %if not c.cs_ranges:

			




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

			




	
	
	
		
 
  %else:

			




	
	
	
		
 

			




	
	
	
		
 
    %if c.ancestor:

			




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

			




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

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    %if c.ancestors:

			




	
	
	
		
 
      <div class="ancestor">

			




	
	
	
		
 
        %if len(c.ancestors) > 1:

			




	
	
	
		
 
        <div style="color:red; font-weight: bold">

			




	
	
	
		
 
          ${_('Criss cross merge situation with multiple merge ancestors detected!')}

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div style="color:red">

			




	
	
	
		
 
          ${_('Please merge the target branch to your branch before creating a pull request.')}

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        %endif

			




	
	
	
		
 
        <div>

			




	
	
	
		
 
          ${_('Merge Ancestor')}:

			




	
	
	
		
 
          %for ancestor in c.ancestors:

			




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

			




	
	
	
		
 
          %endfor

			




	
	
	
		
 
        </div>

			




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

			




	
	
		
 
@@ -84,32 +97,24 @@

			




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

			




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

			




	
	
	
		
 
        ${_('Common ancestor')}:

			




	
	
	
		
 
        %if c.ancestor:

			




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

			




	
	
	
		
 
        %else:

			




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

			




	
	
	
		
 
        %endif

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
    %endif

			




	
	
	
		
 
    %if c.cs_ranges_org is not None:

			




	
	
	
		
 
      ## TODO: list actual changesets?

			




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

			




	
	
	
		
 
        ${h.link_to_ref(c.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

			




        

    


    
    

    

        

                

                    kallithea/tests/functional/test_compare.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -480,30 +480,27 @@ class TestCompareController(TestControll

			




	
	
	
		
 
                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,

			




	
	
	
		
 
                                    merge='1',))

			




	
	
	
		
 
                                    merge='1',), status=404)

			




	
	
	
		
 

			




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

			




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

			




	
	
	
		
 
        response.mustcontain('No files')

			




	
	
	
		
 
        response.mustcontain('No changesets')

			




	
	
	
		
 
        response.mustcontain('Cannot show empty diff')

			




	
	
	
		
 

			




	
	
	
		
 
        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,

			




	
	
		
 
@@ -560,30 +557,27 @@ class TestCompareController(TestControll

			




	
	
	
		
 
                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,

			




	
	
	
		
 
                                    merge='1',))

			




	
	
	
		
 
                                    merge='1',), status=404)

			




	
	
	
		
 

			




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

			




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

			




	
	
	
		
 
        response.mustcontain('No files')

			




	
	
	
		
 
        response.mustcontain('No changesets')

			




	
	
	
		
 
        response.mustcontain('Cannot show empty diff')

			




	
	
	
		
 

			




	
	
	
		
 
        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,

			




        

    


    
    

    

        

                

                    kallithea/tests/functional/test_compare_local.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -198,34 +198,34 @@ class TestCompareController(TestControll

			




	
	
	
		
 
                                    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('Common ancestor')

			




	
	
	
		
 
        response.mustcontain('Merge Ancestor')

			




	
	
	
		
 
        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('Common ancestor')

			




	
	
	
		
 
        response.mustcontain('Merge Ancestor')

			




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

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.