diff --git a/pylons_app/__init__.py b/pylons_app/__init__.py --- a/pylons_app/__init__.py +++ b/pylons_app/__init__.py @@ -2,7 +2,7 @@ Hg app, a web based mercurial repository managment based on pylons """ -VERSION = (0, 6, 0, 'beta') +VERSION = (0, 6, 8, 'beta') __version__ = '.'.join((str(each) for each in VERSION[:4])) diff --git a/pylons_app/controllers/changeset.py b/pylons_app/controllers/changeset.py --- a/pylons_app/controllers/changeset.py +++ b/pylons_app/controllers/changeset.py @@ -1,20 +1,23 @@ -import logging - -from pylons import request, response, session, tmpl_context as c, url, config, app_globals as g +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.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 +import logging + + log = logging.getLogger(__name__) class ChangesetController(BaseController): + + @LoginRequired() def __before__(self): - c.repos_prefix = config['repos_name'] - c.repo_name = get_repo_slug(request) + super(ChangesetController, self).__before__() - def index(self): - # Return a rendered template - #return render('/changeset.mako') - # or, return a string - return 'Hello World' + def index(self, revision): + hg_model = HgModel() + c.changeset = hg_model.get_repo(c.repo_name).get_changeset(revision) + + return render('changeset/changeset.html') diff --git a/pylons_app/lib/utils.py b/pylons_app/lib/utils.py --- a/pylons_app/lib/utils.py +++ b/pylons_app/lib/utils.py @@ -53,7 +53,7 @@ def make_ui(path='hgwebdir.config', chec @param path: path to mercurial config file """ if not os.path.isfile(path): - log.error('Unable to read config file %s' % path) + log.warning('Unable to read config file %s' % path) return False #propagated from mercurial documentation sections = [ diff --git a/pylons_app/templates/changelog/changelog.html b/pylons_app/templates/changelog/changelog.html --- a/pylons_app/templates/changelog/changelog.html +++ b/pylons_app/templates/changelog/changelog.html @@ -1,7 +1,10 @@ +<%! +from pylons_app.lib import filters +%> <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('Repository managment')} + ${_('Changelog - %s') % c.repo_name} %def> <%def name="breadcrumbs()"> ${h.link_to(u'Home',h.url('/'))} @@ -11,104 +14,66 @@ ${_('changelog')} %def> <%def name="page_nav()"> -
- - ${self.menu('changelog')} + ${self.menu('changelog')} %def> <%def name="main()">${filenode}
+ %endfor + %for filenode in c.changeset.changed: +${filenode}
+ %endfor + %for filenode in c.changeset.removed: +${filenode}
+ %endfor +