kallithea Changeset - 7be31af5bc78

Changeset - 7be31af5bc78

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Marcin Kuzminski - 13 years ago 2012-06-06 21:48:53
marcin@python-works.com

changed scope of calling EXTENSIONS from rhodecode for githooks to be able to execute them

2 files changed with 5 insertions and 3 deletions:

rhodecode/lib/hooks.py

rhodecode/lib/middleware/pygrack.py

0 comments (0 inline, 0 general)

rhodecode/lib/hooks.py

➞

Show inline comments

@@ @@ -27,13 +27,12 @@ import sys @@
 import binascii
 from inspect import isfunction
 from mercurial.scmutil import revrange
 from mercurial.node import nullrev
 from rhodecode import EXTENSIONS
 from rhodecode.lib import helpers as h
 from rhodecode.lib.utils import action_logger
 from rhodecode.lib.vcs.backends.base import EmptyChangeset
 def _get_scm_size(alias, root_path):
@@ @@ -97,12 +96,13 @@ def log_pull_action(ui, repo, **kwargs): @@
     repository = extras['repository']
     scm = extras['scm']
     action = 'pull'
     action_logger(username, action, repository, extras['ip'], commit=True)
     # extension hook call
     from rhodecode import EXTENSIONS
     callback = getattr(EXTENSIONS, 'PULL_HOOK', None)
     if isfunction(callback):
         kw = {}
         kw.update(extras)
         callback(**kw)
@@ @@ -146,12 +146,13 @@ def log_push_action(ui, repo, **kwargs): @@
     action = action % ','.join(revs)
     action_logger(username, action, repository, extras['ip'], commit=True)
     # extension hook call
     from rhodecode import EXTENSIONS
     callback = getattr(EXTENSIONS, 'PUSH_HOOK', None)
     if isfunction(callback):
         kw = {'pushed_revs': revs}
         kw.update(extras)
         callback(**kw)
     return 0
@@ @@ -180,13 +181,13 @@ def log_create_repository(repository_dic @@
      'clone_uri',
      'fork_id',
      'group_id',
      'repo_name'
     """
+    from rhodecode import EXTENSIONS
     callback = getattr(EXTENSIONS, 'CREATE_REPO_HOOK', None)
     if isfunction(callback):
         kw = {}
         kw.update(repository_dict)
         kw.update({'created_by': created_by})
         kw.update(kwargs)

rhodecode/lib/middleware/pygrack.py

➞

Show inline comments

@@ @@ -124,13 +124,14 @@ class GitRepository(object): @@
             # forget all configs
             gitenv['GIT_CONFIG_NOGLOBAL'] = '1'
             # we need current .ini file used to later initialize rhodecode
             # env and connect to db
             gitenv['RHODECODE_CONFIG_FILE'] = CONFIG['__file__']
             opts = dict(
                 env=gitenv
                 env=gitenv,
                 cwd=os.getcwd()
+            )
             out = subprocessio.SubprocessIOChunker(
                 r'git %s --stateless-rpc "%s"' % (git_command[4:],
                                                   self.content_path),
                 inputstream=inputstream,
                 **opts

0 comments (0 inline, 0 general)