Changeset - cf32c4cc26e8
[Not reviewed]
default
0 1 0
Marcin Kuzminski - 16 years ago 2010-05-09 14:46:54
marcin@python-works.com
fixed graph when repository is empty moved imports to top and removed some lfet over prints
1 file changed with 10 insertions and 8 deletions:
0 comments (0 inline, 0 general)
pylons_app/controllers/graph.py
Show inline comments
 
import logging
 
from pylons import request, response, session, tmpl_context as c, url, config, \
 
    app_globals as g
 
from pylons.controllers.util import abort, redirect
 
from pylons_app.lib.base import BaseController, render
 
from pylons_app.lib.utils import get_repo_slug
 
from pylons_app.model.hg_model import HgModel
 
import logging
 

	
 
from mercurial.graphmod import revisions as graph_rev, colored, CHANGESET
 
from pylons_app.lib.filters import age as _age, person
 
from simplejson import dumps
 
from mercurial.node import short
 
from webhelpers.paginate import Page
 
        
 

	
 

	
 
log = logging.getLogger(__name__)
 

	
 
class GraphController(BaseController):
 
    def __before__(self):
 
@@ -24,29 +31,24 @@ class GraphController(BaseController):
 
        c.jsdata, c.canvasheight = self.graph(hg_model.get_repo(c.repo_name), c.size)
 
        
 
        return render('/graph.html')
 

	
 

	
 
    def graph(self, repo, size):
 
        from mercurial.graphmod import revisions as graph_rev, colored, CHANGESET
 
        from pylons_app.lib.filters import age as _age, person
 
        from simplejson import dumps
 
        from mercurial.node import short
 
        from webhelpers.paginate import Page
 
        revcount = size
 
        p = int(request.params.get('page', 1))
 
        c.pagination = Page(repo.revisions, page=p, item_count=len(repo.revisions), items_per_page=revcount)
 
        if not repo.revisions:return dumps([]), 0
 
        
 
        max_rev = repo.revisions[-1]
 
        offset = 1 if p == 1 else  ((p - 1) * revcount)
 
        rev_start = repo.revisions[(-1 * offset)]
 
        bg_height = 39
 
        
 
        revcount = min(max_rev, revcount)
 
        rev_end = max(0, rev_start - revcount)
 
        print rev_start, rev_end
 
        print 'x' * 100
 
        dag = graph_rev(repo.repo, rev_start, rev_end)
 
        tree = list(colored(dag))
 
        canvasheight = (len(tree) + 1) * bg_height - 27
 
        data = []
 
        for (id, type, ctx, vtx, edges) in tree:
 
            if type != CHANGESET:
0 comments (0 inline, 0 general)