kallithea Changeset - e14bbd6caa34

Changeset - e14bbd6caa34

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Mads Kiilerich - 12 years ago 2013-06-28 11:50:13
madski@unity3d.com

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

1 file changed with 5 insertions and 3 deletions:

kallithea/controllers/compare.py

0 comments (0 inline, 0 general)

kallithea/controllers/compare.py

➞

Show inline comments

@@ @@ -262,27 +262,29 @@ class CompareController(BaseRepoControll @@
         c.cs_ranges, c.ancestor = self._get_changesets(
             org_repo.scm_instance.alias, org_repo.scm_instance, c.org_rev,
             other_repo.scm_instance, c.other_rev, merge)
         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:
             assert merge
             # case we want a simple diff without incoming changesets,
             # previewing what will be merged.
             # Make the diff on the other repo (which is known to have other_rev)
             log.debug('Using ancestor %s as rev1 instead of %s'
                       % (c.ancestor, c.org_rev))
             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
         log.debug('running diff between %s and %s in %s'
                   % (rev1, c.other_rev, org_repo.scm_instance.path))

0 comments (0 inline, 0 general)