Show More
@@ -134,11 +134,11 b' class ChangelogController(BaseRepoContro' | |||
|
134 | 134 | |
|
135 | 135 | c.branch_name = branch_name |
|
136 | 136 | c.branch_filters = [('', _('None'))] + \ |
|
137 |
[(k, k) for k in c.db_repo_scm_instance.branches |
|
|
137 | [(k, k) for k in c.db_repo_scm_instance.branches] | |
|
138 | 138 | if c.db_repo_scm_instance.closed_branches: |
|
139 | 139 | prefix = _('(closed)') + ' ' |
|
140 | 140 | c.branch_filters += [('-', '-')] + \ |
|
141 |
[(k, prefix + k) for k in c.db_repo_scm_instance.closed_branches |
|
|
141 | [(k, prefix + k) for k in c.db_repo_scm_instance.closed_branches] | |
|
142 | 142 | revs = [] |
|
143 | 143 | if not f_path: |
|
144 | 144 | revs = [x.revision for x in c.cs_pagination] |
@@ -331,8 +331,8 b' class WhooshIndexingDaemon(object):' | |||
|
331 | 331 | log.debug('>> NOTHING TO COMMIT TO CHANGESET INDEX<<') |
|
332 | 332 | |
|
333 | 333 | def update_file_index(self): |
|
334 |
log.debug |
|
|
335 |
|
|
|
334 | log.debug(u'STARTING INCREMENTAL INDEXING UPDATE FOR EXTENSIONS %s ' | |
|
335 | 'AND REPOS %s', INDEX_EXTENSIONS, ' and '.join(self.repo_paths)) | |
|
336 | 336 | |
|
337 | 337 | idx = open_dir(self.index_location, indexname=self.indexname) |
|
338 | 338 | # The set of all paths in the index |
@@ -432,7 +432,7 b' class WhooshIndexingDaemon(object):' | |||
|
432 | 432 | file_idx = create_in(self.index_location, SCHEMA, indexname=IDX_NAME) |
|
433 | 433 | file_idx_writer = file_idx.writer() |
|
434 | 434 | log.debug('BUILDING INDEX FOR EXTENSIONS %s ' |
|
435 |
'AND REPOS %s' |
|
|
435 | 'AND REPOS %s', INDEX_EXTENSIONS, ' and '.join(self.repo_paths)) | |
|
436 | 436 | |
|
437 | 437 | for repo_name, repo in sorted(self.repo_paths.items()): |
|
438 | 438 | log.debug('Updating indices for repo %s', repo_name) |
@@ -9,7 +9,6 b'' | |||
|
9 | 9 | :copyright: (c) 2010-2011 by Marcin Kuzminski, Lukasz Balcerzak. |
|
10 | 10 | """ |
|
11 | 11 | import os |
|
12 | from pprint import pformat | |
|
13 | 12 | |
|
14 | 13 | from kallithea.lib.vcs.conf import settings |
|
15 | 14 | from kallithea.lib.vcs.exceptions import VCSError |
@@ -51,7 +50,7 b' def get_backend(alias):' | |||
|
51 | 50 | """ |
|
52 | 51 | if alias not in settings.BACKENDS: |
|
53 | 52 | raise VCSError("Given alias '%s' is not recognized! Allowed aliases:\n" |
|
54 |
"%s" % (alias, |
|
|
53 | "%s" % (alias, '", "'.join(settings.BACKENDS))) | |
|
55 | 54 | backend_path = settings.BACKENDS[alias] |
|
56 | 55 | klass = import_class(backend_path) |
|
57 | 56 | return klass |
@@ -188,7 +188,7 b' def parse_color_setting(config_string):' | |||
|
188 | 188 | definition['bg'] = colors[-1] |
|
189 | 189 | |
|
190 | 190 | # All remaining instructions are options |
|
191 |
opts = tuple(s for s in styles if s in opt_dict |
|
|
191 | opts = tuple(s for s in styles if s in opt_dict) | |
|
192 | 192 | if opts: |
|
193 | 193 | definition['opts'] = opts |
|
194 | 194 |
@@ -74,6 +74,7 b' class BaseDbModel(object):' | |||
|
74 | 74 | @classmethod |
|
75 | 75 | def _get_keys(cls): |
|
76 | 76 | """return column names for this model """ |
|
77 | # Note: not a normal dict - iterator gives "users.firstname", but keys gives "firstname" | |
|
77 | 78 | return class_mapper(cls).c.keys() |
|
78 | 79 | |
|
79 | 80 | def get_dict(self): |
@@ -177,7 +177,7 b' class EmailNotificationModel(object):' | |||
|
177 | 177 | try: |
|
178 | 178 | subj = tmpl % kwargs |
|
179 | 179 | except KeyError as e: |
|
180 |
log.error('error generating email subject for %r from %s: %s', type_, ','.join(self._subj_map |
|
|
180 | log.error('error generating email subject for %r from %s: %s', type_, ', '.join(self._subj_map), e) | |
|
181 | 181 | raise |
|
182 | 182 | # gmail doesn't do proper threading but will ignore leading square |
|
183 | 183 | # bracket content ... so that is where we put status info |
@@ -5,7 +5,7 b'' | |||
|
5 | 5 | |
|
6 | 6 | <%def name="perms_summary(permissions, show_all=False, actions=True)"> |
|
7 | 7 | <div id="perms"> |
|
8 |
%for section in sorted(permissions |
|
|
8 | %for section in sorted(permissions): | |
|
9 | 9 | <div class="perms_section_head"> |
|
10 | 10 | <h4>${section.replace("_"," ").capitalize()}</h4> |
|
11 | 11 | %if section != 'global': |
General Comments 0
You need to be logged in to leave comments.
Login now