rhodecode-enterprise-ce Files · rhodecode/lib/vcs/connection.py

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.

marcink - - Load All Authors

File last commit:

r2487:fcee5614 default


                r2784:e8c62649

default

Download file

             connection.py
        
                    37 lines
            
             | 1.3 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / rhodecode / lib / vcs / connection.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # -*- coding: utf-8 -*-

      # Copyright (C) 2014-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/

      """

      Holds connection for remote server.

      """

      def _not_initialized(*args, **kwargs):

          """Placeholder for objects which have to be initialized first."""

          raise Exception(

              "rhodecode.lib.vcs is not yet initialized. "

              "Make sure `vcs.server` is enabled in your configuration.")

      # TODO: figure out a nice default value for these things

      Service = _not_initialized

      Git = _not_initialized

      Hg = _not_initialized

      Svn = _not_initialized

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				# -- coding: utf-8 --

				# Copyright (C) 2014-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/

				"""
				Holds connection for remote server.
				"""


				def _not_initialized(args, *kwargs):
				"""Placeholder for objects which have to be initialized first."""
				raise Exception(
				"rhodecode.lib.vcs is not yet initialized. "
				"Make sure `vcs.server` is enabled in your configuration.")

				# TODO: figure out a nice default value for these things
				Service = _not_initialized

				Git = _not_initialized
				Hg = _not_initialized
				Svn = _not_initialized