diff --git a/docs/changelog.rst b/docs/changelog.rst --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -13,6 +13,8 @@ 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. @@ -23,8 +25,11 @@ news - 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 +++++ @@ -34,10 +39,13 @@ fixes - 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) diff --git a/rhodecode/lib/helpers.py b/rhodecode/lib/helpers.py --- a/rhodecode/lib/helpers.py +++ b/rhodecode/lib/helpers.py @@ -436,7 +436,7 @@ def action_parser(user_log): _('and %s more revisions') \ % (len(revs) - revs_limit)) - return literal(cs_links) + return cs_links return '' def get_fork_name(): @@ -452,13 +452,13 @@ def action_parser(user_log): 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'), diff --git a/rhodecode/tests/test_hg_operations.sh b/rhodecode/tests/test_hg_operations.sh --- a/rhodecode/tests/test_hg_operations.sh +++ b/rhodecode/tests/test_hg_operations.sh @@ -1,8 +1,11 @@ #!/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' && \