kallithea Changeset - 30cafecb2630

Changeset - 30cafecb2630

Parent rev.

Child rev.

[Not reviewed]

beta

0 1 0

Marcin Kuzminski - 13 years ago 2012-08-28 09:04:02
marcin@python-works.com

Fixed issue with mixed locking notification and bad username

1 file changed with 4 insertions and 3 deletions:

rhodecode/lib/hooks.py

0 comments (0 inline, 0 general)

rhodecode/lib/hooks.py

➞

Show inline comments

@@ @@ -65,124 +65,125 @@ def _get_scm_size(alias, root_path): @@
     return size_scm_f, size_root_f, size_total_f
 def repo_size(ui, repo, hooktype=None, **kwargs):
     """
     Presents size of repository after push
     :param ui:
     :param repo:
     :param hooktype:
     """
     size_hg_f, size_root_f, size_total_f = _get_scm_size('.hg', repo.root)
     last_cs = repo[len(repo) - 1]
     msg = ('Repository size .hg:%s repo:%s total:%s\n'
            'Last revision is now r%s:%s\n') % (
         size_hg_f, size_root_f, size_total_f, last_cs.rev(), last_cs.hex()[:12]
+    )
     sys.stdout.write(msg)
 def pre_push(ui, repo, **kwargs):
     # pre push function, currently used to ban pushing when
     # repository is locked
     try:
         rc_extras = json.loads(os.environ.get('RC_SCM_DATA', "{}"))
     except:
         rc_extras = {}
     extras = dict(repo.ui.configitems('rhodecode_extras'))
     if 'username' in extras:
         username = extras['username']
         repository = extras['repository']
         scm = extras['scm']
         locked_by = extras['locked_by']
     elif 'username' in rc_extras:
         username = rc_extras['username']
         repository = rc_extras['repository']
         scm = rc_extras['scm']
         locked_by = rc_extras['locked_by']
     else:
         raise Exception('Missing data in repo.ui and os.environ')
     usr = User.get_by_username(username)
     if locked_by[0] and usr.user_id != int(locked_by[0]):
         raise HTTPLockedRC(username, repository)
         locked_by = User.get(locked_by[0]).username
         raise HTTPLockedRC(repository, locked_by)
 def pre_pull(ui, repo, **kwargs):
     # pre push function, currently used to ban pushing when
     # repository is locked
     try:
         rc_extras = json.loads(os.environ.get('RC_SCM_DATA', "{}"))
     except:
         rc_extras = {}
     extras = dict(repo.ui.configitems('rhodecode_extras'))
     if 'username' in extras:
         username = extras['username']
         repository = extras['repository']
         scm = extras['scm']
         locked_by = extras['locked_by']
     elif 'username' in rc_extras:
         username = rc_extras['username']
         repository = rc_extras['repository']
         scm = rc_extras['scm']
         locked_by = rc_extras['locked_by']
     else:
         raise Exception('Missing data in repo.ui and os.environ')
     if locked_by[0]:
         raise HTTPLockedRC(username, repository)
         locked_by = User.get(locked_by[0]).username
         raise HTTPLockedRC(repository, locked_by)
 def log_pull_action(ui, repo, **kwargs):
     """
     Logs user last pull action
     :param ui:
     :param repo:
     """
     try:
         rc_extras = json.loads(os.environ.get('RC_SCM_DATA', "{}"))
     except:
         rc_extras = {}
     extras = dict(repo.ui.configitems('rhodecode_extras'))
     if 'username' in extras:
         username = extras['username']
         repository = extras['repository']
         scm = extras['scm']
         make_lock = extras['make_lock']
     elif 'username' in rc_extras:
         username = rc_extras['username']
         repository = rc_extras['repository']
         scm = rc_extras['scm']
         make_lock = rc_extras['make_lock']
     else:
         raise Exception('Missing data in repo.ui and os.environ')
     user = User.get_by_username(username)
     action = 'pull'
     action_logger(user, 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)
     if make_lock is True:
         Repository.lock(Repository.get_by_repo_name(repository), user.user_id)
         #msg = 'Made lock on repo `%s`' % repository
         #sys.stdout.write(msg)
     return 0
 def log_push_action(ui, repo, **kwargs):
     """

0 comments (0 inline, 0 general)