Mercurial > kallithea
changeset 4525:54df936a9bd3
Fix typos in comments
author | Na'Tosha Bard <natosha@unity3d.com> |
---|---|
date | Fri, 19 Sep 2014 10:52:59 +0200 |
parents | cfd7894f2d00 |
children | 1f94dd1e2757 |
files | kallithea/controllers/compare.py kallithea/model/db.py kallithea/model/forms.py kallithea/model/scm.py kallithea/model/user.py |
diffstat | 5 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/controllers/compare.py Thu Aug 28 11:42:44 2014 +0200 +++ b/kallithea/controllers/compare.py Fri Sep 19 10:52:59 2014 +0200 @@ -63,9 +63,9 @@ ... and the other way ... and the ancestor that would be used for merge - :param org_repo: repo object, that is most likely the orginal repo we forked from + :param org_repo: repo object, that is most likely the original repo we forked from :param org_rev: the revision we want our compare to be made - :param other_repo: repo object, mostl likely the fork of org_repo. It hass + :param other_repo: repo object, most likely the fork of org_repo. It has all changesets that we need to obtain :param other_rev: revision we want out compare to be made on other_repo """
--- a/kallithea/model/db.py Thu Aug 28 11:42:44 2014 +0200 +++ b/kallithea/model/db.py Fri Sep 19 10:52:59 2014 +0200 @@ -238,8 +238,8 @@ @classmethod def create_or_update(cls, key, val=Optional(''), type=Optional('unicode')): """ - Creates or updates Kallithea setting. If updates is triggered it will only - update parameters that are explicityl set Optional instance will be skipped + Creates or updates Kallithea setting. If updates are triggered, it will only + update parameters that are explicitly set. Optional instance will be skipped. :param key: :param val:
--- a/kallithea/model/forms.py Thu Aug 28 11:42:44 2014 +0200 +++ b/kallithea/model/forms.py Fri Sep 19 10:52:59 2014 +0200 @@ -160,7 +160,7 @@ if edit: #FIXME: do a special check that we cannot move a group to one of - #it's children + #its children pass group_parent_id = All(v.CanCreateGroup(can_create_in_root), v.OneOf(available_groups, hideList=False,
--- a/kallithea/model/scm.py Thu Aug 28 11:42:44 2014 +0200 +++ b/kallithea/model/scm.py Fri Sep 19 10:52:59 2014 +0200 @@ -303,7 +303,7 @@ def get_repos(self, all_repos=None, sort_key=None, simple=False): """ - Get all repos from db and for each repo create it's + Get all repos from db and for each repo create its backend instance and fill that backed with information from database :param all_repos: list of repository names as strings @@ -586,7 +586,7 @@ :param repo_name: name of repository :param revision: revision for which to list nodes :param root_path: root path to list - :param flat: return as a list, if False returns a dict with decription + :param flat: return as a list, if False returns a dict with description """ _files = list() @@ -755,7 +755,7 @@ processed_nodes = [] for f_path in nodes: f_path = self._sanitize_path(f_path) - # content can be empty but for compatabilty it allows same dicts + # content can be empty but for compatibility it allows same dicts # structure as add_nodes content = nodes[f_path].get('content') processed_nodes.append((f_path, content))
--- a/kallithea/model/user.py Thu Aug 28 11:42:44 2014 +0200 +++ b/kallithea/model/user.py Fri Sep 19 10:52:59 2014 +0200 @@ -348,7 +348,7 @@ """ Fetches auth_user by user_id,or api_key if present. Fills auth_user attributes with those taken from database. - Additionally set's is_authenitated if lookup fails + Additionally sets is_authenitated if lookup fails present in database :param auth_user: instance of user to set attributes