Mercurial > kallithea

comparison rhodecode/controllers/changelog.py @ 4077:0e1023147334

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use safe_str on flash messages.
author Marcin Kuzminski <marcin@python-works.com>
date Tue, 02 Jul 2013 12:04:34 +0200
parents 4fb3a7286e7b
children ffd45b185016
comparison
equal deleted inserted replaced
4076:c7e656e96c5d 4077:0e1023147334
37 from rhodecode.lib.helpers import RepoPage 37 from rhodecode.lib.helpers import RepoPage
38 from rhodecode.lib.compat import json 38 from rhodecode.lib.compat import json
39 from rhodecode.lib.graphmod import _colored, _dagwalker 39 from rhodecode.lib.graphmod import _colored, _dagwalker
40 from rhodecode.lib.vcs.exceptions import RepositoryError, ChangesetDoesNotExistError,\ 40 from rhodecode.lib.vcs.exceptions import RepositoryError, ChangesetDoesNotExistError,\
41 ChangesetError, NodeDoesNotExistError, EmptyRepositoryError 41 ChangesetError, NodeDoesNotExistError, EmptyRepositoryError
42 from rhodecode.lib.utils2 import safe_int 42 from rhodecode.lib.utils2 import safe_int, safe_str
43 43
44 44
45 log = logging.getLogger(__name__) 45 log = logging.getLogger(__name__)
46 46
47 47
89 category='warning') 89 category='warning')
90 redirect(url('changelog_home', repo_name=repo.repo_name)) 90 redirect(url('changelog_home', repo_name=repo.repo_name))
91 91
92 except RepositoryError, e: 92 except RepositoryError, e:
93 log.error(traceback.format_exc()) 93 log.error(traceback.format_exc())
94 h.flash(str(e), category='warning') 94 h.flash(safe_str(e), category='warning')
95 if not partial: 95 if not partial:
96 redirect(h.url('changelog_home', repo_name=repo.repo_name)) 96 redirect(h.url('changelog_home', repo_name=repo.repo_name))
97 raise HTTPBadRequest() 97 raise HTTPBadRequest()
98 98
99 def _graph(self, repo, revs_int, repo_size, size, p): 99 def _graph(self, repo, revs_int, repo_size, size, p):
156 #this node is not present at tip ! 156 #this node is not present at tip !
157 try: 157 try:
158 cs = self.__get_cs_or_redirect(revision, repo_name) 158 cs = self.__get_cs_or_redirect(revision, repo_name)
159 collection = cs.get_file_history(f_path) 159 collection = cs.get_file_history(f_path)
160 except RepositoryError, e: 160 except RepositoryError, e:
161 h.flash(str(e), category='warning') 161 h.flash(safe_str(e), category='warning')
162 redirect(h.url('changelog_home', repo_name=repo_name)) 162 redirect(h.url('changelog_home', repo_name=repo_name))
163 collection = list(reversed(collection)) 163 collection = list(reversed(collection))
164 else: 164 else:
165 collection = c.rhodecode_repo.get_changesets(start=0, 165 collection = c.rhodecode_repo.get_changesets(start=0,
166 branch_name=branch_name) 166 branch_name=branch_name)
171 collection = list(c.pagination) 171 collection = list(c.pagination)
172 page_revisions = [x.raw_id for x in c.pagination] 172 page_revisions = [x.raw_id for x in c.pagination]
173 c.comments = c.rhodecode_db_repo.get_comments(page_revisions) 173 c.comments = c.rhodecode_db_repo.get_comments(page_revisions)
174 c.statuses = c.rhodecode_db_repo.statuses(page_revisions) 174 c.statuses = c.rhodecode_db_repo.statuses(page_revisions)
175 except (EmptyRepositoryError), e: 175 except (EmptyRepositoryError), e:
176 h.flash(str(e), category='warning') 176 h.flash(safe_str(e), category='warning')
177 return redirect(url('summary_home', repo_name=c.repo_name)) 177 return redirect(url('summary_home', repo_name=c.repo_name))
178 except (RepositoryError, ChangesetDoesNotExistError, Exception), e: 178 except (RepositoryError, ChangesetDoesNotExistError, Exception), e:
179 log.error(traceback.format_exc()) 179 log.error(traceback.format_exc())
180 h.flash(str(e), category='error') 180 h.flash(safe_str(e), category='error')
181 return redirect(url('changelog_home', repo_name=c.repo_name)) 181 return redirect(url('changelog_home', repo_name=c.repo_name))
182 182
183 c.branch_name = branch_name 183 c.branch_name = branch_name
184 c.branch_filters = [('', _('All Branches'))] + \ 184 c.branch_filters = [('', _('All Branches'))] + \
185 [(k, k) for k in c.rhodecode_repo.branches.keys()] 185 [(k, k) for k in c.rhodecode_repo.branches.keys()]