[PATCH 1 of 3] controllers: trivial typo fixes
Thomas De Schampheleire
patrickdepinguin at gmail.com
Thu Mar 12 17:21:48 EDT 2015
# HG changeset patch
# User Thomas De Schampheleire <thomas.de.schampheleire at gmail.com>
# Date 1426195197 -3600
# Thu Mar 12 22:19:57 2015 +0100
# Node ID 38ae235a0df6eaa497fe1d2d98d322bb3ba04623
# Parent cf8eab44c6ec583f7a0642b7274d2222a30d15e3
controllers: trivial typo fixes
diff --git a/kallithea/controllers/admin/auth_settings.py b/kallithea/controllers/admin/auth_settings.py
--- a/kallithea/controllers/admin/auth_settings.py
+++ b/kallithea/controllers/admin/auth_settings.py
@@ -86,7 +86,7 @@
setting = Setting.get_by_name(fullname)
if setting:
_defaults[fullname] = setting.app_settings_value
- # we want to show , seperated list of enabled plugins
+ # we want to show , separated list of enabled plugins
_defaults['auth_plugins'] = ','.join(_defaults['auth_plugins'])
if defaults:
_defaults.update(defaults)
diff --git a/kallithea/controllers/admin/gists.py b/kallithea/controllers/admin/gists.py
--- a/kallithea/controllers/admin/gists.py
+++ b/kallithea/controllers/admin/gists.py
@@ -285,7 +285,7 @@
##TODO: maybe move this to model ?
if revision != last_rev.raw_id:
- log.error('Last revision %s is different then submited %s'
+ log.error('Last revision %s is different than submitted %s'
% (revision, last_rev))
# our gist has newer version than we
success = False
diff --git a/kallithea/controllers/admin/repos.py b/kallithea/controllers/admin/repos.py
--- a/kallithea/controllers/admin/repos.py
+++ b/kallithea/controllers/admin/repos.py
@@ -508,8 +508,8 @@
@HasRepoPermissionAllDecorator('repository.admin')
def edit_advanced_journal(self, repo_name):
"""
- Set's this repository to be visible in public journal,
- in other words assing default user to follow this repo
+ Sets this repository to be visible in public journal,
+ in other words asking default user to follow this repo
:param repo_name:
"""
diff --git a/kallithea/controllers/api/api.py b/kallithea/controllers/api/api.py
--- a/kallithea/controllers/api/api.py
+++ b/kallithea/controllers/api/api.py
@@ -308,7 +308,7 @@
userid=Optional(OAttr('apiuser'))):
"""
Set locking state on given repository by given user. If userid param
- is skipped, then it is set to id of user whos calling this method.
+ is skipped, then it is set to id of user who is calling this method.
If locked param is skipped then function shows current lock state of
given repo. This command can be executed only using api_key belonging
to user with admin rights or regular user that have admin or write
@@ -426,7 +426,7 @@
def get_locks(self, apiuser, userid=Optional(OAttr('apiuser'))):
"""
Get all repositories with locks for given userid, if
- this command is runned by non-admin account userid is set to user
+ this command is run by non-admin account userid is set to user
who is calling this method, thus returning locks for himself.
:param apiuser: filled automatically from apikey
@@ -535,7 +535,7 @@
def get_user(self, apiuser, userid=Optional(OAttr('apiuser'))):
"""
- Get's an user by username or user_id, Returns empty result if user is
+ Gets a user by username or user_id, Returns empty result if user is
not found. If userid param is skipped it is set to id of user who is
calling this method. This command can be executed only using api_key
belonging to user with admin rights, or regular users that cannot
@@ -559,7 +559,7 @@
"lastname" : "<lastname>",
"email" : "<email>",
"emails": "[<list of all emails including additional ones>]",
- "ip_addresses": "[<ip_addresse_for_user>,...]",
+ "ip_addresses": "[<ip_address_for_user>,...]",
"active" : "<bool: user active>",
"admin" : "<bool: user is admin>",
"extern_name" : "<extern_name>",
@@ -789,7 +789,7 @@
@HasPermissionAllDecorator('hg.admin')
def delete_user(self, apiuser, userid):
"""
- deletes givenuser if such user exists. This command can
+ deletes given user if such user exists. This command can
be executed only using api_key belonging to user with admin rights.
:param apiuser: filled automatically from apikey
@@ -1513,7 +1513,7 @@
return dict(
msg="Created new repository `%s`" % (repo_name,),
success=True, # cannot return the repo data here since fork
- # cann be done async
+ # can be done async
task=task_id
)
except Exception:
@@ -1593,7 +1593,7 @@
private=Optional(False), landing_rev=Optional('rev:tip')):
"""
Creates a fork of given repo. In case of using celery this will
- immidiatelly return success message, while fork is going to be created
+ immediately return success message, while fork is going to be created
asynchronous. This command can be executed only using api_key belonging to
user with admin rights or regular user that have fork permission, and at least
read access to forking repository. Regular users cannot specify owner parameter.
@@ -1687,7 +1687,7 @@
msg='Created fork of `%s` as `%s`' % (repo.repo_name,
fork_name),
success=True, # cannot return the repo data here since fork
- # cann be done async
+ # can be done async
task=task_id
)
except Exception:
diff --git a/kallithea/controllers/changeset.py b/kallithea/controllers/changeset.py
--- a/kallithea/controllers/changeset.py
+++ b/kallithea/controllers/changeset.py
@@ -15,7 +15,7 @@
kallithea.controllers.changeset
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-changeset controller for pylons showoing changes beetween
+changeset controller for pylons showing changes between
revisions
This file was forked by the Kallithea project in July 2014.
diff --git a/kallithea/controllers/files.py b/kallithea/controllers/files.py
--- a/kallithea/controllers/files.py
+++ b/kallithea/controllers/files.py
@@ -583,7 +583,7 @@
if fd: # fd means we used temporary file
os.close(fd)
if not archive_cache_enabled:
- log.debug('Destroing temp archive %s' % archive)
+ log.debug('Destroying temp archive %s' % archive)
os.remove(archive)
break
yield data
diff --git a/kallithea/controllers/pullrequests.py b/kallithea/controllers/pullrequests.py
--- a/kallithea/controllers/pullrequests.py
+++ b/kallithea/controllers/pullrequests.py
@@ -571,7 +571,7 @@
c.a_branch_name = 'null' # not a branch name ... but close enough
# candidates: descendants of old head that are on the right branch
# and not are the old head itself ...
- # and nothing at all if old head is a descendent of target ref name
+ # and nothing at all if old head is a descendant of target ref name
if other_scm_instance._repo.revs('present(%s)::&%s', c.cs_ranges[-1].raw_id, c.a_branch_name):
c.update_msg = _('This pull request has already been merged to %s.') % c.a_branch_name
elif c.pull_request.is_closed():
More information about the kallithea-general
mailing list