##// 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
scm_app.py
63 lines | 1.9 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) 2012-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/
"""
Equivalent of rhodecode.lib.middleware.scm_app but using remote apps.
"""
import logging
from rhodecode.lib.middleware.utils import wsgi_app_caller_client
log = logging.getLogger(__name__)
HG_REMOTE_WSGI = None
GIT_REMOTE_WSGI = None
Martin Bornhold
vcs: Do not pass the backend key into the scm app instances....
r951 def create_git_wsgi_app(repo_path, repo_name, config):
project: added all source files and assets
r1 """
Return a WSGI app backed by a remote app to handle Git.
config is a dictionary holding the extras.
"""
factory = GIT_REMOTE_WSGI
if not factory:
core: removed pyro4 from Enterprise code. Fixes #5198
r1409 log.error('VCSServer has not been initialized yet')
project: added all source files and assets
r1
return wsgi_app_caller_client.RemoteAppCaller(
Martin Bornhold
vcs: Do not pass the backend key into the scm app instances....
r951 factory, repo_path, repo_name, config)
project: added all source files and assets
r1
Martin Bornhold
vcs: Do not pass the backend key into the scm app instances....
r951 def create_hg_wsgi_app(repo_path, repo_name, config):
project: added all source files and assets
r1 """
Return a WSGI app backed by a remote app to handle Mercurial.
config is a list of 3-item tuples representing a ConfigObject (it is the
serialized version of the config object).
"""
factory = HG_REMOTE_WSGI
if not factory:
core: removed pyro4 from Enterprise code. Fixes #5198
r1409 log.error('VCSServer has not been initialized yet')
project: added all source files and assets
r1
return wsgi_app_caller_client.RemoteAppCaller(
Martin Bornhold
vcs: Do not pass the backend key into the scm app instances....
r951 factory, repo_path, repo_name, config)