diff --git a/rhodecode/controllers/changelog.py b/rhodecode/controllers/changelog.py
--- a/rhodecode/controllers/changelog.py
+++ b/rhodecode/controllers/changelog.py
@@ -4,10 +4,10 @@
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     changelog controller for rhodecode
-    
+
     :created_on: Apr 21, 2010
     :author: marcink
-    :copyright: (C) 2009-2010 Marcin Kuzminski <marcin@python-works.com>    
+    :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software: you can redistribute it and/or modify
@@ -31,24 +31,24 @@ except ImportError:
     #python 2.5 compatibility
     import simplejson as json
 
-from mercurial.graphmod import colored, CHANGESET, revisions as graph_rev
+from mercurial import graphmod
 from pylons import request, session, tmpl_context as c
 
 from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
-from rhodecode.lib.base import BaseController, render
-from rhodecode.model.scm import ScmModel
-
-from webhelpers.paginate import Page
+from rhodecode.lib.base import BaseRepoController, render
+from rhodecode.lib.helpers import RepoPage
 
 log = logging.getLogger(__name__)
 
-class ChangelogController(BaseController):
+
+class ChangelogController(BaseRepoController):
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
                                    'repository.admin')
     def __before__(self):
         super(ChangelogController, self).__before__()
+        c.affected_files_cut_off = 60
 
     def index(self):
         limit = 100
@@ -65,40 +65,57 @@ class ChangelogController(BaseController
         else:
             c.size = int(session.get('changelog_size', default))
 
-        changesets = ScmModel().get_repo(c.repo_name)
+        p = int(request.params.get('page', 1))
+        branch_name = request.params.get('branch', None)
+        c.total_cs = len(c.rhodecode_repo)
+        c.pagination = RepoPage(c.rhodecode_repo, page=p,
+                                item_count=c.total_cs, items_per_page=c.size,
+                                branch_name=branch_name)
 
-        p = int(request.params.get('page', 1))
-        c.total_cs = len(changesets)
-        c.pagination = Page(changesets, page=p, item_count=c.total_cs,
-                            items_per_page=c.size)
-
-        self._graph(changesets, c.size, p)
+        self._graph(c.rhodecode_repo, c.total_cs, c.size, p)
 
         return render('changelog/changelog.html')
 
+    def changelog_details(self, cs):
+        if request.environ.get('HTTP_X_PARTIAL_XHR'):
+            c.cs = c.rhodecode_repo.get_changeset(cs)
+            return render('changelog/changelog_details.html')
 
-    def _graph(self, repo, size, p):
-        revcount = size
-        if not repo.revisions or repo.alias == 'git':
+    def _graph(self, repo, repo_size, size, p):
+        """
+        Generates a DAG graph for mercurial
+
+        :param repo: repo instance
+        :param size: number of commits to show
+        :param p: page number
+        """
+        if not repo.revisions:
             c.jsdata = json.dumps([])
             return
 
-        max_rev = repo.revisions[-1]
-
+        revcount = min(repo_size, size)
         offset = 1 if p == 1 else  ((p - 1) * revcount + 1)
+        try:
+            rev_end = repo.revisions.index(repo.revisions[(-1 * offset)])
+        except IndexError:
+            rev_end = repo.revisions.index(repo.revisions[-1])
+        rev_start = max(0, rev_end - revcount)
 
-        rev_start = repo.revisions[(-1 * offset)]
+        data = []
+        rev_end += 1
 
-        revcount = min(max_rev, revcount)
-        rev_end = max(0, rev_start - revcount)
-        dag = graph_rev(repo.repo, rev_start, rev_end)
+        if repo.alias == 'git':
+            for _ in xrange(rev_start, rev_end):
+                vtx = [0, 1]
+                edges = [[0, 0, 1]]
+                data.append(['', vtx, edges])
 
-        c.dag = tree = list(colored(dag))
-        data = []
-        for (id, type, ctx, vtx, edges) in tree:
-            if type != CHANGESET:
-                continue
-            data.append(('', vtx, edges))
+        elif repo.alias == 'hg':
+            revs = list(reversed(xrange(rev_start, rev_end)))
+            c.dag = graphmod.colored(graphmod.dagwalker(repo._repo, revs))
+            for (id, type, ctx, vtx, edges) in c.dag:
+                if type != graphmod.CHANGESET:
+                    continue
+                data.append(['', vtx, edges])
 
         c.jsdata = json.dumps(data)
-