kallithea Changeset - 5e59f29edf66

Changeset - 5e59f29edf66

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Marcin Kuzminski - 15 years ago 2010-06-11 16:52:00
marcin@python-works.com

changed way of getting repository in changelog. + some code cleanups

3 files changed with 4 insertions and 4 deletions:

pylons_app/controllers/changelog.py

pylons_app/controllers/shortlog.py

pylons_app/model/hg_model.py

0 comments (0 inline, 0 general)

pylons_app/controllers/changelog.py

➞

Show inline comments

@@ @@ -16,25 +16,25 @@ @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 """
 Created on April 21, 2010
 changelog controller for pylons
 @author: marcink
 """
 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__)
 class ChangelogController(BaseController):
     @LoginRequired()
     def __before__(self):
         super(ChangelogController, self).__before__()
     def index(self):
         limit = 100
@@ @@ -42,25 +42,25 @@ class ChangelogController(BaseController @@
         if request.params.get('size'):
             try:
                 int_size = int(request.params.get('size'))
             except ValueError:
                 int_size = default
             int_size = int_size if int_size <= limit else limit
             c.size = int_size
             session['changelog_size'] = c.size
             session.save()
         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),
                             items_per_page=c.size)
         #self._graph(c.repo, c.size,p)
         return render('changelog/changelog.html')
     def _graph(self, repo, size, p):
         pass

pylons_app/controllers/shortlog.py

➞

Show inline comments

@@ @@ -29,21 +29,20 @@ from pylons_app.model.hg_model import Hg @@
 from webhelpers.paginate import Page
 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))
-        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'):
             return c.shortlog_data
         r = render('shortlog/shortlog.html')
         return r

pylons_app/model/hg_model.py

➞

Show inline comments

@@ @@ -44,24 +44,25 @@ except ImportError: @@
 def _get_repos_cached_initial(app_globals):
     """
     return cached dict with repos
     """
     g = app_globals
     return HgModel.repo_scan(g.paths[0][0], g.paths[0][1], g.baseui)
 @cache_region('long_term', 'cached_repo_list')
 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)
 @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
     """

0 comments (0 inline, 0 general)