kallithea Changeset - e50e6384c529

Changeset - e50e6384c529

Parent rev.

Child rev.

[Not reviewed]

default

0 6 0

Mads Kiilerich - 11 years ago 2014-07-18 19:22:01
madski@unity3d.com

compare: handle revset revision errors more gracefully

6 files changed with 70 insertions and 50 deletions:

kallithea/controllers/changeset.py

kallithea/controllers/compare.py

kallithea/lib/base.py

kallithea/lib/vcs/backends/git/repository.py

kallithea/lib/vcs/backends/hg/changeset.py

kallithea/lib/vcs/backends/hg/repository.py

0 comments (0 inline, 0 general)

kallithea/controllers/changeset.py

➞

Show inline comments

@@ @@ -208,15 +208,12 @@ class ChangesetController(BaseRepoContro @@
         except(ChangesetDoesNotExistError,), e:
             log.error(traceback.format_exc())
             msg = _('Such revision does not exist for this repository')
             h.flash(msg, category='error')
             raise HTTPNotFound()
         except (Exception,), e:
             log.error(traceback.format_exc())
             raise HTTPNotFound()
         c.changes = OrderedDict()
         c.lines_added = 0  # count of lines added
         c.lines_deleted = 0  # count of lines removes

kallithea/controllers/compare.py

➞

Show inline comments

@@ @@ -33,13 +33,12 @@ import re @@
 from webob.exc import HTTPNotFound, HTTPBadRequest
 from pylons import request, response, session, tmpl_context as c, url
 from pylons.controllers.util import abort, redirect
 from pylons.i18n.translation import _
 from kallithea.lib.vcs.exceptions import EmptyRepositoryError, RepositoryError
 from kallithea.lib.vcs.utils import safe_str
 from kallithea.lib.vcs.utils.hgcompat import unionrepo
 from kallithea.lib import helpers as h
 from kallithea.lib.base import BaseRepoController, render
 from kallithea.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
 from kallithea.lib import diffs
@@ @@ -56,43 +55,12 @@ log = logging.getLogger(__name__) @@
 class CompareController(BaseRepoController):
     def __before__(self):
         super(CompareController, self).__before__()
     @staticmethod
     def __get_rev(ref, repo):
         """
         Safe way to get changeset. If error occurs show error.
         """
         rev = ref[1] # default and used for git
         if repo.scm_instance.alias == 'hg':
             # lookup up the exact node id
             _revset_predicates = {
                     'branch': 'branch',
                     'book': 'bookmark',
                     'tag': 'tag',
                     'rev': 'id',
+                }
             rev_spec = "max(%s(%%s))" % _revset_predicates[ref[0]]
             revs = repo.scm_instance._repo.revs(rev_spec, safe_str(ref[1]))
             if revs:
                 rev = revs[-1]
             # else: TODO: just report 'not found'
         try:
             return repo.scm_instance.get_changeset(rev).raw_id
         except EmptyRepositoryError, e:
             h.flash(h.literal(_('There are no changesets yet')),
                     category='error')
             raise HTTPNotFound()
         except RepositoryError, e:
             log.error(traceback.format_exc())
             h.flash(safe_str(e), category='error')
             raise HTTPBadRequest()
     @staticmethod
     def _get_changesets(alias, org_repo, org_rev, other_repo, other_rev):
         """
         Returns lists of changesets that can be merged from org_repo@org_rev
         to other_repo@other_rev
         ... and the other way
         ... and the ancestor that would be used for merge
@@ @@ -185,17 +153,13 @@ class CompareController(BaseRepoControll @@
         return render('compare/compare_diff.html')
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
                                    'repository.admin')
     def compare(self, repo_name, org_ref_type, org_ref_name, other_ref_type, other_ref_name):
         # org_ref will be evaluated in org_repo
         org_repo = c.db_repo.repo_name
         org_ref = (org_ref_type, org_ref_name)
         # other_ref will be evaluated in other_repo
         other_ref = (other_ref_type, other_ref_name)
         other_repo = request.GET.get('other_repo', org_repo)
         # If merge is True:
         #   Show what org would get if merged with other:
         #   List changesets that are ancestors of other but not of org.
         #   New changesets in org is thus ignored.
         #   Diff will be from common ancestor, and merges of org to other will thus be ignored.
@@ @@ -241,14 +205,14 @@ class CompareController(BaseRepoControll @@
         if org_repo.scm_instance.alias != other_repo.scm_instance.alias:
             msg = 'compare of two different kind of remote repos not available'
             log.error(msg)
             h.flash(msg, category='error')
             return redirect(url('compare_home', repo_name=c.repo_name))
         c.org_rev = self.__get_rev(ref=org_ref, repo=org_repo)
         c.other_rev = self.__get_rev(ref=other_ref, repo=other_repo)
         c.org_rev = self._get_ref_rev(org_repo, org_ref_type, org_ref_name)
         c.other_rev = self._get_ref_rev(other_repo, other_ref_type, other_ref_name)
         c.compare_home = False
         c.org_repo = org_repo
         c.other_repo = other_repo
         c.org_ref_name = org_ref_name
         c.other_ref_name = other_ref_name

kallithea/lib/base.py

➞

Show inline comments

@@ @@ -29,15 +29,16 @@ Original author and date, and relevant c @@
 """
 import logging
 import time
 import traceback
 from paste.auth.basic import AuthBasicAuthenticator
 from paste.httpexceptions import HTTPUnauthorized, HTTPForbidden, HTTPNotFound
 from paste.httpheaders import WWW_AUTHENTICATE, AUTHORIZATION
 import webob.exc
 import paste.httpexceptions
 import paste.auth.basic
 import paste.httpheaders
 from pylons import config, tmpl_context as c, request, session, url
 from pylons.controllers import WSGIController
 from pylons.controllers.util import redirect
 from pylons.templating import render_mako as render  # don't remove this import
 from pylons.i18n.translation import _
@@ @@ -47,12 +48,13 @@ from kallithea import __version__, BACKE @@
 from kallithea.lib.utils2 import str2bool, safe_unicode, AttributeDict,\
     safe_str, safe_int
 from kallithea.lib import auth_modules
 from kallithea.lib.auth import AuthUser, HasPermissionAnyMiddleware, CookieStoreWrapper
 from kallithea.lib.utils import get_repo_slug
 from kallithea.lib.exceptions import UserCreationError
 from kallithea.lib.vcs.exceptions import RepositoryError, EmptyRepositoryError, ChangesetDoesNotExistError
 from kallithea.model import meta
 from kallithea.model.db import Repository, Ui, User, Setting
 from kallithea.model.notification import NotificationModel
 from kallithea.model.scm import ScmModel
 from kallithea.model.meta import Session
@@ @@ -99,29 +101,29 @@ def _get_access_path(environ): @@
     org_req = environ.get('pylons.original_request')
     if org_req:
         path = org_req.environ.get('PATH_INFO')
     return path
 class BasicAuth(AuthBasicAuthenticator):
+class BasicAuth(paste.auth.basic.AuthBasicAuthenticator):
     def __init__(self, realm, authfunc, auth_http_code=None):
         self.realm = realm
         self.authfunc = authfunc
         self._rc_auth_http_code = auth_http_code
     def build_authentication(self):
         head = WWW_AUTHENTICATE.tuples('Basic realm="%s"' % self.realm)
+        head = paste.httpheaders.WWW_AUTHENTICATE.tuples('Basic realm="%s"' % self.realm)
         if self._rc_auth_http_code and self._rc_auth_http_code == '403':
             # return 403 if alternative http return code is specified in
             # Kallithea config
             return HTTPForbidden(headers=head)
         return HTTPUnauthorized(headers=head)
             return paste.httpexceptions.HTTPForbidden(headers=head)
         return paste.httpexceptions.HTTPUnauthorized(headers=head)
     def authenticate(self, environ):
         authorization = AUTHORIZATION(environ)
+        authorization = paste.httpheaders.AUTHORIZATION(environ)
         if not authorization:
             return self.build_authentication()
         (authmeth, auth) = authorization.split(' ', 1)
         if 'basic' != authmeth.lower():
             return self.build_authentication()
         auth = auth.strip().decode('base64')
@@ @@ -409,14 +411,35 @@ class BaseRepoController(BaseController) @@
             if c.db_repo_scm_instance is None:
                 log.error('%s this repository is present in database but it '
                           'cannot be created as an scm instance', c.repo_name)
                 from kallithea.lib import helpers as h
                 h.flash(h.literal(_('Repository not found in the filesystem')),
                         category='error')
                 raise HTTPNotFound()
+                raise paste.httpexceptions.HTTPNotFound()
             # some globals counter for menu
             c.repository_followers = self.scm_model.get_followers(dbr)
             c.repository_forks = self.scm_model.get_forks(dbr)
             c.repository_pull_requests = self.scm_model.get_pull_requests(dbr)
             c.repository_following = self.scm_model.is_following_repo(
                                     c.repo_name, self.authuser.user_id)
     @staticmethod
     def _get_ref_rev(repo, ref_type, ref_name):
         """
         Safe way to get changeset. If error occurs show error.
         """
         from kallithea.lib import helpers as h
         try:
             return repo.scm_instance.get_ref_revision(ref_type, ref_name)
         except EmptyRepositoryError as e:
             h.flash(h.literal(_('There are no changesets yet')),
                     category='error')
             raise webob.exc.HTTPNotFound()
         except ChangesetDoesNotExistError as e:
             h.flash(h.literal(_('Changeset not found')),
                     category='error')
             raise webob.exc.HTTPNotFound()
         except RepositoryError as e:
             log.error(traceback.format_exc())
             h.flash(safe_str(e), category='error')
             raise webob.exc.HTTPBadRequest()

kallithea/lib/vcs/backends/git/repository.py

➞

Show inline comments

@@ @@ -310,12 +310,19 @@ class GitRepository(BaseRepository): @@
         # Ensure we return full id
         if not SHA_PATTERN.match(str(revision)):
             raise ChangesetDoesNotExistError("Given revision %s not recognized"
                 % revision)
         return revision
     def get_ref_revision(self, ref_type, ref_name):
         """
         Returns ``MercurialChangeset`` object representing repository's
         changeset at the given ``revision``.
         """
         return self._get_revision(ref_name)
     def _get_archives(self, archive_name='tip'):
         for i in [('zip', '.zip'), ('gz', '.tar.gz'), ('bz2', '.tar.bz2')]:
                 yield {"type": i[0], "extension": i[1], "node": archive_name}
     def _get_url(self, url):

kallithea/lib/vcs/backends/hg/changeset.py

➞

Show inline comments

@@ @@ -21,12 +21,13 @@ class MercurialChangeset(BaseChangeset): @@
     """
     Represents state of the repository at the single revision.
     """
     def __init__(self, repository, revision):
         self.repository = repository
         assert isinstance(revision, basestring), repr(revision)
         self.raw_id = revision
         self._ctx = repository._repo[revision]
         self.revision = self._ctx._rev
         self.nodes = {}
     @LazyProperty

kallithea/lib/vcs/backends/hg/repository.py

➞

Show inline comments

@@ @@ -446,12 +446,40 @@ class MercurialRepository(BaseRepository @@
         except (IndexError, ValueError, RepoLookupError, TypeError):
             msg = ("Revision %s does not exist for %s" % (revision, self))
             raise ChangesetDoesNotExistError(msg)
         return revision
     def get_ref_revision(self, ref_type, ref_name):
         """
         Returns revision number for the given reference.
         """
         # lookup up the exact node id
         _revset_predicates = {
                 'branch': 'branch',
                 'book': 'bookmark',
                 'tag': 'tag',
                 'rev': 'id',
+            }
         rev_spec = "max(%s(%%s))" % _revset_predicates[ref_type]
         try:
             revs = self._repo.revs(rev_spec, safe_str(ref_name))
         except (LookupError, ):
             msg = ("Ambiguous identifier %s:%s for %s" % (ref_type, ref_name, self.name))
             raise ChangesetDoesNotExistError(msg)
         except (IndexError, ValueError, RepoLookupError, TypeError):
             msg = ("Revision %s:%s does not exist for %s" % (ref_type, ref_name, self.name))
             raise ChangesetDoesNotExistError(msg)
         if revs:
             revision = revs[-1]
         else:
             # TODO: just report 'not found'?
             revision = ref_name
         return self._get_revision(revision)
     def _get_archives(self, archive_name='tip'):
         allowed = self.baseui.configlist("web", "allow_archive",
                                          untrusted=True)
         for i in [('zip', '.zip'), ('gz', '.tar.gz'), ('bz2', '.tar.bz2')]:
             if i[0] in allowed or self._repo.ui.configbool("web",
                                                            "allow" + i[0],

0 comments (0 inline, 0 general)