fixed vcs import.

fixed problem with '[' chars in commit messages in journal

rhodecode/controllers/files.py

@@ -41,7 +41,7 b' from rhodecode.model.scm import ScmModel'
 
 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
 

rhodecode/lib/helpers.py

@@ -394,7 +394,6 b' def action_parser(user_log):'
         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(',')
@@ -426,10 +425,8 b' def action_parser(user_log):'
                     for rev in revs[revs_limit:revs_top_limit]]))
 
             return cs_links
-        return ''
 
     def get_fork_name():
-        if action == 'user_forked_repo':
             from rhodecode.model.scm import ScmModel
             repo_name = action_params
             repo = ScmModel().get(repo_name)
@@ -438,24 +435,28 b' def action_parser(user_log):'
             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'),
+
+    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