# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 2014-08-21 23:46:55
# Node ID d6e96730edfb41b4bebaba43cdd89d328fb4d897
# Parent  6cb077e99873bdce8bbd9b51948cd2bdfa478fa9

diff: consistently use a=base=ancestor and b=changes in compare and PR

Some additional fixes to the previous change.

diff --git a/kallithea/controllers/compare.py b/kallithea/controllers/compare.py
--- a/kallithea/controllers/compare.py
+++ b/kallithea/controllers/compare.py
@@ -215,13 +215,12 @@ class CompareController(BaseRepoControll
 
         c.compare_home = False
         c.a_repo = org_repo
+        c.a_ref_name = org_ref_name
+        c.a_ref_type = org_ref_type
         c.cs_repo = other_repo
-        c.a_ref_name = org_ref_name
         c.cs_ref_name = other_ref_name
-        c.a_ref_type = org_ref_type
         c.cs_ref_type = other_ref_type
 
-        c.cs_repo = other_repo
         c.cs_ranges, c.cs_ranges_org, c.ancestor = self._get_changesets(
             org_repo.scm_instance.alias, org_repo.scm_instance, c.a_rev,
             other_repo.scm_instance, c.cs_rev)
diff --git a/kallithea/templates/changeset/diff_block.html b/kallithea/templates/changeset/diff_block.html
--- a/kallithea/templates/changeset/diff_block.html
+++ b/kallithea/templates/changeset/diff_block.html
@@ -80,9 +80,9 @@
                     ${_('Added')}
                     <a class="spantag" href="${h.url('files_home', repo_name=c.cs_repo.repo_name, f_path=filenode_path, revision=c.cs_rev)}">${h.short_id(c.cs_ref_name) if c.cs_ref_type=='rev' else c.cs_ref_name}</a>
                   %elif op == 'M':
-                    <a class="spantag" href="${h.url('files_home', repo_name=c.cs_repo.repo_name, f_path=filenode_path, revision=c.cs_rev)}">${h.short_id(c.cs_ref_name) if c.cs_ref_type=='rev' else c.cs_ref_name}</a>
+                    <a class="spantag" href="${h.url('files_home', repo_name=c.a_repo.repo_name, f_path=filenode_path, revision=c.a_rev)}">${h.short_id(c.a_ref_name) if c.a_ref_type=='rev' else c.a_ref_name}</a>
                     <i class="icon-arrow-right"></i>
-                    <a class="spantag" href="${h.url('files_home', repo_name=c.a_repo.repo_name, f_path=filenode_path, revision=c.a_rev)}">${h.short_id(c.a_ref_name) if c.a_ref_type=='rev' else c.a_ref_name}</a>
+                    <a class="spantag" href="${h.url('files_home', repo_name=c.cs_repo.repo_name, f_path=filenode_path, revision=c.cs_rev)}">${h.short_id(c.cs_ref_name) if c.cs_ref_type=='rev' else c.cs_ref_name}</a>
                   %elif op == 'D':
                     ${_('Deleted')}
                     <a class="spantag" href="${h.url('files_home', repo_name=c.a_repo.repo_name, f_path=filenode_path, revision=c.a_rev)}">${h.short_id(c.a_ref_name) if c.a_ref_type=='rev' else c.a_ref_name}</a>
diff --git a/kallithea/templates/compare/compare_cs.html b/kallithea/templates/compare/compare_cs.html
--- a/kallithea/templates/compare/compare_cs.html
+++ b/kallithea/templates/compare/compare_cs.html
@@ -83,7 +83,7 @@
         ${_('is')}
         <a href="${c.swap_url}">${_('%s changesets') % (len(c.cs_ranges_org))}</a>
         ${_('behind')}
-        ${h.link_to_ref(c.a_repo.repo_name, c.a_ref_type, c.a_ref_name, c.a_rev)}
+        ${h.link_to_ref(c.a_repo.repo_name, c.a_ref_type, c.a_ref_name)}
       </div>
     %endif
   %endif