##// 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
error.py
109 lines | 3.7 KiB | text/x-python | PythonLexer
spelling fixes for error controller
r819 # -*- 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 #
spelling fixes for error controller
r819 # 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 #
spelling fixes for error controller
r819 # 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.controllers.error
~~~~~~~~~~~~~~~~~~~~~~~~~~~
RhodeCode error controller
:created_on: Dec 8, 2010
:author: marcink
:copyright: (c) 2013 RhodeCode GmbH.
:license: GPLv3, see LICENSE for more details.
"""
spelling fixes for error controller
r819 import os
renamed project to rhodecode
r547 import cgi
spelling fixes for error controller
r819 import logging
renamed project to rhodecode
r547 import paste.fileapp
spelling fixes for error controller
r819
pep8ify
r1212 from pylons import tmpl_context as c, request, config, url
renamed project to rhodecode
r547 from pylons.i18n.translation import _
spelling fixes for error controller
r819 from pylons.middleware import media_path
renamed project to rhodecode
r547 from rhodecode.lib.base import BaseController, render
spelling fixes for error controller
r819
renamed project to rhodecode
r547 log = logging.getLogger(__name__)
pep8ify
r1212
renamed project to rhodecode
r547 class ErrorController(BaseController):
spelling fixes for error controller
r819 """Generates error documents as and when they are required.
renamed project to rhodecode
r547
The ErrorDocuments middleware forwards to ErrorController when error
related status codes are returned from the application.
spelling fixes for error controller
r819 This behavior can be altered by changing the parameters to the
renamed project to rhodecode
r547 ErrorDocuments middleware in your config/middleware.py file.
"""
spelling fixes for error controller
r819
renamed project to rhodecode
r547 def __before__(self):
pep8ify
r1212 #disable all base actions since we don't need them here
pass
spelling fixes for error controller
r819
renamed project to rhodecode
r547 def document(self):
resp = request.environ.get('pylons.original_response')
removed obsolete css from 404 page, and implemented rhodecode title app in the error page
r986 c.rhodecode_name = config.get('rhodecode_title')
spelling fixes for error controller
r819
garden...
r1976 log.debug('### %s ###' % resp.status)
renamed project to rhodecode
r547
e = request.environ
pep8ify
r1212 c.serv_p = r'%(protocol)s://%(host)s/' \
% {'protocol': e.get('wsgi.url_scheme'),
'host': e.get('HTTP_HOST'), }
spelling fixes for error controller
r819
renamed project to rhodecode
r547 c.error_message = cgi.escape(request.GET.get('code', str(resp.status)))
c.error_explanation = self.get_error_explanation(resp.status_int)
pep8ify
r1212 # redirect to when error with given seconds
renamed project to rhodecode
r547 c.redirect_time = 0
pep8ify
r1212 c.redirect_module = _('Home page')
renamed project to rhodecode
r547 c.url_redirect = "/"
return render('/errors/error_document.html')
def img(self, id):
"""Serve Pylons' stock images"""
return self._serve_file(os.path.join(media_path, 'img', id))
def style(self, id):
"""Serve Pylons' stock stylesheets"""
return self._serve_file(os.path.join(media_path, 'style', id))
def _serve_file(self, path):
"""Call Paste's FileApp (a WSGI application) to serve the file
at the specified path
"""
fapp = paste.fileapp.FileApp(path)
return fapp(request.environ, self.start_response)
def get_error_explanation(self, code):
use consisten double quote docstring formatting
r3886 """ get the error explanations of int codes
[400, 401, 403, 404, 500]"""
renamed project to rhodecode
r547 try:
code = int(code)
Don't catch all exceptions
r3631 except Exception:
renamed project to rhodecode
r547 code = 500
if code == 400:
pep8ify
r1212 return _('The request could not be understood by the server'
' due to malformed syntax.')
renamed project to rhodecode
r547 if code == 401:
spelling fixes for error controller
r819 return _('Unauthorized access to resource')
renamed project to rhodecode
r547 if code == 403:
return _("You don't have permission to view this page")
if code == 404:
return _('The resource could not be found')
if code == 500:
pep8ify
r1212 return _('The server encountered an unexpected condition'
' which prevented it from fulfilling the request.')