Mercurial > kallithea
changeset 860:5f7731e3ab4d beta
fixed spelling mistakes, and some minor docs bugs
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Sat, 18 Dec 2010 16:39:46 +0100 |
| parents | e81636a261cf |
| children | fd2ea6ceadc8 |
| files | rhodecode/controllers/admin/ldap_settings.py rhodecode/controllers/admin/permissions.py rhodecode/controllers/admin/repos.py rhodecode/controllers/admin/settings.py rhodecode/controllers/admin/users.py rhodecode/controllers/error.py rhodecode/controllers/settings.py rhodecode/controllers/summary.py rhodecode/lib/utils.py |
| diffstat | 9 files changed, 30 insertions(+), 31 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/controllers/admin/ldap_settings.py Sat Dec 18 16:30:42 2010 +0100 +++ b/rhodecode/controllers/admin/ldap_settings.py Sat Dec 18 16:39:46 2010 +0100 @@ -64,9 +64,7 @@ force_defaults=True,) def ldap_settings(self): - """ - POST ldap create and store ldap settings - """ + """POST ldap create and store ldap settings""" settings_model = SettingsModel() _form = LdapSettingsForm()() @@ -100,7 +98,7 @@ encoding="UTF-8") except Exception: log.error(traceback.format_exc()) - h.flash(_('error occured during update of ldap settings'), + h.flash(_('error occurred during update of ldap settings'), category='error') return redirect(url('ldap_home'))
--- a/rhodecode/controllers/admin/permissions.py Sat Dec 18 16:30:42 2010 +0100 +++ b/rhodecode/controllers/admin/permissions.py Sat Dec 18 16:39:46 2010 +0100 @@ -120,7 +120,7 @@ encoding="UTF-8") except Exception: log.error(traceback.format_exc()) - h.flash(_('error occured during update of permissions'), + h.flash(_('error occurred during update of permissions'), category='error') return redirect(url('edit_permission', id=id))
--- a/rhodecode/controllers/admin/repos.py Sat Dec 18 16:30:42 2010 +0100 +++ b/rhodecode/controllers/admin/repos.py Sat Dec 18 16:39:46 2010 +0100 @@ -107,7 +107,7 @@ except Exception: log.error(traceback.format_exc()) - msg = _('error occured during creation of repository %s') \ + msg = _('error occurred during creation of repository %s') \ % form_result.get('repo_name') h.flash(msg, category='error') if request.POST.get('user_created'): @@ -206,7 +206,7 @@ except Exception, e: log.error(traceback.format_exc()) - h.flash(_('An error occured during deletion of %s') % repo_name, + h.flash(_('An error occurred during deletion of %s') % repo_name, category='error') return redirect(url('repos')) @@ -222,7 +222,7 @@ repo_model = RepoModel() repo_model.delete_perm_user(request.POST, repo_name) except Exception, e: - h.flash(_('An error occured during deletion of repository user'), + h.flash(_('An error occurred during deletion of repository user'), category='error') raise HTTPInternalServerError() @@ -237,14 +237,14 @@ repo_model = RepoModel() repo_model.delete_stats(repo_name) except Exception, e: - h.flash(_('An error occured during deletion of repository stats'), + h.flash(_('An error occurred during deletion of repository stats'), category='error') return redirect(url('edit_repo', repo_name=repo_name)) @HasPermissionAllDecorator('hg.admin') def repo_cache(self, repo_name): """ - INVALIDATE exisitings repository cache + INVALIDATE existing repository cache :param repo_name: """
--- a/rhodecode/controllers/admin/settings.py Sat Dec 18 16:30:42 2010 +0100 +++ b/rhodecode/controllers/admin/settings.py Sat Dec 18 16:39:46 2010 +0100 @@ -1,7 +1,8 @@ # -*- coding: utf-8 -*- """ - package.rhodecode.controllers.admin.settings - ~~~~~~~~~~~~~~ + rhodecode.controllers.admin.settings + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + settings controller for rhodecode admin :created_on: Jul 14, 2010
--- a/rhodecode/controllers/admin/users.py Sat Dec 18 16:30:42 2010 +0100 +++ b/rhodecode/controllers/admin/users.py Sat Dec 18 16:39:46 2010 +0100 @@ -87,7 +87,7 @@ encoding="UTF-8") except Exception: log.error(traceback.format_exc()) - h.flash(_('error occured during creation of user %s') \ + h.flash(_('error occurred during creation of user %s') \ % request.POST.get('username'), category='error') return redirect(url('users')) @@ -144,7 +144,7 @@ except (UserOwnsReposException, DefaultUserException), e: h.flash(str(e), category='warning') except Exception: - h.flash(_('An error occured during deletion of user'), + h.flash(_('An error occurred during deletion of user'), category='error') return redirect(url('users'))
--- a/rhodecode/controllers/error.py Sat Dec 18 16:30:42 2010 +0100 +++ b/rhodecode/controllers/error.py Sat Dec 18 16:39:46 2010 +0100 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """ - package.rhodecode.controllers.error - ~~~~~~~~~~~~~~ + rhodecode.controllers.error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~ RhodeCode error controller
--- a/rhodecode/controllers/settings.py Sat Dec 18 16:30:42 2010 +0100 +++ b/rhodecode/controllers/settings.py Sat Dec 18 16:39:46 2010 +0100 @@ -50,7 +50,7 @@ c.repo_info = repo = repo_model.get_by_repo_name(repo_name) if not repo: h.flash(_('%s repository is not mapped to db perhaps' - ' it was created or renamed from the filesystem' + ' it was created or renamed from the file system' ' please run the application again' ' in order to rescan repositories') % repo_name, category='error') @@ -139,7 +139,7 @@ c.repo_info = repo = repo_model.get_by_repo_name(repo_name) if not repo: h.flash(_('%s repository is not mapped to db perhaps' - ' it was created or renamed from the filesystem' + ' it was created or renamed from the file system' ' please run the application again' ' in order to rescan repositories') % repo_name, category='error')
--- a/rhodecode/controllers/summary.py Sat Dec 18 16:30:42 2010 +0100 +++ b/rhodecode/controllers/summary.py Sat Dec 18 16:39:46 2010 +0100 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """ - package.rhodecode.controllers.summary - ~~~~~~~~~~~~~~ + rhodecode.controllers.summary + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Summary controller for Rhodecode
--- a/rhodecode/lib/utils.py Sat Dec 18 16:30:42 2010 +0100 +++ b/rhodecode/lib/utils.py Sat Dec 18 16:39:46 2010 +0100 @@ -113,6 +113,7 @@ def get_repos(path, recursive=False, initial=False): """ Scans given path for repos and return (name,(type,path)) tuple + :param prefix: :param path: :param recursive: @@ -137,7 +138,7 @@ def check_repo_fast(repo_name, base_path): """ - Check given path for existance of directory + Check given path for existence of directory :param repo_name: :param base_path: @@ -233,8 +234,8 @@ def set_rhodecode_config(config): - """ - Updates pylons config with new settings from database + """Updates pylons config with new settings from database + :param config: """ from rhodecode.model.settings import SettingsModel @@ -244,10 +245,10 @@ config[k] = v def invalidate_cache(cache_key, *args): - """ - Puts cache invalidation task into db for + """Puts cache invalidation task into db for further global cache invalidation """ + from rhodecode.model.scm import ScmModel if cache_key.startswith('get_repo_cached_'): @@ -269,10 +270,10 @@ @LazyProperty def raw_id(self): - """ - Returns raw string identifying this changeset, useful for web + """Returns raw string identifying this changeset, useful for web representation. """ + return self._empty_cs @LazyProperty @@ -289,8 +290,7 @@ return 0 def repo2db_mapper(initial_repo_list, remove_obsolete=False): - """ - maps all found repositories into db + """maps all found repositories into db """ sa = meta.Session() @@ -443,10 +443,10 @@ beaker.cache.cache_regions[region] = region_settings def get_current_revision(): - """ - Returns tuple of (number, id) from repository containing this package + """Returns tuple of (number, id) from repository containing this package or None if repository could not be found. """ + try: from vcs import get_repo from vcs.utils.helpers import get_scm