pull-requests: allow to show range diff in pr view

rhodecode/apps/_base/__init__.py

@@ -303,7 +303,8 b' class PathFilter(object):'
 
     def render_patchset_filtered(self, diffset, patchset, source_ref=None, target_ref=None):
         filtered_patchset, has_hidden_changes = self.filter_patchset(patchset)
-        result = diffset.render_patchset(filtered_patchset, source_ref=source_ref, target_ref=target_ref)
+        result = diffset.render_patchset(
+            filtered_patchset, source_ref=source_ref, target_ref=target_ref)
         result.has_hidden_changes = has_hidden_changes
         return result
 

rhodecode/apps/repository/tests/test_repo_commit_comments.py

@@ -135,12 +135,18 b' class TestRepoCommitCommentsView(TestCon'
         if backend.alias == 'svn':
             response.mustcontain(
                 '''data-f-path="vcs/commands/summary.py" '''
-                '''id="a_c--ad05457a43f8"'''
+                '''id="a_c-300-ad05457a43f8"'''
             )
-        else:
+        if backend.alias == 'git':
             response.mustcontain(
                 '''data-f-path="vcs/backends/hg.py" '''
-                '''id="a_c--9c390eb52cd6"'''
+                '''id="a_c-883e775e89ea-9c390eb52cd6"'''
+            )
+
+        if backend.alias == 'hg':
+            response.mustcontain(
+                '''data-f-path="vcs/backends/hg.py" '''
+                '''id="a_c-e58d85a3973b-9c390eb52cd6"'''
             )
 
         assert Notification.query().count() == 1

rhodecode/apps/repository/tests/test_repo_compare.py

@@ -105,10 +105,8 b' class TestCompareView(object):'
         response = self.app.get(
             route_path('repo_compare',
                 repo_name=origin.repo_name,
-                source_ref_type="rev",
-                source_ref=commit3.raw_id,
-                target_ref_type="rev",
-                target_ref=commit4.raw_id,
+                       source_ref_type="rev", source_ref=commit3.raw_id,
+                       target_ref_type="rev", target_ref=commit4.raw_id,
                 params=dict(merge='1', target_repo=fork.repo_name)
            ))
 
@@ -143,10 +141,8 b' class TestCompareView(object):'
         response = self.app.get(
             route_path('repo_compare',
                 repo_name=repo1.repo_name,
-                source_ref_type="branch",
-                source_ref=commit_id2,
-                target_ref_type="branch",
-                target_ref=commit_id1,
+                       source_ref_type="branch", source_ref=commit_id2,
+                       target_ref_type="branch", target_ref=commit_id1,
                 params=dict(merge='1', target_repo=repo2.repo_name)
         ))
 
@@ -156,9 +152,9 b' class TestCompareView(object):'
         compare_page = ComparePage(response)
         compare_page.contains_change_summary(1, 2, 0)
         compare_page.contains_commits([commit1, commit2])
-        compare_page.contains_file_links_and_anchors([
-            ('file1', 'a_c--826e8142e6ba'),
-        ])
+
+        anchor = 'a_c-{}-826e8142e6ba'.format(commit0.short_id)
+        compare_page.contains_file_links_and_anchors([('file1', anchor), ])
 
         # Swap is removed when comparing branches since it's a PR feature and
         # it is then a preview mode
@@ -200,10 +196,8 b' class TestCompareView(object):'
         response = self.app.get(
             route_path('repo_compare',
                 repo_name=repo1.repo_name,
-                source_ref_type="branch",
-                source_ref=commit_id2,
-                target_ref_type="branch",
-                target_ref=commit_id1,
+                       source_ref_type="branch", source_ref=commit_id2,
+                       target_ref_type="branch", target_ref=commit_id1,
                 params=dict(merge='1', target_repo=repo2.repo_name),
             ))
 
@@ -213,9 +207,8 b' class TestCompareView(object):'
         compare_page = ComparePage(response)
         compare_page.contains_change_summary(1, 2, 0)
         compare_page.contains_commits([commit1, commit2])
-        compare_page.contains_file_links_and_anchors([
-            ('file1', 'a_c--826e8142e6ba'),
-        ])
+        anchor = 'a_c-{}-826e8142e6ba'.format(commit0.short_id)
+        compare_page.contains_file_links_and_anchors([('file1', anchor), ])
 
         # Swap is removed when comparing branches since it's a PR feature and
         # it is then a preview mode
@@ -231,10 +224,8 b' class TestCompareView(object):'
         response = self.app.get(
             route_path('repo_compare',
                 repo_name=orig.repo_name,
-                source_ref_type="rev",
-                source_ref="tip",
-                target_ref_type="rev",
-                target_ref="tip",
+                       source_ref_type="rev", source_ref="tip",
+                       target_ref_type="rev", target_ref="tip",
                 params=dict(merge='1', target_repo=fork.repo_name),
             ),
             status=302)
@@ -290,11 +281,9 b' class TestCompareView(object):'
         response = self.app.get(
             route_path('repo_compare',
                 repo_name=repo2.repo_name,
-                source_ref_type="rev",
                 # parent of commit2, in target repo2
-                source_ref=commit1.raw_id,
-                target_ref_type="rev",
-                target_ref=commit4.raw_id,
+                       source_ref_type="rev", source_ref=commit1.raw_id,
+                       target_ref_type="rev", target_ref=commit4.raw_id,
                 params=dict(merge='1', target_repo=repo1.repo_name),
             ))
         response.mustcontain('%s@%s' % (repo2.repo_name, commit1.short_id))
@@ -304,9 +293,8 b' class TestCompareView(object):'
         compare_page = ComparePage(response)
         compare_page.contains_change_summary(1, 3, 0)
         compare_page.contains_commits([commit2, commit3, commit4])
-        compare_page.contains_file_links_and_anchors([
-            ('file1', 'a_c--826e8142e6ba'),
-        ])
+        anchor = 'a_c-{}-826e8142e6ba'.format(commit1.short_id)
+        compare_page.contains_file_links_and_anchors([('file1', anchor),])
 
     @pytest.mark.xfail_backends("svn")
     def test_compare_cherry_pick_commits_from_top(self, backend):
@@ -356,13 +344,10 b' class TestCompareView(object):'
         response = self.app.get(
             route_path('repo_compare',
                 repo_name=repo1.repo_name,
-                source_ref_type="rev",
                 # parent of commit3, not in source repo2
-                source_ref=commit2.raw_id,
-                target_ref_type="rev",
-                target_ref=commit5.raw_id,
-                params=dict(merge='1'),
-        ))
+                       source_ref_type="rev", source_ref=commit2.raw_id,
+                       target_ref_type="rev", target_ref=commit5.raw_id,
+                       params=dict(merge='1'),))
 
         response.mustcontain('%s@%s' % (repo1.repo_name, commit2.short_id))
         response.mustcontain('%s@%s' % (repo1.repo_name, commit5.short_id))
@@ -372,9 +357,8 b' class TestCompareView(object):'
         compare_page.contains_commits([commit3, commit4, commit5])
 
         # files
-        compare_page.contains_file_links_and_anchors([
-            ('file1', 'a_c--826e8142e6ba'),
-        ])
+        anchor = 'a_c-{}-826e8142e6ba'.format(commit2.short_id)
+        compare_page.contains_file_links_and_anchors([('file1', anchor),])
 
     @pytest.mark.xfail_backends("svn")
     def test_compare_remote_branches(self, backend):
@@ -382,15 +366,15 b' class TestCompareView(object):'
         repo2 = backend.create_fork()
 
         commit_id1 = repo1.get_commit(commit_idx=3).raw_id
+        commit_id1_short = repo1.get_commit(commit_idx=3).short_id
         commit_id2 = repo1.get_commit(commit_idx=6).raw_id
+        commit_id2_short = repo1.get_commit(commit_idx=6).short_id
 
         response = self.app.get(
             route_path('repo_compare',
                 repo_name=repo1.repo_name,
-                source_ref_type="rev",
-                source_ref=commit_id1,
-                target_ref_type="rev",
-                target_ref=commit_id2,
+                       source_ref_type="rev", source_ref=commit_id1,
+                       target_ref_type="rev", target_ref=commit_id2,
                 params=dict(merge='1', target_repo=repo2.repo_name),
             ))
 
@@ -405,9 +389,9 b' class TestCompareView(object):'
 
         # files
         compare_page.contains_file_links_and_anchors([
-            ('vcs/backends/hg.py', 'a_c--9c390eb52cd6'),
-            ('vcs/backends/__init__.py', 'a_c--41b41c1f2796'),
-            ('vcs/backends/base.py', 'a_c--2f574d260608'),
+            ('vcs/backends/hg.py', 'a_c-{}-9c390eb52cd6'.format(commit_id2_short)),
+            ('vcs/backends/__init__.py', 'a_c-{}-41b41c1f2796'.format(commit_id1_short)),
+            ('vcs/backends/base.py', 'a_c-{}-2f574d260608'.format(commit_id1_short)),
         ])
 
     @pytest.mark.xfail_backends("svn")
@@ -452,10 +436,8 b' class TestCompareView(object):'
         response = self.app.get(
             route_path('repo_compare',
                 repo_name=r2_name,
-                source_ref_type="branch",
-                source_ref=commit_id1,
-                target_ref_type="branch",
-                target_ref=commit_id2,
+                       source_ref_type="branch", source_ref=commit_id1,
+                       target_ref_type="branch", target_ref=commit_id2,
                 params=dict(merge='1', target_repo=r1_name),
             ))
 
@@ -473,10 +455,8 b' class TestCompareView(object):'
         response = self.app.get(
             route_path('repo_compare',
                 repo_name=r2_name,
-                source_ref_type="branch",
-                source_ref=commit_id1,
-                target_ref_type="branch",
-                target_ref=commit_id2,
+                       source_ref_type="branch", source_ref=commit_id1,
+                       target_ref_type="branch", target_ref=commit_id2,
                 params=dict(merge='1', target_repo=r1_name),
             ))
 
@@ -496,10 +476,8 b' class TestCompareView(object):'
         response = self.app.get(
             route_path('repo_compare',
                 repo_name=backend.repo_name,
-                source_ref_type="rev",
-                source_ref=commit0.raw_id,
-                target_ref_type="rev",
-                target_ref=commit1.raw_id,
+                       source_ref_type="rev", source_ref=commit0.raw_id,
+                       target_ref_type="rev", target_ref=commit1.raw_id,
                 params=dict(merge='1')
             ),
             extra_environ=xhr_header,)
@@ -515,10 +493,8 b' class TestCompareView(object):'
         response = self.app.get(
             route_path('repo_compare',
                 repo_name=badrepo,
-                source_ref_type="rev",
-                source_ref='tip',
-                target_ref_type="rev",
-                target_ref='tip',
+                       source_ref_type="rev", source_ref='tip',
+                       target_ref_type="rev", target_ref='tip',
                 params=dict(merge='1', target_repo=repo.repo_name)
             ),
             status=404)
@@ -530,10 +506,8 b' class TestCompareView(object):'
         response = self.app.get(
             route_path('repo_compare',
                 repo_name=repo.repo_name,
-                source_ref_type="rev",
-                source_ref='tip',
-                target_ref_type="rev",
-                target_ref='tip',
+                       source_ref_type="rev", source_ref='tip',
+                       target_ref_type="rev", target_ref='tip',
                 params=dict(merge='1', target_repo=badrepo),
             ),
             status=302)
@@ -548,10 +522,8 b' class TestCompareView(object):'
         response = self.app.get(
             route_path('repo_compare',
                 repo_name=backend_stub.repo_name,
-                source_ref_type="rev",
-                source_ref=commit0.raw_id,
-                target_ref_type="rev",
-                target_ref=commit1.raw_id,
+                       source_ref_type="rev", source_ref=commit0.raw_id,
+                       target_ref_type="rev", target_ref=commit1.raw_id,
             ))
 
         # outgoing commits between those commits
@@ -576,10 +548,8 b' class TestCompareView(object):'
             response = self.app.get(
                 route_path('repo_compare',
                     repo_name=orig.repo_name,
-                    source_ref_type="rev",
-                    source_ref="tip",
-                    target_ref_type="rev",
-                    target_ref="tip",
+                           source_ref_type="rev", source_ref="tip",
+                           target_ref_type="rev", target_ref="tip",
                     params=dict(merge='1', target_repo=fork.repo_name),
                 ),
                 status=302)
@@ -694,4 +664,3 b' class ComparePage(AssertResponse):'
     def target_source_are_enabled(self):
         response = self.response
         response.mustcontain("var enable_fields = true;")
-

rhodecode/apps/repository/tests/test_repo_compare_local.py

@@ -47,10 +47,8 b' class TestCompareView(object):'
             route_path(
                 'repo_compare',
                 repo_name=backend.repo_name,
-                source_ref_type="tag",
-                source_ref=tag1,
-                target_ref_type="tag",
-                target_ref=tag2),
+                source_ref_type="tag", source_ref=tag1,
+                target_ref_type="tag", target_ref=tag2),
             status=200)
 
         response.mustcontain('%s@%s' % (backend.repo_name, tag1))
@@ -69,18 +67,28 b' class TestCompareView(object):'
         compare_page.contains_commits(commits)
 
         # files diff
+        short_id = short_id_new = ''
+        if backend.alias == 'git':
+            short_id = '5a3a8fb00555'
+            short_id_new = '0ba5f8a46600'
+        if backend.alias == 'hg':
+            short_id = '17544fbfcd33'
+            short_id_new = 'a7e60bff65d5'
+
         compare_page.contains_file_links_and_anchors([
-            ('docs/api/utils/index.rst', 'a_c--1c5cf9e91c12'),
-            ('test_and_report.sh', 'a_c--e3305437df55'),
-            ('.hgignore', 'a_c--c8e92ef85cd1'),
-            ('.hgtags', 'a_c--6e08b694d687'),
-            ('docs/api/index.rst', 'a_c--2c14b00f3393'),
-            ('vcs/__init__.py', 'a_c--430ccbc82bdf'),
-            ('vcs/backends/hg.py', 'a_c--9c390eb52cd6'),
-            ('vcs/utils/__init__.py', 'a_c--ebb592c595c0'),
-            ('vcs/utils/annotate.py', 'a_c--7abc741b5052'),
-            ('vcs/utils/diffs.py', 'a_c--2ef0ef106c56'),
-            ('vcs/utils/lazy.py', 'a_c--3150cb87d4b7'),
+            # modified
+            ('docs/api/utils/index.rst', 'a_c-{}-1c5cf9e91c12'.format(short_id)),
+            ('test_and_report.sh', 'a_c-{}-e3305437df55'.format(short_id)),
+            # added
+            ('.hgignore', 'a_c-{}-c8e92ef85cd1'.format(short_id_new)),
+            ('.hgtags', 'a_c-{}-6e08b694d687'.format(short_id_new)),
+            ('docs/api/index.rst', 'a_c-{}-2c14b00f3393'.format(short_id_new)),
+            ('vcs/__init__.py', 'a_c-{}-430ccbc82bdf'.format(short_id_new)),
+            ('vcs/backends/hg.py', 'a_c-{}-9c390eb52cd6'.format(short_id_new)),
+            ('vcs/utils/__init__.py', 'a_c-{}-ebb592c595c0'.format(short_id_new)),
+            ('vcs/utils/annotate.py', 'a_c-{}-7abc741b5052'.format(short_id_new)),
+            ('vcs/utils/diffs.py', 'a_c-{}-2ef0ef106c56'.format(short_id_new)),
+            ('vcs/utils/lazy.py', 'a_c-{}-3150cb87d4b7'.format(short_id_new)),
         ])
 
     @pytest.mark.xfail_backends("svn", msg="Depends on branch and tag support")
@@ -106,10 +114,8 b' class TestCompareView(object):'
             route_path(
             'repo_compare',
             repo_name=backend.repo_name,
-            source_ref_type='branch',
-            source_ref=data['branch'],
-            target_ref_type="tag",
-            target_ref=data['tag'],
+                source_ref_type='branch', source_ref=data['branch'],
+                target_ref_type="tag", target_ref=data['tag'],
             ))
 
         response.mustcontain('%s@%s' % (backend.repo_name, data['branch']))
@@ -123,10 +129,8 b' class TestCompareView(object):'
             route_path(
             'repo_compare',
             repo_name=backend.repo_name,
-            source_ref_type="branch",
-            source_ref=head_id,
-            target_ref_type="branch",
-            target_ref=head_id,
+                source_ref_type="branch", source_ref=head_id,
+                target_ref_type="branch", target_ref=head_id,
             ))
 
         response.mustcontain('%s@%s' % (backend.repo_name, head_id))
@@ -138,16 +142,16 b' class TestCompareView(object):'
     def test_compare_commits(self, backend):
         repo = backend.repo
         commit1 = repo.get_commit(commit_idx=0)
+        commit1_short_id = commit1.short_id
         commit2 = repo.get_commit(commit_idx=1)
+        commit2_short_id = commit2.short_id
 
         response = self.app.get(
             route_path(
             'repo_compare',
             repo_name=backend.repo_name,
-            source_ref_type="rev",
-            source_ref=commit1.raw_id,
-            target_ref_type="rev",
-            target_ref=commit2.raw_id,
+                source_ref_type="rev", source_ref=commit1.raw_id,
+                target_ref_type="rev", target_ref=commit2.raw_id,
             ))
         response.mustcontain('%s@%s' % (backend.repo_name, commit1.raw_id))
         response.mustcontain('%s@%s' % (backend.repo_name, commit2.raw_id))
@@ -158,6 +162,6 b' class TestCompareView(object):'
 
         # outgoing commits between those commits
         compare_page.contains_commits([commit2])
-        compare_page.contains_file_links_and_anchors([
-            ('.hgignore', 'a_c--c8e92ef85cd1'),
-        ])
+        anchor = 'a_c-{}-c8e92ef85cd1'.format(commit2_short_id)
+        response.mustcontain(anchor)
+        compare_page.contains_file_links_and_anchors([('.hgignore', anchor),])

rhodecode/apps/repository/tests/test_repo_pullrequests.py

@@ -81,20 +81,21 b' class TestPullrequestsView(object):'
         repo = backend.repo
 
         self.app.get(
-            route_path('pullrequest_new',
-                repo_name=repo.repo_name,
+            route_path('pullrequest_new', repo_name=repo.repo_name,
                 commit=repo.get_commit().raw_id),
             status=200)
 
     @pytest.mark.parametrize('pr_merge_enabled', [True, False])
-    def test_show(self, pr_util, pr_merge_enabled):
+    @pytest.mark.parametrize('range_diff', ["0", "1"])
+    def test_show(self, pr_util, pr_merge_enabled, range_diff):
         pull_request = pr_util.create_pull_request(
             mergeable=pr_merge_enabled, enable_notifications=False)
 
         response = self.app.get(route_path(
             'pullrequest_show',
             repo_name=pull_request.target_repo.scm_instance().name,
-            pull_request_id=pull_request.pull_request_id))
+            pull_request_id=pull_request.pull_request_id,
+            params={'range-diff': range_diff}))
 
         for commit_id in pull_request.revisions:
             response.mustcontain(commit_id)
@@ -105,9 +106,13 b' class TestPullrequestsView(object):'
         assert target_clone_url in response
 
         assert 'class="pull-request-merge"' in response
-        assert (
-            'Server-side pull request merging is disabled.'
-            in response) != pr_merge_enabled
+        if pr_merge_enabled:
+            response.mustcontain('Pull request reviewer approval is pending')
+        else:
+            response.mustcontain('Server-side pull request merging is disabled.')
+
+        if range_diff == "1":
+            response.mustcontain('Turn off: Show the diff as commit range')
 
     def test_close_status_visibility(self, pr_util, user_util, csrf_token):
         # Logout

rhodecode/apps/repository/views/repo_commits.py

@@ -245,7 +245,7 b' class RepoCommitsView(RepoAppView):'
             c.changes[commit.raw_id] = []
 
             commit2 = commit
-            commit1 = commit.parents[0] if commit.parents else EmptyCommit()
+            commit1 = commit.first_parent
 
             if method == 'show':
                 inline_comments = CommentsModel().get_inline_comments(

rhodecode/apps/repository/views/repo_pull_requests.py

@@ -138,6 +138,13 b' class RepoPullRequestsView(RepoAppView, '
         })
         return data
 
+    def get_recache_flag(self):
+        for flag_name in ['force_recache', 'force-recache', 'no-cache']:
+            flag_val = self.request.GET.get(flag_name)
+            if str2bool(flag_val):
+                return True
+        return False
+
     @LoginRequired()
     @HasRepoPermissionAnyDecorator(
         'repository.read', 'repository.write', 'repository.admin')
@@ -234,6 +241,30 b' class RepoPullRequestsView(RepoAppView, '
 
         return diffset
 
+    def _get_range_diffset(self, source_scm, source_repo,
+                           commit1, commit2, diff_limit, file_limit,
+                           fulldiff, ign_whitespace_lcl, context_lcl):
+        vcs_diff = source_scm.get_diff(
+            commit1, commit2,
+            ignore_whitespace=ign_whitespace_lcl,
+            context=context_lcl)
+
+        diff_processor = diffs.DiffProcessor(
+            vcs_diff, format='newdiff', diff_limit=diff_limit,
+            file_limit=file_limit, show_full_diff=fulldiff)
+
+        _parsed = diff_processor.prepare()
+
+        diffset = codeblocks.DiffSet(
+            repo_name=source_repo.repo_name,
+            source_node_getter=codeblocks.diffset_node_getter(commit1),
+            target_node_getter=codeblocks.diffset_node_getter(commit2))
+
+        diffset = self.path_filter.render_patchset_filtered(
+            diffset, _parsed, commit1.raw_id, commit2.raw_id)
+
+        return diffset
+
     @LoginRequired()
     @HasRepoPermissionAnyDecorator(
         'repository.read', 'repository.write', 'repository.admin')
@@ -265,6 +296,9 b' class RepoPullRequestsView(RepoAppView, '
                 pull_request_id=pull_request_id))
 
         versions = pull_request_display_obj.versions()
+        # used to store per-commit range diffs
+        c.changes = collections.OrderedDict()
+        c.range_diff_on = self.request.GET.get('range-diff') == "1"
 
         c.at_version = at_version
         c.at_version_num = (at_version
@@ -453,14 +487,13 b' class RepoPullRequestsView(RepoAppView, '
         version_normalized = version or 'latest'
         from_version_normalized = from_version or 'latest'
 
-        cache_path = self.rhodecode_vcs_repo.get_create_shadow_cache_pr_path(
-            target_repo)
+        cache_path = self.rhodecode_vcs_repo.get_create_shadow_cache_pr_path(target_repo)
         cache_file_path = diff_cache_exist(
             cache_path, 'pull_request', pull_request_id, version_normalized,
             from_version_normalized, source_ref_id, target_ref_id, c.fulldiff)
 
         caching_enabled = self._is_diff_cache_enabled(c.target_repo)
-        force_recache = str2bool(self.request.GET.get('force_recache'))
+        force_recache = self.get_recache_flag()
 
         cached_diff = None
         if caching_enabled:
@@ -471,7 +504,8 b' class RepoPullRequestsView(RepoAppView, '
                 and len(cached_diff.get('commits', [])) == 5
                 and cached_diff.get('commits')[0]
                 and cached_diff.get('commits')[3])
-        if not force_recache and has_proper_commit_cache:
+
+        if not force_recache and not c.range_diff_on and has_proper_commit_cache:
             diff_commit_cache = \
                 (ancestor_commit, commit_cache, missing_requirements,
                  source_commit, target_commit) = cached_diff['commits']
@@ -546,8 +580,41 b' class RepoPullRequestsView(RepoAppView, '
                     c.deleted_files_comments[fname]['stats'] = 0
                     c.deleted_files_comments[fname]['comments'] = list()
                     for lno, comments in per_line_comments.items():
-                        c.deleted_files_comments[fname]['comments'].extend(
-                            comments)
+                        c.deleted_files_comments[fname]['comments'].extend(comments)
+
+            # maybe calculate the range diff
+            if c.range_diff_on:
+                # TODO(marcink): set whitespace/context
+                context_lcl = 3
+                ign_whitespace_lcl = False
+
+                for commit in c.commit_ranges:
+                    commit2 = commit
+                    commit1 = commit.first_parent
+
+                    range_diff_cache_file_path = diff_cache_exist(
+                        cache_path, 'diff', commit.raw_id,
+                        ign_whitespace_lcl, context_lcl, c.fulldiff)
+
+                    cached_diff = None
+                    if caching_enabled:
+                        cached_diff = load_cached_diff(range_diff_cache_file_path)
+
+                    has_proper_diff_cache = cached_diff and cached_diff.get('diff')
+                    if not force_recache and has_proper_diff_cache:
+                        diffset = cached_diff['diff']
+                    else:
+                        diffset = self._get_range_diffset(
+                            source_scm, source_repo,
+                            commit1, commit2, diff_limit, file_limit,
+                            c.fulldiff, ign_whitespace_lcl, context_lcl
+                        )
+
+                    # save cached diff
+                    if caching_enabled:
+                        cache_diff(range_diff_cache_file_path, diffset, None)
+
+                    c.changes[commit.raw_id] = diffset
 
         # this is a hack to properly display links, when creating PR, the
         # compare view and others uses different notation, and
@@ -607,7 +674,7 b' class RepoPullRequestsView(RepoAppView, '
         commit_cache = collections.OrderedDict()
         missing_requirements = False
         try:
-            pre_load = ["author", "branch", "date", "message"]
+            pre_load = ["author", "branch", "date", "message", "parents"]
             show_revs = pull_request_at_ver.revisions
             for rev in show_revs:
                 comm = commits_source_repo.get_commit(

rhodecode/lib/codeblocks.py

@@ -469,6 +469,13 b' class DiffSet(object):'
 
         source_file = self.source_nodes.get(source_filename, source_filename)
         target_file = self.target_nodes.get(target_filename, target_filename)
+        raw_id_uid = ''
+        if self.source_nodes.get(source_filename):
+            raw_id_uid = self.source_nodes[source_filename].commit.raw_id
+
+        if not raw_id_uid and self.target_nodes.get(target_filename):
+            # in case this is a new file we only have it in target
+            raw_id_uid = self.target_nodes[target_filename].commit.raw_id
 
         source_filenode, target_filenode = None, None
 
@@ -512,7 +519,9 b' class DiffSet(object):'
             'hunks': [],
             'hunk_ops': None,
             'diffset': self,
+            'raw_id': raw_id_uid,
         })
+
         file_chunks = patch['chunks'][1:]
         for hunk in file_chunks:
             hunkbit = self.parse_hunk(hunk, source_file, target_file)

rhodecode/lib/vcs/backends/base.py

@@ -821,6 +821,13 b' class BaseCommit(object):'
         """
         raise NotImplementedError
 
+    @LazyProperty
+    def first_parent(self):
+        """
+        Returns list of parent commits.
+        """
+        return self.parents[0] if self.parents else EmptyCommit()
+
     @property
     def merge(self):
         """
@@ -1099,8 +1106,7 b' class BaseCommit(object):'
         """
         Returns a `Diff` object representing the change made by this commit.
         """
-        parent = (
-            self.parents[0] if self.parents else self.repository.EMPTY_COMMIT)
+        parent = self.first_parent
         diff = self.repository.get_diff(
             parent, self,
             ignore_whitespace=ignore_whitespace,

rhodecode/templates/codeblocks/diffs.mako

@@ -47,7 +47,7 b" return '%s_%s_%i' % (h.safeid(filename),"
     deleted_files_comments=None,
 
     # for cache purpose
-    inline_comments=None
+    inline_comments=None,
 
 )">
 %if use_comments:
@@ -118,7 +118,7 b' collapse_all = len(diffset.files) > coll'
         <h2 class="clearinner">
         ## invidual commit
         % if commit:
-            <a class="tooltip revision" title="${h.tooltip(commit.message)}" href="${h.route_path('repo_commit',repo_name=c.repo_name,commit_id=commit.raw_id)}">${('r%s:%s' % (commit.idx,h.short_id(commit.raw_id)))}</a> -
+            <a class="tooltip revision" title="${h.tooltip(commit.message)}" href="${h.route_path('repo_commit',repo_name=diffset.repo_name,commit_id=commit.raw_id)}">${('r%s:%s' % (commit.idx,h.short_id(commit.raw_id)))}</a> -
             ${h.age_component(commit.date)}
             % if diffset.limited_diff:
                 - ${_('The requested commit is too big and content was truncated.')}
@@ -158,7 +158,7 b' collapse_all = len(diffset.files) > coll'
         <div
             class="filediff"
             data-f-path="${filediff.patch['filename']}"
-            id="a_${h.FID('', filediff.patch['filename'])}"
+            id="a_${h.FID(filediff.raw_id, filediff.patch['filename'])}"
         >
 
         <label for="filediff-collapse-${id(filediff)}" class="filediff-heading">
@@ -290,7 +290,7 b' collapse_all = len(diffset.files) > coll'
         %>
         <div class="filediffs filediff-outdated" style="${display_state}">
             <input ${(collapse_all and 'checked' or '')} class="filediff-collapse-state" id="filediff-collapse-${id(filename)}" type="checkbox">
-            <div class="filediff" data-f-path="${filename}"  id="a_${h.FID('', filename)}">
+            <div class="filediff" data-f-path="${filename}"  id="a_${h.FID(filediff.raw_id, filename)}">
                 <label for="filediff-collapse-${id(filename)}" class="filediff-heading">
                     <div class="filediff-collapse-indicator"></div>
                     <span class="pill">
@@ -301,7 +301,7 b' collapse_all = len(diffset.files) > coll'
                         ## file op, doesn't need translation
                         <span class="pill" op="removed">removed in this version</span>
                     </span>
-                    <a class="pill filediff-anchor" href="#a_${h.FID('', filename)}">¶</a>
+                    <a class="pill filediff-anchor" href="#a_${h.FID(filediff.raw_id, filename)}">¶</a>
                     <span class="pill-group" style="float: right">
                         <span class="pill" op="deleted">-${comments_dict['stats']}</span>
                     </span>
@@ -384,7 +384,7 b' from rhodecode.lib.diffs import NEW_FILE'
         <i style="color: #aaa" class="tooltip icon-clipboard clipboard-action" data-clipboard-text="${final_path}" title="${_('Copy the full path')}" onclick="return false;"></i>
     </span>
     ## anchor link
-    <a class="pill filediff-anchor" href="#a_${h.FID('', filediff.patch['filename'])}">¶</a>
+    <a class="pill filediff-anchor" href="#a_${h.FID(filediff.raw_id, filediff.patch['filename'])}">¶</a>
 
     <span class="pill-group" style="float: right">
 
@@ -493,10 +493,10 b' from rhodecode.lib.diffs import NEW_FILE'
 
         ## TODO: dan: refactor ignorews_url and context_url into the diff renderer same as diffmode=unified/sideside. Also use ajax to load more context (by clicking hunks)
         %if hasattr(c, 'ignorews_url'):
-        ${c.ignorews_url(request, h.FID('', filediff.patch['filename']))}
+        ${c.ignorews_url(request, h.FID(filediff.raw_id, filediff.patch['filename']))}
         %endif
         %if hasattr(c, 'context_url'):
-        ${c.context_url(request, h.FID('', filediff.patch['filename']))}
+        ${c.context_url(request, h.FID(filediff.raw_id, filediff.patch['filename']))}
         %endif
 
         %if use_comments:
@@ -721,7 +721,7 b' def get_comments_for(diff_type, comments'
             <td>unknown diff mode</td>
         </tr>
     % endif
-</%def>
+</%def>file changes
 
 
 <%def name="render_add_comment_button()">
@@ -730,7 +730,7 b' def get_comments_for(diff_type, comments'
 </button>
 </%def>
 
-<%def name="render_diffset_menu(diffset=None)">
+<%def name="render_diffset_menu(diffset=None, range_diff_on=None)">
 
     <div class="diffset-menu clearinner">
         <div class="pull-right">
@@ -747,6 +747,21 b' def get_comments_for(diff_type, comments'
                   title="${h.tooltip(_('View unified'))}" href="${h.current_route_path(request, diffmode='unified')}">
                     <span>${_('Unified')}</span>
                 </a>
+                % if range_diff_on is True:
+                    <a
+                      title="${_('Turn off: Show the diff as commit range')}"
+                      class="btn btn-primary"
+                      href="${h.current_route_path(request, **{"range-diff":"0"})}">
+                        <span>${_('Range Diff')}</span>
+                   </a>
+                % elif range_diff_on is False:
+                    <a
+                      title="${_('Show the diff as commit range')}"
+                      class="btn"
+                      href="${h.current_route_path(request, **{"range-diff":"1"})}">
+                        <span>${_('Range Diff')}</span>
+                   </a>
+                % endif
             </div>
         </div>
 
@@ -834,7 +849,7 b' def get_comments_for(diff_type, comments'
         var preloadData = {
             results: [
                 % for filediff in diffset.files:
-                    {id:"a_${h.FID('', filediff.patch['filename'])}",
+                    {id:"a_${h.FID(filediff.raw_id, filediff.patch['filename'])}",
                      text:"${filediff.patch['filename']}",
                      ops:${h.json.dumps(filediff.patch['stats'])|n}}${('' if loop.last else ',')}
                 % endfor

rhodecode/templates/pullrequests/pullrequest_show.mako

@@ -448,16 +448,6 b''
                               onclick="$('.compare_select').hide();$('.compare_select_hidden').show(); return false">
                               ${_ungettext('Collapse %s commit','Collapse %s commits', len(c.commit_ranges)) % len(c.commit_ranges)}
                           </a>
-                          <%
-                          range_commit_id = '{}...{}'.format(c.commit_ranges[-1].raw_id, c.commit_ranges[0].raw_id)
-                          %>
-                          <a
-                              class="btn"
-                              href="${request.route_path('repo_commit', repo_name=c.source_repo.repo_name, commit_id=range_commit_id)}"
-                              >
-                              ${_('Show range diff')}
-                          </a>
-
                       </div>
                     </div>
 
@@ -578,13 +568,28 b''
 
                 <div class="cs_files">
                     <%namespace name="cbdiffs" file="/codeblocks/diffs.mako"/>
-                    ${cbdiffs.render_diffset_menu(c.diffset)}
+
+                    ${cbdiffs.render_diffset_menu(c.diffset, range_diff_on=c.range_diff_on)}
+
+                    % if c.range_diff_on:
+                        % for commit in c.commit_ranges:
+                            ${cbdiffs.render_diffset(
+                              c.changes[commit.raw_id],
+                              commit=commit, use_comments=True,
+                              collapse_when_files_over=5,
+                              disable_new_comments=True,
+                              deleted_files_comments=c.deleted_files_comments,
+                              inline_comments=c.inline_comments)}
+                        % endfor
+                    % else:
                     ${cbdiffs.render_diffset(
                       c.diffset, use_comments=True,
                       collapse_when_files_over=30,
                       disable_new_comments=not c.allowed_to_comment,
                       deleted_files_comments=c.deleted_files_comments,
                       inline_comments=c.inline_comments)}
+                    % endif
+
                 </div>
               % else:
                   ## skipping commits we need to clear the view for missing commits