# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 2013-06-28 11:50:13
# Node ID e14bbd6caa345fa0a8fee3ac3b40ec4b2cbe3691
# Parent  6c1bd918a78962fae37d2cd6f963b025ea9a01ce

compare: compare without 'merge' cannot span across repos - report error instead of failing

diff --git a/kallithea/controllers/compare.py b/kallithea/controllers/compare.py
--- a/kallithea/controllers/compare.py
+++ b/kallithea/controllers/compare.py
@@ -265,9 +265,6 @@ class CompareController(BaseRepoControll
         c.statuses = c.db_repo.statuses(
             [x.raw_id for x in c.cs_ranges])
 
-        if merge and not c.ancestor:
-            log.error('Unable to find ancestor revision')
-
         if partial:
             return render('compare/compare_cs.html')
         if c.ancestor:
@@ -280,6 +277,11 @@ class CompareController(BaseRepoControll
             rev1 = c.ancestor
             org_repo = other_repo
         else: # comparing tips, not necessarily linearly related
+            if merge:
+                log.error('Unable to find ancestor revision')
+            if org_repo != other_repo:
+                log.error('cannot compare across repos %s and %s', org_repo, other_repo)
+                raise HTTPNotFound
             rev1 = c.org_rev
 
         diff_limit = self.cut_off_limit if not c.fulldiff else None