##// 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:

r2651:95f21d33 default
r2784:e8c62649 default
Show More
pyramid_utils.py
58 lines | 2.0 KiB | text/x-python | PythonLexer
# -*- coding: utf-8 -*-
# Copyright (C) 2016-2018 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 os
from pyramid.compat import configparser
from pyramid.paster import bootstrap as pyramid_bootstrap, setup_logging # noqa
from pyramid.request import Request
from pyramid.scripting import prepare
def get_config(ini_path, **kwargs):
parser = configparser.ConfigParser(**kwargs)
parser.read(ini_path)
return parser
def get_app_config(ini_path):
from paste.deploy.loadwsgi import appconfig
return appconfig('config:{}'.format(ini_path), relative_to=os.getcwd())
def bootstrap(config_uri, request=None, options=None, env=None):
if env:
os.environ.update(env)
config = get_config(config_uri)
base_url = 'http://rhodecode.local'
try:
base_url = config.get('app:main', 'app.base_url')
except (configparser.NoSectionError, configparser.NoOptionError):
pass
request = request or Request.blank('/', base_url=base_url)
return pyramid_bootstrap(config_uri, request=request, options=options)
def prepare_request(environ):
request = Request.blank('/', environ=environ)
prepare(request) # set pyramid threadlocal request
return request