Show More
@@ -67,7 +67,7 b' proc_name = rhodecode' | |||||
67 | <%text>## recommended for bigger setup is using of of other than sync one</%text> |
|
67 | <%text>## recommended for bigger setup is using of of other than sync one</%text> | |
68 | worker_class = sync |
|
68 | worker_class = sync | |
69 | max_requests = 1000 |
|
69 | max_requests = 1000 | |
70 |
<%text>## ammount of time a worker can handle request before it get |
|
70 | <%text>## ammount of time a worker can handle request before it gets killed and</%text> | |
71 | <%text>## restarted</%text> |
|
71 | <%text>## restarted</%text> | |
72 | timeout = 3600 |
|
72 | timeout = 3600 | |
73 | %endif |
|
73 | %endif |
@@ -59,7 +59,7 b' max_request_body_size = 107374182400' | |||||
59 | ## recommended for bigger setup is using of of other than sync one |
|
59 | ## recommended for bigger setup is using of of other than sync one | |
60 | #worker_class = sync |
|
60 | #worker_class = sync | |
61 | #max_requests = 5 |
|
61 | #max_requests = 5 | |
62 |
## ammount of time a worker can handle request before it get |
|
62 | ## ammount of time a worker can handle request before it gets killed and | |
63 | ## restarted |
|
63 | ## restarted | |
64 | #timeout = 3600 |
|
64 | #timeout = 3600 | |
65 |
|
65 |
@@ -22,7 +22,7 b' def main():' | |||||
22 | push_data = sys.stdin.readlines() |
|
22 | push_data = sys.stdin.readlines() | |
23 | # os.environ is modified here by a subprocess call that |
|
23 | # os.environ is modified here by a subprocess call that | |
24 | # runs git and later git executes this hook. |
|
24 | # runs git and later git executes this hook. | |
25 |
# Environ get |
|
25 | # Environ gets some additional info from rhodecode system | |
26 | # like IP or username from basic-auth |
|
26 | # like IP or username from basic-auth | |
27 | handle_git_post_receive(repo_path, push_data, os.environ) |
|
27 | handle_git_post_receive(repo_path, push_data, os.environ) | |
28 | sys.exit(0) |
|
28 | sys.exit(0) |
@@ -22,7 +22,7 b' def main():' | |||||
22 | push_data = sys.stdin.readlines() |
|
22 | push_data = sys.stdin.readlines() | |
23 | # os.environ is modified here by a subprocess call that |
|
23 | # os.environ is modified here by a subprocess call that | |
24 | # runs git and later git executes this hook. |
|
24 | # runs git and later git executes this hook. | |
25 |
# Environ get |
|
25 | # Environ gets some additional info from rhodecode system | |
26 | # like IP or username from basic-auth |
|
26 | # like IP or username from basic-auth | |
27 | handle_git_pre_receive(repo_path, push_data, os.environ) |
|
27 | handle_git_pre_receive(repo_path, push_data, os.environ) | |
28 | sys.exit(0) |
|
28 | sys.exit(0) |
@@ -22,7 +22,7 b' EXTRA_LEXERS = {}' | |||||
22 | INDEX_EXTENSIONS = [] |
|
22 | INDEX_EXTENSIONS = [] | |
23 |
|
23 | |||
24 | # additional extensions for indexing besides the default from pygments |
|
24 | # additional extensions for indexing besides the default from pygments | |
25 |
# those get |
|
25 | # those gets added to INDEX_EXTENSIONS | |
26 | EXTRA_INDEX_EXTENSIONS = [] |
|
26 | EXTRA_INDEX_EXTENSIONS = [] | |
27 |
|
27 | |||
28 |
|
28 |
@@ -97,7 +97,7 b' class SummaryController(BaseRepoControll' | |||||
97 | readme_file = None |
|
97 | readme_file = None | |
98 | log.debug('Looking for README file') |
|
98 | log.debug('Looking for README file') | |
99 | try: |
|
99 | try: | |
100 |
# get |
|
100 | # gets the landing revision! or tip if fails | |
101 | cs = db_repo.get_landing_changeset() |
|
101 | cs = db_repo.get_landing_changeset() | |
102 | if isinstance(cs, EmptyChangeset): |
|
102 | if isinstance(cs, EmptyChangeset): | |
103 | raise EmptyRepositoryError() |
|
103 | raise EmptyRepositoryError() |
@@ -279,7 +279,7 b' def login_container_auth(username):' | |||||
279 |
|
279 | |||
280 | def get_container_username(environ, config, clean_username=False): |
|
280 | def get_container_username(environ, config, clean_username=False): | |
281 | """ |
|
281 | """ | |
282 |
Get |
|
282 | Gets the container_auth username (or email). It tries to get username | |
283 | from REMOTE_USER if container_auth_enabled is enabled, if that fails |
|
283 | from REMOTE_USER if container_auth_enabled is enabled, if that fails | |
284 | it tries to get username from HTTP_X_FORWARDED_USER if proxypass_auth_enabled |
|
284 | it tries to get username from HTTP_X_FORWARDED_USER if proxypass_auth_enabled | |
285 | is enabled. clean_username extracts the username from this data if it's |
|
285 | is enabled. clean_username extracts the username from this data if it's |
@@ -124,7 +124,7 b' class BaseVCSController(object):' | |||||
124 |
|
124 | |||
125 | def _get_by_id(self, repo_name): |
|
125 | def _get_by_id(self, repo_name): | |
126 | """ |
|
126 | """ | |
127 |
Get |
|
127 | Gets a special pattern _<ID> from clone url and tries to replace it | |
128 | with a repository_name for support of _<ID> non changable urls |
|
128 | with a repository_name for support of _<ID> non changable urls | |
129 |
|
129 | |||
130 | :param repo_name: |
|
130 | :param repo_name: |
@@ -243,7 +243,7 b' class DiffProcessor(object):' | |||||
243 |
|
243 | |||
244 | self.cur_diff_size += len(string) |
|
244 | self.cur_diff_size += len(string) | |
245 |
|
245 | |||
246 |
# escaper get |
|
246 | # escaper gets iterated on each .next() call and it checks if each | |
247 | # parsed line doesn't exceed the diff limit |
|
247 | # parsed line doesn't exceed the diff limit | |
248 | if self.diff_limit is not None and self.cur_diff_size > self.diff_limit: |
|
248 | if self.diff_limit is not None and self.cur_diff_size > self.diff_limit: | |
249 | raise DiffLimitExceeded('Diff Limit Exceeded') |
|
249 | raise DiffLimitExceeded('Diff Limit Exceeded') |
@@ -70,7 +70,7 b' dulserver.DEFAULT_HANDLERS = {' | |||||
70 | 'git-receive-pack': dulserver.ReceivePackHandler, |
|
70 | 'git-receive-pack': dulserver.ReceivePackHandler, | |
71 | } |
|
71 | } | |
72 |
|
72 | |||
73 |
# not used for now until dulwich get |
|
73 | # not used for now until dulwich gets fixed | |
74 | #from dulwich.repo import Repo |
|
74 | #from dulwich.repo import Repo | |
75 | #from dulwich.web import make_wsgi_chain |
|
75 | #from dulwich.web import make_wsgi_chain | |
76 |
|
76 | |||
@@ -264,7 +264,7 b' class SimpleGit(BaseVCSController):' | |||||
264 |
|
264 | |||
265 | def __get_repository(self, environ): |
|
265 | def __get_repository(self, environ): | |
266 | """ |
|
266 | """ | |
267 |
Get |
|
267 | Gets repository name out of PATH_INFO header | |
268 |
|
268 | |||
269 | :param environ: environ where PATH_INFO is stored |
|
269 | :param environ: environ where PATH_INFO is stored | |
270 | """ |
|
270 | """ |
@@ -218,7 +218,7 b' class SimpleHg(BaseVCSController):' | |||||
218 |
|
218 | |||
219 | def __get_repository(self, environ): |
|
219 | def __get_repository(self, environ): | |
220 | """ |
|
220 | """ | |
221 |
Get |
|
221 | Gets repository name out of PATH_INFO header | |
222 |
|
222 | |||
223 | :param environ: environ where PATH_INFO is stored |
|
223 | :param environ: environ where PATH_INFO is stored | |
224 | """ |
|
224 | """ |
@@ -470,7 +470,7 b' class GitChangeset(BaseChangeset):' | |||||
470 | @LazyProperty |
|
470 | @LazyProperty | |
471 | def affected_files(self): |
|
471 | def affected_files(self): | |
472 | """ |
|
472 | """ | |
473 |
Get |
|
473 | Gets a fast accessible file changes for given changeset | |
474 | """ |
|
474 | """ | |
475 | added, modified, deleted = self._changes_cache |
|
475 | added, modified, deleted = self._changes_cache | |
476 | return list(added.union(modified).union(deleted)) |
|
476 | return list(added.union(modified).union(deleted)) |
@@ -435,7 +435,7 b' class GitRepository(BaseRepository):' | |||||
435 | @LazyProperty |
|
435 | @LazyProperty | |
436 | def bookmarks(self): |
|
436 | def bookmarks(self): | |
437 | """ |
|
437 | """ | |
438 |
Get |
|
438 | Gets bookmarks for this repository | |
439 | """ |
|
439 | """ | |
440 | return {} |
|
440 | return {} | |
441 |
|
441 |
@@ -355,7 +355,7 b' class MercurialChangeset(BaseChangeset):' | |||||
355 | @LazyProperty |
|
355 | @LazyProperty | |
356 | def affected_files(self): |
|
356 | def affected_files(self): | |
357 | """ |
|
357 | """ | |
358 |
Get |
|
358 | Gets a fast accessible file changes for given changeset | |
359 | """ |
|
359 | """ | |
360 | return self._ctx.files() |
|
360 | return self._ctx.files() | |
361 |
|
361 |
@@ -113,7 +113,7 b' class MercurialRepository(BaseRepository' | |||||
113 |
|
113 | |||
114 | def _get_branches(self, normal=True, closed=False): |
|
114 | def _get_branches(self, normal=True, closed=False): | |
115 | """ |
|
115 | """ | |
116 |
Get |
|
116 | Gets branches for this repository | |
117 | Returns only not closed branches by default |
|
117 | Returns only not closed branches by default | |
118 |
|
118 | |||
119 | :param closed: return also closed branches for mercurial |
|
119 | :param closed: return also closed branches for mercurial | |
@@ -155,7 +155,7 b' class MercurialRepository(BaseRepository' | |||||
155 | @LazyProperty |
|
155 | @LazyProperty | |
156 | def tags(self): |
|
156 | def tags(self): | |
157 | """ |
|
157 | """ | |
158 |
Get |
|
158 | Gets tags for this repository | |
159 | """ |
|
159 | """ | |
160 | return self._get_tags() |
|
160 | return self._get_tags() | |
161 |
|
161 | |||
@@ -234,7 +234,7 b' class MercurialRepository(BaseRepository' | |||||
234 | @LazyProperty |
|
234 | @LazyProperty | |
235 | def bookmarks(self): |
|
235 | def bookmarks(self): | |
236 | """ |
|
236 | """ | |
237 |
Get |
|
237 | Gets bookmarks for this repository | |
238 | """ |
|
238 | """ | |
239 | return self._get_bookmarks() |
|
239 | return self._get_bookmarks() | |
240 |
|
240 | |||
@@ -411,7 +411,7 b' class MercurialRepository(BaseRepository' | |||||
411 |
|
411 | |||
412 | def _get_revision(self, revision): |
|
412 | def _get_revision(self, revision): | |
413 | """ |
|
413 | """ | |
414 |
Get |
|
414 | Gets an ID revision given as str. This will always return a fill | |
415 | 40 char revision number |
|
415 | 40 char revision number | |
416 |
|
416 | |||
417 | :param revision: str or int or None |
|
417 | :param revision: str or int or None |
@@ -79,7 +79,7 b' class BaseModel(object):' | |||||
79 |
|
79 | |||
80 | def _get_instance(self, cls, instance, callback=None): |
|
80 | def _get_instance(self, cls, instance, callback=None): | |
81 | """ |
|
81 | """ | |
82 |
Get |
|
82 | Gets instance of given cls using some simple lookup mechanism. | |
83 |
|
83 | |||
84 | :param cls: class to fetch |
|
84 | :param cls: class to fetch | |
85 | :param instance: int or Instance |
|
85 | :param instance: int or Instance |
@@ -240,7 +240,7 b' class ChangesetCommentsModel(BaseModel):' | |||||
240 |
|
240 | |||
241 | def get_comments(self, repo_id, revision=None, pull_request=None): |
|
241 | def get_comments(self, repo_id, revision=None, pull_request=None): | |
242 | """ |
|
242 | """ | |
243 |
Get |
|
243 | Gets main comments based on revision or pull_request_id | |
244 |
|
244 | |||
245 | :param repo_id: |
|
245 | :param repo_id: | |
246 | :param revision: |
|
246 | :param revision: |
@@ -83,7 +83,7 b' class RepoModel(BaseModel):' | |||||
83 | @LazyProperty |
|
83 | @LazyProperty | |
84 | def repos_path(self): |
|
84 | def repos_path(self): | |
85 | """ |
|
85 | """ | |
86 |
Get |
|
86 | Gets the repositories root path from database | |
87 | """ |
|
87 | """ | |
88 |
|
88 | |||
89 | q = self.sa.query(RhodeCodeUi).filter(RhodeCodeUi.ui_key == '/').one() |
|
89 | q = self.sa.query(RhodeCodeUi).filter(RhodeCodeUi.ui_key == '/').one() | |
@@ -112,7 +112,7 b' class RepoModel(BaseModel):' | |||||
112 |
|
112 | |||
113 | def get_all_user_repos(self, user): |
|
113 | def get_all_user_repos(self, user): | |
114 | """ |
|
114 | """ | |
115 |
Get |
|
115 | Gets all repositories that user have at least read access | |
116 |
|
116 | |||
117 | :param user: |
|
117 | :param user: | |
118 | """ |
|
118 | """ | |
@@ -250,7 +250,7 b' class RepoModel(BaseModel):' | |||||
250 |
|
250 | |||
251 | def _get_defaults(self, repo_name): |
|
251 | def _get_defaults(self, repo_name): | |
252 | """ |
|
252 | """ | |
253 |
Get |
|
253 | Gets information about repository, and returns a dict for | |
254 | usage in forms |
|
254 | usage in forms | |
255 |
|
255 | |||
256 | :param repo_name: |
|
256 | :param repo_name: |
@@ -53,7 +53,7 b' class ReposGroupModel(BaseModel):' | |||||
53 | @LazyProperty |
|
53 | @LazyProperty | |
54 | def repos_path(self): |
|
54 | def repos_path(self): | |
55 | """ |
|
55 | """ | |
56 |
Get |
|
56 | Gets the repositories root path from database | |
57 | """ |
|
57 | """ | |
58 |
|
58 | |||
59 | q = RhodeCodeUi.get_by_key('/') |
|
59 | q = RhodeCodeUi.get_by_key('/') |
@@ -250,7 +250,7 b' class ScmModel(BaseModel):' | |||||
250 | @LazyProperty |
|
250 | @LazyProperty | |
251 | def repos_path(self): |
|
251 | def repos_path(self): | |
252 | """ |
|
252 | """ | |
253 |
Get |
|
253 | Gets the repositories root path from database | |
254 | """ |
|
254 | """ | |
255 |
|
255 | |||
256 | q = self.sa.query(RhodeCodeUi).filter(RhodeCodeUi.ui_key == '/').one() |
|
256 | q = self.sa.query(RhodeCodeUi).filter(RhodeCodeUi.ui_key == '/').one() |
@@ -342,7 +342,7 b'' | |||||
342 |
|
342 | |||
343 | /** |
|
343 | /** | |
344 | * History.getInternetExplorerMajorVersion() |
|
344 | * History.getInternetExplorerMajorVersion() | |
345 |
* Get |
|
345 | * Gets the major version of Internet Explorer | |
346 | * @return {integer} |
|
346 | * @return {integer} | |
347 | * @license Public Domain |
|
347 | * @license Public Domain | |
348 | * @author Benjamin Arthur Lupton <contact@balupton.com> |
|
348 | * @author Benjamin Arthur Lupton <contact@balupton.com> | |
@@ -1971,4 +1971,4 b'' | |||||
1971 | // Try and Initialise History |
|
1971 | // Try and Initialise History | |
1972 | History.init(); |
|
1972 | History.init(); | |
1973 |
|
1973 | |||
1974 | })(window); No newline at end of file |
|
1974 | })(window); |
@@ -122,7 +122,7 b' class TestChangeSetCommentsController(Te' | |||||
122 | self.assertEqual(Notification.query().count(), 2) |
|
122 | self.assertEqual(Notification.query().count(), 2) | |
123 | users = [x.user.username for x in UserNotification.query().all()] |
|
123 | users = [x.user.username for x in UserNotification.query().all()] | |
124 |
|
124 | |||
125 |
# test_regular get |
|
125 | # test_regular gets notification by @mention | |
126 | self.assertEqual(sorted(users), [u'test_admin', u'test_regular']) |
|
126 | self.assertEqual(sorted(users), [u'test_admin', u'test_regular']) | |
127 |
|
127 | |||
128 | def test_delete(self): |
|
128 | def test_delete(self): |
@@ -89,7 +89,7 b' class TestPermissions(BaseTestCase):' | |||||
89 | RepoModel().grant_user_permission(repo=HG_REPO, user=self.a1, |
|
89 | RepoModel().grant_user_permission(repo=HG_REPO, user=self.a1, | |
90 | perm=new_perm) |
|
90 | perm=new_perm) | |
91 | Session().commit() |
|
91 | Session().commit() | |
92 |
# cannot really downgrade admins permissions !? they still get |
|
92 | # cannot really downgrade admins permissions !? they still gets set as | |
93 | # admin ! |
|
93 | # admin ! | |
94 | u1_auth = AuthUser(user_id=self.a1.user_id) |
|
94 | u1_auth = AuthUser(user_id=self.a1.user_id) | |
95 | self.assertEqual(u1_auth.permissions['repositories'][HG_REPO], |
|
95 | self.assertEqual(u1_auth.permissions['repositories'][HG_REPO], |
General Comments 0
You need to be logged in to leave comments.
Login now