##// END OF EJS Templates
subrepo: Handle subrepo merge errors.
subrepo: Handle subrepo merge errors.

File last commit:

r1024:56031659 default
r1108:ebe0247c default
Show More
__init__.py
89 lines | 3.4 KiB | text/x-python | PythonLexer
Martin Bornhold
svn: Add subscriber to generate the mod_dav_svn config on RepoGroupEvents #4082
r559 # -*- coding: utf-8 -*-
# Copyright (C) 2016-2016 RhodeCode GmbH
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License, version 3
# (only), as published by the Free Software Foundation.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
# This program is dual-licensed. If you wish to learn more about the
# RhodeCode Enterprise Edition, including its added features, Support services,
# and proprietary license terms, please see https://rhodecode.com/licenses/
import logging
import os
Martin Bornhold
svn-support: Use shlex to split the reload command for subprocess usage.
r1016 import shlex
Martin Bornhold
svn: Add subscriber to generate the mod_dav_svn config on RepoGroupEvents #4082
r559
Martin Bornhold
svn-support: Add subscriber to execute the svn.proxy.reload_cmd on config changes. #4271
r1011 # Do not use `from rhodecode import events` here, it will be overridden by the
# events module in this package due to pythons import mechanism.
from rhodecode.events import RepoGroupEvent
Martin Bornhold
events: Move subscriber classes from svn_support to rhodecode.subscribers....
r1019 from rhodecode.subscribers import AsyncSubprocessSubscriber
Martin Bornhold
svn-support: Make the reload command timeout configurable via ini file....
r1015 from rhodecode.config.middleware import (
_bool_setting, _string_setting, _int_setting)
Martin Bornhold
svn: Moved code and make a small bugfix.
r563
Martin Bornhold
svn-support: Add subscriber to execute the svn.proxy.reload_cmd on config changes. #4271
r1011 from .events import ModDavSvnConfigChange
Martin Bornhold
events: Move subscriber classes from svn_support to rhodecode.subscribers....
r1019 from .subscribers import generate_config_subscriber
Martin Bornhold
svn: Rename keys.py to config_keys.py
r567 from . import config_keys
Martin Bornhold
svn: Add subscriber to generate the mod_dav_svn config on RepoGroupEvents #4082
r559
log = logging.getLogger(__name__)
def includeme(config):
settings = config.registry.settings
_sanitize_settings_and_apply_defaults(settings)
Martin Bornhold
svn: Rename keys.py to config_keys.py
r567 if settings[config_keys.generate_config]:
Martin Bornhold
svn-support: Add subscriber to execute the svn.proxy.reload_cmd on config changes. #4271
r1011 # Add subscriber to generate the Apache mod dav svn configuration on
# repository group events.
config.add_subscriber(generate_config_subscriber, RepoGroupEvent)
Martin Bornhold
svn-support: Only add reload-cmd subscriber if a reload command is set....
r1024 # If a reload command is set add a subscriber to execute it on
# configuration changes.
Martin Bornhold
svn-support: Use shlex to split the reload command for subprocess usage.
r1016 reload_cmd = shlex.split(settings[config_keys.reload_command])
Martin Bornhold
svn-support: Only add reload-cmd subscriber if a reload command is set....
r1024 if reload_cmd:
reload_timeout = settings[config_keys.reload_timeout] or None
reload_subscriber = AsyncSubprocessSubscriber(
cmd=reload_cmd, timeout=reload_timeout)
config.add_subscriber(reload_subscriber, ModDavSvnConfigChange)
Martin Bornhold
svn: Add subscriber to generate the mod_dav_svn config on RepoGroupEvents #4082
r559
def _sanitize_settings_and_apply_defaults(settings):
Martin Bornhold
svn: Update and add doc strings and comments.
r560 """
Set defaults, convert to python types and validate settings.
"""
Martin Bornhold
svn-support: Use settings functions from rhodecode config.
r1004 _bool_setting(settings, config_keys.generate_config, 'false')
_bool_setting(settings, config_keys.list_parent_path, 'true')
Martin Bornhold
svn-support: Make the reload command timeout configurable via ini file....
r1015 _int_setting(settings, config_keys.reload_timeout, 10)
Martin Bornhold
svn-support: Use settings functions from rhodecode config.
r1004 _string_setting(settings, config_keys.config_file_path, '', lower=False)
_string_setting(settings, config_keys.location_root, '/', lower=False)
Martin Bornhold
svn-support: Add config setting to set the svn proxy (apache) reload command.
r1005 _string_setting(settings, config_keys.reload_command, '', lower=False)
Martin Bornhold
svn: Add subscriber to generate the mod_dav_svn config on RepoGroupEvents #4082
r559
Martin Bornhold
svn-support: Make the reload command timeout configurable via ini file....
r1015 # Convert negative timeout values to zero.
if settings[config_keys.reload_timeout] < 0:
settings[config_keys.reload_timeout] = 0
Martin Bornhold
svn-support: Use settings functions from rhodecode config.
r1004 # Append path separator to location root.
Martin Bornhold
svn: Rename keys.py to config_keys.py
r567 settings[config_keys.location_root] = _append_path_sep(
settings[config_keys.location_root])
Martin Bornhold
svn: Add subscriber to generate the mod_dav_svn config on RepoGroupEvents #4082
r559
# Validate settings.
Martin Bornhold
svn: Rename keys.py to config_keys.py
r567 if settings[config_keys.generate_config]:
Martin Bornhold
svn-support: Use settings functions from rhodecode config.
r1004 assert len(settings[config_keys.config_file_path]) > 0
Martin Bornhold
svn: Add subscriber to generate the mod_dav_svn config on RepoGroupEvents #4082
r559
Martin Bornhold
svn: Update and add doc strings and comments.
r560 def _append_path_sep(path):
"""
Append the path separator if missing.
"""
Martin Bornhold
svn: Add subscriber to generate the mod_dav_svn config on RepoGroupEvents #4082
r559 if isinstance(path, basestring) and not path.endswith(os.path.sep):
path += os.path.sep
return path