Files
@ b19b1723ff10
Branch filter:
Location: kallithea/rhodecode/controllers/bookmarks.py - annotation
b19b1723ff10
2.0 KiB
text/x-python
pullrequest: pullrequest from changelog view
It seems like it didn't work ... perhaps because I broke it. But now we clean
it up and make it work:
Use rev_end as the revision to merge. We don't know where to merge ... but
start_rev cannot be used for that.
This might to some extent have been working before ... but we prefer to clean
it up and start over again when the normal merge workflow is fully working.
It seems like it didn't work ... perhaps because I broke it. But now we clean
it up and make it work:
Use rev_end as the revision to merge. We don't know where to merge ... but
start_rev cannot be used for that.
This might to some extent have been working before ... but we prefer to clean
it up and start over again when the normal merge workflow is fully working.
a3ee2611e6e8 a3ee2611e6e8 a3ee2611e6e8 a3ee2611e6e8 a3ee2611e6e8 a3ee2611e6e8 a3ee2611e6e8 a3ee2611e6e8 a3ee2611e6e8 89efedac4e6c a3ee2611e6e8 a3ee2611e6e8 a3ee2611e6e8 a3ee2611e6e8 a3ee2611e6e8 a3ee2611e6e8 a3ee2611e6e8 a3ee2611e6e8 a3ee2611e6e8 a3ee2611e6e8 a3ee2611e6e8 a3ee2611e6e8 a3ee2611e6e8 a3ee2611e6e8 a3ee2611e6e8 a3ee2611e6e8 a3ee2611e6e8 a3ee2611e6e8 a3ee2611e6e8 a3ee2611e6e8 a3ee2611e6e8 d0effbe1acb1 a3ee2611e6e8 a3ee2611e6e8 a3ee2611e6e8 a3ee2611e6e8 a3ee2611e6e8 a3ee2611e6e8 a3ee2611e6e8 a3ee2611e6e8 a3ee2611e6e8 a3ee2611e6e8 a3ee2611e6e8 a3ee2611e6e8 a3ee2611e6e8 d0effbe1acb1 d0effbe1acb1 cf51bbfb120e a3ee2611e6e8 a3ee2611e6e8 a3ee2611e6e8 a3ee2611e6e8 a3ee2611e6e8 a3ee2611e6e8 a3ee2611e6e8 a3ee2611e6e8 a3ee2611e6e8 | # -*- coding: utf-8 -*-
"""
rhodecode.controllers.bookmarks
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Bookmarks controller for rhodecode
:created_on: Dec 1, 2011
:author: marcink
:copyright: (C) 2011-2012 Marcin Kuzminski <marcin@python-works.com>
:license: GPLv3, see COPYING for more details.
"""
# 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, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import logging
from pylons import tmpl_context as c
from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
from rhodecode.lib.base import BaseRepoController, render
from rhodecode.lib.compat import OrderedDict
from webob.exc import HTTPNotFound
log = logging.getLogger(__name__)
class BookmarksController(BaseRepoController):
@LoginRequired()
@HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
'repository.admin')
def __before__(self):
super(BookmarksController, self).__before__()
def index(self):
if c.rhodecode_repo.alias != 'hg':
raise HTTPNotFound()
c.repo_bookmarks = OrderedDict()
bookmarks = [(name, c.rhodecode_repo.get_changeset(hash_)) for \
name, hash_ in c.rhodecode_repo._repo._bookmarks.items()]
ordered_tags = sorted(bookmarks, key=lambda x: x[1].date, reverse=True)
for name, cs_book in ordered_tags:
c.repo_bookmarks[name] = cs_book
return render('bookmarks/bookmarks.html')
|