diff --git a/rhodecode/controllers/compare.py b/rhodecode/controllers/compare.py --- a/rhodecode/controllers/compare.py +++ b/rhodecode/controllers/compare.py @@ -41,6 +41,8 @@ from rhodecode.model.db import Repositor from rhodecode.model.pull_request import PullRequestModel from webob.exc import HTTPBadRequest from rhodecode.lib.utils2 import str2bool +from rhodecode.lib.diffs import LimitedDiffContainer +from rhodecode.lib.vcs.backends.base import EmptyChangeset log = logging.getLogger(__name__) @@ -87,13 +89,16 @@ class CompareController(BaseRepoControll org_ref = (org_ref_type, org_ref) other_ref = (other_ref_type, other_ref) other_repo = request.GET.get('repo', org_repo) - bundle_compare = str2bool(request.GET.get('bundle', True)) + incoming_changesets = str2bool(request.GET.get('bundle', False)) + 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', 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], repo=org_repo, as_form=request.GET.get('as_form'), - bundle=bundle_compare) + bundle=incoming_changesets) c.org_repo = org_repo = Repository.get_by_repo_name(org_repo) c.other_repo = other_repo = Repository.get_by_repo_name(other_repo) @@ -102,15 +107,25 @@ class CompareController(BaseRepoControll log.error('Could not found repo %s or %s' % (org_repo, other_repo)) raise HTTPNotFound - if c.org_repo.scm_instance.alias != 'hg': - log.error('Review not available for GIT REPOS') + 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') raise HTTPNotFound + + 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 + 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) + if rev_start and rev_end: + #replace our org_ref with given CS + org_ref = ('rev', rev_start) + other_ref = ('rev', rev_end) + c.cs_ranges, discovery_data = PullRequestModel().get_compare_data( - org_repo, org_ref, other_repo, other_ref + org_repo, org_ref, other_repo, other_ref, ) c.statuses = c.rhodecode_db_repo.statuses([x.raw_id for x in @@ -121,28 +136,46 @@ class CompareController(BaseRepoControll if partial: return render('compare/compare_cs.html') - if not bundle_compare and c.cs_ranges: - # 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 - other_ref = ('rev', c.cs_ranges[-1].parents[0].raw_id) - other_repo = org_repo - c.org_ref = org_ref[1] c.other_ref = other_ref[1] - _diff = diffs.differ(other_repo, other_ref, org_repo, org_ref, - discovery_data, bundle_compare=bundle_compare) - diff_processor = diffs.DiffProcessor(_diff, format='gitdiff') + if not incoming_changesets and c.cs_ranges and c.org_repo != c.other_repo: + # 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 + _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)) + other_repo = org_repo + + diff_limit = self.cut_off_limit if not fulldiff else None + + _diff = diffs.differ(org_repo, org_ref, other_repo, other_ref, + discovery_data, + remote_compare=incoming_changesets) + + 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, diff_lines=[f]) + 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')