Mercurial > kallithea

comparison rhodecode/controllers/changelog.py @ 2854:d998cc84cf72 rhodecode-0.0.1.4.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge branch beta into stable
author Marcin Kuzminski <marcin@python-works.com>
date Wed, 19 Sep 2012 22:38:12 +0200
parents 63e58ef80ef1 6b176c679896
children 3563bb7b4b82
comparison
equal deleted inserted replaced
2829:026609c4ef02 2854:d998cc84cf72
35 from rhodecode.lib.base import BaseRepoController, render 35 from rhodecode.lib.base import BaseRepoController, render
36 from rhodecode.lib.helpers import RepoPage 36 from rhodecode.lib.helpers import RepoPage
37 from rhodecode.lib.compat import json 37 from rhodecode.lib.compat import json
38 from rhodecode.lib.graphmod import _colored, _dagwalker 38 from rhodecode.lib.graphmod import _colored, _dagwalker
39 from rhodecode.lib.vcs.exceptions import RepositoryError, ChangesetDoesNotExistError 39 from rhodecode.lib.vcs.exceptions import RepositoryError, ChangesetDoesNotExistError
40 from rhodecode.lib.utils2 import safe_int
40 41
41 log = logging.getLogger(__name__) 42 log = logging.getLogger(__name__)
42 43
43 44
44 class ChangelogController(BaseRepoController): 45 class ChangelogController(BaseRepoController):
63 session.save() 64 session.save()
64 else: 65 else:
65 c.size = int(session.get('changelog_size', default)) 66 c.size = int(session.get('changelog_size', default))
66 # min size must be 1 67 # min size must be 1
67 c.size = max(c.size, 1) 68 c.size = max(c.size, 1)
68 p = int(request.params.get('page', 1)) 69 p = safe_int(request.params.get('page', 1), 1)
69 branch_name = request.params.get('branch', None) 70 branch_name = request.params.get('branch', None)
70 try: 71 try:
71 if branch_name: 72 if branch_name:
72 collection = [z for z in 73 collection = [z for z in
73 c.rhodecode_repo.get_changesets(start=0, 74 c.rhodecode_repo.get_changesets(start=0,