##// 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
51 lines | 1.8 KiB | text/x-python | PythonLexer
Bradley M. Kuhn
Imported some of the GPLv3'd changes from RhodeCode v2.2.5....
r4116 # -*- coding: utf-8 -*-
# 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.
#
# 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 General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
"""
rhodecode.lib
~~~~~~~~~~~~~
RhodeCode libs
:created_on: Oct 06, 2010
:author: marcink
:copyright: (c) 2013 RhodeCode GmbH.
:license: GPLv3, see LICENSE for more details.
"""
fixes rhodecode upgrade problem that caused setuptool to crash on importing sqlalchemy models
r1541 import os
added quiet flag into get_current_revision
r1571 def get_current_revision(quiet=False):
fixes rhodecode upgrade problem that caused setuptool to crash on importing sqlalchemy models
r1541 """
Returns tuple of (number, id) from repository containing this package
or None if repository could not be found.
auto white-space removal
r1818
added quiet flag into get_current_revision
r1571 :param quiet: prints error for fetching revision if True
fixes rhodecode upgrade problem that caused setuptool to crash on importing sqlalchemy models
r1541 """
try:
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007 from rhodecode.lib.vcs import get_repo
from rhodecode.lib.vcs.utils.helpers import get_scm
synced vcs with upstream...
r3797 repopath = os.path.abspath(os.path.join(os.path.dirname(__file__),
'..', '..'))
fixes rhodecode upgrade problem that caused setuptool to crash on importing sqlalchemy models
r1541 scm = get_scm(repopath)[0]
repo = get_repo(path=repopath, alias=scm)
current revision will show workdir state, not the latest revision
r3796 wk_dir = repo.workdir
cur_rev = wk_dir.get_changeset()
return (cur_rev.revision, cur_rev.short_id)
Catch all exception on get_current_revision
r1578 except Exception, err:
added quiet flag into get_current_revision
r1571 if not quiet:
be blunt about that error message to not confuse people
r3231 print ("WARNING: Cannot retrieve rhodecode's revision. "
"disregard this if you don't know what that means. "
"Original error was: %s" % err)
fixes rhodecode upgrade problem that caused setuptool to crash on importing sqlalchemy models
r1541 return None