diffs: add repo_name as parameter of diffset - fixes bug

where comparing different target/source repos had wrong diff links

rhodecode/controllers/changeset.py

@@ -260,6 +260,7 b' class ChangesetController(BaseRepoContro'
                     return get_node
 
                 diffset = codeblocks.DiffSet(
+                    repo_name=c.repo_name,
                     source_node_getter=_node_getter(commit1),
                     target_node_getter=_node_getter(commit2),
                 ).render_patchset(_parsed, commit1.raw_id, commit2.raw_id)

rhodecode/controllers/compare.py

@@ -254,6 +254,7 b' class CompareController(BaseRepoControll'
             return get_node
 
         c.diffset = codeblocks.DiffSet(
+            repo_name=source_repo.repo_name,
             source_node_getter=_node_getter(source_commit),
             target_node_getter=_node_getter(target_commit),
         ).render_patchset(_parsed, source_ref, target_ref)

rhodecode/lib/codeblocks.py

@@ -352,7 +352,7 b' class DiffSet(object):'
                      # in the case of multiline code
     HL_NONE = 'NONE' # no highlighting, fastest
 
-    def __init__(self, highlight_mode=HL_REAL,
+    def __init__(self, highlight_mode=HL_REAL, repo_name=None,
                  source_node_getter=lambda filename: None,
                  target_node_getter=lambda filename: None,
                  source_nodes=None, target_nodes=None,
@@ -366,7 +366,7 b' class DiffSet(object):'
         self.target_node_getter = target_node_getter
         self.source_nodes = source_nodes or {}
         self.target_nodes = target_nodes or {}
-
+        self.repo_name = repo_name
 
         self.max_file_size_limit = max_file_size_limit
 
@@ -377,6 +377,7 b' class DiffSet(object):'
             changed_files=0,
             files=[],
             limited_diff=isinstance(patchset, LimitedDiffContainer),
+            repo_name=self.repo_name,
             source_ref=source_ref,
             target_ref=target_ref,
         ))

rhodecode/templates/codeblocks/diffs.html

@@ -65,7 +65,7 b' collapse_all = len(diffset.files) > coll'
     <div class="diffset-heading ${diffset.limited_diff and 'diffset-heading-warning' or ''}">
         %if commit:
             <div class="pull-right">
-                <a class="btn tooltip" title="${_('Browse Files at revision {}').format(commit.raw_id)}" href="${h.url('files_home',repo_name=c.repo_name, revision=commit.raw_id, f_path='')}">
+                <a class="btn tooltip" title="${_('Browse Files at revision {}').format(commit.raw_id)}" href="${h.url('files_home',repo_name=diffset.repo_name, revision=commit.raw_id, f_path='')}">
                     ${_('Browse Files')}
                 </a>
             </div>
@@ -256,7 +256,7 b' from rhodecode.lib.diffs import NEW_FILE'
     %if filediff.patch['operation'] in ['D', 'M']:
         <a
             class="tooltip"
-            href="${h.url('files_home',repo_name=c.repo_name,f_path=filediff.source_file_path,revision=filediff.diffset.source_ref)}"
+            href="${h.url('files_home',repo_name=filediff.diffset.repo_name,f_path=filediff.source_file_path,revision=filediff.diffset.source_ref)}"
             title="${h.tooltip(_('Show file at commit: %(commit_id)s') % {'commit_id': filediff.diffset.source_ref[:12]})}"
         >
             ${_('Show file before')}
@@ -272,7 +272,7 b' from rhodecode.lib.diffs import NEW_FILE'
     %if filediff.patch['operation'] in ['A', 'M']:
         <a
             class="tooltip"
-            href="${h.url('files_home',repo_name=c.repo_name,f_path=filediff.target_file_path,revision=filediff.diffset.target_ref)}"
+            href="${h.url('files_home',repo_name=filediff.diffset.repo_name,f_path=filediff.target_file_path,revision=filediff.diffset.target_ref)}"
             title="${h.tooltip(_('Show file at commit: %(commit_id)s') % {'commit_id': filediff.diffset.target_ref[:12]})}"
         >
             ${_('Show file after')}
@@ -288,14 +288,14 b' from rhodecode.lib.diffs import NEW_FILE'
         <a
             class="tooltip"
             title="${h.tooltip(_('Raw diff'))}"
-            href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=filediff.target_file_path,diff2=filediff.diffset.target_ref,diff1=filediff.diffset.source_ref,diff='raw')}"
+            href="${h.url('files_diff_home',repo_name=filediff.diffset.repo_name,f_path=filediff.target_file_path,diff2=filediff.diffset.target_ref,diff1=filediff.diffset.source_ref,diff='raw')}"
         >
             ${_('Raw diff')}
         </a>
         <a
             class="tooltip"
             title="${h.tooltip(_('Download diff'))}"
-            href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=filediff.target_file_path,diff2=filediff.diffset.target_ref,diff1=filediff.diffset.source_ref,diff='download')}"
+            href="${h.url('files_diff_home',repo_name=filediff.diffset.repo_name,f_path=filediff.target_file_path,diff2=filediff.diffset.target_ref,diff1=filediff.diffset.source_ref,diff='download')}"
         >
             ${_('Download diff')}
         </a>