kallithea Changeset - 3fc9183e05dd

Changeset - 3fc9183e05dd

Parent rev.

Child rev.

[Not reviewed]

beta

0 23 0

Marcin Kuzminski - 15 years ago 2011-02-15 01:36:07
marcin@python-works.com

another major codes rewrite:
- created BaseRepo controller for all repo specific controller, and added common data propagation
- removed obosete codes, and made optimizations, removed to often calls to RepoModel
- fixed found bugs in files controller that generated unhandled 500 errors
- cache issues
- removed repo_branches global template values
- journal fixes
- main repo list is fully dict now it's less resource heavy that way

23 files changed with 211 insertions and 189 deletions:

rhodecode/controllers/admin/settings.py

rhodecode/controllers/branches.py

rhodecode/controllers/changelog.py

rhodecode/controllers/changeset.py

rhodecode/controllers/feed.py

rhodecode/controllers/files.py

rhodecode/controllers/home.py

rhodecode/controllers/journal.py

rhodecode/controllers/search.py

rhodecode/controllers/settings.py

rhodecode/controllers/shortlog.py

rhodecode/controllers/summary.py

rhodecode/controllers/tags.py

rhodecode/lib/base.py

rhodecode/lib/helpers.py

rhodecode/model/repo.py

rhodecode/model/scm.py

rhodecode/public/css/style.css

rhodecode/templates/admin/repos/repos.html

rhodecode/templates/admin/users/user_edit_my_account.html

rhodecode/templates/base/base.html

rhodecode/templates/index.html

rhodecode/templates/journal/journal_data.html

0 comments (0 inline, 0 general)

rhodecode/controllers/admin/settings.py

➞

Show inline comments

@@ @@ -248,29 +248,27 @@ class SettingsController(BaseController) @@
     def edit(self, setting_id, format='html'):
         """GET /admin/settings/setting_id/edit: Form to edit an existing item"""
         # url('admin_edit_setting', setting_id=ID)
     @NotAnonymous()
     def my_account(self):
         """
         GET /_admin/my_account Displays info about my account
         """
         # url('admin_settings_my_account')
         c.user = UserModel().get(c.rhodecode_user.user_id, cache=False)
         all_repos = self.sa.query(Repository)\
+        all_repos = [r.repo_name for r in self.sa.query(Repository)\
             .filter(Repository.user_id == c.user.user_id)\
             .order_by(func.lower(Repository.repo_name))\
             .all()
                      .order_by(func.lower(Repository.repo_name)).all()]
         c.user_repos = ScmModel().get_repos(all_repos)
         if c.user.username == 'default':
             h.flash(_("You can't edit this user since it's"
               " crucial for entire application"), category='warning')
             return redirect(url('users'))
         defaults = c.user.get_dict()
         return htmlfill.render(
             render('admin/users/user_edit_my_account.html'),
             defaults=defaults,
             encoding="UTF-8",

rhodecode/controllers/branches.py

➞

Show inline comments

@@ @@ -21,33 +21,32 @@ @@
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 import logging
 from pylons import tmpl_context as c
 from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
-from rhodecode.lib.base import BaseController, render
+from rhodecode.lib.base import BaseRepoController, render
 from rhodecode.lib.utils import OrderedDict
 from rhodecode.model.scm import ScmModel
 log = logging.getLogger(__name__)
-class BranchesController(BaseController):
+class BranchesController(BaseRepoController):
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
                                    'repository.admin')
     def __before__(self):
         super(BranchesController, self).__before__()
     def index(self):
-        c.repo_info, dbrepo = ScmModel().get(c.repo_name, retval='repo')
         c.repo_branches = OrderedDict()
         for name, hash_ in c.repo_info.branches.items():
             c.repo_branches[name] = c.repo_info.get_changeset(hash_)
         for name, hash_ in c.rhodecode_repo.branches.items():
             c.repo_branches[name] = c.rhodecode_repo.get_changeset(hash_)
         return render('branches/branches.html')

rhodecode/controllers/changelog.py

➞

Show inline comments

@@ @@ -28,62 +28,59 @@ @@
 import logging
 try:
     import json
 except ImportError:
     #python 2.5 compatibility
     import simplejson as json
 from mercurial.graphmod import colored, CHANGESET, revisions as graph_rev
 from pylons import request, session, tmpl_context as c
 from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
 from rhodecode.lib.base import BaseController, render
 from rhodecode.model.scm import ScmModel
 from rhodecode.lib.base import BaseRepoController, render
 from webhelpers.paginate import Page
 log = logging.getLogger(__name__)
-class ChangelogController(BaseController):
+class ChangelogController(BaseRepoController):
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
                                    'repository.admin')
     def __before__(self):
         super(ChangelogController, self).__before__()
     def index(self):
         limit = 100
         default = 20
         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 = int(session.get('changelog_size', default))
         repo, dbrepo = ScmModel().get(c.repo_name, retval='repo')
         p = int(request.params.get('page', 1))
         c.total_cs = len(repo)
         c.pagination = Page(repo, page=p, item_count=c.total_cs,
         c.total_cs = len(c.rhodecode_repo)
         c.pagination = Page(c.rhodecode_repo, page=p, item_count=c.total_cs,
                             items_per_page=c.size)
-        self._graph(repo, c.size, p)
+        self._graph(c.rhodecode_repo, c.size, p)
         return render('changelog/changelog.html')
     def _graph(self, repo, size, p):
         revcount = size
         if not repo.revisions or repo.alias == 'git':
             c.jsdata = json.dumps([])
             return
         max_rev = repo.revisions[-1]

rhodecode/controllers/changeset.py

➞

Show inline comments

@@ @@ -25,67 +25,65 @@ @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 import logging
 import traceback
 from pylons import tmpl_context as c, url, request, response
 from pylons.i18n.translation import _
 from pylons.controllers.util import redirect
 import rhodecode.lib.helpers as h
 from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
-from rhodecode.lib.base import BaseController, render
+from rhodecode.lib.base import BaseRepoController, render
 from rhodecode.lib.utils import EmptyChangeset
 from rhodecode.model.scm import ScmModel
 from vcs.exceptions import RepositoryError, ChangesetError, \
 ChangesetDoesNotExistError
 from vcs.nodes import FileNode
 from vcs.utils import diffs as differ
 from vcs.utils.ordered_dict import OrderedDict
 log = logging.getLogger(__name__)
-class ChangesetController(BaseController):
+class ChangesetController(BaseRepoController):
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
                                    'repository.admin')
     def __before__(self):
         super(ChangesetController, self).__before__()
     def index(self, revision):
         def wrap_to_table(str):
             return '''<table class="code-difftable">
                         <tr class="line">
                         <td class="lineno new"></td>
                         <td class="code"><pre>%s</pre></td>
                         </tr>
                       </table>''' % str
         #get ranges of revisions if preset
         rev_range = revision.split('...')[:2]
         range_limit = 50
         try:
             repo, dbrepo = ScmModel().get(c.repo_name, retval='repo')
             if len(rev_range) == 2:
                 rev_start = rev_range[0]
                 rev_end = rev_range[1]
-                rev_ranges = repo.get_changesets_ranges(rev_start, rev_end,
+                rev_ranges = c.rhodecode_repo.get_changesets_ranges(rev_start, rev_end,
                                                        range_limit)
             else:
-                rev_ranges = [repo.get_changeset(revision)]
+                rev_ranges = [c.rhodecode_repo.get_changeset(revision)]
             c.cs_ranges = list(rev_ranges)
         except (RepositoryError, ChangesetDoesNotExistError, Exception), e:
             log.error(traceback.format_exc())
             h.flash(str(e), category='warning')
             return redirect(url('home'))
         c.changes = OrderedDict()
         c.sum_added = 0
         c.sum_removed = 0
@@ @@ -155,55 +153,54 @@ class ChangesetController(BaseController @@
         if len(c.cs_ranges) == 1:
             c.changeset = c.cs_ranges[0]
             c.changes = c.changes[c.changeset.raw_id]
             return render('changeset/changeset.html')
         else:
             return render('changeset/changeset_range.html')
     def raw_changeset(self, revision):
         method = request.GET.get('diff', 'show')
         try:
             repo, dbrepo = ScmModel().get(c.repo_name, retval='repo')
             c.scm_type = repo.alias
             c.changeset = repo.get_changeset(revision)
             c.scm_type = c.rhodecode_repo.alias
             c.changeset = c.rhodecode_repo.get_changeset(revision)
         except RepositoryError:
             log.error(traceback.format_exc())
             return redirect(url('home'))
         else:
             try:
                 c.changeset_parent = c.changeset.parents[0]
             except IndexError:
                 c.changeset_parent = None
             c.changes = []
             for node in c.changeset.added:
                 filenode_old = FileNode(node.path, '')
                 if filenode_old.is_binary or node.is_binary:
                     diff = _('binary file') + '\n'
                 else:
-                    f_udiff = differ.get_udiff(filenode_old, node)
+                    f_udiff = differ.get_gitdiff(filenode_old, node)
                     diff = differ.DiffProcessor(f_udiff).raw_diff()
                 cs1 = None
                 cs2 = node.last_changeset.raw_id
                 c.changes.append(('added', node, diff, cs1, cs2))
             for node in c.changeset.changed:
                 filenode_old = c.changeset_parent.get_node(node.path)
                 if filenode_old.is_binary or node.is_binary:
                     diff = _('binary file')
                 else:
-                    f_udiff = differ.get_udiff(filenode_old, node)
+                    f_udiff = differ.get_gitdiff(filenode_old, node)
                     diff = differ.DiffProcessor(f_udiff).raw_diff()
                 cs1 = filenode_old.last_changeset.raw_id
                 cs2 = node.last_changeset.raw_id
                 c.changes.append(('changed', node, diff, cs1, cs2))
         response.content_type = 'text/plain'
         if method == 'download':
             response.content_disposition = 'attachment; filename=%s.patch' % revision
         parent = True if len(c.changeset.parents) > 0 else False

rhodecode/controllers/feed.py

➞

Show inline comments

@@ @@ -18,74 +18,70 @@ @@
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 import logging
 from pylons import url, response
+from pylons import url, response, tmpl_context as c
 from pylons.i18n.translation import _
 from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
 from rhodecode.lib.base import BaseController
 from rhodecode.model.scm import ScmModel
 from rhodecode.lib.base import BaseRepoController
 from webhelpers.feedgenerator import Atom1Feed, Rss201rev2Feed
 log = logging.getLogger(__name__)
-class FeedController(BaseController):
+class FeedController(BaseRepoController):
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
                                    'repository.admin')
     def __before__(self):
         super(FeedController, self).__before__()
         #common values for feeds
         self.description = _('Changes on %s repository')
         self.title = "%s feed"
         self.language = 'en-us'
         self.ttl = "5"
         self.feed_nr = 10
     def atom(self, repo_name):
         """Produce an atom-1.0 feed via feedgenerator module"""
         feed = Atom1Feed(title=self.title % repo_name,
                          link=url('summary_home', repo_name=repo_name, qualified=True),
                          description=self.description % repo_name,
                          language=self.language,
                          ttl=self.ttl)
         repo, dbrepo = ScmModel().get(repo_name, retval='repo')
         for cs in repo[:self.feed_nr]:
         for cs in c.rhodecode_repo[:self.feed_nr]:
             feed.add_item(title=cs.message,
                           link=url('changeset_home', repo_name=repo_name,
                                    revision=cs.raw_id, qualified=True),
                                    description=str(cs.date))
         response.content_type = feed.mime_type
         return feed.writeString('utf-8')
     def rss(self, repo_name):
         """Produce an rss2 feed via feedgenerator module"""
         feed = Rss201rev2Feed(title=self.title % repo_name,
                          link=url('summary_home', repo_name=repo_name, qualified=True),
                          description=self.description % repo_name,
                          language=self.language,
                          ttl=self.ttl)
         repo, dbrepo = ScmModel().get(repo_name, retval='repo')
         for cs in repo[:self.feed_nr]:
         for cs in c.rhodecode_repo[:self.feed_nr]:
             feed.add_item(title=cs.message,
                           link=url('changeset_home', repo_name=repo_name,
                                    revision=cs.raw_id, qualified=True),
                           description=str(cs.date))
         response.content_type = feed.mime_type
         return feed.writeString('utf-8')

rhodecode/controllers/files.py

➞

Show inline comments

@@ @@ -15,199 +15,218 @@ @@
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
+#
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 import tempfile
 import logging
 import rhodecode.lib.helpers as h
 from mercurial import archival
 from pylons import request, response, session, tmpl_context as c, url
 from pylons.i18n.translation import _
 from pylons.controllers.util import redirect
 from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
-from rhodecode.lib.base import BaseController, render
+from rhodecode.lib.base import BaseRepoController, render
 from rhodecode.lib.utils import EmptyChangeset
-from rhodecode.model.scm import ScmModel
+from rhodecode.model.repo import RepoModel
 from vcs.backends import ARCHIVE_SPECS
 from vcs.exceptions import RepositoryError, ChangesetError, \
     ChangesetDoesNotExistError, EmptyRepositoryError, ImproperArchiveTypeError
 from vcs.nodes import FileNode
     ChangesetDoesNotExistError, EmptyRepositoryError, ImproperArchiveTypeError, \
     VCSError
 from vcs.nodes import FileNode, NodeKind
 from vcs.utils import diffs as differ
 log = logging.getLogger(__name__)
-class FilesController(BaseController):
+class FilesController(BaseRepoController):
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
                                    'repository.admin')
     def __before__(self):
         super(FilesController, self).__before__()
         c.cut_off_limit = self.cut_off_limit
     def __get_cs(self, rev, repo_name):
         """
         Safe way to get changeset if error ucure it redirects to given
         :param rev: revision to fetch
         :param repo_name: repo name to redirect after
         """
         try:
             return c.rhodecode_repo.get_changeset(rev)
         except EmptyRepositoryError, e:
             h.flash(_('There are no files yet'), category='warning')
             redirect(h.url('summary_home', repo_name=repo_name))
         except RepositoryError, e:
             h.flash(str(e), category='warning')
             redirect(h.url('files_home', repo_name=repo_name, revision='tip'))
     def index(self, repo_name, revision, f_path):
         c.repo, dbrepo = ScmModel().get(c.repo_name, retval='repo')
         try:
             #reditect to given revision from form
             post_revision = request.POST.get('at_rev', None)
             if post_revision:
-                post_revision = c.repo.get_changeset(post_revision).raw_id
+                post_revision = c.rhodecode_repo.get_changeset(post_revision).raw_id
                 redirect(url('files_home', repo_name=c.repo_name,
                              revision=post_revision, f_path=f_path))
             c.branch = request.GET.get('branch', None)
             c.f_path = f_path
-            c.changeset = c.repo.get_changeset(revision)
+            c.changeset = c.rhodecode_repo.get_changeset(revision)
             cur_rev = c.changeset.revision
             #prev link
             try:
-                prev_rev = c.repo.get_changeset(cur_rev).prev(c.branch).raw_id
+                prev_rev = c.rhodecode_repo.get_changeset(cur_rev).prev(c.branch).raw_id
                 c.url_prev = url('files_home', repo_name=c.repo_name,
                              revision=prev_rev, f_path=f_path)
                 if c.branch:
                     c.url_prev += '?branch=%s' % c.branch
             except ChangesetDoesNotExistError:
+            except (ChangesetDoesNotExistError, VCSError):
                 c.url_prev = '#'
             #next link
             try:
-                next_rev = c.repo.get_changeset(cur_rev).next(c.branch).raw_id
+                next_rev = c.rhodecode_repo.get_changeset(cur_rev).next(c.branch).raw_id
                 c.url_next = url('files_home', repo_name=c.repo_name,
                          revision=next_rev, f_path=f_path)
                 if c.branch:
                     c.url_next += '?branch=%s' % c.branch
             except ChangesetDoesNotExistError:
+            except (ChangesetDoesNotExistError, VCSError):
                 c.url_next = '#'
             #files
             try:
                 c.files_list = c.changeset.get_node(f_path)
-                c.file_history = self._get_history(c.repo, c.files_list, f_path)
+                c.file_history = self._get_history(c.rhodecode_repo, c.files_list, f_path)
             except RepositoryError, e:
                 h.flash(str(e), category='warning')
                 redirect(h.url('files_home', repo_name=repo_name, revision=revision))
         except EmptyRepositoryError, e:
             h.flash(_('There are no files yet'), category='warning')
             redirect(h.url('summary_home', repo_name=repo_name))
         except RepositoryError, e:
             h.flash(str(e), category='warning')
             redirect(h.url('files_home', repo_name=repo_name, revision='tip'))
         return render('files/files.html')
     def rawfile(self, repo_name, revision, f_path):
         c.repo, dbrepo = ScmModel().get(c.repo_name, retval='repo')
         file_node = c.repo.get_changeset(revision).get_node(f_path)
         cs = self.__get_cs(revision, repo_name)
         try:
             file_node = cs.get_node(f_path)
         except RepositoryError, e:
             h.flash(str(e), category='warning')
             redirect(h.url('files_home', repo_name=repo_name, revision=cs.raw_id))
         response.content_type = file_node.mimetype
         response.content_disposition = 'attachment; filename=%s' \
                                                     % f_path.split('/')[-1]
         return file_node.content
     def raw(self, repo_name, revision, f_path):
         c.repo, dbrepo = ScmModel().get(c.repo_name, retval='repo')
         file_node = c.repo.get_changeset(revision).get_node(f_path)
         cs = self.__get_cs(revision, repo_name)
         try:
             file_node = cs.get_node(f_path)
         except RepositoryError, e:
             h.flash(str(e), category='warning')
             redirect(h.url('files_home', repo_name=repo_name, revision=cs.raw_id))
         response.content_type = 'text/plain'
         return file_node.content
     def annotate(self, repo_name, revision, f_path):
         c.repo, dbrepo = ScmModel().get(c.repo_name, retval='repo')
         cs = self.__get_cs(revision, repo_name)
         try:
             c.cs = c.repo.get_changeset(revision)
             c.file = c.cs.get_node(f_path)
             c.file = cs.get_node(f_path)
         except RepositoryError, e:
             h.flash(str(e), category='warning')
-            redirect(h.url('files_home', repo_name=repo_name, revision=revision))
+            redirect(h.url('files_home', repo_name=repo_name, revision=cs.raw_id))
         c.file_history = self._get_history(c.repo, c.file, f_path)
         c.file_history = self._get_history(c.rhodecode_repo, c.file, f_path)
         c.cs = cs
         c.f_path = f_path
         return render('files/files_annotate.html')
     def archivefile(self, repo_name, fname):
         fileformat = None
         revision = None
         ext = None
         for a_type, ext_data in ARCHIVE_SPECS.items():
             archive_spec = fname.split(ext_data[1])
             if len(archive_spec) == 2 and archive_spec[1] == '':
                 fileformat = a_type or ext_data[1]
                 revision = archive_spec[0]
                 ext = ext_data[1]
         try:
             repo, dbrepo = ScmModel().get(repo_name)
             dbrepo = RepoModel().get_by_repo_name(repo_name)
             if dbrepo.enable_downloads is False:
                 return _('downloads disabled')
-            cs = repo.get_changeset(revision)
+            cs = c.rhodecode_repo.get_changeset(revision)
             content_type = ARCHIVE_SPECS[fileformat][0]
         except ChangesetDoesNotExistError:
             return _('Unknown revision %s') % revision
         except EmptyRepositoryError:
             return _('Empty repository')
         except (ImproperArchiveTypeError, KeyError):
             return _('Unknown archive type')
         response.content_type = content_type
         response.content_disposition = 'attachment; filename=%s-%s%s' \
             % (repo_name, revision, ext)
         return cs.get_chunked_archive(kind=fileformat)
     def diff(self, repo_name, f_path):
         diff1 = request.GET.get('diff1')
         diff2 = request.GET.get('diff2')
         c.action = request.GET.get('diff')
         c.no_changes = diff1 == diff2
         c.f_path = f_path
         c.repo, dbrepo = ScmModel().get(c.repo_name, retval='repo')
         try:
             if diff1 not in ['', None, 'None', '0' * 12, '0' * 40]:
-                c.changeset_1 = c.repo.get_changeset(diff1)
+                c.changeset_1 = c.rhodecode_repo.get_changeset(diff1)
                 node1 = c.changeset_1.get_node(f_path)
             else:
                 c.changeset_1 = EmptyChangeset()
                 node1 = FileNode('.', '', changeset=c.changeset_1)
             if diff2 not in ['', None, 'None', '0' * 12, '0' * 40]:
-                c.changeset_2 = c.repo.get_changeset(diff2)
+                c.changeset_2 = c.rhodecode_repo.get_changeset(diff2)
                 node2 = c.changeset_2.get_node(f_path)
             else:
                 c.changeset_2 = EmptyChangeset()
                 node2 = FileNode('.', '', changeset=c.changeset_2)
         except RepositoryError:
             return redirect(url('files_home',
                                 repo_name=c.repo_name, f_path=f_path))
         if c.action == 'download':
             diff = differ.DiffProcessor(differ.get_gitdiff(node1, node2))
@@ @@ -236,40 +255,39 @@ class FilesController(BaseController): @@
             #default option
             if node1.size > self.cut_off_limit or node2.size > self.cut_off_limit:
                 c.cur_diff = _('Diff is to big to display')
             elif node1.is_binary or node2.is_binary:
                 c.cur_diff = _('Binary file')
             else:
                 c.cur_diff = diff.as_html()
         if not c.cur_diff: c.no_changes = True
         return render('files/file_diff.html')
     def _get_history(self, repo, node, f_path):
         from vcs.nodes import NodeKind
         if not node.kind is NodeKind.FILE:
             return []
         changesets = node.history
         hist_l = []
         changesets_group = ([], _("Changesets"))
         branches_group = ([], _("Branches"))
         tags_group = ([], _("Tags"))
         for chs in changesets:
             n_desc = 'r%s:%s' % (chs.revision, chs.short_id)
             changesets_group[0].append((chs.raw_id, n_desc,))
         hist_l.append(changesets_group)
-        for name, chs in c.repository_branches.items():
+        for name, chs in c.rhodecode_repo.branches.items():
             #chs = chs.split(':')[-1]
             branches_group[0].append((chs, name),)
         hist_l.append(branches_group)
-        for name, chs in c.repository_tags.items():
+        for name, chs in c.rhodecode_repo.tags.items():
             #chs = chs.split(':')[-1]
             tags_group[0].append((chs, name),)
         hist_l.append(tags_group)
         return hist_l

rhodecode/controllers/home.py

➞

Show inline comments

@@ @@ -23,44 +23,43 @@ @@
 # 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.
 import logging
 from operator import itemgetter
 from pylons import tmpl_context as c, request
 from rhodecode.lib.auth import LoginRequired
 from rhodecode.lib.base import BaseController, render
 from rhodecode.model.scm import ScmModel
 log = logging.getLogger(__name__)
 class HomeController(BaseController):
     @LoginRequired()
     def __before__(self):
         super(HomeController, self).__before__()
     def index(self):
         sortables = ['name', 'description', 'last_change', 'tip', 'owner']
         current_sort = request.GET.get('sort', 'name')
         current_sort_slug = current_sort.replace('-', '')
         if current_sort_slug not in sortables:
             c.sort_by = 'name'
             current_sort_slug = c.sort_by
         else:
             c.sort_by = current_sort
         c.sort_slug = current_sort_slug
         cached_repo_list = ScmModel().get_repos()
         sort_key = current_sort_slug + '_sort'
         if c.sort_by.startswith('-'):
             c.repos_list = sorted(cached_repo_list, key=itemgetter(sort_key),
+            c.repos_list = sorted(c.cached_repo_list, key=itemgetter(sort_key),
                                   reverse=True)
         else:
             c.repos_list = sorted(cached_repo_list, key=itemgetter(sort_key),
+            c.repos_list = sorted(c.cached_repo_list, key=itemgetter(sort_key),
                                   reverse=False)
         return render('/index.html')

rhodecode/controllers/journal.py

➞

Show inline comments

@@ @@ -20,115 +20,114 @@ @@
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 import logging
 from sqlalchemy import or_
 from sqlalchemy.orm import joinedload, make_transient
 from webhelpers.paginate import Page
 from itertools import groupby
 from paste.httpexceptions import HTTPInternalServerError
-from pylons import request, response, session, tmpl_context as c, url
 from pylons import request, tmpl_context as c
 from rhodecode.lib.auth import LoginRequired, NotAnonymous
 from rhodecode.lib.base import BaseController, render
 from rhodecode.lib.helpers import get_token
 from rhodecode.model.db import UserLog, UserFollowing
 from rhodecode.model.scm import ScmModel
 log = logging.getLogger(__name__)
 class JournalController(BaseController):
     @LoginRequired()
     @NotAnonymous()
     def __before__(self):
         super(JournalController, self).__before__()
     def index(self):
         # Return a rendered template
         c.following = self.sa.query(UserFollowing)\
             .filter(UserFollowing.user_id == c.rhodecode_user.user_id)\
             .options(joinedload(UserFollowing.follows_repository))\
             .all()
         repo_ids = [x.follows_repository.repo_id for x in c.following
                     if x.follows_repository is not None]
         user_ids = [x.follows_user.user_id for x in c.following
                     if x.follows_user is not None]
         filtering_criterion = None
         if repo_ids and user_ids:
             filtering_criterion = or_(UserLog.repository_id.in_(repo_ids),
                         UserLog.user_id.in_(user_ids))
         if repo_ids and not user_ids:
             filtering_criterion = UserLog.repository_id.in_(repo_ids)
         if not repo_ids and user_ids:
             filtering_criterion = UserLog.user_id.in_(user_ids)
         if filtering_criterion is not None:
             journal = self.sa.query(UserLog)\
                 .options(joinedload(UserLog.user))\
                 .options(joinedload(UserLog.repository))\
                 .filter(filtering_criterion)\
                 .order_by(UserLog.action_date.desc())
         else:
             journal = []
         p = int(request.params.get('page', 1))
         p = int(request.params.get('page', 1))
         c.journal_pager = Page(journal, page=p, items_per_page=10)
         c.journal_pager = Page(journal, page=p, items_per_page=20)
         c.journal_day_aggreagate = self._get_daily_aggregate(c.journal_pager)
         c.journal_data = render('journal/journal_data.html')
         if request.params.get('partial'):
             return c.journal_data
         return render('journal/journal.html')
     def _get_daily_aggregate(self, journal):
         from itertools import groupby
         groups = []
         for k, g in groupby(journal, lambda x:x.action_as_day):
             user_group = []
             for k2, g2 in groupby(list(g), lambda x:x.user.email):
                 l = list(g2)
                 user_group.append((l[0].user, l))
             groups.append((k, user_group,))
         return groups
     def toggle_following(self):
         cur_token = request.POST.get('auth_token')
         token = get_token()
         if cur_token == token:
             scm_model = ScmModel()
             user_id = request.POST.get('follows_user_id')
             if user_id:
                 try:
                     scm_model.toggle_following_user(user_id,
+                    self.scm_model.toggle_following_user(user_id,
                                                     c.rhodecode_user.user_id)
                     return 'ok'
                 except:
                     raise HTTPInternalServerError()
             repo_id = request.POST.get('follows_repo_id')
             if repo_id:
                 try:
                     scm_model.toggle_following_repo(repo_id,
+                    self.scm_model.toggle_following_repo(repo_id,
                                                     c.rhodecode_user.user_id)
                     return 'ok'
                 except:
                     raise HTTPInternalServerError()
         log.debug('token mismatch %s vs %s', cur_token, token)
         raise HTTPInternalServerError()

rhodecode/controllers/search.py

➞

Show inline comments

@@ @@ -19,26 +19,25 @@ @@
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 import logging
 import traceback
 from pylons.i18n.translation import _
 from pylons import request, response, config, session, tmpl_context as c, url
 from pylons.controllers.util import abort, redirect
 from pylons import request, config, session, tmpl_context as c
 from rhodecode.lib.auth import LoginRequired
 from rhodecode.lib.base import BaseController, render
 from rhodecode.lib.indexers import SCHEMA, IDX_NAME, ResultWrapper
 from webhelpers.paginate import Page
 from webhelpers.util import update_params
 from whoosh.index import open_dir, EmptyIndexError
 from whoosh.qparser import QueryParser, QueryParserError
 from whoosh.query import Phrase

rhodecode/controllers/settings.py

➞

Show inline comments

@@ @@ -20,41 +20,40 @@ @@
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 import logging
 import traceback
 import formencode
 from formencode import htmlfill
 from pylons import tmpl_context as c, request, url
 from pylons.controllers.util import redirect
 from pylons.i18n.translation import _
 import rhodecode.lib.helpers as h
 from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAllDecorator
-from rhodecode.lib.base import BaseController, render
+from rhodecode.lib.base import BaseRepoController, render
 from rhodecode.lib.utils import invalidate_cache, action_logger
 from rhodecode.model.forms import RepoSettingsForm, RepoForkForm
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.db import User
 log = logging.getLogger(__name__)
-class SettingsController(BaseController):
+class SettingsController(BaseRepoController):
     @LoginRequired()
     @HasRepoPermissionAllDecorator('repository.admin')
     def __before__(self):
         super(SettingsController, self).__before__()
     def index(self, repo_name):
         repo_model = RepoModel()
         c.repo_info = repo = repo_model.get_by_repo_name(repo_name)
         if not repo:
             h.flash(_('%s repository is not mapped to db perhaps'
                       ' it was created or renamed from the file system'
@@ @@ -78,49 +77,49 @@ class SettingsController(BaseController) @@
             defaults.update({'user':replacement_user})
         #fill repository users
         for p in c.repo_info.repo_to_perm:
             defaults.update({'u_perm_%s' % p.user.username:
                              p.permission.permission_name})
         #fill repository groups
         for p in c.repo_info.users_group_to_perm:
             defaults.update({'g_perm_%s' % p.users_group.users_group_name:
                              p.permission.permission_name})
         return htmlfill.render(
+        return formencode.htmlfill.render(
             render('settings/repo_settings.html'),
             defaults=defaults,
             encoding="UTF-8",
             force_defaults=False
+        )
     def update(self, repo_name):
         repo_model = RepoModel()
         changed_name = repo_name
         _form = RepoSettingsForm(edit=True, old_data={'repo_name':repo_name})()
         try:
             form_result = _form.to_python(dict(request.POST))
             repo_model.update(repo_name, form_result)
             invalidate_cache('get_repo_cached_%s' % repo_name)
             h.flash(_('Repository %s updated successfully' % repo_name),
                     category='success')
             changed_name = form_result['repo_name']
             action_logger(self.rhodecode_user, 'user_updated_repo',
                               changed_name, '', self.sa)
         except formencode.Invalid, errors:
             c.repo_info = repo_model.get_by_repo_name(repo_name)
             c.users_array = repo_model.get_users_js()
             errors.value.update({'user':c.repo_info.user.username})
             return htmlfill.render(
+            return formencode.htmlfill.render(
                 render('settings/repo_settings.html'),
                 defaults=errors.value,
                 errors=errors.error_dict or {},
                 prefix_error=False,
                 encoding="UTF-8")
         except Exception:
             log.error(traceback.format_exc())
             h.flash(_('error occurred during update of repository %s') \
                     % repo_name, category='error')
         return redirect(url('repo_settings_home', repo_name=changed_name))
@@ @@ -183,19 +182,19 @@ class SettingsController(BaseController) @@
             form_result.update({'repo_name':repo_name})
             repo_model.create_fork(form_result, c.rhodecode_user)
             h.flash(_('forked %s repository as %s') \
                       % (repo_name, form_result['fork_name']),
                     category='success')
             action_logger(self.rhodecode_user,
                           'user_forked_repo:%s' % form_result['fork_name'],
                            repo_name, '', self.sa)
         except formencode.Invalid, errors:
             c.new_repo = errors.value['fork_name']
             r = render('settings/repo_fork.html')
             return htmlfill.render(
+            return formencode.htmlfill.render(
                 r,
                 defaults=errors.value,
                 errors=errors.error_dict or {},
                 prefix_error=False,
                 encoding="UTF-8")
         return redirect(url('home'))

rhodecode/controllers/shortlog.py

➞

Show inline comments

@@ @@ -23,34 +23,32 @@ @@
 # 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.
 import logging
 from pylons import tmpl_context as c, request
 from webhelpers.paginate import Page
 from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
 from rhodecode.lib.base import BaseController, render
 from rhodecode.model.scm import ScmModel
 from rhodecode.lib.base import BaseRepoController, render
 log = logging.getLogger(__name__)
-class ShortlogController(BaseController):
+class ShortlogController(BaseRepoController):
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
                                    'repository.admin')
     def __before__(self):
         super(ShortlogController, self).__before__()
     def index(self):
         p = int(request.params.get('page', 1))
         repo, dbrepo = ScmModel().get(c.repo_name, 'repo')
         c.repo_changesets = Page(repo, page=p, items_per_page=20)
         c.repo_changesets = Page(c.rhodecode_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

rhodecode/controllers/summary.py

➞

Show inline comments

@@ @@ -26,56 +26,55 @@ @@
 # MA  02110-1301, USA.
 import calendar
 import logging
 from time import mktime
 from datetime import datetime, timedelta, date
 from vcs.exceptions import ChangesetError
 from pylons import tmpl_context as c, request, url
 from pylons.i18n.translation import _
 from rhodecode.model.scm import ScmModel
 from rhodecode.model.db import Statistics
 from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
-from rhodecode.lib.base import BaseController, render
+from rhodecode.lib.base import BaseRepoController, render
 from rhodecode.lib.utils import OrderedDict, EmptyChangeset
 from rhodecode.lib.celerylib import run_task
 from rhodecode.lib.celerylib.tasks import get_commits_stats
 from webhelpers.paginate import Page
 try:
     import json
 except ImportError:
     #python 2.5 compatibility
     import simplejson as json
 log = logging.getLogger(__name__)
-class SummaryController(BaseController):
+class SummaryController(BaseRepoController):
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
                                    'repository.admin')
     def __before__(self):
         super(SummaryController, self).__before__()
     def index(self):
         scm_model = ScmModel()
         c.repo, dbrepo = scm_model.get(c.repo_name)
         c.repo, dbrepo = self.scm_model.get(c.repo_name)
         c.dbrepo = dbrepo
         c.following = scm_model.is_following_repo(c.repo_name,
         c.following = self.scm_model.is_following_repo(c.repo_name,
                                              c.rhodecode_user.user_id)
         def url_generator(**kw):
             return url('shortlog_home', repo_name=c.repo_name, **kw)
         c.repo_changesets = Page(c.repo, page=1, items_per_page=10,
                                  url=url_generator)
         e = request.environ
         if self.rhodecode_user.username == 'default':
             #for default(anonymous) user we don't need to pass credentials
             username = ''
@@ @@ -149,23 +148,23 @@ class SummaryController(BaseController): @@
         return render('summary/summary.html')
     def _get_download_links(self, repo):
         download_l = []
         branches_group = ([], _("Branches"))
         tags_group = ([], _("Tags"))
-        for name, chs in c.repository_branches.items():
+        for name, chs in c.rhodecode_repo.branches.items():
             #chs = chs.split(':')[-1]
             branches_group[0].append((chs, name),)
         download_l.append(branches_group)
-        for name, chs in c.repository_tags.items():
+        for name, chs in c.rhodecode_repo.tags.items():
             #chs = chs.split(':')[-1]
             tags_group[0].append((chs, name),)
         download_l.append(tags_group)
         return download_l

rhodecode/controllers/tags.py

➞

Show inline comments

@@ @@ -20,33 +20,31 @@ @@
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 import logging
 from pylons import tmpl_context as c
 from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
-from rhodecode.lib.base import BaseController, render
+from rhodecode.lib.base import BaseRepoController, render
 from rhodecode.lib.utils import OrderedDict
 from rhodecode.model.scm import ScmModel
 log = logging.getLogger(__name__)
-class TagsController(BaseController):
+class TagsController(BaseRepoController):
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
                                    'repository.admin')
     def __before__(self):
         super(TagsController, self).__before__()
     def index(self):
         c.repo_info, dbrepo = ScmModel().get(c.repo_name, retval='repo')
         c.repo_tags = OrderedDict()
         for name, hash_ in c.repo_info.tags.items():
             c.repo_tags[name] = c.repo_info.get_changeset(hash_)
         for name, hash_ in c.rhodecode_repo.tags.items():
             c.repo_tags[name] = c.rhodecode_repo.get_changeset(hash_)
         return render('tags/tags.html')

rhodecode/lib/base.py

➞

Show inline comments

@@ @@ -14,41 +14,50 @@ from rhodecode import BACKENDS @@
 class BaseController(WSGIController):
     def __before__(self):
         c.rhodecode_version = __version__
         c.rhodecode_name = config.get('rhodecode_title')
         c.ga_code = config.get('rhodecode_ga_code')
         c.repo_name = get_repo_slug(request)
         c.backends = BACKENDS.keys()
         self.cut_off_limit = int(config.get('cut_off_limit'))
         self.sa = meta.Session()
         scm_model = ScmModel(self.sa)
         c.cached_repo_list = scm_model.get_repos()
         self.scm_model = ScmModel(self.sa)
         c.cached_repo_list = self.scm_model.get_repos()
         #c.unread_journal = scm_model.get_unread_journal()
         if c.repo_name:
             repo, dbrepo = scm_model.get(c.repo_name)
             if repo:
                 c.repository_tags = repo.tags
                 c.repository_branches = repo.branches
                 c.repository_followers = scm_model.get_followers(dbrepo.repo_id)
                 c.repository_forks = scm_model.get_forks(dbrepo.repo_id)
             else:
                 c.repository_tags = {}
                 c.repository_branches = {}
                 c.repository_followers = 0
                 c.repository_forks = 0
     def __call__(self, environ, start_response):
         """Invoke the Controller"""
         # WSGIController.__call__ dispatches to the Controller method
         # the request is routed to. This routing information is
         # available in environ['pylons.routes_dict']
         try:
             #putting this here makes sure that we update permissions every time
             self.rhodecode_user = c.rhodecode_user = auth.get_user(session)
             return WSGIController.__call__(self, environ, start_response)
         finally:
             meta.Session.remove()
 class BaseRepoController(BaseController):
     """
     Base class for controllers responsible for loading all needed data
     for those controllers, loaded items are
     c.rhodecode_repo: instance of scm repository (taken from cache)
     """
     def __before__(self):
         super(BaseRepoController, self).__before__()
         if c.repo_name:
             c.rhodecode_repo, dbrepo = self.scm_model.get(c.repo_name,
                                                           retval='repo')
             if c.rhodecode_repo:
                 c.repository_followers = self.scm_model.get_followers(c.repo_name)
                 c.repository_forks = self.scm_model.get_forks(c.repo_name)
             else:
                 c.repository_followers = 0
                 c.repository_forks = 0

rhodecode/lib/helpers.py

➞

Show inline comments

@@ @@ -431,26 +431,29 @@ def action_parser(user_log): @@
     action_params = ' '
     x = action.split(':')
     if len(x) > 1:
         action, action_params = x
     def get_cs_links():
         revs_limit = 5 #display this amount always
         revs_top_limit = 50 #show upto this amount of changesets hidden
         revs = action_params.split(',')
         repo_name = user_log.repository.repo_name
         from rhodecode.model.scm import ScmModel
         repo, dbrepo = ScmModel().get(repo_name, retval='repo')
         repo, dbrepo = ScmModel().get(repo_name, retval='repo',
                                       invalidation_list=[])
         message = lambda rev: get_changeset_safe(repo, rev).message
         cs_links = " " + ', '.join ([link_to(rev,
                 url('changeset_home',
                 repo_name=repo_name,
                 revision=rev), title=tooltip(message(rev)),
                 class_='tooltip') for rev in revs[:revs_limit] ])
         compare_view = (' <div class="compare_view tooltip" title="%s">'
                         '<a href="%s">%s</a> '
                         '</div>' % (_('Show all combined changesets %s->%s' \
                                       % (revs[0], revs[-1])),
@@ @@ -472,32 +475,27 @@ def action_parser(user_log): @@
             html_tmpl = '<span id="%s" style="display:none"> %s </span>'
             cs_links += html_tmpl % (uniq_id, ', '.join([link_to(rev,
                 url('changeset_home',
                 repo_name=repo_name, revision=rev),
                 title=message(rev), class_='tooltip')
                 for rev in revs[revs_limit:revs_top_limit]]))
         cs_links += _(' into')
         if len(revs) > 1:
             cs_links += compare_view
         return cs_links
     def get_fork_name():
         from rhodecode.model.scm import ScmModel
         repo_name = action_params
         repo, dbrepo = ScmModel().get(repo_name)
         if repo is None:
             return repo_name
         return link_to(action_params, url('summary_home',
                                           repo_name=repo.name,),
                                           title=dbrepo.description)
         return str(link_to(action_params, url('summary_home',
                                           repo_name=repo_name,)))
     map = {'user_deleted_repo':(_('[deleted] repository'), None),
            'user_created_repo':(_('[created] repository'), None),
            'user_forked_repo':(_('[forked] repository as:'), get_fork_name),
            'user_updated_repo':(_('[updated] repository'), None),
            'admin_deleted_repo':(_('[delete] repository'), None),
            'admin_created_repo':(_('[created] repository'), None),
            'admin_forked_repo':(_('[forked] repository'), None),
            'admin_updated_repo':(_('[updated] repository'), None),
            'push':(_('[pushed]'), get_cs_links),
            'pull':(_('[pulled]'), None),
            'started_following_repo':(_('[started following] repository'), None),

rhodecode/model/repo.py

➞

Show inline comments

@@ @@ -21,25 +21,25 @@ @@
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 import os
 import shutil
 import logging
 import traceback
 from datetime import datetime
 from sqlalchemy.orm import joinedload
+from sqlalchemy.orm import joinedload, make_transient
 from vcs.utils.lazy import LazyProperty
 from vcs.backends import get_backend
 from rhodecode.model import BaseModel
 from rhodecode.model.caching_query import FromCache
 from rhodecode.model.db import Repository, RepoToPerm, User, Permission, \
     Statistics, UsersGroup, UsersGroupToPerm, RhodeCodeUi
 from rhodecode.model.user import UserModel
 from rhodecode.model.users_group import UsersGroupMember, UsersGroupModel
@@ @@ -70,37 +70,40 @@ class RepoModel(BaseModel): @@
             .filter(Repository.repo_name == repo_name)
         if cache:
             repo = repo.options(FromCache("sql_cache_short",
                                           "get_repo_%s" % repo_name))
         return repo.scalar()
     def get_full(self, repo_name, cache=False, invalidate=False):
         repo = self.sa.query(Repository)\
             .options(joinedload(Repository.fork))\
             .options(joinedload(Repository.user))\
             .options(joinedload(Repository.followers))\
             .options(joinedload(Repository.repo_to_perm))\
             .options(joinedload(Repository.users_group_to_perm))\
             .filter(Repository.repo_name == repo_name)\
         if cache:
             repo = repo.options(FromCache("sql_cache_long",
                                           "get_repo_full_%s" % repo_name))
         if invalidate and cache:
             repo.invalidate()
         ret = repo.scalar()
         self.sa.expunge_all()
         #make transient for sake of errors
         make_transient(ret)
         for k in ['fork', 'user']:
             attr = getattr(ret, k, False)
             if attr:
                 make_transient(attr)
         return ret
     def get_users_js(self):
         users = self.sa.query(User).filter(User.active == True).all()
         u_tmpl = '''{id:%s, fname:"%s", lname:"%s", nname:"%s"},'''
         users_array = '[%s]' % '\n'.join([u_tmpl % (u.user_id, u.name,
                                                     u.lastname, u.username)
                                         for u in users])
         return users_array

rhodecode/model/scm.py

➞

Show inline comments

@@ @@ -23,24 +23,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.
 import os
 import time
 import traceback
 import logging
 from mercurial import ui
 from sqlalchemy.exc import DatabaseError
 from sqlalchemy.orm import make_transient
 from beaker.cache import cache_region, region_invalidate
 from vcs import get_backend
 from vcs.utils.helpers import get_scm
 from vcs.exceptions import RepositoryError, VCSError
 from vcs.utils.lazy import LazyProperty
 from rhodecode import BACKENDS
 from rhodecode.lib import helpers as h
 from rhodecode.lib.auth import HasRepoPermissionAny
 from rhodecode.lib.utils import get_repos as get_filesystem_repos, make_ui, \
@@ @@ -112,62 +113,61 @@ class ScmModel(BaseModel): @@
                     if path[0] == 'git' and path[0] in BACKENDS.keys():
                         repos_list[name] = klass(path[1])
             except OSError:
                 continue
         return repos_list
     def get_repos(self, all_repos=None):
         """Get all repos from db and for each repo create it's backend instance.
         and fill that backed with information from database
         :param all_repos: give specific repositories list, good for filtering
             this have to be a list of  just the repository names
         """
         if all_repos is None:
             all_repos = self.sa.query(Repository)\
                 .order_by(Repository.repo_name).all()
             all_repos = [r.repo_name for r in self.sa.query(Repository)\
                 .order_by(Repository.repo_name).all()]
         #get the repositories that should be invalidated
         invalidation_list = [str(x.cache_key) for x in \
                              self.sa.query(CacheInvalidation.cache_key)\
                              .filter(CacheInvalidation.cache_active == False)\
                              .all()]
         for r in all_repos:
             r_dbr = self.get(r.repo_name, invalidation_list)
         for r_name in all_repos:
             r_dbr = self.get(r_name, invalidation_list)
             if r_dbr is not None:
                 repo, dbrepo = r_dbr
                 last_change = repo.last_change
                 tip = h.get_changeset_safe(repo, 'tip')
                 tmp_d = {}
-                tmp_d['name'] = r.repo_name
+                tmp_d['name'] = dbrepo.repo_name
                 tmp_d['name_sort'] = tmp_d['name'].lower()
                 tmp_d['description'] = dbrepo.description
                 tmp_d['description_sort'] = tmp_d['description']
                 tmp_d['last_change'] = last_change
                 tmp_d['last_change_sort'] = time.mktime(last_change.timetuple())
                 tmp_d['tip'] = tip.raw_id
                 tmp_d['tip_sort'] = tip.revision
                 tmp_d['rev'] = tip.revision
                 tmp_d['contact'] = dbrepo.user.full_contact
                 tmp_d['contact_sort'] = tmp_d['contact']
                 tmp_d['owner_sort'] = tmp_d['contact']
                 tmp_d['repo_archives'] = list(repo._get_archives())
                 tmp_d['last_msg'] = tip.message
                 tmp_d['repo'] = repo
                 tmp_d['dbrepo'] = dbrepo
                 tmp_d['dbrepo'] = dbrepo.get_dict()
                 tmp_d['dbrepo_fork'] = dbrepo.fork.get_dict() if dbrepo.fork else {}
                 yield tmp_d
     def get(self, repo_name, invalidation_list=None, retval='all'):
         """Returns a tuple of Repository,DbRepository,
         Get's repository from given name, creates BackendInstance and
         propagates it's data from database with all additional information
         :param repo_name:
         :param invalidation_list: if a invalidation list is given the get
             method should not manually check if this repository needs
             invalidation and just invalidate the repositories in list
         :param retval: string specifing what to return one of 'repo','dbrepo',
@@ @@ -217,25 +217,25 @@ class ScmModel(BaseModel): @@
             #this returns object to invalidate
             invalidate = self._should_invalidate(repo_name)
             if invalidate:
                 log.info('invalidating cache for repository %s', repo_name)
                 region_invalidate(_get_repo, None, repo_name)
                 self._mark_invalidated(invalidate)
                 dbinvalidate = True
         r, dbr = None, None
         if retval == 'repo' or 'all':
             r = _get_repo(repo_name)
         if retval == 'dbrepo' or 'all':
-            dbr = RepoModel(self.sa).get_full(repo_name, cache=True,
             dbr = RepoModel().get_full(repo_name, cache=True,
                                           invalidate=dbinvalidate)
         return r, dbr
     def mark_for_invalidation(self, repo_name):
         """Puts cache invalidation task into db for
         further global cache invalidation
         :param repo_name: this repo that should invalidation take place
@@ @@ -332,30 +332,40 @@ class ScmModel(BaseModel): @@
         return f is not None
     def is_following_user(self, username, user_id, cache=False):
         u = UserModel(self.sa).get_by_username(username)
         f = self.sa.query(UserFollowing)\
             .filter(UserFollowing.follows_user == u)\
             .filter(UserFollowing.user_id == user_id).scalar()
         return f is not None
     def get_followers(self, repo_id):
         if isinstance(repo_id, int):
         return self.sa.query(UserFollowing)\
                 .filter(UserFollowing.follows_repo_id == repo_id).count()
         else:
             return self.sa.query(UserFollowing)\
                     .filter(UserFollowing.follows_repository \
                             == RepoModel().get_by_repo_name(repo_id)).count()
     def get_forks(self, repo_id):
         if isinstance(repo_id, int):
         return self.sa.query(Repository)\
                 .filter(Repository.fork_id == repo_id).count()
         else:
             return self.sa.query(Repository)\
                 .filter(Repository.fork \
                         == RepoModel().get_by_repo_name(repo_id)).count()
     def get_unread_journal(self):
         return self.sa.query(UserLog).count()
     def _should_invalidate(self, repo_name):
         """Looks up database for invalidation signals for this repo_name
         :param repo_name:
         """

rhodecode/public/css/style.css

➞

Show inline comments

@@ @@ -1411,41 +1411,46 @@ padding:10px 0px; @@
 border-bottom:2px solid #DDD;
 margin-left:10px;
 margin-right:10px;
+}
 #journal .journal_user{
 color: #747474;
 font-size: 14px;
 font-weight: bold;
 height: 30px;
+}
 #journal .journal_icon{
 clear: both;
 float: left;
 padding-top: 4px;
 padding-left:12px;
 padding-left: 36px;
 padding-right: 4px;
-clear: both;
+padding-top: 3px;
+}
 #journal .journal_action{
 padding-top:4px;
 min-height:2px;
 float:left
+}
 #journal .journal_repo{
 float: left;
 margin-left: 6px;
 padding-top: 3px;
+}
 #journal .date{
 clear: both;
 color: #777777;
 font-size: 11px;
 padding-left: 56px;
+}
 #journal .journal_repo .journal_repo_name{
 font-weight: bold;
 font-size: 1.1em;
+}
 #journal .compare_view{
 padding: 5px 0px 5px 3px;
 width: 95px;
+}
 .journal_highlight{
 font-weight: bold;
 padding: 0 2px;
 vertical-align: bottom;

rhodecode/templates/admin/repos/repos.html

➞

Show inline comments

@@ @@ -29,44 +29,44 @@ @@
         <tr class="header">
 	        <th class="left">${_('Name')}</th>
 	        <th class="left">${_('Description')}</th>
 	        <th class="left">${_('Last change')}</th>
 	        <th class="left">${_('Tip')}</th>
 	        <th class="left">${_('Contact')}</th>
             <th class="left">${_('action')}</th>
         </tr>
             %for cnt,repo in enumerate(c.repos_list):
             <tr class="parity${cnt%2}">
                  <td>
                  ## TYPE OF REPO
-                 %if repo['dbrepo'].repo_type =='hg':
+                 %if repo['dbrepo']['repo_type'] =='hg':
                    <img class="icon" title="${_('Mercurial repository')}" alt="${_('Mercurial repository')}" src="/images/icons/hgicon.png"/>
-                 %elif repo['dbrepo'].repo_type =='git':
+                 %elif repo['dbrepo']['repo_type'] =='git':
                    <img class="icon" title="${_('Git repository')}" alt="${_('Git repository')}" src="/images/icons/giticon.png"/>
                  %else:
                  %endif
                  ## PRIVATE/PUBLIC REPO
-                 %if repo['dbrepo'].private:
+                 %if repo['dbrepo']['private']:
                     <img alt="${_('private')}" src="/images/icons/lock.png"/>
                  %else:
                     <img alt="${_('public')}" src="/images/icons/lock_open.png"/>
                  %endif
                 ${h.link_to(repo['name'],h.url('edit_repo',repo_name=repo['name']))}
 	            %if repo['dbrepo'].fork:
 	            	<a href="${h.url('summary_home',repo_name=repo['dbrepo'].fork.repo_name)}">
 	            %if repo['dbrepo_fork']:
 	            	<a href="${h.url('summary_home',repo_name=repo['dbrepo_fork']['repo_name'])}">
 	            	<img class="icon" alt="${_('public')}"
-	            	title="${_('Fork of')} ${repo['dbrepo'].fork.repo_name}"
+	            	title="${_('Fork of')} ${repo['dbrepo_fork']['repo_name']}"
 	            	src="/images/icons/arrow_divide.png"/></a>
 	            %endif
                 </td>
 				<td title="${repo['description']}">${h.truncate(repo['description'],60)}</td>
 	            <td>${h.age(repo['last_change'])}</td>
 	            <td>
 	            	%if repo['rev']>=0:
 	            	${h.link_to('r%s:%s' % (repo['rev'],h.short_id(repo['tip'])),
 	                h.url('changeset_home',repo_name=repo['name'],revision=repo['tip']),
 	                class_="tooltip",
 	                title=h.tooltip(repo['last_msg']))}
 	            	%else:

rhodecode/templates/admin/users/user_edit_my_account.html

➞

Show inline comments

@@ @@ -110,42 +110,42 @@ @@
 	    <table>
 	    <thead>
             <tr>
             <th class="left">${_('Name')}</th>
             <th class="left">${_('revision')}</th>
             <th colspan="2" class="left">${_('action')}</th>
 	    </thead>
 	     <tbody>
 	     %if c.user_repos:
 		     %for repo in c.user_repos:
 		        <tr>
 		            <td>
-                     %if repo['dbrepo'].repo_type =='hg':
+                     %if repo['dbrepo']['repo_type'] =='hg':
                        <img class="icon" title="${_('Mercurial repository')}" alt="${_('Mercurial repository')}" src="/images/icons/hgicon.png"/>
-                     %elif repo['dbrepo'].repo_type =='git':
+                     %elif repo['dbrepo']['repo_type'] =='git':
                        <img class="icon" title="${_('Git repository')}" alt="${_('Git repository')}" src="/images/icons/giticon.png"/>
                      %else:
                      %endif
-		             %if repo['dbrepo'].private:
+		             %if repo['dbrepo']['private']:
 		                <img class="icon" alt="${_('private')}" src="/images/icons/lock.png"/>
 		             %else:
 		                <img class="icon" alt="${_('public')}" src="/images/icons/lock_open.png"/>
 		             %endif
 		            ${h.link_to(repo['repo'].name, h.url('summary_home',repo_name=repo['repo'].name),class_="repo_name")}
 		            %if repo['dbrepo'].fork:
 		            	<a href="${h.url('summary_home',repo_name=repo['dbrepo'].fork.repo_name)}">
 		            %if repo['dbrepo_fork']:
 		            	<a href="${h.url('summary_home',repo_name=repo['dbrepo_fork']['repo_name'])}">
 		            	<img class="icon" alt="${_('public')}"
-		            	title="${_('Fork of')} ${repo['dbrepo'].fork.repo_name}"
+		            	title="${_('Fork of')} ${repo['dbrepo_fork']['repo_name']}"
 		            	src="/images/icons/arrow_divide.png"/></a>
 		            %endif
 		            </td>
 		            <td><span class="tooltip" title="${repo['repo'].last_change}">${("r%s:%s") % (h.get_changeset_safe(repo['repo'],'tip').revision,h.short_id(h.get_changeset_safe(repo['repo'],'tip').raw_id))}</span></td>
 		            <td><a href="${h.url('repo_settings_home',repo_name=repo['repo'].name)}" title="${_('edit')}"><img class="icon" alt="${_('private')}" src="/images/icons/application_form_edit.png"/></a></td>
 		            <td>
 	                  ${h.form(url('repo_settings_delete', repo_name=repo['repo'].name),method='delete')}
 	                    ${h.submit('remove_%s' % repo['repo'].name,'',class_="delete_icon action_button",onclick="return confirm('Confirm to delete this repository');")}
 	                  ${h.end_form()}
 		            </td>
 		        </tr>
 		     %endfor

rhodecode/templates/base/base.html

➞

Show inline comments

@@ @@ -133,28 +133,28 @@ @@
 	        <ul id="quick">
 				<!-- repo switcher -->
 				<li>
 					<a id="repo_switcher" title="${_('Switch repository')}" href="#">
                     <span class="icon">
                         <img src="/images/icons/database.png" alt="${_('Products')}" />
                     </span>
                     <span>&darr;</span>
 					</a>
 					<ul class="repo_switcher">
                         %for repo in c.cached_repo_list:
                           %if repo['dbrepo'].private:
                              <li><img src="/images/icons/lock.png" alt="${_('Private repository')}" class="repo_switcher_type"/>${h.link_to(repo['repo'].name,h.url('summary_home',repo_name=repo['repo'].name),class_="%s" % repo['dbrepo'].repo_type)}</li>
                           %if repo['dbrepo']['private']:
                              <li><img src="/images/icons/lock.png" alt="${_('Private repository')}" class="repo_switcher_type"/>${h.link_to(repo['repo'].name,h.url('summary_home',repo_name=repo['repo'].name),class_="%s" % repo['dbrepo']['repo_type'])}</li>
                           %else:
-                             <li><img src="/images/icons/lock_open.png" alt="${_('Public repository')}" class="repo_switcher_type" />${h.link_to(repo['repo'].name,h.url('summary_home',repo_name=repo['repo'].name),class_="%s" % repo['dbrepo'].repo_type)}</li>
+                             <li><img src="/images/icons/lock_open.png" alt="${_('Public repository')}" class="repo_switcher_type" />${h.link_to(repo['repo'].name,h.url('summary_home',repo_name=repo['repo'].name),class_="%s" % repo['dbrepo']['repo_type'])}</li>
                           %endif
                         %endfor
 					</ul>
 				</li>
 	            <li ${is_current('summary')}>
 	               <a title="${_('Summary')}" href="${h.url('summary_home',repo_name=c.repo_name)}">
 	               <span class="icon">
 	                   <img src="/images/icons/clipboard_16.png" alt="${_('Summary')}" />
 	               </span>
 	               <span>${_('Summary')}</span>
 	               </a>
@@ @@ -176,40 +176,40 @@ @@
                    </a>
                 </li>
                 <li ${is_current('switch_to')}>
                    <a title="${_('Switch to')}" href="#">
                    <span class="icon">
                        <img src="/images/icons/arrow_switch.png" alt="${_('Switch to')}" />
                    </span>
                    <span>${_('Switch to')}</span>
                    </a>
                     <ul>
                         <li>
-                            ${h.link_to('%s (%s)' % (_('branches'),len(c.repository_branches.values()),),h.url('branches_home',repo_name=c.repo_name),class_='branches childs')}
+                            ${h.link_to('%s (%s)' % (_('branches'),len(c.rhodecode_repo.branches.values()),),h.url('branches_home',repo_name=c.repo_name),class_='branches childs')}
                             <ul>
                             %if c.repository_branches.values():
 						        %for cnt,branch in enumerate(c.repository_branches.items()):
                             %if c.rhodecode_repo.branches.values():
 						        %for cnt,branch in enumerate(c.rhodecode_repo.branches.items()):
 						            <li>${h.link_to('%s - %s' % (branch[0],h.short_id(branch[1])),h.url('files_home',repo_name=c.repo_name,revision=branch[1]))}</li>
 						        %endfor
 						    %else:
 						    	<li>${h.link_to(_('There are no branches yet'),'#')}</li>
 						    %endif
                             </ul>
                         </li>
                         <li>
-                            ${h.link_to('%s (%s)' % (_('tags'),len(c.repository_tags.values()),),h.url('tags_home',repo_name=c.repo_name),class_='tags childs')}
+                            ${h.link_to('%s (%s)' % (_('tags'),len(c.rhodecode_repo.tags.values()),),h.url('tags_home',repo_name=c.repo_name),class_='tags childs')}
                             <ul>
                             %if c.repository_tags.values():
                                 %for cnt,tag in enumerate(c.repository_tags.items()):
                             %if c.rhodecode_repo.tags.values():
                                 %for cnt,tag in enumerate(c.rhodecode_repo.tags.items()):
                                  <li>${h.link_to('%s - %s' % (tag[0],h.short_id(tag[1])),h.url('files_home',repo_name=c.repo_name,revision=tag[1]))}</li>
                                 %endfor
                             %else:
                             	<li>${h.link_to(_('There are no tags yet'),'#')}</li>
                             %endif
                             </ul>
                         </li>
                     </ul>
                 </li>
                 <li ${is_current('files')}>
                    <a title="${_('Files')}" href="${h.url('files_home',repo_name=c.repo_name)}">
                    <span class="icon">

rhodecode/templates/index.html

➞

Show inline comments

@@ @@ -51,46 +51,46 @@ @@
 			        <th class="left">${get_sort(_('Tip'))}</th>
 			        <th class="left">${get_sort(_('Owner'))}</th>
 			        <th class="left">${_('RSS')}</th>
 			        <th class="left">${_('Atom')}</th>
 	            </tr>
             </thead>
             <tbody>
 		    %for cnt,repo in enumerate(c.repos_list):
 		        <tr class="parity${cnt%2}">
 		            <td>
 		            <div style="white-space: nowrap">
 		             ## TYPE OF REPO
-		             %if repo['dbrepo'].repo_type =='hg':
+		             %if repo['dbrepo']['repo_type'] =='hg':
 		               <img class="icon" title="${_('Mercurial repository')}" alt="${_('Mercurial repository')}" src="/images/icons/hgicon.png"/>
-		             %elif repo['dbrepo'].repo_type =='git':
+		             %elif repo['dbrepo']['repo_type'] =='git':
 		               <img class="icon" title="${_('Git repository')}" alt="${_('Git repository')}" src="/images/icons/giticon.png"/>
 		             %else:
 		             %endif
 		             ##PRIVATE/PUBLIC
-		             %if repo['dbrepo'].private:
+		             %if repo['dbrepo']['private']:
 		                <img class="icon" title="${_('private repository')}" alt="${_('private repository')}" src="/images/icons/lock.png"/>
 		             %else:
 		                <img class="icon" title="${_('public repository')}" alt="${_('public repository')}" src="/images/icons/lock_open.png"/>
 		             %endif
 		            ##NAME
 		            ${h.link_to(repo['name'],
 		                h.url('summary_home',repo_name=repo['name']),class_="repo_name")}
 		            %if repo['dbrepo'].fork:
 		            	<a href="${h.url('summary_home',repo_name=repo['dbrepo'].fork.repo_name)}">
 		            %if repo['dbrepo_fork']:
 		            	<a href="${h.url('summary_home',repo_name=repo['dbrepo_fork']['repo_name'])}">
 		            	<img class="icon" alt="${_('fork')}"
-		            	title="${_('Fork of')} ${repo['dbrepo'].fork.repo_name}"
+		            	title="${_('Fork of')} ${repo['dbrepo_fork']['repo_name']}"
 		            	src="/images/icons/arrow_divide.png"/></a>
 		            %endif
 		            </div>
 		            </td>
 		            ##DESCRIPTION
 		            <td><span class="tooltip" title="${h.tooltip(repo['description'])}">
 		               ${h.truncate(repo['description'],60)}</span>
 		            </td>
 		            ##LAST CHANGE
 		            <td>
 		              <span class="tooltip" title="${repo['last_change']}">
 		              ${h.age(repo['last_change'])}</span>

rhodecode/templates/journal/journal_data.html

➞

Show inline comments

@@ @@ -5,32 +5,33 @@ @@
     <div class="journal_day">${day}</div>
         % for user,entries in items:
         <div style="padding:10px">
             <div class="gravatar">
                 <img alt="gravatar" src="${h.gravatar_url(user.email,24)}"/>
             </div>
             <div class="journal_user">${user.name} ${user.lastname}</div>
             % for entry in entries:
             <div class="journal_icon"> ${h.action_parser_icon(entry)}</div>
             <div class="journal_action">${h.action_parser(entry)}</div>
             <div class="journal_repo">
                 <span class="journal_repo_name">
                 %if entry.repository:
+                %if entry.repository is not None:
                   ${h.link_to(entry.repository.repo_name,
                               h.url('summary_home',repo_name=entry.repository.repo_name))}
                 %else:
                   ${entry.repository_name}
                 %endif
-                </span> - <span title="${entry.action_date}">${h.age(entry.action_date)}</span>
                 </span>
             </div>
             <div class="date"><span class="tooltip" title="${entry.action_date}">${h.age(entry.action_date)}</span></div>
             %endfor
         </div>
         <div style="clear:both;border-bottom:1px dashed #DDD;padding:3px 3px;margin:0px 10px 0px 10px"></div>
         %endfor
     %endfor
 <div class="pagination-wh pagination-left">
 <script type="text/javascript">
   var data_div = 'journal';
   YAHOO.util.Event.onDOMReady(function(){
     YAHOO.util.Event.addListener(YAHOO.util.Dom.getElementsByClassName('pager_link'),"click",function(){
             YAHOO.util.Dom.setStyle(data_div,'opacity','0.3');});});

0 comments (0 inline, 0 general)