kallithea Changeset - 16a6a2f5d422

Changeset - 16a6a2f5d422

Parent rev.

Child rev.

[Not reviewed]

beta

0 1 0

Marcin Kuzminski - 13 years ago 2012-07-11 23:24:38
marcin@python-works.com

Add check for existing revisions in compare view

1 file changed with 28 insertions and 0 deletions:

rhodecode/controllers/compare.py

0 comments (0 inline, 0 general)

rhodecode/controllers/compare.py

➞

Show inline comments

@@ @@ -26,13 +26,15 @@ @@
 import logging
 import traceback
 from webob.exc import HTTPNotFound
 from pylons import request, response, session, tmpl_context as c, url
 from pylons.controllers.util import abort, redirect
 from pylons.i18n.translation import _
 from rhodecode.lib.vcs.exceptions import EmptyRepositoryError, RepositoryError
 from rhodecode.lib import helpers as h
 from rhodecode.lib.base import BaseRepoController, render
 from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
 from rhodecode.lib import diffs
 from rhodecode.model.db import Repository
@@ @@ -46,12 +48,35 @@ class CompareController(BaseRepoControll @@
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
                                    'repository.admin')
     def __before__(self):
         super(CompareController, self).__before__()
     def __get_cs_or_redirect(self, rev, repo, redirect_after=True):
         """
         Safe way to get changeset if error occur it redirects to changeset with
         proper message
         :param rev: revision to fetch
         :param repo: repo instance
         """
         try:
             type_, rev = rev
             return repo.scm_instance.get_changeset(rev)
         except EmptyRepositoryError, e:
             if not redirect_after:
                 return None
             h.flash(h.literal(_('There are no changesets yet')),
                     category='warning')
             redirect(url('summary_home', repo_name=repo.repo_name))
         except RepositoryError, e:
             h.flash(str(e), category='warning')
             redirect(h.url('summary_home', repo_name=repo.repo_name))
     def index(self, org_ref_type, org_ref, other_ref_type, other_ref):
         org_repo = c.rhodecode_db_repo.repo_name
         org_ref = (org_ref_type, org_ref)
         other_ref = (other_ref_type, other_ref)
         other_repo = request.GET.get('repo', org_repo)
@@ @@ -69,12 +94,15 @@ class CompareController(BaseRepoControll @@
             raise HTTPNotFound
         if c.org_repo.scm_instance.alias != 'hg':
             log.error('Review not available for GIT REPOS')
             raise HTTPNotFound
         self.__get_cs_or_redirect(rev=org_ref, repo=org_repo)
         self.__get_cs_or_redirect(rev=other_ref, repo=other_repo)
         c.cs_ranges, discovery_data = PullRequestModel().get_compare_data(
                                        org_repo, org_ref, other_repo, other_ref
+                                      )
         c.statuses = c.rhodecode_db_repo.statuses([x.raw_id for x in
                                                    c.cs_ranges])

0 comments (0 inline, 0 general)