Mercurial > kallithea

comparison rhodecode/controllers/changelog.py @ 1514:87ec80c280bb beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed issues with python2.5 added compat module to rhodecode to have one point of fetching backward incompatible libs.
author Marcin Kuzminski <marcin@python-works.com>
date Fri, 07 Oct 2011 02:51:18 +0200
parents d21c14e36fa8
children da8f1d1b22de 833f9dec0a06
comparison
equal deleted inserted replaced
1511:a5981def1961 1514:87ec80c280bb
23 # You should have received a copy of the GNU General Public License 23 # You should have received a copy of the GNU General Public License
24 # along with this program. If not, see <http://www.gnu.org/licenses/>. 24 # along with this program. If not, see <http://www.gnu.org/licenses/>.
25 25
26 import logging 26 import logging
27 27
28 try:
29 import json
30 except ImportError:
31 #python 2.5 compatibility
32 import simplejson as json
33
34 from mercurial import graphmod 28 from mercurial import graphmod
35 from pylons import request, session, tmpl_context as c 29 from pylons import request, session, tmpl_context as c
36 30
37 from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator 31 from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
38 from rhodecode.lib.base import BaseRepoController, render 32 from rhodecode.lib.base import BaseRepoController, render
39 from rhodecode.lib.helpers import RepoPage 33 from rhodecode.lib.helpers import RepoPage
34 from rhodecode.lib.compat import json
40 35
41 log = logging.getLogger(__name__) 36 log = logging.getLogger(__name__)
42 37
43 38
44 class ChangelogController(BaseRepoController): 39 class ChangelogController(BaseRepoController):