Mercurial > kallithea
changeset 389:174785aa5dc4
fixed sorting of tags and branches. Fix made in vcs.
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Thu, 05 Aug 2010 23:59:41 +0200 |
| parents | 3bcf9529d221 |
| children | 6a506a7acd1a |
| files | pylons_app/controllers/branches.py pylons_app/controllers/summary.py pylons_app/controllers/tags.py |
| diffstat | 3 files changed, 12 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/pylons_app/controllers/branches.py Thu Aug 05 22:31:23 2010 +0200 +++ b/pylons_app/controllers/branches.py Thu Aug 05 23:59:41 2010 +0200 @@ -2,7 +2,7 @@ # encoding: utf-8 # branches controller for pylons # Copyright (C) 2009-2010 Marcin Kuzminski <marcin@python-works.com> - +# # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; version 2 @@ -22,9 +22,10 @@ branches controller for pylons @author: marcink """ -from pylons import tmpl_context as c, request +from pylons import tmpl_context as c from pylons_app.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator from pylons_app.lib.base import BaseController, render +from pylons_app.lib.utils import OrderedDict from pylons_app.model.hg_model import HgModel import logging log = logging.getLogger(__name__) @@ -39,7 +40,7 @@ def index(self): hg_model = HgModel() c.repo_info = hg_model.get_repo(c.repo_name) - c.repo_branches = {} + c.repo_branches = OrderedDict() for name, hash_ in c.repo_info.branches.items(): c.repo_branches[name] = c.repo_info.get_changeset(hash_)
--- a/pylons_app/controllers/summary.py Thu Aug 05 22:31:23 2010 +0200 +++ b/pylons_app/controllers/summary.py Thu Aug 05 23:59:41 2010 +0200 @@ -55,11 +55,11 @@ 'host':e.get('HTTP_HOST'), 'repo_name':c.repo_name, } c.clone_repo_url = uri - c.repo_tags = {} + c.repo_tags = OrderedDict() for name, hash in c.repo_info.tags.items()[:10]: c.repo_tags[name] = c.repo_info.get_changeset(hash) - c.repo_branches = {} + c.repo_branches = OrderedDict() for name, hash in c.repo_info.branches.items()[:10]: c.repo_branches[name] = c.repo_info.get_changeset(hash)
--- a/pylons_app/controllers/tags.py Thu Aug 05 22:31:23 2010 +0200 +++ b/pylons_app/controllers/tags.py Thu Aug 05 23:59:41 2010 +0200 @@ -2,7 +2,7 @@ # encoding: utf-8 # tags controller for pylons # Copyright (C) 2009-2010 Marcin Kuzminski <marcin@python-works.com> - +# # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; version 2 @@ -22,9 +22,10 @@ tags controller for pylons @author: marcink """ -from pylons import tmpl_context as c, request +from pylons import tmpl_context as c from pylons_app.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator from pylons_app.lib.base import BaseController, render +from pylons_app.lib.utils import OrderedDict from pylons_app.model.hg_model import HgModel import logging log = logging.getLogger(__name__) @@ -39,8 +40,8 @@ def index(self): hg_model = HgModel() c.repo_info = hg_model.get_repo(c.repo_name) - c.repo_tags = {} - for name, hash in c.repo_info.tags.items(): - c.repo_tags[name] = c.repo_info.get_changeset(hash) + c.repo_tags = OrderedDict() + for name, hash_ in c.repo_info.tags.items(): + c.repo_tags[name] = c.repo_info.get_changeset(hash_) return render('tags/tags.html')