kallithea Changeset - c3236d7febad

Changeset - c3236d7febad

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Marcin Kuzminski - 15 years ago 2010-09-03 09:55:48
marcin@python-works.com

fixed, empty cs bug.
Implemented as webhlepers function

3 files changed with 23 insertions and 12 deletions:

pylons_app/lib/helpers.py

pylons_app/model/hg_model.py

pylons_app/templates/admin/users/user_edit_my_account.html

0 comments (0 inline, 0 general)

pylons_app/lib/helpers.py

➞

Show inline comments

@@ @@ -216,13 +216,13 @@ files_breadcrumbs = _FilesBreadCrumbs() @@
 def pygmentize(filenode, **kwargs):
     """
     pygmentize function using pygments
     @param filenode:
     """
-    return literal(code_highlight(filenode.content,
     return literal(code_highlight(filenode.content,
                                   filenode.lexer, HtmlFormatter(**kwargs)))
 def pygmentize_annotation(filenode, **kwargs):
     """
     pygmentize function for annotation
     @param filenode:
@@ @@ -236,29 +236,29 @@ def pygmentize_annotation(filenode, **kw @@
         import colorsys
         n = 10000
         golden_ratio = 0.618033988749895
         h = 0.22717784590367374
         #generate 10k nice web friendly colors in the same order
         for c in xrange(n):
             h +=golden_ratio
+            h += golden_ratio
             h %= 1
             HSV_tuple = [h, 0.95, 0.95]
             RGB_tuple = colorsys.hsv_to_rgb(*HSV_tuple)
             yield map(lambda x:str(int(x*256)),RGB_tuple)
+            yield map(lambda x:str(int(x * 256)), RGB_tuple)
     cgenerator = gen_color()
     def get_color_string(cs):
         if color_dict.has_key(cs):
             col = color_dict[cs]
         else:
             col = color_dict[cs] = cgenerator.next()
         return "color: rgb(%s)! important;" % (', '.join(col))
     def url_func(changeset):
         tooltip_html = "<div style='font-size:0.8em'><b>Author:</b>"+\
+        tooltip_html = "<div style='font-size:0.8em'><b>Author:</b>" + \
         " %s<br/><b>Date:</b> %s</b><br/><b>Message:</b> %s<br/></div>"
         tooltip_html = tooltip_html % (changeset.author,
                                                changeset.date,
                                                tooltip(changeset.message))
         lnk_format = 'r%-5s:%s' % (changeset.revision,
@@ @@ -283,12 +283,27 @@ def repo_name_slug(value): @@
     slug = urlify(value)
     for c in """=[]\;'"<>,/~!@#$%^&*()+{}|:""":
         slug = slug.replace(c, '-')
     slug = recursive_replace(slug, '-')
     return slug
 def get_changeset_safe(repo, rev):
     from vcs.backends.base import BaseRepository
     from vcs.exceptions import RepositoryError
     if not isinstance(repo, BaseRepository):
         raise Exception('You must pass an Repository '
                         'object as first argument got %s', type(repo))
     try:
         cs = repo.get_changeset(rev)
     except RepositoryError:
         from pylons_app.lib.utils import EmptyChangeset
         cs = EmptyChangeset()
     return cs
 flash = _Flash()
 #===============================================================================
 # MERCURIAL FILTERS available via h.
 #===============================================================================
@@ @@ -348,7 +363,7 @@ def safe_unicode(str): @@
         try:
             u_str = unicode(str, 'utf-8', 'replace')
         except UnicodeDecodeError:
             #incase we have a decode error just represent as byte string
             u_str = unicode(str(str).encode('string_escape'))
     return u_str
@@ \ No newline at end of file @@
     return u_str

pylons_app/model/hg_model.py

➞

Show inline comments

@@ @@ -26,13 +26,13 @@ from beaker.cache import cache_region @@
 from mercurial import ui
 from mercurial.hgweb.hgwebdir_mod import findrepos
 from pylons.i18n.translation import _
 from pylons_app.lib.auth import HasRepoPermissionAny
 from pylons_app.model import meta
 from pylons_app.model.db import Repository, User
-from sqlalchemy.orm import joinedload
+from pylons_app.lib import helpers as h
 from vcs.exceptions import RepositoryError, VCSError
 import logging
 import os
 import sys
 log = logging.getLogger(__name__)
@@ @@ -148,17 +148,13 @@ class HgModel(object): @@
         for name, repo in _get_repos_cached().items():
             if repo._get_hidden():
                 #skip hidden web repository
                 continue
             last_change = repo.last_change
             try:
                 tip = repo.get_changeset('tip')
             except RepositoryError:
                 from pylons_app.lib.utils import EmptyChangeset
                 tip = EmptyChangeset()
             tip = h.get_changeset_safe(repo, 'tip')
             tmp_d = {}
             tmp_d['name'] = repo.name
             tmp_d['name_sort'] = tmp_d['name'].lower()
             tmp_d['description'] = repo.description
             tmp_d['description_sort'] = tmp_d['description']

pylons_app/templates/admin/users/user_edit_my_account.html

➞

Show inline comments

@@ @@ -95,13 +95,13 @@ @@
 	                <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.name, h.url('summary_home',repo_name=repo.name))}</td>
-	            <td>${_('revision')}: ${repo.revisions[-1]}</td>
+	            <td>${_('revision')}: ${h.get_changeset_safe(repo,'tip').revision}</td>
 	            <td>${_('last changed')}: ${h.age(repo.last_change)}</td>
 	            <td><img class="icon" alt="${_('private')}" src="/images/icons/application_form_edit.png"/> ${h.link_to(_('edit'),h.url('edit_repo',repo_name=repo.name))}</td>
 	        </tr>
 	     %endfor
 	     </tbody>
 	     </table>

0 comments (0 inline, 0 general)