Files
@ aa3b55946089
Branch filter:
Location: kallithea/rhodecode/lib/exceptions.py - annotation
aa3b55946089
2.3 KiB
text/x-python
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
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
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 | c1516b35f91d a671db5bdd58 a671db5bdd58 a671db5bdd58 a671db5bdd58 6832ef664673 26237de9b613 26237de9b613 26237de9b613 26237de9b613 6832ef664673 26237de9b613 a671db5bdd58 ffd45b185016 ffd45b185016 ffd45b185016 ffd45b185016 ffd45b185016 ffd45b185016 ffd45b185016 ffd45b185016 ffd45b185016 ffd45b185016 ffd45b185016 c1516b35f91d aa17c7a1b8a5 aa17c7a1b8a5 c1516b35f91d c1516b35f91d c1516b35f91d c1516b35f91d c1516b35f91d c1516b35f91d c1516b35f91d c1516b35f91d 26237de9b613 c1516b35f91d c1516b35f91d c1516b35f91d c1516b35f91d c1516b35f91d c1516b35f91d 1bb0fcdec895 c1516b35f91d c1516b35f91d c1516b35f91d c1516b35f91d c1516b35f91d c1516b35f91d c1516b35f91d a62af7d509ee 89efedac4e6c fa6ba6727475 a62af7d509ee 4fbbc65e8cd5 4fbbc65e8cd5 4fbbc65e8cd5 aa17c7a1b8a5 aa17c7a1b8a5 aa17c7a1b8a5 b44979649915 b44979649915 b44979649915 b44979649915 d9b89874edf9 d9b89874edf9 d9b89874edf9 d9b89874edf9 dc4644865e8b dc4644865e8b dc4644865e8b dc4644865e8b aa17c7a1b8a5 aa17c7a1b8a5 7174ee850baa 7174ee850baa aa17c7a1b8a5 aa17c7a1b8a5 aa17c7a1b8a5 aa17c7a1b8a5 aa17c7a1b8a5 7174ee850baa 7174ee850baa 7174ee850baa 7174ee850baa aa17c7a1b8a5 aa17c7a1b8a5 aa17c7a1b8a5 008e460c5b9d 008e460c5b9d 008e460c5b9d 008e460c5b9d 3b136af34329 3b136af34329 3b136af34329 3b136af34329 3b136af34329 3b136af34329 3b136af34329 3b136af34329 7676606f7622 7676606f7622 7676606f7622 7676606f7622 | # -*- 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.exceptions
~~~~~~~~~~~~~~~~~~~~~~~~
Set of custom exceptions used in RhodeCode
:created_on: Nov 17, 2010
:author: marcink
:copyright: (c) 2013 RhodeCode GmbH.
:license: GPLv3, see LICENSE for more details.
"""
from webob.exc import HTTPClientError
class LdapUsernameError(Exception):
pass
class LdapPasswordError(Exception):
pass
class LdapConnectionError(Exception):
pass
class LdapImportError(Exception):
pass
class DefaultUserException(Exception):
pass
class UserOwnsReposException(Exception):
pass
class UserGroupsAssignedException(Exception):
pass
class StatusChangeOnClosedPullRequestError(Exception):
pass
class AttachedForksError(Exception):
pass
class RepoGroupAssignmentError(Exception):
pass
class NonRelativePathError(Exception):
pass
class HTTPLockedRC(HTTPClientError):
"""
Special Exception For locked Repos in RhodeCode, the return code can
be overwritten by _code keyword argument passed into constructors
"""
code = 423
title = explanation = 'Repository Locked'
def __init__(self, reponame, username, *args, **kwargs):
from rhodecode import CONFIG
from rhodecode.lib.utils2 import safe_int
_code = CONFIG.get('lock_ret_code')
self.code = safe_int(_code, self.code)
self.title = self.explanation = ('Repository `%s` locked by '
'user `%s`' % (reponame, username))
super(HTTPLockedRC, self).__init__(*args, **kwargs)
class IMCCommitError(Exception):
pass
class UserCreationError(Exception):
pass
class RepositoryCreationError(Exception):
pass
class HgsubversionImportError(Exception):
pass
|