##// END OF EJS Templates
git: use force fetch and update for target ref. This solves a case...
git: use force fetch and update for target ref. This solves a case when in PRs a target is force updated and is out of sync. Before we used a pull which --ff-only fails obviosly because two are out of sync. This change uses new logic that resets the target branch according to the source target branch allowing smooth merge simulation.

File last commit:

r2487:fcee5614 default
r2784:e8c62649 default
Show More
utils.py
87 lines | 3.2 KiB | text/x-python | PythonLexer
project: added all source files and assets
r1 # -*- coding: utf-8 -*-
release: update copyright year to 2018
r2487 # Copyright (C) 2010-2018 RhodeCode GmbH
project: added all source files and assets
r1 #
# 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 os
import shlex
import platform
from rhodecode.model import init_model
def configure_vcs(config):
"""
Patch VCS config with some RhodeCode specific stuff
"""
from rhodecode.lib.vcs import conf
conf.settings.BACKENDS = {
'hg': 'rhodecode.lib.vcs.backends.hg.MercurialRepository',
'git': 'rhodecode.lib.vcs.backends.git.GitRepository',
'svn': 'rhodecode.lib.vcs.backends.svn.SubversionRepository',
}
Martin Bornhold
config: Move vcs hooks protocol and direct call setting to vcs configure mehod.
r588 conf.settings.HOOKS_PROTOCOL = config['vcs.hooks.protocol']
conf.settings.HOOKS_DIRECT_CALLS = config['vcs.hooks.direct_calls']
conf.settings.GIT_REV_FILTER = shlex.split(config['git_rev_filter'])
conf.settings.DEFAULT_ENCODINGS = config['default_encoding']
conf.settings.ALIASES[:] = config['vcs.backends']
conf.settings.SVN_COMPATIBLE_VERSION = config['vcs.svn.compatible_version']
project: added all source files and assets
r1
def initialize_database(config):
encryption: use common method to fetch encryption key for encrypted fields.
r261 from rhodecode.lib.utils2 import engine_from_config, get_encryption_key
project: added all source files and assets
r1 engine = engine_from_config(config, 'sqlalchemy.db1.')
encryption: use common method to fetch encryption key for encrypted fields.
r261 init_model(engine, encryption_key=get_encryption_key(config))
project: added all source files and assets
r1
db: Move initialization of test environment up to pyramid layer.
r116 def initialize_test_environment(settings, test_env=None):
if test_env is None:
test_env = not int(os.environ.get('RC_NO_TMP_PATH', 0))
Martin Bornhold
pytest: Unify create_test_* functions.
r215 from rhodecode.lib.utils import (
create_test_directory, create_test_database, create_test_repositories,
create_test_index)
db: Move initialization of test environment up to pyramid layer.
r116 from rhodecode.tests import TESTS_TMP_PATH
mercurial: allow editing largefile store from web interface.
r1563 from rhodecode.lib.vcs.backends.hg import largefiles_store
git-lfs: create default LFS storage on new installation...
r1564 from rhodecode.lib.vcs.backends.git import lfs_store
db: Move initialization of test environment up to pyramid layer.
r116 # test repos
if test_env:
Martin Bornhold
pytest: Unify create_test_* functions.
r215 create_test_directory(TESTS_TMP_PATH)
mercurial: allow editing largefile store from web interface.
r1563 # large object stores
create_test_directory(largefiles_store(TESTS_TMP_PATH))
git-lfs: create default LFS storage on new installation...
r1564 create_test_directory(lfs_store(TESTS_TMP_PATH))
mercurial: allow editing largefile store from web interface.
r1563
Martin Bornhold
pytest: Unify create_test_* functions.
r215 create_test_database(TESTS_TMP_PATH, settings)
create_test_repositories(TESTS_TMP_PATH, settings)
Martin Bornhold
pytest: Removed unused argument.
r214 create_test_index(TESTS_TMP_PATH, settings)
db: Move initialization of test environment up to pyramid layer.
r116
project: added all source files and assets
r1 def get_vcs_server_protocol(config):
Martin Bornhold
config: Move vcs hooks protocol and direct call setting to vcs configure mehod.
r588 return config['vcs.server.protocol']
project: added all source files and assets
r1
def set_instance_id(config):
""" Sets a dynamic generated config['instance_id'] if missing or '*' """
config['instance_id'] = config.get('instance_id') or ''
if config['instance_id'] == '*' or not config['instance_id']:
_platform_id = platform.uname()[1] or 'instance'
config['instance_id'] = '%s-%s' % (_platform_id, os.getpid())