##// END OF EJS Templates
Migrate to Mergely 3.3.4....
Migrate to Mergely 3.3.4. RhodeCode 2.2.5 distributed Mergely 3.3.4 with some of the changes that Mergely 3.3.3 in RhodeCode 1.7.2 also had. That do however not seem to be changes we want for Kallithea this way and we take the 3.3.4 files as they are. I've also included the Mergely license file, as downloaded from: http://www.mergely.com/license.php That LICENSE file is kept in HTML just as it was downloaded from their website. While it's a bit annoying to keep the license file in HTML, this is the way it came from upstream so we'll leave it that way. Since the Javascript code is used with other GPLv3 Javascript, we are using the GPL option of Mergely's tri-license. Finally, note that previously, this was incorrectly called "mergerly", so the opportunity is taken here to correct the name. That required changes to diff_2way.html. As commands:: $ wget -N --output-document LICENSE-MERGELY.html http://www.mergely.com/license.php $ hg add LICENSE-MERGELY.html $ hg mv rhodecode/public/css/mergerly.css rhodecode/public/css/mergely.css $ hg mv rhodecode/public/js/mergerly.js rhodecode/public/js/mergely.js $ sed -i 's,mergerly\.,mergely,g' rhodecode/templates/files/diff_2way.html $ ( cd /tmp; \ wget -N http://www.mergely.com/releases/mergely-3.3.4.zip; \ unzip mergely-3.3.4.zip ) $ sha256sum /tmp/mergely-3.3.4.zip 87415d30494bbe829c248881aa7cdc0303f7e70b458a5f687615564d4498cc82 mergely-3.3.4.zip $ cp /tmp/mergely-3.3.4/lib/mergely.js rhodecode/public/js/mergely.js $ cp /tmp/mergely-3.3.4/lib/mergely.css rhodecode/public/css/mergely.css $ sed -i -e '/^ \* Version/a\ *\n * NOTE by bkuhn@sfconservancy.org for Kallithea:\n * Mergely license appears at http://www.mergely.com/license.php and in LICENSE-MERGELY.html' rhodecode/public/js/mergely.js rhodecode/public/css/mergely.css

File last commit:

r3700:3563bb7b merge default
r4125:aa3b5594 rhodecode-2.2.5-gpl
Show More
003_version_1_2_0.py
118 lines | 4.8 KiB | text/x-python | PythonLexer
updated migration for version 1.2
r900 import logging
import datetime
from sqlalchemy import *
from sqlalchemy.exc import DatabaseError
from sqlalchemy.orm import relation, backref, class_mapper
from sqlalchemy.orm.session import Session
Fixed dbmigrate issues.
r907
from rhodecode.lib.dbmigrate.migrate import *
from rhodecode.lib.dbmigrate.migrate.changeset import *
updated migration for version 1.2
r900 from rhodecode.model.meta import Base
log = logging.getLogger(__name__)
added migrations from 1.2.X to 1.3
r2000
updated migration for version 1.2
r900 def upgrade(migrate_engine):
source code cleanup: remove trailing white space, normalize file endings
r1203 """ Upgrade operations go here.
updated migration for version 1.2
r900 Don't create your own engine; bind migrate_engine to your metadata
"""
#==========================================================================
# Add table `groups``
#==========================================================================
fixed migration import error
r2195 from rhodecode.lib.dbmigrate.schema.db_1_2_0 import Group as Group
uncommented migrate tables, docfix
r1026 Group().__table__.create()
updated migration for version 1.2
r900
#==========================================================================
# Add table `group_to_perm`
#==========================================================================
freeze of models for future migrations using small schema files snapshoting current model state
r1631 from rhodecode.lib.dbmigrate.schema.db_1_2_0 import UserRepoGroupToPerm
UserRepoGroupToPerm().__table__.create()
updated db migrations to schema 3
r1023
#==========================================================================
# Add table `users_groups`
#==========================================================================
Mads Kiilerich
further cleanup of UsersGroup...
r3417 from rhodecode.lib.dbmigrate.schema.db_1_2_0 import UserGroup
UserGroup().__table__.create()
updated db migrations to schema 3
r1023
#==========================================================================
# Add table `users_groups_members`
#==========================================================================
Mads Kiilerich
further cleanup of UsersGroup...
r3417 from rhodecode.lib.dbmigrate.schema.db_1_2_0 import UserGroupMember
UserGroupMember().__table__.create()
updated db migrations to schema 3
r1023
#==========================================================================
Fixed permissions for users groups, group can have create repo permission now....
r1271 # Add table `users_group_repo_to_perm`
#==========================================================================
Mads Kiilerich
further cleanup of UsersGroup...
r3417 from rhodecode.lib.dbmigrate.schema.db_1_2_0 import UserGroupRepoToPerm
UserGroupRepoToPerm().__table__.create()
Fixed permissions for users groups, group can have create repo permission now....
r1271
#==========================================================================
updated db migrations to schema 3
r1023 # Add table `users_group_to_perm`
#==========================================================================
Mads Kiilerich
further cleanup of UsersGroup...
r3417 from rhodecode.lib.dbmigrate.schema.db_1_2_0 import UserGroupToPerm
UserGroupToPerm().__table__.create()
updated db migrations to schema 3
r1023
#==========================================================================
# Upgrade of `users` table
#==========================================================================
freeze of models for future migrations using small schema files snapshoting current model state
r1631 from rhodecode.lib.dbmigrate.schema.db_1_2_0 import User
updated db migrations to schema 3
r1023
#add column
migration fix for mysql
r1762 ldap_dn = Column("ldap_dn", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
updated db migrations to schema 3
r1023 ldap_dn.create(User().__table__)
updated migration schema
r1133 api_key = Column("api_key", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
api_key.create(User().__table__)
updated db migrations to schema 3
r1023
#remove old column
is_ldap = Column("is_ldap", Boolean(), nullable=False, unique=None, default=False)
is_ldap.drop(User().__table__)
updated migration for version 1.2
r900 #==========================================================================
# Upgrade of `repositories` table
source code cleanup: remove trailing white space, normalize file endings
r1203 #==========================================================================
freeze of models for future migrations using small schema files snapshoting current model state
r1631 from rhodecode.lib.dbmigrate.schema.db_1_2_0 import Repository
updated migration for version 1.2
r900
migration schema fix
r1509 #ADD clone_uri column#
clone_uri = Column("clone_uri", String(length=255, convert_unicode=False,
assert_unicode=None),
nullable=True, unique=False, default=None)
clone_uri.create(Repository().__table__)
auto white-space removal
r1818
updated db migrations to schema 3
r1023 #ADD downloads column#
enable_downloads = Column("downloads", Boolean(), nullable=True, unique=None, default=True)
enable_downloads.create(Repository().__table__)
update migrations for 1.2
r1442 #ADD column created_on
created_on = Column('created_on', DateTime(timezone=False), nullable=True,
unique=None, default=datetime.datetime.now)
created_on.create(Repository().__table__)
updated migration for version 1.2
r900 #ADD group_id column#
Added missing FK to migration
r908 group_id = Column("group_id", Integer(), ForeignKey('groups.group_id'),
updated migration for version 1.2
r900 nullable=True, unique=False, default=None)
Added missing FK to migration
r908 group_id.create(Repository().__table__)
updated migration for version 1.2
r900
update migrations for 1.2
r1442 #==========================================================================
# Upgrade of `user_followings` table
#==========================================================================
freeze of models for future migrations using small schema files snapshoting current model state
r1631 from rhodecode.lib.dbmigrate.schema.db_1_2_0 import UserFollowing
migration schema fix
r1509
auto white-space removal
r1818 follows_from = Column('follows_from', DateTime(timezone=False),
nullable=True, unique=None,
migration schema fix
r1509 default=datetime.datetime.now)
follows_from.create(UserFollowing().__table__)
update migrations for 1.2
r1442
updated migration for version 1.2
r900 return
def downgrade(migrate_engine):
meta = MetaData()
meta.bind = migrate_engine