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

r2560:69c11742 default
r2784:e8c62649 default
Show More
__init__.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) 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/
"""
RhodeCode, a web based repository management software
versioning implementation: http://www.python.org/dev/peps/pep-0386/
"""
import os
import sys
import platform
VERSION = tuple(open(os.path.join(
os.path.dirname(__file__), 'VERSION')).read().split('.'))
BACKENDS = {
'hg': 'Mercurial repository',
'git': 'Git repository',
'svn': 'Subversion repository',
}
CELERY_ENABLED = False
CELERY_EAGER = False
pylons: fixed code and test suite after removal of pylons.
r2358 # link to config for pyramid
project: added all source files and assets
r1 CONFIG = {}
Martin Bornhold
config: Fix settings for celery tasks.
r626 # Populated with the settings dictionary from application init in
# rhodecode.conf.environment.load_pyramid_environment
PYRAMID_SETTINGS = {}
project: added all source files and assets
r1 # Linked module for extensions
EXTENSIONS = {}
__version__ = ('.'.join((str(each) for each in VERSION[:3])))
repositories: allow storing push url for automation.
r2560 __dbversion__ = 86 # defines current db version for migrations
project: added all source files and assets
r1 __platform__ = platform.system()
__license__ = 'AGPLv3, and Commercial License'
__author__ = 'RhodeCode GmbH'
setup: updated url to source code.
r1233 __url__ = 'https://code.rhodecode.com'
project: added all source files and assets
r1
is_windows = __platform__ in ['Windows']
is_unix = not is_windows
is_test = False
dan
tests: add missing disable_error_handler to rhodecoode/__init__.py
r736 disable_error_handler = False