kallithea Changeset - 4aba7be311e8

Changeset - 4aba7be311e8

Parent rev.

Child rev.

[Not reviewed]

beta

0 4 0

Marcin Kuzminski - 14 years ago 2011-10-02 02:06:23
marcin@python-works.com

API added checks for a valid repository on pull command
Added pre-check if repository have a remote_uri defines before pulling
bugfix with no default arguments on api function
added traceback when unhandled exception occurs on API

4 files changed with 37 insertions and 5 deletions:

rhodecode/controllers/api/__init__.py

rhodecode/controllers/api/api.py

rhodecode/model/db.py

rhodecode/model/scm.py

0 comments (0 inline, 0 general)

rhodecode/controllers/api/__init__.py

➞

Show inline comments

@@ @@ -27,12 +27,13 @@ @@
 import inspect
 import json
 import logging
 import types
 import urllib
 import traceback
 from itertools import izip_longest
 from paste.response import replace_header
 from pylons.controllers import WSGIController
 from pylons.controllers.util import Response
@@ @@ -132,14 +133,15 @@ class JSONRPCController(WSGIController): @@
             return jsonrpc_error(message=str(e))
         # now that we have a method, add self._req_params to
         # self.kargs and dispatch control to WGIController
         argspec = inspect.getargspec(self._func)
         arglist = argspec[0][1:]
         defaults = argspec[3]
+        defaults = argspec[3] or []
         default_empty = types.NotImplementedType
         kwarglist = list(izip_longest(reversed(arglist),reversed(defaults),
                                 fillvalue=default_empty))
         # this is little trick to inject logged in user for
         # perms decorators to work they expect the controller class to have
         # rhodecode_user attribute set
@@ @@ -199,13 +201,13 @@ class JSONRPCController(WSGIController): @@
             raw_response = self._inspect_call(self._func)
             if isinstance(raw_response, HTTPError):
                 self._error = str(raw_response)
         except JSONRPCError as e:
             self._error = str(e)
         except Exception as e:
-            log.debug('Encountered unhandled exception: %s', repr(e))
+            log.error('Encountered unhandled exception: %s' % traceback.format_exc())
             json_exc = JSONRPCError('Internal server error')
             self._error = str(json_exc)
         if self._error is not None:
             raw_response = None

rhodecode/controllers/api/api.py

➞

Show inline comments

@@ @@ -2,13 +2,13 @@ import traceback @@
 import logging
 from rhodecode.controllers.api import JSONRPCController, JSONRPCError
 from rhodecode.lib.auth import HasPermissionAllDecorator
 from rhodecode.model.scm import ScmModel
 from rhodecode.model.db import User, UsersGroup
+from rhodecode.model.db import User, UsersGroup, Repository
 log = logging.getLogger(__name__)
 class ApiController(JSONRPCController):
     """
@@ @@ -33,12 +33,15 @@ class ApiController(JSONRPCController): @@
         :param user:
         :param repo:
         """
         if Repository.is_valid(repo) is False:
             raise JSONRPCError('Unknown repo "%s"' % repo)
         try:
             ScmModel().pull_changes(repo, self.rhodecode_user.username)
             return 'Pulled from %s' % repo
         except Exception:
             raise JSONRPCError('Unable to pull changes from "%s"' % repo)

rhodecode/model/db.py

➞

Show inline comments

@@ @@ -496,12 +496,23 @@ class Repository(Base, BaseModel): @@
         return q.one()
     @classmethod
     def get_repo_forks(cls, repo_id):
         return Session.query(cls).filter(Repository.fork_id == repo_id)
     @classmethod
     def base_path(cls):
         """
         Returns base path when all repos are stored
         :param cls:
         """
         q = Session.query(RhodeCodeUi).filter(RhodeCodeUi.ui_key == '/')
         q.options(FromCache("sql_cache_short", "repository_repo_path"))
         return q.one().ui_value
     @property
     def just_name(self):
         return self.repo_name.split(os.sep)[-1]
     @property
     def groups_with_parents(self):
@@ @@ -567,12 +578,25 @@ class Repository(Base, BaseModel): @@
                 log.debug('settings ui from db[%s]%s:%s', ui_.ui_section,
                           ui_.ui_key, ui_.ui_value)
                 baseui.setconfig(ui_.ui_section, ui_.ui_key, ui_.ui_value)
         return baseui
     @classmethod
     def is_valid(cls, repo_name):
         """
         returns True if given repo name is a valid filesystem repository
         @param cls:
         @param repo_name:
         """
         from rhodecode.lib.utils import is_valid_repo
         return is_valid_repo(repo_name, cls.base_path())
     #==========================================================================
     # SCM PROPERTIES
     #==========================================================================
     def get_changeset(self, rev):
         return get_changeset_safe(self.scm_instance, rev)

rhodecode/model/scm.py

➞

Show inline comments

@@ @@ -304,30 +304,33 @@ class ScmModel(BaseModel): @@
         return self.sa.query(Repository)\
                 .filter(Repository.fork_id == repo_id).count()
     def pull_changes(self, repo_name, username):
         dbrepo = Repository.by_repo_name(repo_name)
         clone_uri = dbrepo.clone_uri
         if not clone_uri:
             raise Exception("This repository doesn't have a clone uri")
         repo = dbrepo.scm_instance
         try:
             extras = {'ip': '',
                       'username': username,
                       'action': 'push_remote',
                       'repository': repo_name}
             #inject ui extra param to log this action via push logger
             for k, v in extras.items():
                 repo._repo.ui.setconfig('rhodecode_extras', k, v)
-            repo.pull(dbrepo.clone_uri)
             repo.pull(clone_uri)
             self.mark_for_invalidation(repo_name)
         except:
             log.error(traceback.format_exc())
             raise
     def commit_change(self, repo, repo_name, cs, user, author, message, content,
                       f_path):
         if repo.alias == 'hg':
             from vcs.backends.hg import MercurialInMemoryChangeset as IMC
         elif repo.alias == 'git':

0 comments (0 inline, 0 general)