Mercurial > kallithea

changeset 953:def3578dac8c beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed vcs import. fixed problem with '[' chars in commit messages in journal
author Marcin Kuzminski <marcin@python-works.com>
date Sun, 23 Jan 2011 00:23:28 +0100
parents beabd452f08b
children de671e3af0e5
files rhodecode/controllers/files.py rhodecode/lib/helpers.py
diffstat 2 files changed, 55 insertions(+), 54 deletions(-) [+]
line wrap: on
line diff
--- a/rhodecode/controllers/files.py	Sat Jan 22 19:03:23 2011 +0100
+++ b/rhodecode/controllers/files.py	Sun Jan 23 00:23:28 2011 +0100
@@ -41,7 +41,7 @@
 
 from vcs.backends import ARCHIVE_SPECS
 from vcs.exceptions import RepositoryError, ChangesetError, \
-    ChangesetDoesNotExistError, EmptyRepositoryError, InproperArchiveTypeError
+    ChangesetDoesNotExistError, EmptyRepositoryError, ImproperArchiveTypeError
 from vcs.nodes import FileNode
 from vcs.utils import diffs as differ
 
--- a/rhodecode/lib/helpers.py	Sat Jan 22 19:03:23 2011 +0100
+++ b/rhodecode/lib/helpers.py	Sun Jan 23 00:23:28 2011 +0100
@@ -394,68 +394,69 @@
         action, action_params = x
 
     def get_cs_links():
-        if action == 'push':
-            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
+        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
 
-            message = lambda rev: get_changeset_safe(ScmModel().get(repo_name),
-                                                     rev).message
+        message = lambda rev: get_changeset_safe(ScmModel().get(repo_name),
+                                                 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] ])
-            if len(revs) > revs_limit:
-                uniq_id = revs[0]
-                html_tmpl = ('<span> %s '
-                '<a class="show_more" id="_%s" href="#">%s</a> '
-                '%s</span>')
-                cs_links += html_tmpl % (_('and'), uniq_id, _('%s more') \
-                                            % (len(revs) - revs_limit),
-                                            _('revisions'))
+        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] ])
+        if len(revs) > revs_limit:
+            uniq_id = revs[0]
+            html_tmpl = ('<span> %s '
+            '<a class="show_more" id="_%s" href="#">%s</a> '
+            '%s</span>')
+            cs_links += html_tmpl % (_('and'), uniq_id, _('%s more') \
+                                        % (len(revs) - revs_limit),
+                                        _('revisions'))
 
-                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]]))
+            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]]))
 
-            return cs_links
-        return ''
+        return cs_links
 
     def get_fork_name():
-        if action == 'user_forked_repo':
-            from rhodecode.model.scm import ScmModel
-            repo_name = action_params
-            repo = ScmModel().get(repo_name)
-            if repo is None:
-                return repo_name
-            return link_to(action_params, url('summary_home',
-                                              repo_name=repo.name,),
-                                              title=repo.dbrepo.description)
-        return ''
-    map = {'user_deleted_repo':_('User [deleted] repository'),
-           'user_created_repo':_('User [created] repository'),
-           'user_forked_repo':_('User [forked] repository as: %s') % get_fork_name(),
-           'user_updated_repo':_('User [updated] repository'),
-           'admin_deleted_repo':_('Admin [delete] repository'),
-           'admin_created_repo':_('Admin [created] repository'),
-           'admin_forked_repo':_('Admin [forked] repository'),
-           'admin_updated_repo':_('Admin [updated] repository'),
-           'push':_('[Pushed] %s') % get_cs_links(),
-           'pull':_('[Pulled]'),
-           'started_following_repo':_('User [started following] repository'),
-           'stopped_following_repo':_('User [stopped following] repository'),
+        from rhodecode.model.scm import ScmModel
+        repo_name = action_params
+        repo = ScmModel().get(repo_name)
+        if repo is None:
+            return repo_name
+        return link_to(action_params, url('summary_home',
+                                          repo_name=repo.name,),
+                                          title=repo.dbrepo.description)
+
+    map = {'user_deleted_repo':(_('User [deleted] repository'), None),
+           'user_created_repo':(_('User [created] repository'), None),
+           'user_forked_repo':(_('User [forked] repository as:'), get_fork_name),
+           'user_updated_repo':(_('User [updated] repository'), None),
+           'admin_deleted_repo':(_('Admin [delete] repository'), None),
+           'admin_created_repo':(_('Admin [created] repository'), None),
+           'admin_forked_repo':(_('Admin [forked] repository'), None),
+           'admin_updated_repo':(_('Admin [updated] repository'), None),
+           'push':(_('[Pushed]'), get_cs_links),
+           'pull':(_('[Pulled]'), None),
+           'started_following_repo':(_('User [started following] repository'), None),
+           'stopped_following_repo':(_('User [stopped following] repository'), None),
             }
 
     action_str = map.get(action, action)
-    return literal(action_str.replace('[', '<span class="journal_highlight">')\
-                   .replace(']', '</span>'))
+    action = action_str[0].replace('[', '<span class="journal_highlight">')\
+                   .replace(']', '</span>')
+    if action_str[1] is not None:
+        action = action + " " + action_str[1]()
+
+    return literal(action)
 
 def action_parser_icon(user_log):
     action = user_log.action