aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Kuzminski <marcin@python-works.com>2010-06-11 16:52:00 +0200
committerMarcin Kuzminski <marcin@python-works.com>2010-06-11 16:52:00 +0200
commit19e5aeabf6606c48c79dd706259255d64e2dd835 (patch)
tree9ebd6c98c4185f822ca5e15a2dc4faf4e489a07b
parent6d9dd9436a127d32ba446618136bb1e5defc9c98 (diff)
changed way of getting repository in changelog. + some code cleanups
-rw-r--r--pylons_app/controllers/changelog.py4
-rw-r--r--pylons_app/controllers/shortlog.py3
-rw-r--r--pylons_app/model/hg_model.py1
3 files changed, 4 insertions, 4 deletions
diff --git a/pylons_app/controllers/changelog.py b/pylons_app/controllers/changelog.py
index bb49444b..48618930 100644
--- a/pylons_app/controllers/changelog.py
+++ b/pylons_app/controllers/changelog.py
@@ -25,7 +25,7 @@ changelog controller for pylons
from pylons import request, session, 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 _full_changelog_cached
+from pylons_app.model.hg_model import HgModel
from webhelpers.paginate import Page
import logging
log = logging.getLogger(__name__)
@@ -51,7 +51,7 @@ class ChangelogController(BaseController):
else:
c.size = session.get('changelog_size', default)
- changesets = _full_changelog_cached(c.repo_name)
+ changesets = HgModel().get_repo(c.repo_name)
p = int(request.params.get('page', 1))
c.pagination = Page(changesets, page=p, item_count=len(changesets),
diff --git a/pylons_app/controllers/shortlog.py b/pylons_app/controllers/shortlog.py
index 1e31dce3..c0234ded 100644
--- a/pylons_app/controllers/shortlog.py
+++ b/pylons_app/controllers/shortlog.py
@@ -38,9 +38,8 @@ class ShortlogController(BaseController):
super(ShortlogController, self).__before__()
def index(self):
- hg_model = HgModel()
p = int(request.params.get('page', 1))
- repo = hg_model.get_repo(c.repo_name)
+ repo = HgModel().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'):
diff --git a/pylons_app/model/hg_model.py b/pylons_app/model/hg_model.py
index b9efc20f..5040a9e1 100644
--- a/pylons_app/model/hg_model.py
+++ b/pylons_app/model/hg_model.py
@@ -53,6 +53,7 @@ def _get_repos_cached():
"""
return cached dict with repos
"""
+ log.info('getting all repositories list')
from pylons import app_globals as g
return HgModel.repo_scan(g.paths[0][0], g.paths[0][1], g.baseui)