kallithea Changeset - a83a1799480c

Changeset - a83a1799480c

Parent rev.

Child rev.

[Not reviewed]

default

0 14 0

Marcin Kuzminski - 15 years ago 2010-06-03 00:04:48
marcin@python-works.com

Reimplemented way of caching repos list, hg model now get's repos objects right from cached dict, this way we skipp creating instances of MercurialRepository and gain performance. Some import cleanup

14 files changed with 123 insertions and 88 deletions:

pylons_app/controllers/branches.py

pylons_app/controllers/changelog.py

pylons_app/controllers/changeset.py

pylons_app/controllers/feed.py

pylons_app/controllers/files.py

pylons_app/controllers/hg.py

pylons_app/controllers/shortlog.py

pylons_app/controllers/summary.py

pylons_app/controllers/tags.py

pylons_app/controllers/users.py

pylons_app/lib/base.py

pylons_app/lib/utils.py

pylons_app/model/hg_model.py

pylons_app/templates/base/base.html

0 comments (0 inline, 0 general)

pylons_app/controllers/branches.py

➞

Show inline comments

 from pylons import tmpl_context as c, app_globals as g
 from pylons_app.lib.auth import LoginRequired
 from pylons_app.lib.base import BaseController, render
 from pylons_app.model.hg_model import HgModel
 import logging
 from pylons import tmpl_context as c, app_globals as g, session, request, config, url
 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 pylons_app.lib.auth import LoginRequired
 log = logging.getLogger(__name__)
 class BranchesController(BaseController):
     @LoginRequired()
     def __before__(self):
         super(BranchesController, self).__before__()
     def index(self):
         hg_model = HgModel()
         c.repo_info = hg_model.get_repo(c.repo_name)
         c.repo_branches = c.repo_info.branches
         return render('branches/branches.html')

pylons_app/controllers/changelog.py

➞

Show inline comments

 from mercurial.graphmod import revisions as graph_rev, colored, CHANGESET
 from mercurial.node import short
 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 import request, session, tmpl_context as c
 from pylons_app.lib.auth import LoginRequired
-from pylons_app.lib.base import BaseController, render, _full_changelog_cached
 from pylons_app.lib.base import BaseController, render
 from pylons_app.lib.filters import age as _age, person
 from pylons_app.model.hg_model import _full_changelog_cached
 from simplejson import dumps
 from webhelpers.paginate import Page
 import logging
 log = logging.getLogger(__name__)
 class ChangelogController(BaseController):
     @LoginRequired()
     def __before__(self):
         super(ChangelogController, self).__before__()
     def index(self):

pylons_app/controllers/changeset.py

➞

Show inline comments

 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 import tmpl_context as c
 from pylons_app.lib.auth import LoginRequired
 from pylons_app.lib.base import BaseController, render
 from pylons_app.model.hg_model import HgModel
 from vcs.utils import diffs as differ
 import logging
 from vcs.nodes import FileNode
 log = logging.getLogger(__name__)
 class ChangesetController(BaseController):

pylons_app/controllers/feed.py

➞

Show inline comments

 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 from pylons import tmpl_context as c, url, response
 from pylons_app.lib.base import BaseController, render
 from pylons_app.model.hg_model import _full_changelog_cached
 from webhelpers.feedgenerator import Atom1Feed, Rss201rev2Feed
 import logging
 from operator import itemgetter
 from pylons import tmpl_context as c, request, config, url, response
 from pylons_app.lib.base import BaseController, render, _full_changelog_cached
 from pylons_app.lib.utils import get_repo_slug
 from pylons_app.model.hg_model import HgModel
 from pylons_app.lib.auth import LoginRequired
 from webhelpers.feedgenerator import Atom1Feed, Rss201rev2Feed
 log = logging.getLogger(__name__)
 class FeedController(BaseController):
     #secure it or not ?
     def __before__(self):
         super(FeedController, self).__before__()
         #common values for feeds
         self.description = 'Changes on %s repository'
         self.title = "%s feed"
         self.language = 'en-us'
         self.ttl = "5"
@@ @@ -26,25 +23,26 @@ class FeedController(BaseController): @@
         """Produce an atom-1.0 feed via feedgenerator module"""
         feed = Atom1Feed(title=self.title % repo_name,
                          link=url('summary_home', repo_name=repo_name, qualified=True),
                          description=self.description % repo_name,
                          language=self.language,
                          ttl=self.ttl)
         for cnt, cs in enumerate(_full_changelog_cached(repo_name)):
             if cnt > self.feed_nr:
                 break
             feed.add_item(title=cs.message,
                           link=url('changeset_home', repo_name=repo_name, revision=cs.raw_id, qualified=True),
                           link=url('changeset_home', repo_name=repo_name,
                                    revision=cs.raw_id, qualified=True),
                           description=str(cs.date))
         response.content_type = feed.mime_type
         return feed.writeString('utf-8')
     def rss(self, repo_name):
         """Produce an rss2 feed via feedgenerator module"""
         feed = Rss201rev2Feed(title=self.title % repo_name,
                          link=url('summary_home', repo_name=repo_name, qualified=True),
                          description=self.description % repo_name,
                          language=self.language,

pylons_app/controllers/files.py

➞

Show inline comments

 import tempfile
 from pylons import request, response, session, tmpl_context as c, url, config, \
     app_globals as g
 from pylons.controllers.util import abort, redirect
 from mercurial import archival
 from pylons import request, response, session, tmpl_context as c, url
 from pylons_app.lib.auth import LoginRequired
 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 vcs.exceptions import RepositoryError, ChangesetError
 from vcs.utils import diffs as differ
 import logging
-from mercurial import archival
+import tempfile
 log = logging.getLogger(__name__)
 class FilesController(BaseController):
     @LoginRequired()
     def __before__(self):
         super(FilesController, self).__before__()
     def index(self, repo_name, revision, f_path):
         hg_model = HgModel()

pylons_app/controllers/hg.py

➞

Show inline comments

 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 import logging
 from operator import itemgetter
 from pylons import tmpl_context as c, request, config
 from pylons_app.lib.auth import LoginRequired
 from pylons_app.lib.base import BaseController, render
 from pylons_app.lib.auth import LoginRequired
 from pylons_app.model.hg_model import HgModel
 import logging
 log = logging.getLogger(__name__)
 class HgController(BaseController):
     @LoginRequired()
     def __before__(self):
         super(HgController, self).__before__()
     def index(self):
         c.current_sort = request.GET.get('sort', 'name')
         cs = c.current_sort
         c.cs_slug = cs.replace('-', '')
         sortables = ['name', 'description', 'last_change', 'tip', 'contact']
+        cached_repo_list = HgModel().get_repos()
         if cs and c.cs_slug in sortables:
             sort_key = c.cs_slug + '_sort'
             if cs.startswith('-'):
-                c.repos_list = sorted(c.cached_repo_list, key=itemgetter(sort_key), reverse=True)
                 c.repos_list = sorted(cached_repo_list, key=itemgetter(sort_key), reverse=True)
             else:
-                c.repos_list = sorted(c.cached_repo_list, key=itemgetter(sort_key), reverse=False)
                 c.repos_list = sorted(cached_repo_list, key=itemgetter(sort_key), reverse=False)
         return render('/index.html')

pylons_app/controllers/shortlog.py

➞

Show inline comments

 import logging
 from pylons import tmpl_context as c, app_globals as g, session, request, config, url
 from pylons.controllers.util import abort, redirect
 from pylons import tmpl_context as c, request
 from pylons_app.lib.auth import LoginRequired
 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 webhelpers.paginate import Page
-from pylons_app.lib.auth import LoginRequired
+import logging
 log = logging.getLogger(__name__)
 class ShortlogController(BaseController):
     @LoginRequired()
     def __before__(self):
         super(ShortlogController, self).__before__()
     def index(self):
         hg_model = HgModel()
         p = int(request.params.get('page', 1))

pylons_app/controllers/summary.py

➞

Show inline comments

 from pylons import tmpl_context as c, request
 from pylons_app.lib.auth import LoginRequired
 from pylons_app.lib.base import BaseController, render, _full_changelog_cached
 from pylons_app.model.hg_model import HgModel
 from pylons_app.lib.base import BaseController, render
 from pylons_app.model.hg_model import HgModel, _full_changelog_cached
 import logging
 log = logging.getLogger(__name__)
 class SummaryController(BaseController):
     @LoginRequired()
     def __before__(self):
         super(SummaryController, self).__before__()
     def index(self):
         hg_model = HgModel()
         c.repo_info = hg_model.get_repo(c.repo_name)
         c.repo_changesets = _full_changelog_cached(c.repo_name)[:10]
         e = request.environ
         uri = u'%(protocol)s://%(user)s@%(host)s/%(repo_name)s' % {
                                         'protocol': e.get('wsgi.url_scheme'),
                                         'user':str(c.hg_app_user.username),
                                         'host':e.get('HTTP_HOST'),
                                         'repo_name':c.repo_name, }
         c.clone_repo_url = uri
         c.repo_tags = c.repo_info.tags[:10]
         c.repo_branches = c.repo_info.branches[:10]
         return render('summary/summary.html')

pylons_app/controllers/tags.py

➞

Show inline comments

 from pylons import tmpl_context as c
 from pylons_app.lib.auth import LoginRequired
 from pylons_app.lib.base import BaseController, render
 from pylons_app.model.hg_model import HgModel
 import logging
 from pylons import tmpl_context as c, app_globals as g, session, request, config, url
 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 pylons_app.lib.auth import LoginRequired
 log = logging.getLogger(__name__)
 class TagsController(BaseController):
     @LoginRequired()
     def __before__(self):
         super(TagsController, self).__before__()
     def index(self):
         hg_model = HgModel()
         c.repo_info = hg_model.get_repo(c.repo_name)
         c.repo_tags = c.repo_info.tags
         return render('tags/tags.html')

pylons_app/controllers/users.py

➞

Show inline comments

 from formencode import htmlfill
 from pylons import request, response, session, tmpl_context as c, url, \
     app_globals as g
 from pylons import request, session, tmpl_context as c, url
 from pylons.controllers.util import abort, redirect
 from pylons.i18n.translation import _
 from pylons_app.lib import helpers as h
 from pylons.controllers.util import abort, redirect
 from pylons_app.lib.auth import LoginRequired, CheckPermissionAll
 from pylons_app.lib.base import BaseController, render
 from pylons_app.model.db import User, UserLog
 from pylons_app.model.forms import UserForm
 from pylons_app.model.user_model import UserModel
 import formencode
 import logging
 log = logging.getLogger(__name__)
 class UsersController(BaseController):
     """REST Controller styled on the Atom Publishing Protocol"""
     # To properly map this controller, ensure your config/routing.py
     # file has a resource setup:
     #     map.resource('user', 'users')
     @LoginRequired()
     def __before__(self):
         c.admin_user = session.get('admin_user')
         c.admin_username = session.get('admin_username')
         super(UsersController, self).__before__()

pylons_app/lib/base.py

➞

Show inline comments

 """The base Controller API
 Provides the BaseController class for subclassing.
 """
 from beaker.cache import cache_region
 from pylons import config, tmpl_context as c, request, session
 from pylons.controllers import WSGIController
 from pylons.templating import render_mako as render
 from pylons_app.lib.auth import LoginRequired, AuthUser
 from pylons_app.lib.utils import get_repo_slug
 from pylons_app.model import meta
-from pylons_app.model.hg_model import HgModel
+from pylons_app.model.hg_model import _get_repos_cached
 from pylons_app import __version__
 @cache_region('long_term', 'cached_repo_list')
 def _get_repos_cached():
     return [rep for rep in HgModel().get_repos()]
 @cache_region('long_term', 'full_changelog')
 def _full_changelog_cached(repo_name):
     return list(reversed(list(HgModel().get_repo(repo_name))))
 class BaseController(WSGIController):
     def __before__(self):
         c.hg_app_version = __version__
         c.repos_prefix = config['hg_app_name']
         c.repo_name = get_repo_slug(request)
         c.hg_app_user = session.get('hg_app_user', AuthUser())
         c.cached_repo_list = _get_repos_cached()
         self.sa = meta.Session
     def __call__(self, environ, start_response):
         """Invoke the Controller"""

pylons_app/lib/utils.py

➞

Show inline comments

@@ @@ -98,33 +98,47 @@ def invalidate_cache(name, *args): @@
     from beaker.cache import region_invalidate
     log.info('INVALIDATING CACHE FOR %s', name)
     """propagate our arguments to make sure invalidation works. First
     argument has to be the name of cached func name give to cache decorator
     without that the invalidation would not work"""
     tmp = [name]
     tmp.extend(args)
     args = tuple(tmp)
     if name == 'cached_repo_list':
-        from pylons_app.lib.base import _get_repos_cached
+        from pylons_app.model.hg_model import _get_repos_cached
         region_invalidate(_get_repos_cached, None, *args)
     if name == 'full_changelog':
-        from pylons_app.lib.base import _full_changelog_cached
+        from pylons_app.model.hg_model import _full_changelog_cached
         region_invalidate(_full_changelog_cached, None, *args)
 from vcs.backends.base import BaseChangeset
 from vcs.utils.lazy import LazyProperty
 class EmptyChangeset(BaseChangeset):
     revision = -1
     @LazyProperty
     def raw_id(self):
         """
         Returns raw string identifing this changeset, useful for web
         representation.
         """
         return '0' * 12
 def repo2db_mapper():
     """
     put !
     """
     pass
     #scann all dirs for .hgdbid
     #if some dir doesn't have one generate one.
+    #

pylons_app/model/hg_model.py

➞

Show inline comments

 #!/usr/bin/env python
 # encoding: utf-8
+#
 # Copyright (c) 2010 marcink.  All rights reserved.
+#
 from vcs.exceptions import RepositoryError
 '''
 Created on Apr 9, 2010
 @author: marcink
 '''
 from beaker.cache import cache_region
 from mercurial import ui
 from mercurial.hgweb.hgwebdir_mod import findrepos
 from pylons import app_globals as g
 from vcs.exceptions import RepositoryError, VCSError
 import logging
 import os
 from pylons import tmpl_context as c, app_globals as g, session, request, config
 from pylons.controllers.util import abort
 import sys
 log = logging.getLogger(__name__)
 try:
-    from vcs.backends.hg import get_repositories, MercurialRepository
     from vcs.backends.hg import MercurialRepository
 except ImportError:
     sys.stderr.write('You have to import vcs module')
     raise Exception('Unable to import vcs')
 @cache_region('long_term', 'cached_repo_list')
 def _get_repos_cached():
     """
     return cached dict with repos
     """
     return HgModel.repo_scan(g.paths[0][0], g.paths[0][1], g.baseui)
 @cache_region('long_term', 'full_changelog')
 def _full_changelog_cached(repo_name):
     log.info('getting full changelog for %s', repo_name)
     return list(reversed(list(HgModel().get_repo(repo_name))))
 class HgModel(object):
     """
     Mercurial Model
     """
     def __init__(self):
         """
         Constructor
         """
         pass
     @staticmethod
     def repo_scan(repos_prefix, repos_path, baseui):
         """
         Listing of repositories in given path. This path should not be a
         repository itself. Return a dictionary of repository objects
         :param repos_path: path to directory it could take syntax with
         * or ** for deep recursive displaying repositories
         """
         def check_repo_dir(path):
             """
             Checks the repository
             :param path:
             """
             repos_path = path.split('/')
             if repos_path[-1] in ['*', '**']:
                 repos_path = repos_path[:-1]
             if repos_path[0] != '/':
                 repos_path[0] = '/'
             if not os.path.isdir(os.path.join(*repos_path)):
                 raise RepositoryError('Not a valid repository in %s' % path[0][1])
         if not repos_path.endswith('*'):
             raise VCSError('You need to specify * or ** at the end of path '
                             'for recursive scanning')
         check_repo_dir(repos_path)
         log.info('scanning for repositories in %s', repos_path)
         repos = findrepos([(repos_prefix, repos_path)])
         if not isinstance(baseui, ui.ui):
             baseui = ui.ui()
         repos_list = {}
         for name, path in repos:
             try:
                 repos_list[name] = MercurialRepository(path, baseui=baseui)
             except OSError:
                 continue
         return repos_list
     def get_repos(self):
         for mercurial_repo in get_repositories(g.paths[0][0], g.paths[0][1], g.baseui):
             if mercurial_repo._get_hidden():
         for name, repo in _get_repos_cached().items():
             if repo._get_hidden():
                 #skip hidden web repository
                 continue
-            last_change = mercurial_repo.last_change
+            last_change = repo.last_change
             try:
-                tip = mercurial_repo.get_changeset('tip')
+                tip = repo.get_changeset('tip')
             except RepositoryError:
                 from pylons_app.lib.utils import EmptyChangeset
                 tip = EmptyChangeset()
             tmp_d = {}
-            tmp_d['name'] = mercurial_repo.name
+            tmp_d['name'] = repo.name
             tmp_d['name_sort'] = tmp_d['name'].lower()
-            tmp_d['description'] = mercurial_repo.description
+            tmp_d['description'] = repo.description
             tmp_d['description_sort'] = tmp_d['description']
             tmp_d['last_change'] = last_change
             tmp_d['last_change_sort'] = last_change[1] - last_change[0]
             tmp_d['tip'] = tip.raw_id
             tmp_d['tip_sort'] = tip.revision
             tmp_d['rev'] = tip.revision
-            tmp_d['contact'] = mercurial_repo.contact
+            tmp_d['contact'] = repo.contact
             tmp_d['contact_sort'] = tmp_d['contact']
-            tmp_d['repo_archives'] = list(mercurial_repo._get_archives())
+            tmp_d['repo_archives'] = list(repo._get_archives())
             yield tmp_d
     def get_repo(self, repo_name):
         path = g.paths[0][1].replace('*', '')
         repo = MercurialRepository(os.path.join(path, repo_name), baseui=g.baseui)
         return repo
         return _get_repos_cached()[repo_name]

pylons_app/templates/base/base.html

➞

Show inline comments

@@ @@ -83,26 +83,26 @@ def is_current(selected): @@
 		            var wa = YAHOO.util.Dom.get('repos_list').value;
 		            var url = "${h.url('summary_home',repo_name='__REPLACE__')}".replace('__REPLACE__',wa);
 			        window.location = url;
 				})
 	           });
 	       	</script>
 	        <ul class="page-nav">
 				<li>
 					<a id="repo_switcher" title="${_('Switch repository')}" href="#">&darr;</a>
 					<div id="switch_repos" style="display:none;position: absolute;width: 150px;height: 25px">
 						<select id="repos_list" size="=10">
 						%for repo in c.cached_repo_list:
 							<option value="${repo['name']}">${repo['name']}</option>
 						%for repo in c.cached_repo_list.values():
 							<option value="${repo.name}">${repo.name}</option>
 						%endfor
 						</select>
 					</div>
 				</li>
 	            <li ${is_current('summary')}>${h.link_to(_('summary'),h.url('summary_home',repo_name=c.repo_name))}</li>
 	            <li ${is_current('shortlog')}>${h.link_to(_('shortlog'),h.url('shortlog_home',repo_name=c.repo_name))}</li>
 				<li ${is_current('changelog')}>${h.link_to(_('changelog'),h.url('changelog_home',repo_name=c.repo_name))}</li>
 	            <li ${is_current('branches')}>${h.link_to(_('branches'),h.url('branches_home',repo_name=c.repo_name))}</li>
 	            <li ${is_current('tags')}>${h.link_to(_('tags'),h.url('tags_home',repo_name=c.repo_name))}</li>
 	            <li ${is_current('files')}>${h.link_to(_('files'),h.url('files_home',repo_name=c.repo_name))}</li>
 	        </ul>
 		%else:

0 comments (0 inline, 0 general)