compare.py
180 lines
| 7.1 KiB
| text/x-python
|
PythonLexer
r2241 | # -*- coding: utf-8 -*- | |||
""" | ||||
rhodecode.controllers.compare | ||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||||
|
r3304 | compare controller for pylons showing differences between two | ||
r2241 | 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 | ||||
r2337 | from webob.exc import HTTPNotFound | |||
r2241 | from pylons import request, response, session, tmpl_context as c, url | |||
from pylons.controllers.util import abort, redirect | ||||
r2593 | from pylons.i18n.translation import _ | |||
r2241 | ||||
r2593 | from rhodecode.lib.vcs.exceptions import EmptyRepositoryError, RepositoryError | |||
r2348 | from rhodecode.lib import helpers as h | |||
r2241 | from rhodecode.lib.base import BaseRepoController, render | |||
from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator | ||||
r2337 | from rhodecode.lib import diffs | |||
from rhodecode.model.db import Repository | ||||
r2442 | from rhodecode.model.pull_request import PullRequestModel | |||
r2847 | from webob.exc import HTTPBadRequest | |||
r2892 | from rhodecode.lib.utils2 import str2bool | |||
r3011 | from rhodecode.lib.diffs import LimitedDiffContainer | |||
r3023 | from rhodecode.lib.vcs.backends.base import EmptyChangeset | |||
r2241 | ||||
log = logging.getLogger(__name__) | ||||
class CompareController(BaseRepoController): | ||||
@LoginRequired() | ||||
@HasRepoPermissionAnyDecorator('repository.read', 'repository.write', | ||||
'repository.admin') | ||||
def __before__(self): | ||||
super(CompareController, self).__before__() | ||||
r2847 | def __get_cs_or_redirect(self, rev, repo, redirect_after=True, | |||
partial=False): | ||||
r2593 | """ | |||
Safe way to get changeset if error occur it redirects to changeset with | ||||
r2847 | proper message. If partial is set then don't do redirect raise Exception | |||
instead | ||||
r2593 | ||||
: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: | ||||
r2684 | log.error(traceback.format_exc()) | |||
r2593 | h.flash(str(e), category='warning') | |||
r2847 | if not partial: | |||
redirect(h.url('summary_home', repo_name=repo.repo_name)) | ||||
raise HTTPBadRequest() | ||||
r2593 | ||||
r2363 | def index(self, org_ref_type, org_ref, other_ref_type, other_ref): | |||
r2362 | ||||
r2363 | 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('repo', org_repo) | ||||
r3011 | c.fulldiff = fulldiff = request.GET.get('fulldiff') | |||
r3023 | rev_start = request.GET.get('rev_start') | |||
rev_end = request.GET.get('rev_end') | ||||
r2363 | ||||
c.swap_url = h.url('compare_url', repo_name=other_repo, | ||||
org_ref_type=other_ref[0], org_ref=other_ref[1], | ||||
other_ref_type=org_ref[0], other_ref=org_ref[1], | ||||
|
r3304 | repo=org_repo, as_form=request.GET.get('as_form')) | ||
r2363 | ||||
r2337 | c.org_repo = org_repo = Repository.get_by_repo_name(org_repo) | |||
c.other_repo = other_repo = Repository.get_by_repo_name(other_repo) | ||||
r2362 | ||||
|
r3143 | if c.org_repo is None: | ||
log.error('Could not find org repo %s' % org_repo) | ||||
raise HTTPNotFound | ||||
if c.other_repo is None: | ||||
log.error('Could not find other repo %s' % other_repo) | ||||
r2362 | raise HTTPNotFound | |||
r3010 | if c.org_repo != c.other_repo and h.is_git(c.rhodecode_repo): | |||
log.error('compare of two remote repos not available for GIT REPOS') | ||||
r2444 | raise HTTPNotFound | |||
r3010 | ||||
if c.org_repo.scm_instance.alias != c.other_repo.scm_instance.alias: | ||||
log.error('compare of two different kind of remote repos not available') | ||||
raise HTTPNotFound | ||||
r2847 | partial = request.environ.get('HTTP_X_PARTIAL_XHR') | |||
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) | ||||
r2593 | ||||
r3023 | if rev_start and rev_end: | |||
#replace our org_ref with given CS | ||||
org_ref = ('rev', rev_start) | ||||
other_ref = ('rev', rev_end) | ||||
|
r3192 | c.cs_ranges = PullRequestModel().get_compare_data( | ||
r3023 | org_repo, org_ref, other_repo, other_ref, | |||
r2892 | ) | |||
r2337 | ||||
r2393 | c.statuses = c.rhodecode_db_repo.statuses([x.raw_id for x in | |||
c.cs_ranges]) | ||||
r2487 | c.target_repo = c.repo_name | |||
r2434 | # defines that we need hidden inputs with changesets | |||
c.as_form = request.GET.get('as_form', False) | ||||
r2847 | if partial: | |||
r2395 | return render('compare/compare_cs.html') | |||
r2393 | ||||
r3015 | c.org_ref = org_ref[1] | |||
c.other_ref = other_ref[1] | ||||
|
r3304 | if c.cs_ranges and c.org_repo != c.other_repo: | ||
r2892 | # case we want a simple diff without incoming changesets, just | |||
# for review purposes. Make the diff on the forked repo, with | ||||
# revision that is common ancestor | ||||
r3023 | _org_ref = org_ref | |||
org_ref = ('rev', getattr(c.cs_ranges[0].parents[0] | ||||
if c.cs_ranges[0].parents | ||||
else EmptyChangeset(), 'raw_id')) | ||||
log.debug('Changed org_ref from %s to %s' % (_org_ref, org_ref)) | ||||
r2892 | other_repo = org_repo | |||
r3015 | diff_limit = self.cut_off_limit if not fulldiff else None | |||
r3023 | ||||
|
r3304 | _diff = diffs.differ(org_repo, org_ref, other_repo, other_ref) | ||
r2892 | ||||
r3015 | diff_processor = diffs.DiffProcessor(_diff or '', format='gitdiff', | |||
r3011 | diff_limit=diff_limit) | |||
r2348 | _parsed = diff_processor.prepare() | |||
r2337 | ||||
r3011 | c.limited_diff = False | |||
if isinstance(_parsed, LimitedDiffContainer): | ||||
c.limited_diff = True | ||||
r2348 | c.files = [] | |||
c.changes = {} | ||||
r3015 | c.lines_added = 0 | |||
c.lines_deleted = 0 | ||||
r2393 | for f in _parsed: | |||
r3015 | st = f['stats'] | |||
if st[0] != 'b': | ||||
c.lines_added += st[0] | ||||
c.lines_deleted += st[1] | ||||
r2348 | fid = h.FID('', f['filename']) | |||
c.files.append([fid, f['operation'], f['filename'], f['stats']]) | ||||
r2995 | diff = diff_processor.as_html(enable_comments=False, parsed_lines=[f]) | |||
r2348 | c.changes[fid] = [f['operation'], f['filename'], diff] | |||
r2337 | ||||
return render('compare/compare_diff.html') | ||||