Mercurial > kallithea

changeset 1321:560206522815 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed local hgrc settings, patch introduced by Marc Villetard
author Marcin Kuzminski <marcin@python-works.com>
date Sun, 08 May 2011 20:04:35 +0200
parents 09c3fb460fcb
children 8cca07df79dd
files rhodecode/lib/middleware/simplehg.py
diffstat 1 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/rhodecode/lib/middleware/simplehg.py	Sun May 08 19:58:42 2011 +0200
+++ b/rhodecode/lib/middleware/simplehg.py	Sun May 08 20:04:35 2011 +0200
@@ -254,6 +254,14 @@
         invalidate_cache('get_repo_cached_%s' % repo_name)
 
     def __inject_extras(self, baseui, extras={}):
+        """
+        Injects some extra params into baseui instance
+        
+        also overwrites global settings with those takes from local hgrc file
+        
+        :param baseui: baseui instance
+        :param extras: dict with extra params to put into baseui
+        """
 
         hgrc = os.path.join(self.repo_path, '.hg', 'hgrc')
 
@@ -268,4 +276,4 @@
             #overwrite our ui instance with the section from hgrc file
             for section in ui_sections:
                 for k, v in repoui.configitems(section):
-                    baseui.repo.ui.setconfig(section, k, v)
+                    baseui.setconfig(section, k, v)