kallithea Changeset - 0142dac6f3c7

Changeset - 0142dac6f3c7

Parent rev.

Child rev.

[Not reviewed]

beta

0 3 0

Marcin Kuzminski - 15 years ago 2010-11-29 01:59:49
marcin@python-works.com

fixed journal helper, little test update,
docs update

3 files changed with 18 insertions and 7 deletions:

docs/changelog.rst

rhodecode/lib/helpers.py

rhodecode/tests/test_hg_operations.sh

0 comments (0 inline, 0 general)

docs/changelog.rst

➞

Show inline comments

@@ @@ -10,37 +10,45 @@ Changelog @@
 :branch: beta
 news
 ++++
 - rewrite of internals for vcs >=0.1.10
 - uses mercurial 1.7 with dotencode disabled for maintaining compatibility
   with older clients
 - anonymous access, authentication via ldap
 - performance upgrade for cached repos list - each repository has it's own
   cache that's invalidated when needed.
 - main page quick filter for filtering repositories
 - user dashboards with ability to follow chosen repositories actions
 - sends email to admin on new user registration
 - added cache/statistics reset options into repository settings
 - more detailed action logger (based on hooks) with pushed changesets lists
   and options to disable those hooks from admin panel
 - introduced new enhanced changelog for merges that shows more accurate results
 - new improved and faster code stats (based on pygments lexers mapping tables,
   showing up to 10 trending sources for each repository
 - gui optimizations, fixed application width to 1024px
 - whoosh, celeryd, upgrade moved to paster command
 - other than sqlite database backends can be used
 fixes
 +++++
 - fixes #61 forked repo was showing only after cache expired
 - fixes #76 no confirmation on user deletes
 - fixes #66 Name field misspelled
 - fixes #72 block user removal when he owns repositories
 - fixes #69 added password confirmation fields
 - numerous small bugfixes
 - a lot of fixes and tweaks for file browser
 - fixed detached session issues
 - fixed when user had no repos he would see all repos listed in my account
 - fixed ui() instance bug when global hgrc settings was loaded for server
   instance and all hgrc options were merged with our db ui() object
 - numerous small bugfixes
 (special thanks for TkSoh for detailed feedback)
 .0.2 (**2010-11-12**)
 ----------------------

rhodecode/lib/helpers.py

➞

Show inline comments

@@ @@ -433,13 +433,13 @@ def action_parser(user_log): @@
             if len(revs) > revs_limit:
                 html_tmpl = '<span title="%s"> %s </span>'
                 cs_links += html_tmpl % (', '.join(r for r in revs[revs_limit:]),
                                          _('and %s more revisions') \
                                             % (len(revs) - revs_limit))
-            return literal(cs_links)
             return cs_links
         return ''
     def get_fork_name():
         if action == 'user_forked_repo':
             from rhodecode.model.scm import ScmModel
             repo_name = action_params
@@ @@ -449,19 +449,19 @@ 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: ') + get_fork_name(),
+           '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]') + get_cs_links(),
+           'push':_('[Pushed] %s') % get_cs_links(),
            'pull':_('[Pulled]'),
            'started_following_repo':_('User [started following] repository'),
            'stopped_following_repo':_('User [stopped following] repository'),
+            }
     action_str = map.get(action, action)

rhodecode/tests/test_hg_operations.sh

➞

Show inline comments

 #!/bin/bash
 repo=/tmp/vcs_test_hg_clone
 echo 'removing repo'$repo
 repo_name=vcs_test_hg
 user=test_admin
 password=test12
 echo 'removing repo '$repo
 rm -rf '$repo'
-hg clone http://test_admin:test12@127.0.0.1:5000/vcs_test_hg $repo
+hg clone http://$user:$password@127.0.0.1:5000/$repo_name $repo
 cd $repo
 echo 'some' >> $repo/setup.py && hg ci -m 'ci1' && \
 echo 'some' >> $repo/setup.py && hg ci -m 'ci2' && \
 echo 'some' >> $repo/setup.py && hg ci -m 'ci3' && \
 echo 'some' >> $repo/setup.py && hg ci -m 'ci4' && \
 hg push

0 comments (0 inline, 0 general)