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

r2036:872d5f0a beta
r4125:aa3b5594 rhodecode-2.2.5-gpl
Show More
005_version_1_3_0.py
79 lines | 3.0 KiB | text/x-python | PythonLexer
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
from rhodecode.lib.dbmigrate.migrate import *
from rhodecode.lib.dbmigrate.migrate.changeset import *
from rhodecode.model.meta import Base
log = logging.getLogger(__name__)
def upgrade(migrate_engine):
""" Upgrade operations go here.
Don't create your own engine; bind migrate_engine to your metadata
"""
#==========================================================================
# Change unique constraints of table `repo_to_perm`
#==========================================================================
from rhodecode.lib.dbmigrate.schema.db_1_3_0 import UserRepoToPerm
tbl = UserRepoToPerm().__table__
new_cons = UniqueConstraint('user_id', 'repository_id', 'permission_id', table=tbl)
new_cons.create()
old_cons = None
if migrate_engine.name in ['mysql']:
old_cons = UniqueConstraint('user_id', 'repository_id', table=tbl, name="user_id")
elif migrate_engine.name in ['postgresql']:
old_cons = UniqueConstraint('user_id', 'repository_id', table=tbl)
else:
# sqlite doesn't support dropping constraints...
print """Please manually drop UniqueConstraint('user_id', 'repository_id')"""
if old_cons:
try:
old_cons.drop()
except Exception, e:
# we don't care if this fails really... better to pass migration than
# leave this in intermidiate state
print 'Failed to remove Unique for user_id, repository_id reason %s' % e
#==========================================================================
# fix uniques of table `user_repo_group_to_perm`
#==========================================================================
from rhodecode.lib.dbmigrate.schema.db_1_3_0 import UserRepoGroupToPerm
tbl = UserRepoGroupToPerm().__table__
new_cons = UniqueConstraint('group_id', 'permission_id', 'user_id', table=tbl)
new_cons.create()
old_cons = None
# fix uniqueConstraints
if migrate_engine.name in ['mysql']:
#mysql is givinig troubles here...
old_cons = UniqueConstraint('group_id', 'permission_id', table=tbl, name="group_id")
elif migrate_engine.name in ['postgresql']:
old_cons = UniqueConstraint('group_id', 'permission_id', table=tbl, name='group_to_perm_group_id_permission_id_key')
else:
# sqlite doesn't support dropping constraints...
print """Please manually drop UniqueConstraint('group_id', 'permission_id')"""
if old_cons:
try:
old_cons.drop()
except Exception, e:
# we don't care if this fails really... better to pass migration than
# leave this in intermidiate state
print 'Failed to remove Unique for user_id, repository_id reason %s' % e
return
def downgrade(migrate_engine):
meta = MetaData()
meta.bind = migrate_engine