compare.py
273 lines
| 11.0 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/>. | ||||
|
r3721 | |||
r2241 | import logging | |||
import traceback | ||||
|
r3721 | import re | ||
r2241 | ||||
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 | |||
|
r3721 | from rhodecode.lib.vcs.utils import safe_str | ||
from rhodecode.lib.vcs.utils.hgcompat import scmutil | ||||
r2348 | from rhodecode.lib import helpers as h | |||
r2241 | from rhodecode.lib.base import BaseRepoController, render | |||
from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator | ||||
|
r3721 | from rhodecode.lib import diffs, unionrepo | ||
r2337 | ||||
from rhodecode.model.db import Repository | ||||
r2847 | from webob.exc import HTTPBadRequest | |||
r3011 | from rhodecode.lib.diffs import LimitedDiffContainer | |||
|
r3721 | |||
r2241 | ||||
log = logging.getLogger(__name__) | ||||
class CompareController(BaseRepoController): | ||||
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 | ||||
r3749 | def _get_changesets(self, alias, org_repo, org_ref, other_repo, other_ref, merge): | |||
""" | ||||
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 = "max(%s('%s'))" % (_revset_predicates[org_ref[0]], | ||||
safe_str(org_ref[1])) | ||||
org_revs = scmutil.revrange(org_repo._repo, [org_rev_spec]) | ||||
org_rev = org_repo._repo[org_revs[-1] if org_revs else -1].hex() | ||||
other_rev_spec = "max(%s('%s'))" % (_revset_predicates[other_ref[0]], | ||||
safe_str(other_ref[1])) | ||||
other_revs = scmutil.revrange(other_repo._repo, [other_rev_spec]) | ||||
other_rev = other_repo._repo[other_revs[-1] if other_revs else -1].hex() | ||||
#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 | ||||
if merge: | ||||
revs = ["ancestors(id('%s')) and not ancestors(id('%s')) and not id('%s')" % | ||||
(other_rev, org_rev, org_rev)] | ||||
ancestors = scmutil.revrange(hgrepo, | ||||
["ancestor(id('%s'), id('%s'))" % (org_rev, other_rev)]) | ||||
if ancestors: | ||||
# pick arbitrary ancestor - but there is usually only one | ||||
ancestor = hgrepo[ancestors[0]].hex() | ||||
else: | ||||
# TODO: have both + and - changesets | ||||
revs = ["id('%s') :: id('%s') - id('%s')" % | ||||
(org_rev, other_rev, org_rev)] | ||||
changesets = [other_repo.get_changeset(cs) | ||||
for cs in scmutil.revrange(hgrepo, revs)] | ||||
elif alias == 'git': | ||||
r3771 | assert org_repo == other_repo, ('no support for compare for two ' | |||
'different repositories in git') | ||||
r3749 | so, se = org_repo.run_git_command( | |||
r3771 | 'log --reverse --pretty="format: %%H" -s -p %s..%s' | |||
% (org_ref[1], other_ref[1]) | ||||
r3749 | ) | |||
changesets = [org_repo.get_changeset(cs) | ||||
for cs in re.findall(r'[0-9a-fA-F]{40}', so)] | ||||
return changesets, ancestor | ||||
@LoginRequired() | ||||
@HasRepoPermissionAnyDecorator('repository.read', 'repository.write', | ||||
'repository.admin') | ||||
r2363 | def index(self, org_ref_type, org_ref, other_ref_type, other_ref): | |||
|
r3443 | # org_ref will be evaluated in org_repo | ||
r2363 | org_repo = c.rhodecode_db_repo.repo_name | |||
org_ref = (org_ref_type, org_ref) | ||||
|
r3443 | # other_ref will be evaluated in other_repo | ||
r2363 | other_ref = (other_ref_type, other_ref) | |||
|
r3317 | other_repo = request.GET.get('other_repo', org_repo) | ||
|
r3486 | # 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 | ||||
merge = bool(request.GET.get('merge')) | ||||
|
r3443 | # fulldiff disables cut_off_limit | ||
c.fulldiff = request.GET.get('fulldiff') | ||||
|
r3442 | # partial uses compare_cs.html template directly | ||
partial = request.environ.get('HTTP_X_PARTIAL_XHR') | ||||
# as_form puts hidden input field with changeset revisions | ||||
c.as_form = partial and request.GET.get('as_form') | ||||
# swap url for compare_diff page - never partial and never as_form | ||||
c.swap_url = h.url('compare_url', | ||||
|
r3317 | repo_name=other_repo, | ||
org_ref_type=other_ref[0], org_ref=other_ref[1], | ||||
r3320 | other_repo=org_repo, | |||
|
r3486 | other_ref_type=org_ref[0], other_ref=org_ref[1], | ||
merge=merge or '') | ||||
r2363 | ||||
r3380 | org_repo = Repository.get_by_repo_name(org_repo) | |||
other_repo = Repository.get_by_repo_name(other_repo) | ||||
r2362 | ||||
r3380 | if org_repo is None: | |||
|
r3143 | log.error('Could not find org repo %s' % org_repo) | ||
raise HTTPNotFound | ||||
r3380 | if other_repo is None: | |||
|
r3143 | log.error('Could not find other repo %s' % other_repo) | ||
r2362 | raise HTTPNotFound | |||
r3380 | if org_repo != other_repo and h.is_git(org_repo): | |||
r3010 | log.error('compare of two remote repos not available for GIT REPOS') | |||
r2444 | raise HTTPNotFound | |||
r3010 | ||||
r3380 | if org_repo.scm_instance.alias != other_repo.scm_instance.alias: | |||
r3010 | log.error('compare of two different kind of remote repos not available') | |||
raise HTTPNotFound | ||||
r3615 | 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) | ||||
r3380 | 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] | ||||
r2593 | ||||
|
r3721 | c.cs_ranges, c.ancestor = self._get_changesets(org_repo.scm_instance.alias, | ||
org_repo.scm_instance, org_ref, | ||||
other_repo.scm_instance, other_ref, | ||||
merge) | ||||
r2337 | ||||
r2393 | c.statuses = c.rhodecode_db_repo.statuses([x.raw_id for x in | |||
c.cs_ranges]) | ||||
r3771 | if not c.ancestor: | |||
log.warning('Unable to find ancestor revision') | ||||
r2847 | if partial: | |||
r2395 | return render('compare/compare_cs.html') | |||
r2393 | ||||
|
r3486 | if c.ancestor: | ||
assert merge | ||||
|
r3323 | # case we want a simple diff without incoming changesets, | ||
# previewing what will be merged. | ||||
|
r3486 | # Make the diff on the other repo (which is known to have other_ref) | ||
r3380 | log.debug('Using ancestor %s as org_ref instead of %s' | |||
|
r3486 | % (c.ancestor, org_ref)) | ||
org_ref = ('rev', c.ancestor) | ||||
|
r3322 | org_repo = other_repo | ||
r2892 | ||||
|
r3443 | diff_limit = self.cut_off_limit if not c.fulldiff else None | ||
r3023 | ||||
|
r3718 | log.debug('running diff between %s@%s and %s@%s' | ||
% (org_repo.scm_instance.path, org_ref, | ||||
other_repo.scm_instance.path, other_ref)) | ||||
r3771 | _diff = org_repo.scm_instance.get_diff(rev1=safe_str(org_ref[1]), | |||
rev2=safe_str(other_ref[1])) | ||||
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') | ||||