# HG changeset patch # User Marcin Kuzminski # Date 2013-07-16 19:54:28 # Node ID a5888ca796b5ae448e704498cc7d2273d9ab4bdd # Parent 7c73f1868318763928c8182ef6f72cae4a053b5d Fixed spelling of get's to gets diff --git a/rhodecode/bin/template.ini.mako b/rhodecode/bin/template.ini.mako --- a/rhodecode/bin/template.ini.mako +++ b/rhodecode/bin/template.ini.mako @@ -67,7 +67,7 @@ proc_name = rhodecode <%text>## recommended for bigger setup is using of of other than sync one worker_class = sync max_requests = 1000 -<%text>## ammount of time a worker can handle request before it get's killed and +<%text>## ammount of time a worker can handle request before it gets killed and <%text>## restarted timeout = 3600 %endif diff --git a/rhodecode/config/deployment.ini_tmpl b/rhodecode/config/deployment.ini_tmpl --- a/rhodecode/config/deployment.ini_tmpl +++ b/rhodecode/config/deployment.ini_tmpl @@ -59,7 +59,7 @@ max_request_body_size = 107374182400 ## recommended for bigger setup is using of of other than sync one #worker_class = sync #max_requests = 5 -## ammount of time a worker can handle request before it get's killed and +## ammount of time a worker can handle request before it gets killed and ## restarted #timeout = 3600 diff --git a/rhodecode/config/post_receive_tmpl.py b/rhodecode/config/post_receive_tmpl.py --- a/rhodecode/config/post_receive_tmpl.py +++ b/rhodecode/config/post_receive_tmpl.py @@ -22,7 +22,7 @@ def main(): push_data = sys.stdin.readlines() # os.environ is modified here by a subprocess call that # runs git and later git executes this hook. - # Environ get's some additional info from rhodecode system + # Environ gets some additional info from rhodecode system # like IP or username from basic-auth handle_git_post_receive(repo_path, push_data, os.environ) sys.exit(0) diff --git a/rhodecode/config/pre_receive_tmpl.py b/rhodecode/config/pre_receive_tmpl.py --- a/rhodecode/config/pre_receive_tmpl.py +++ b/rhodecode/config/pre_receive_tmpl.py @@ -22,7 +22,7 @@ def main(): push_data = sys.stdin.readlines() # os.environ is modified here by a subprocess call that # runs git and later git executes this hook. - # Environ get's some additional info from rhodecode system + # Environ gets some additional info from rhodecode system # like IP or username from basic-auth handle_git_pre_receive(repo_path, push_data, os.environ) sys.exit(0) diff --git a/rhodecode/config/rcextensions/__init__.py b/rhodecode/config/rcextensions/__init__.py --- a/rhodecode/config/rcextensions/__init__.py +++ b/rhodecode/config/rcextensions/__init__.py @@ -22,7 +22,7 @@ EXTRA_LEXERS = {} INDEX_EXTENSIONS = [] # additional extensions for indexing besides the default from pygments -# those get's added to INDEX_EXTENSIONS +# those gets added to INDEX_EXTENSIONS EXTRA_INDEX_EXTENSIONS = [] diff --git a/rhodecode/controllers/summary.py b/rhodecode/controllers/summary.py --- a/rhodecode/controllers/summary.py +++ b/rhodecode/controllers/summary.py @@ -97,7 +97,7 @@ class SummaryController(BaseRepoControll readme_file = None log.debug('Looking for README file') try: - # get's the landing revision! or tip if fails + # gets the landing revision! or tip if fails cs = db_repo.get_landing_changeset() if isinstance(cs, EmptyChangeset): raise EmptyRepositoryError() diff --git a/rhodecode/lib/auth.py b/rhodecode/lib/auth.py --- a/rhodecode/lib/auth.py +++ b/rhodecode/lib/auth.py @@ -279,7 +279,7 @@ def login_container_auth(username): def get_container_username(environ, config, clean_username=False): """ - Get's the container_auth username (or email). It tries to get username + Gets the container_auth username (or email). It tries to get username from REMOTE_USER if container_auth_enabled is enabled, if that fails it tries to get username from HTTP_X_FORWARDED_USER if proxypass_auth_enabled is enabled. clean_username extracts the username from this data if it's diff --git a/rhodecode/lib/base.py b/rhodecode/lib/base.py --- a/rhodecode/lib/base.py +++ b/rhodecode/lib/base.py @@ -124,7 +124,7 @@ class BaseVCSController(object): def _get_by_id(self, repo_name): """ - Get's a special pattern _ from clone url and tries to replace it + Gets a special pattern _ from clone url and tries to replace it with a repository_name for support of _ non changable urls :param repo_name: diff --git a/rhodecode/lib/diffs.py b/rhodecode/lib/diffs.py --- a/rhodecode/lib/diffs.py +++ b/rhodecode/lib/diffs.py @@ -243,7 +243,7 @@ class DiffProcessor(object): self.cur_diff_size += len(string) - # escaper get's iterated on each .next() call and it checks if each + # escaper gets iterated on each .next() call and it checks if each # parsed line doesn't exceed the diff limit if self.diff_limit is not None and self.cur_diff_size > self.diff_limit: raise DiffLimitExceeded('Diff Limit Exceeded') diff --git a/rhodecode/lib/middleware/simplegit.py b/rhodecode/lib/middleware/simplegit.py --- a/rhodecode/lib/middleware/simplegit.py +++ b/rhodecode/lib/middleware/simplegit.py @@ -70,7 +70,7 @@ dulserver.DEFAULT_HANDLERS = { 'git-receive-pack': dulserver.ReceivePackHandler, } -# not used for now until dulwich get's fixed +# not used for now until dulwich gets fixed #from dulwich.repo import Repo #from dulwich.web import make_wsgi_chain @@ -264,7 +264,7 @@ class SimpleGit(BaseVCSController): def __get_repository(self, environ): """ - Get's repository name out of PATH_INFO header + Gets repository name out of PATH_INFO header :param environ: environ where PATH_INFO is stored """ diff --git a/rhodecode/lib/middleware/simplehg.py b/rhodecode/lib/middleware/simplehg.py --- a/rhodecode/lib/middleware/simplehg.py +++ b/rhodecode/lib/middleware/simplehg.py @@ -218,7 +218,7 @@ class SimpleHg(BaseVCSController): def __get_repository(self, environ): """ - Get's repository name out of PATH_INFO header + Gets repository name out of PATH_INFO header :param environ: environ where PATH_INFO is stored """ diff --git a/rhodecode/lib/vcs/backends/git/changeset.py b/rhodecode/lib/vcs/backends/git/changeset.py --- a/rhodecode/lib/vcs/backends/git/changeset.py +++ b/rhodecode/lib/vcs/backends/git/changeset.py @@ -470,7 +470,7 @@ class GitChangeset(BaseChangeset): @LazyProperty def affected_files(self): """ - Get's a fast accessible file changes for given changeset + Gets a fast accessible file changes for given changeset """ added, modified, deleted = self._changes_cache return list(added.union(modified).union(deleted)) diff --git a/rhodecode/lib/vcs/backends/git/repository.py b/rhodecode/lib/vcs/backends/git/repository.py --- a/rhodecode/lib/vcs/backends/git/repository.py +++ b/rhodecode/lib/vcs/backends/git/repository.py @@ -435,7 +435,7 @@ class GitRepository(BaseRepository): @LazyProperty def bookmarks(self): """ - Get's bookmarks for this repository + Gets bookmarks for this repository """ return {} diff --git a/rhodecode/lib/vcs/backends/hg/changeset.py b/rhodecode/lib/vcs/backends/hg/changeset.py --- a/rhodecode/lib/vcs/backends/hg/changeset.py +++ b/rhodecode/lib/vcs/backends/hg/changeset.py @@ -355,7 +355,7 @@ class MercurialChangeset(BaseChangeset): @LazyProperty def affected_files(self): """ - Get's a fast accessible file changes for given changeset + Gets a fast accessible file changes for given changeset """ return self._ctx.files() diff --git a/rhodecode/lib/vcs/backends/hg/repository.py b/rhodecode/lib/vcs/backends/hg/repository.py --- a/rhodecode/lib/vcs/backends/hg/repository.py +++ b/rhodecode/lib/vcs/backends/hg/repository.py @@ -113,7 +113,7 @@ class MercurialRepository(BaseRepository def _get_branches(self, normal=True, closed=False): """ - Get's branches for this repository + Gets branches for this repository Returns only not closed branches by default :param closed: return also closed branches for mercurial @@ -155,7 +155,7 @@ class MercurialRepository(BaseRepository @LazyProperty def tags(self): """ - Get's tags for this repository + Gets tags for this repository """ return self._get_tags() @@ -234,7 +234,7 @@ class MercurialRepository(BaseRepository @LazyProperty def bookmarks(self): """ - Get's bookmarks for this repository + Gets bookmarks for this repository """ return self._get_bookmarks() @@ -411,7 +411,7 @@ class MercurialRepository(BaseRepository def _get_revision(self, revision): """ - Get's an ID revision given as str. This will always return a fill + Gets an ID revision given as str. This will always return a fill 40 char revision number :param revision: str or int or None diff --git a/rhodecode/model/__init__.py b/rhodecode/model/__init__.py --- a/rhodecode/model/__init__.py +++ b/rhodecode/model/__init__.py @@ -79,7 +79,7 @@ class BaseModel(object): def _get_instance(self, cls, instance, callback=None): """ - Get's instance of given cls using some simple lookup mechanism. + Gets instance of given cls using some simple lookup mechanism. :param cls: class to fetch :param instance: int or Instance diff --git a/rhodecode/model/comment.py b/rhodecode/model/comment.py --- a/rhodecode/model/comment.py +++ b/rhodecode/model/comment.py @@ -240,7 +240,7 @@ class ChangesetCommentsModel(BaseModel): def get_comments(self, repo_id, revision=None, pull_request=None): """ - Get's main comments based on revision or pull_request_id + Gets main comments based on revision or pull_request_id :param repo_id: :param revision: diff --git a/rhodecode/model/repo.py b/rhodecode/model/repo.py --- a/rhodecode/model/repo.py +++ b/rhodecode/model/repo.py @@ -83,7 +83,7 @@ class RepoModel(BaseModel): @LazyProperty def repos_path(self): """ - Get's the repositories root path from database + Gets the repositories root path from database """ q = self.sa.query(RhodeCodeUi).filter(RhodeCodeUi.ui_key == '/').one() @@ -112,7 +112,7 @@ class RepoModel(BaseModel): def get_all_user_repos(self, user): """ - Get's all repositories that user have at least read access + Gets all repositories that user have at least read access :param user: """ @@ -250,7 +250,7 @@ class RepoModel(BaseModel): def _get_defaults(self, repo_name): """ - Get's information about repository, and returns a dict for + Gets information about repository, and returns a dict for usage in forms :param repo_name: diff --git a/rhodecode/model/repos_group.py b/rhodecode/model/repos_group.py --- a/rhodecode/model/repos_group.py +++ b/rhodecode/model/repos_group.py @@ -53,7 +53,7 @@ class ReposGroupModel(BaseModel): @LazyProperty def repos_path(self): """ - Get's the repositories root path from database + Gets the repositories root path from database """ q = RhodeCodeUi.get_by_key('/') diff --git a/rhodecode/model/scm.py b/rhodecode/model/scm.py --- a/rhodecode/model/scm.py +++ b/rhodecode/model/scm.py @@ -250,7 +250,7 @@ class ScmModel(BaseModel): @LazyProperty def repos_path(self): """ - Get's the repositories root path from database + Gets the repositories root path from database """ q = self.sa.query(RhodeCodeUi).filter(RhodeCodeUi.ui_key == '/').one() diff --git a/rhodecode/public/js/native.history.js b/rhodecode/public/js/native.history.js --- a/rhodecode/public/js/native.history.js +++ b/rhodecode/public/js/native.history.js @@ -342,7 +342,7 @@ /** * History.getInternetExplorerMajorVersion() - * Get's the major version of Internet Explorer + * Gets the major version of Internet Explorer * @return {integer} * @license Public Domain * @author Benjamin Arthur Lupton @@ -1971,4 +1971,4 @@ // Try and Initialise History History.init(); -})(window); \ No newline at end of file +})(window); diff --git a/rhodecode/tests/functional/test_changeset_comments.py b/rhodecode/tests/functional/test_changeset_comments.py --- a/rhodecode/tests/functional/test_changeset_comments.py +++ b/rhodecode/tests/functional/test_changeset_comments.py @@ -122,7 +122,7 @@ class TestChangeSetCommentsController(Te self.assertEqual(Notification.query().count(), 2) users = [x.user.username for x in UserNotification.query().all()] - # test_regular get's notification by @mention + # test_regular gets notification by @mention self.assertEqual(sorted(users), [u'test_admin', u'test_regular']) def test_delete(self): diff --git a/rhodecode/tests/models/test_permissions.py b/rhodecode/tests/models/test_permissions.py --- a/rhodecode/tests/models/test_permissions.py +++ b/rhodecode/tests/models/test_permissions.py @@ -89,7 +89,7 @@ class TestPermissions(BaseTestCase): RepoModel().grant_user_permission(repo=HG_REPO, user=self.a1, perm=new_perm) Session().commit() - # cannot really downgrade admins permissions !? they still get's set as + # cannot really downgrade admins permissions !? they still gets set as # admin ! u1_auth = AuthUser(user_id=self.a1.user_id) self.assertEqual(u1_auth.permissions['repositories'][HG_REPO],