u/ewong/rhodecode-enterprise-ce-fork Files · rhodecode/lib/dbmigrate/migrate/changeset/__init__.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:

r1:854a839a default


                r2784:e8c62649

default

Download file

             __init__.py
        
                    30 lines
            
             | 841 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / rhodecode / lib / dbmigrate / migrate / changeset / __init__.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      """

         This module extends SQLAlchemy and provides additional DDL [#]_

         support.

         .. [#] SQL Data Definition Language

      """

      import re

      import warnings

      import sqlalchemy

      from sqlalchemy import __version__ as _sa_version

      warnings.simplefilter('always', DeprecationWarning)

      _sa_version = tuple(int(re.match("\d+", x).group(0))

                          for x in _sa_version.split("."))

      SQLA_07 = _sa_version >= (0, 7)

      SQLA_08 = _sa_version >= (0, 8)

      del re

      del _sa_version

      from rhodecode.lib.dbmigrate.migrate.changeset.schema import *

      from rhodecode.lib.dbmigrate.migrate.changeset.constraint import *

      sqlalchemy.schema.Table.__bases__ += (ChangesetTable,)

      sqlalchemy.schema.Column.__bases__ += (ChangesetColumn,)

      sqlalchemy.schema.Index.__bases__ += (ChangesetIndex,)

      sqlalchemy.schema.DefaultClause.__bases__ += (ChangesetDefaultClause,)

	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

				"""
				This module extends SQLAlchemy and provides additional DDL [#]_
				support.

				.. [#] SQL Data Definition Language
				"""
				import re
				import warnings

				import sqlalchemy
				from sqlalchemy import __version__ as _sa_version

				warnings.simplefilter('always', DeprecationWarning)

				_sa_version = tuple(int(re.match("\d+", x).group(0))
				for x in _sa_version.split("."))
				SQLA_07 = _sa_version >= (0, 7)
				SQLA_08 = _sa_version >= (0, 8)

				del re
				del _sa_version

				from rhodecode.lib.dbmigrate.migrate.changeset.schema import *
				from rhodecode.lib.dbmigrate.migrate.changeset.constraint import *

				sqlalchemy.schema.Table.__bases__ += (ChangesetTable,)
				sqlalchemy.schema.Column.__bases__ += (ChangesetColumn,)
				sqlalchemy.schema.Index.__bases__ += (ChangesetIndex,)

				sqlalchemy.schema.DefaultClause.__bases__ += (ChangesetDefaultClause,)