kallithea Changeset - 88e750527c7c

Changeset - 88e750527c7c

Parent rev.

Child rev.

[Not reviewed]

beta

0 1 0

Marcin Kuzminski - 15 years ago 2011-04-23 15:52:32
marcin@python-works.com

small rewrite for injecting rhodecode_extras into ui. instead of injecting to hgweb instance, inject to ui and pass to hgweb. It's simpler and more readable.

1 file changed with 14 insertions and 14 deletions:

rhodecode/lib/middleware/simplehg.py

0 comments (0 inline, 0 general)

rhodecode/lib/middleware/simplehg.py

➞

Show inline comments

@@ @@ -171,21 +171,23 @@ class SimpleHg(object): @@
         if self.action == 'push':
             self.__invalidate_cache(self.repo_name)
         return app(environ, start_response)
     def __make_app(self):
         """Make an wsgi application using hgweb, and my generated baseui
         instance
         """
         Make an wsgi application using hgweb, and inject generated baseui
         instance, additionally inject some extras into ui object
         """
         self.__inject_extras(self.baseui, self.extras)
         return hgweb(str(self.repo_path), baseui=self.baseui)
         hgserve = hgweb(str(self.repo_path), baseui=self.baseui)
         return  self.__load_web_settings(hgserve, self.extras)
     def __check_permission(self, action, user, repo_name):
         """Checks permissions using action (push/pull) user and repository
         """
         Checks permissions using action (push/pull) user and repository
         name
         :param action: push or pull action
         :param user: user instance
         :param repo_name: repository name
         """
@@ @@ -203,13 +205,14 @@ class SimpleHg(object): @@
                                                                   repo_name):
                 return False
         return True
     def __get_repository(self, environ):
         """Get's repository name out of PATH_INFO header
         """
         Get's repository name out of PATH_INFO header
         :param environ: environ where PATH_INFO is stored
         """
         try:
             repo_name = '/'.join(environ['PATH_INFO'].split('/')[1:])
             if repo_name.endswith('/'):
@@ @@ -221,13 +224,14 @@ class SimpleHg(object): @@
         return repo_name
     def __get_user(self, username):
         return UserModel().get_by_username(username, cache=True)
     def __get_action(self, environ):
         """Maps mercurial request commands into a clone,pull or push command.
         """
         Maps mercurial request commands into a clone,pull or push command.
         This should always return a valid command string
         :param environ:
         """
         mapping = {'changegroup': 'pull',
                    'changegroupsubset': 'pull',
@@ @@ -246,26 +250,22 @@ class SimpleHg(object): @@
     def __invalidate_cache(self, repo_name):
         """we know that some change was made to repositories and we should
         invalidate the cache to see the changes right away but only for
         push requests"""
         invalidate_cache('get_repo_cached_%s' % repo_name)
     def __load_web_settings(self, hgserve, extras={}):
         #set the global ui for hgserve instance passed
         hgserve.repo.ui = self.baseui
     def __inject_extras(self, baseui, extras={}):
         hgrc = os.path.join(self.repo_path, '.hg', 'hgrc')
         #inject some additional parameters that will be available in ui
         #for hooks
         for k, v in extras.items():
-            hgserve.repo.ui.setconfig('rhodecode_extras', k, v)
+            baseui.setconfig('rhodecode_extras', k, v)
         repoui = make_ui('file', hgrc, False)
         if repoui:
             #overwrite our ui instance with the section from hgrc file
             for section in ui_sections:
                 for k, v in repoui.configitems(section):
                     hgserve.repo.ui.setconfig(section, k, v)
         return hgserve
                     baseui.repo.ui.setconfig(section, k, v)

0 comments (0 inline, 0 general)