kallithea Changeset - f7218849798a

Changeset - f7218849798a

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Marcin Kuzminski - 16 years ago 2010-05-09 17:22:30
marcin@python-works.com

Changeg graph to changelog, and changelog to shortlog

3 files changed with 53 insertions and 13 deletions:

pylons_app/config/routing.py

pylons_app/controllers/changelog.py

pylons_app/controllers/files.py

0 comments (0 inline, 0 general)

pylons_app/config/routing.py

➞

Show inline comments

@@ @@ -34,10 +34,10 @@ def make_map(config): @@
     map.connect('changeset_home', '/{repo_name}/changeset/{revision}', controller='changeset', revision='tip')
     map.connect('summary_home', '/{repo_name}/summary', controller='summary')
-    map.connect('changelog_home', '/{repo_name}/changelog/{revision}', controller='changelog', revision='tip')
+    map.connect('shortlog_home', '/{repo_name}/shortlog/{revision}', controller='shortlog', revision='tip')
     map.connect('branches_home', '/{repo_name}/branches', controller='branches')
     map.connect('tags_home', '/{repo_name}/tags', controller='tags')
-    map.connect('graph_home', '/{repo_name}/graph/{revision}', controller='graph', revision='tip')
+    map.connect('changelog_home', '/{repo_name}/changelog/{revision}', controller='changelog', revision='tip')
     map.connect('files_home', '/{repo_name}/files/{revision}/{f_path:.*}', controller='files', revision='tip', f_path='')
     map.connect('files_diff_home', '/{repo_name}/diff/{f_path:.*}', controller='files', action='diff', revision='tip', f_path='')

pylons_app/controllers/changelog.py

➞

Show inline comments

 import logging
 from pylons import tmpl_context as c, app_globals as g, session, request, config, url
 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
 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 ChangelogController(BaseController):
@@ @@ -16,12 +22,44 @@ class ChangelogController(BaseController @@
         c.repo_name = get_repo_slug(request)
     def index(self):
         # Return a rendered template
         hg_model = HgModel()
         if request.POST.get('size'):
             c.size = int(request.params.get('size', 20))
         else:
             c.size = int(request.params.get('size', 20))
         c.jsdata, c.canvasheight = self.graph(hg_model.get_repo(c.repo_name), c.size)
         return render('changelog/changelog.html')
     def graph(self, repo, size):
         revcount = size
         p = int(request.params.get('page', 1))
         repo = hg_model.get_repo(c.repo_name)
         c.repo_changesets = Page(repo, page=p, items_per_page=20)
         c.shortlog_data = render('shortlog/shortlog_data.html')
         if request.params.get('partial'):
             return c.shortlog_data
         r = render('shortlog/shortlog.html')
         return r
         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)
         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:
                 continue
             node = short(ctx.node())
             age = _age(ctx.date())
             desc = ctx.description()
             user = person(ctx.user())
             branch = ctx.branch()
             branch = branch, repo.repo.branchtags().get(branch) == ctx.node()
             data.append((node, vtx, edges, desc, user, age, branch, ctx.tags()))
         return dumps(data), canvasheight

pylons_app/controllers/files.py

➞

Show inline comments

@@ @@ -18,12 +18,14 @@ class FilesController(BaseController): @@
         c.repo_name = get_repo_slug(request)
     def index(self, repo_name, revision, f_path):
         revision = request.POST.get('at_rev', None) or revision
         hg_model = HgModel()
         c.repo = repo = hg_model.get_repo(c.repo_name)
         c.cur_rev = revision
         c.f_path = f_path
         try:
             c.changeset = repo.get_changeset(repo._get_revision(revision))
             c.cur_rev = c.changeset.raw_id
             c.rev_nr = c.changeset.revision
             c.files_list = c.changeset.get_node(f_path)
             c.file_history = self._get_history(repo, c.files_list, f_path)
         except RepositoryError:

0 comments (0 inline, 0 general)