Mercurial > kallithea
changeset 3878:7d29355db6f4 beta
fixes #834 hooks error on remote pulling
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Mon, 20 May 2013 02:34:03 +0200 |
parents | 5070c840dc23 |
children | a228a33d868e |
files | rhodecode/model/scm.py |
diffstat | 1 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/model/scm.py Mon May 20 02:24:16 2013 +0200 +++ b/rhodecode/model/scm.py Mon May 20 02:34:03 2013 +0200 @@ -436,7 +436,8 @@ self.sa.add(repo) return repo - def _handle_rc_scm_extras(self, username, repo_name, repo_alias): + def _handle_rc_scm_extras(self, username, repo_name, repo_alias, + action=None): from rhodecode import CONFIG from rhodecode.lib.base import _get_ip_addr try: @@ -450,7 +451,7 @@ extras = { 'ip': _get_ip_addr(environ), 'username': username, - 'action': 'push_local', + 'action': action or 'push_local', 'repository': repo_name, 'scm': repo_alias, 'config': CONFIG['__file__'], @@ -504,7 +505,10 @@ if repo.alias == 'git': repo.fetch(clone_uri) else: + self._handle_rc_scm_extras(username, dbrepo.repo_name, + repo.alias, action='push_remote') repo.pull(clone_uri) + self.mark_for_invalidation(repo_name) except Exception: log.error(traceback.format_exc())