kallithea Changeset - 578a152f5ae3

Changeset - 578a152f5ae3

Parent rev.

Child rev.

[Not reviewed]

beta

0 1 0

Marcin Kuzminski - 13 years ago 2012-11-07 23:36:28
marcin@python-works.com

added missing installation of git hooks when doing a fork

1 file changed with 5 insertions and 2 deletions:

rhodecode/lib/celerylib/tasks.py

0 comments (0 inline, 0 general)

rhodecode/lib/celerylib/tasks.py

➞

Show inline comments

@@ @@ -29,48 +29,49 @@ import os @@
 import traceback
 import logging
 from os.path import join as jn
 from time import mktime
 from operator import itemgetter
 from string import lower
 from pylons import config, url
 from pylons.i18n.translation import _
 from rhodecode.lib.vcs import get_backend
 from rhodecode import CELERY_ON, CELERY_EAGER
 from rhodecode.lib.utils2 import safe_str
 from rhodecode.lib.celerylib import run_task, locked_task, dbsession, \
     str2bool, __get_lockkey, LockHeld, DaemonLock, get_session
 from rhodecode.lib.helpers import person
 from rhodecode.lib.rcmail.smtp_mailer import SmtpMailer
 from rhodecode.lib.utils import add_cache, action_logger
 from rhodecode.lib.compat import json, OrderedDict
 from rhodecode.lib.hooks import log_create_repository
 from rhodecode.model.db import Statistics, Repository, User
 from rhodecode.model.scm import ScmModel
 add_cache(config)
 __all__ = ['whoosh_index', 'get_commits_stats',
            'reset_user_password', 'send_email']
 def get_logger(cls):
     if CELERY_ON:
         try:
             log = cls.get_logger()
         except:
             log = logging.getLogger(__name__)
     else:
         log = logging.getLogger(__name__)
     return log
 @task(ignore_result=True)
 @locked_task
 @dbsession
 def whoosh_index(repo_location, full_index):
@@ @@ -381,59 +382,61 @@ def create_repo_fork(form_data, cur_user @@
     owner = cur_user
     private = form_data['private']
     clone_uri = form_data.get('clone_uri')
     repos_group = form_data['repo_group']
     landing_rev = form_data['landing_rev']
     copy_fork_permissions = form_data.get('copy_permissions')
     fork_of = RepoModel(DBS)._get_repo(form_data.get('fork_parent_id'))
     fork_repo = RepoModel(DBS).create_repo(
         fork_name, repo_type, description, owner, private, clone_uri,
         repos_group, landing_rev, just_db=True, fork_of=fork_of,
         copy_fork_permissions=copy_fork_permissions
+    )
     update_after_clone = form_data['update_after_clone']
     source_repo_path = os.path.join(base_path, fork_of.repo_name)
     destination_fork_path = os.path.join(base_path, fork_name)
     log.info('creating fork of %s as %s', source_repo_path,
              destination_fork_path)
     backend = get_backend(repo_type)
     if repo_type == 'git':
         backend(safe_str(destination_fork_path), create=True,
+        r = backend(safe_str(destination_fork_path), create=True,
                 src_url=safe_str(source_repo_path),
                 update_after_clone=update_after_clone,
                 bare=True)
     elif repo_type == 'hg':
         backend(safe_str(destination_fork_path), create=True,
+        r = backend(safe_str(destination_fork_path), create=True,
                 src_url=safe_str(source_repo_path),
                 update_after_clone=update_after_clone)
     else:
         raise Exception('Unknown backend type %s' % repo_type)
     # add rhodecode hook into this repo
     ScmModel().install_git_hook(repo=r)
     log_create_repository(fork_repo.get_dict(), created_by=cur_user.username)
     action_logger(cur_user, 'user_forked_repo:%s' % fork_name,
                    fork_of.repo_name, '', DBS)
     action_logger(cur_user, 'user_created_fork:%s' % fork_name,
                    fork_name, '', DBS)
     # finally commit at latest possible stage
     DBS.commit()
 def __get_codes_stats(repo_name):
     from rhodecode.config.conf import  LANGUAGES_EXTENSIONS_MAP
     repo = Repository.get_by_repo_name(repo_name).scm_instance
     tip = repo.get_changeset()
     code_stats = {}
     def aggregate(cs):
         for f in cs[2]:
             ext = lower(f.extension)
             if ext in LANGUAGES_EXTENSIONS_MAP.keys() and not f.is_binary:
                 if ext in code_stats:
                     code_stats[ext] += 1

0 comments (0 inline, 0 general)