aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Kuzminski <marcin@python-works.com>2010-06-03 01:01:36 +0200
committerMarcin Kuzminski <marcin@python-works.com>2010-06-03 01:01:36 +0200
commit8fbf74d070cd3e83179e1a21abdebdc6429c6bd9 (patch)
tree73913cdc169e1e5f9f71caf9ea7ab75c21632cd3
parentae33848596e2f165e26436d15ec0224ffd54b12d (diff)
Fixed bug in repos, added dependencies and bumped versionv0.7.6
-rw-r--r--pylons_app/__init__.py2
-rw-r--r--pylons_app/controllers/repos.py5
-rw-r--r--setup.py4
3 files changed, 8 insertions, 3 deletions
diff --git a/pylons_app/__init__.py b/pylons_app/__init__.py
index 61249f92..a5f5b6c3 100644
--- 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, 7, 5, 'beta')
+VERSION = (0, 7, 6, 'beta')
__version__ = '.'.join((str(each) for each in VERSION[:4]))
diff --git a/pylons_app/controllers/repos.py b/pylons_app/controllers/repos.py
index 2358ec99..deaecd4d 100644
--- a/pylons_app/controllers/repos.py
+++ b/pylons_app/controllers/repos.py
@@ -5,9 +5,11 @@ from pylons_app.lib.auth import LoginRequired
from pylons_app.lib.base import BaseController, render
from pylons_app.lib.filters import clean_repo
from pylons_app.lib.utils import check_repo, invalidate_cache
+from pylons_app.model.hg_model import HgModel
import logging
import os
import shutil
+from operator import itemgetter
log = logging.getLogger(__name__)
class ReposController(BaseController):
@@ -24,7 +26,8 @@ class ReposController(BaseController):
def index(self, format='html'):
"""GET /repos: All items in the collection"""
# url('repos')
- c.repos_list = c.cached_repo_list
+ cached_repo_list = HgModel().get_repos()
+ c.repos_list = sorted(cached_repo_list, key=itemgetter('name'))
return render('admin/repos/repos.html')
def create(self):
diff --git a/setup.py b/setup.py
index a602335e..f10128e0 100644
--- a/setup.py
+++ b/setup.py
@@ -18,7 +18,9 @@ setup(
"SQLAlchemy>=0.6",
"Mako>=0.3.2",
"vcs>=0.1.2",
- "pygments>=1.3.0"
+ "pygments>=1.3.0",
+ "mercurial>=1.5",
+ "pysqlite"
],
setup_requires=["PasteScript>=1.6.3"],
packages=find_packages(exclude=['ez_setup']),