Files @ 934f1fd5d549
Branch filter:

Location: kallithea/rhodecode/controllers/compare.py - annotation

Marcin Kuzminski
rev_start for compare should use parents only if there are present
b2a2868d7bec
b2a2868d7bec
b2a2868d7bec
b2a2868d7bec
b2a2868d7bec
70309536c143
b2a2868d7bec
b2a2868d7bec
b2a2868d7bec
b2a2868d7bec
b2a2868d7bec
b2a2868d7bec
b2a2868d7bec
b2a2868d7bec
b2a2868d7bec
b2a2868d7bec
b2a2868d7bec
b2a2868d7bec
b2a2868d7bec
b2a2868d7bec
b2a2868d7bec
b2a2868d7bec
b2a2868d7bec
b2a2868d7bec
b2a2868d7bec
b2a2868d7bec
b2a2868d7bec
b2a2868d7bec
f8c953c6b040
b2a2868d7bec
b2a2868d7bec
16a6a2f5d422
b2a2868d7bec
16a6a2f5d422
a07e04ef7bb4
b2a2868d7bec
b2a2868d7bec
f8c953c6b040
f8c953c6b040
f8c953c6b040
3bf057a7f7e8
1cd0a0c05f42
25d77aef2729
934f1fd5d549
b2a2868d7bec
b2a2868d7bec
b2a2868d7bec
b2a2868d7bec
b2a2868d7bec
b2a2868d7bec
b2a2868d7bec
b2a2868d7bec
b2a2868d7bec
b2a2868d7bec
b2a2868d7bec
b2a2868d7bec
1cd0a0c05f42
1cd0a0c05f42
16a6a2f5d422
16a6a2f5d422
1cd0a0c05f42
1cd0a0c05f42
16a6a2f5d422
16a6a2f5d422
16a6a2f5d422
16a6a2f5d422
16a6a2f5d422
16a6a2f5d422
16a6a2f5d422
16a6a2f5d422
16a6a2f5d422
16a6a2f5d422
16a6a2f5d422
16a6a2f5d422
16a6a2f5d422
16a6a2f5d422
16a6a2f5d422
16a6a2f5d422
2b6939a77052
16a6a2f5d422
1cd0a0c05f42
1cd0a0c05f42
1cd0a0c05f42
16a6a2f5d422
745dda7817ed
3c4afb8894bd
745dda7817ed
745dda7817ed
745dda7817ed
b36285f90f89
25d77aef2729
c2a206162062
c2a206162062
745dda7817ed
b36285f90f89
b36285f90f89
b36285f90f89
75431548602a
b36285f90f89
745dda7817ed
01fe360a66c0
01fe360a66c0
01fe360a66c0
01fe360a66c0
3c4afb8894bd
01fe360a66c0
01fe360a66c0
01fe360a66c0
01fe360a66c0
db4ca2212ec0
db4ca2212ec0
01fe360a66c0
db4ca2212ec0
3c4afb8894bd
3c4afb8894bd
01fe360a66c0
bf96fd1920c1
b45e9fd75ac0
bf96fd1920c1
01fe360a66c0
bf96fd1920c1
bf96fd1920c1
bf96fd1920c1
01fe360a66c0
01fe360a66c0
01fe360a66c0
01fe360a66c0
01fe360a66c0
01fe360a66c0
16a6a2f5d422
c2a206162062
01fe360a66c0
01fe360a66c0
01fe360a66c0
01fe360a66c0
01fe360a66c0
01fe360a66c0
01fe360a66c0
01fe360a66c0
934f1fd5d549
c2a206162062
c2a206162062
01fe360a66c0
01fe360a66c0
c2a206162062
a07296564f6b
a07296564f6b
f8c953c6b040
b94eac50ec4d
b94eac50ec4d
f29469677319
f29469677319
1cd0a0c05f42
b262e349a7a5
b94eac50ec4d
01fe360a66c0
a07296564f6b
a07296564f6b
a07296564f6b
5fba3778431c
01fe360a66c0
01fe360a66c0
a07296564f6b
c9b0f1d363c7
5fba3778431c
16af24982e30
c2a206162062
70309536c143
5fba3778431c
16af24982e30
25d77aef2729
a07e04ef7bb4
f8c953c6b040
25d77aef2729
25d77aef2729
25d77aef2729
25d77aef2729
a07e04ef7bb4
a07e04ef7bb4
16af24982e30
16af24982e30
b94eac50ec4d
16af24982e30
16af24982e30
16af24982e30
16af24982e30
a07e04ef7bb4
a07e04ef7bb4
32471bd1f4ee
a07e04ef7bb4
f8c953c6b040
f8c953c6b040
# -*- 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
from rhodecode.lib.vcs.backends.base import EmptyChangeset

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

        partial = request.environ.get('HTTP_X_PARTIAL_XHR')

        org_repo = Repository.get_by_repo_name(org_repo)
        other_repo = Repository.get_by_repo_name(other_repo)

        self.__get_cs_or_redirect(rev=org_ref, repo=org_repo, partial=partial)
        self.__get_cs_or_redirect(rev=other_ref, repo=other_repo, partial=partial)

        if org_repo is None:
            log.error('Could not find org repo %s' % org_repo)
            raise HTTPNotFound
        if other_repo is None:
            log.error('Could not find other repo %s' % other_repo)
            raise HTTPNotFound

        if org_repo != other_repo and h.is_git(org_repo):
            log.error('compare of two remote repos not available for GIT REPOS')
            raise HTTPNotFound

        if org_repo.scm_instance.alias != other_repo.scm_instance.alias:
            log.error('compare of two different kind of remote repos not available')
            raise HTTPNotFound

        c.org_repo = org_repo
        c.other_repo = other_repo
        c.org_ref = org_ref[1]
        c.other_ref = other_ref[1]
        c.org_ref_type = org_ref[0]
        c.other_ref_type = other_ref[0]

        if rev_start and rev_end:
            # swap revs with cherry picked ones, save them for display
            #org_ref = ('rev', rev_start)
            #other_ref = ('rev', rev_end)
            c.org_ref = rev_start[:12]
            c.other_ref = rev_end[:12]
            # get parent of
            # rev start to include it in the diff
            _cs = other_repo.scm_instance.get_changeset(rev_start)
            rev_start = _cs.parents[0].raw_id if _cs.parents else EmptyChangeset()
            org_ref = ('rev', rev_start)
            other_ref = ('rev', rev_end)
            #if we cherry pick it's not remote, make the other_repo org_repo
            org_repo = other_repo

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

        if ancestor and org_repo != other_repo:
            # 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
            log.debug('Using ancestor %s as org_ref instead of %s'
                      % (ancestor, org_ref))
            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')