kallithea Changeset - 167df0c8d191

Changeset - 167df0c8d191

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Anton Schur - 9 years ago 2017-04-10 12:15:52
tonich.sh@gmail.com

lib: fix Git hook failure after TG2 port

This fixes manual_test_vcs_operations.py failures after e1ab82613133 dropped
test_env and test_index parameters to load_environment without fixing
handle_git_receive().

1 file changed with 7 insertions and 4 deletions:

kallithea/lib/hooks.py

0 comments (0 inline, 0 general)

kallithea/lib/hooks.py

➞

Show inline comments

@@ @@ -367,9 +367,11 @@ def log_delete_user(user_dict, deleted_b @@
 def handle_git_pre_receive(repo_path, revs, env):
     return handle_git_receive(repo_path, revs, env, hook_type='pre')
 def handle_git_post_receive(repo_path, revs, env):
     return handle_git_receive(repo_path, revs, env, hook_type='post')
 def handle_git_receive(repo_path, revs, env, hook_type):
     """
     A really hacky method that is run by git post-receive hook and logs
@@ @@ -386,14 +388,15 @@ def handle_git_receive(repo_path, revs, @@
     from kallithea.config.environment import load_environment
     from kallithea.model.base import init_model
     from kallithea.model.db import Ui
     from kallithea.lib.utils import make_ui
+    from kallithea.lib.utils import make_ui, setup_cache_regions
     extras = _extract_extras(env)
     repo_path = safe_unicode(repo_path)
     path, ini_name = os.path.split(extras['config'])
     conf = appconfig('config:%s' % ini_name, relative_to=path)
     conf = load_environment(conf.global_conf, conf.local_conf, test_env=False,
                      test_index=False)
     conf = load_environment(conf.global_conf, conf.local_conf)
     setup_cache_regions(conf)
     engine = engine_from_config(conf, 'sqlalchemy.')
     init_model(engine)
@@ @@ -413,7 +416,7 @@ def handle_git_receive(repo_path, revs, @@
     if hook_type == 'pre':
         repo = repo.scm_instance
     else:
         #post push shouldn't use the cached instance never
+        # post push shouldn't use the cached instance never
         repo = repo.scm_instance_no_cache()
     if hook_type == 'pre':

0 comments (0 inline, 0 general)