kallithea Changeset - 5f878edbee00

Changeset - 5f878edbee00

Parent rev.

Child rev.

[Not reviewed]

beta

0 1 0

Marcin Kuzminski - 14 years ago 2011-07-02 16:42:41
marcin@python-works.com

Bumped Mercurial to 1.9 and fixed graphlog for this version

1 file changed with 9 insertions and 10 deletions:

rhodecode/controllers/changelog.py

0 comments (0 inline, 0 general)

rhodecode/controllers/changelog.py

➞

Show inline comments

@@ @@ -22,25 +22,25 @@ @@
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import logging
 try:
     import json
 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 BaseRepoController, render
 from rhodecode.lib.helpers import RepoPage
 log = logging.getLogger(__name__)
 class ChangelogController(BaseRepoController):
     @LoginRequired()
@@ @@ -82,34 +82,33 @@ class ChangelogController(BaseRepoContro @@
         :param repo: repo instance
         :param size: number of commits to show
         :param p: page number
         """
         if not repo.revisions:
             c.jsdata = json.dumps([])
             return
         revcount = min(repo_size, size)
         offset = 1 if p == 1 else  ((p - 1) * revcount + 1)
         try:
-            rev_start = repo.revisions.index(repo.revisions[(-1 * offset)])
+            rev_end = repo.revisions.index(repo.revisions[(-1 * offset)])
         except IndexError:
             rev_start = repo.revisions.index(repo.revisions[-1])
         rev_end = max(0, rev_start - revcount)
             rev_end = repo.revisions.index(repo.revisions[-1])
         rev_start = max(0, rev_end - revcount)
         data = []
         if repo.alias == 'git':
-            for _ in xrange(rev_end, rev_start):
+            for _ in xrange(rev_start, rev_end):
                 vtx = [0, 1]
                 edges = [[0, 0, 1]]
                 data.append(['', vtx, edges])
         elif repo.alias == 'hg':
             dag = graph_rev(repo._repo, rev_start, rev_end)
             c.dag = tree = list(colored(dag))
             for (id, type, ctx, vtx, edges) in tree:
                 if type != CHANGESET:
             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)

0 comments (0 inline, 0 general)