kallithea Changeset - 7676606f7622

Changeset - 7676606f7622

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Grzegorz Rożniecki - 12 years ago 2013-07-17 09:19:10
xaerxess@gmail.com

Transplanted from: 9740dcdeaea0

Added more detailed (and localized) information if hgsubversion is not
installed while enabling from settings

2 files changed with 16 insertions and 0 deletions:

rhodecode/controllers/admin/settings.py

rhodecode/lib/exceptions.py

0 comments (0 inline, 0 general)

rhodecode/controllers/admin/settings.py

➞

Show inline comments

@@ @@ -38,12 +38,13 @@ from pylons.i18n.translation import _ @@
 from rhodecode.lib import helpers as h
 from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator, \
     HasPermissionAnyDecorator, NotAnonymous, HasPermissionAny,\
     HasReposGroupPermissionAll, HasReposGroupPermissionAny, AuthUser
 from rhodecode.lib.base import BaseController, render
 from rhodecode.lib.celerylib import tasks, run_task
 from rhodecode.lib.exceptions import HgsubversionImportError
 from rhodecode.lib.utils import repo2db_mapper, set_rhodecode_config, \
     check_git_version
 from rhodecode.model.db import RhodeCodeUi, Repository, RepoGroup, \
     RhodeCodeSetting, PullRequest, PullRequestReviewers
 from rhodecode.model.forms import UserForm, ApplicationSettingsForm, \
     ApplicationUiSettingsForm, ApplicationVisualisationForm
@@ @@ -284,12 +285,17 @@ class SettingsController(BaseController) @@
                     #make one if it's not there !
                     sett = RhodeCodeUi()
                     sett.ui_key = 'hgsubversion'
                     sett.ui_section = 'extensions'
                 sett.ui_active = form_result['extensions_hgsubversion']
                 if sett.ui_active:
                     try:
                         import hgsubversion
                     except ImportError:
                         raise HgsubversionImportError
                 Session().add(sett)
 #                sett = RhodeCodeUi.get_by_key('hggit')
 #                if not sett:
 #                    #make one if it's not there !
 #                    sett = RhodeCodeUi()
@@ @@ -300,12 +306,18 @@ class SettingsController(BaseController) @@
 #                Session().add(sett)
                 Session().commit()
                 h.flash(_('Updated VCS settings'), category='success')
             except HgsubversionImportError:
                 log.error(traceback.format_exc())
                 h.flash(_('Unable to activate hgsubversion support. '
                           'The "hgsubversion" library is missing'),
                         category='error')
             except Exception:
                 log.error(traceback.format_exc())
                 h.flash(_('Error occurred during updating '
                           'application settings'), category='error')
         if setting_id == 'hooks':

rhodecode/lib/exceptions.py

➞

Show inline comments

@@ @@ -95,6 +95,10 @@ class IMCCommitError(Exception): @@
 class UserCreationError(Exception):
     pass
 class RepositoryCreationError(Exception):
     pass
 class HgsubversionImportError(Exception):
     pass

0 comments (0 inline, 0 general)