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

r4116:ffd45b18 rhodecode-2.2.5-gpl
r4125:aa3b5594 rhodecode-2.2.5-gpl
Show More
__init__.py
75 lines | 2.4 KiB | text/x-python | PythonLexer
added dbmigrate package, added model changes...
r833 # -*- coding: utf-8 -*-
fixed license issue #149
r1206 # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
source code cleanup: remove trailing white space, normalize file endings
r1203 #
added dbmigrate package, added model changes...
r833 # 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.
source code cleanup: remove trailing white space, normalize file endings
r1203 #
added dbmigrate package, added model changes...
r833 # You should have received a copy of the GNU General Public License
fixed license issue #149
r1206 # along with this program. If not, see <http://www.gnu.org/licenses/>.
Bradley M. Kuhn
Imported some of the GPLv3'd changes from RhodeCode v2.2.5....
r4116 """
rhodecode.lib.dbmigrate.__init__
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Database migration modules
:created_on: Dec 11, 2010
:author: marcink
:copyright: (c) 2013 RhodeCode GmbH.
:license: GPLv3, see LICENSE for more details.
"""
added dbmigrate package, added model changes...
r833
fixed imports on migrate, added getting current version from database
r835 import logging
from sqlalchemy import engine_from_config
moved db migration do db manage script, added my cycles for upgrades
r839
added dbmigrate package, added model changes...
r833 from rhodecode.lib.utils import BasePasterCommand, Command, add_cache
fixed wrong migration schema...
r837 from rhodecode.lib.db_manage import DbManage
added dbmigrate package, added model changes...
r833
fixed imports on migrate, added getting current version from database
r835 log = logging.getLogger(__name__)
added dbmigrate package, added model changes...
r833
pep8ify
r1210
added dbmigrate package, added model changes...
r833 class UpgradeDb(BasePasterCommand):
"""Command used for paster to upgrade our database to newer version
"""
max_args = 1
min_args = 1
usage = "CONFIG_FILE"
pasters RhodeCode commands help text improvements
r3339 summary = "Upgrades current db to newer version"
added dbmigrate package, added model changes...
r833 group_name = "RhodeCode"
parser = Command.standard_parser(verbose=True)
def command(self):
from pylons import config
add_cache(config)
fixed imports on migrate, added getting current version from database
r835
dbmigrations:...
r836 db_uri = config['sqlalchemy.db1.url']
fixed wrong migration schema...
r837 dbmanage = DbManage(log_sql=True, dbconf=db_uri,
Bradley M. Kuhn
Imported some of the GPLv3'd changes from RhodeCode v2.2.5....
r4116 root=config['here'], tests=False,
cli_args=self.options.__dict__)
moved db migration do db manage script, added my cycles for upgrades
r839 dbmanage.upgrade()
fixed wrong migration schema...
r837
added dbmigrate package, added model changes...
r833 def update_parser(self):
self.parser.add_option('--sql',
action='store_true',
dest='just_sql',
help="Prints upgrade sql for further investigation",
default=False)
Bradley M. Kuhn
Imported some of the GPLv3'd changes from RhodeCode v2.2.5....
r4116
self.parser.add_option('--force-yes',
action='store_true',
dest='force_ask',
default=None,
help='Force yes to every question')
self.parser.add_option('--force-no',
action='store_false',
dest='force_ask',
default=None,
help='Force no to every question')