merge beta in stable branch

docs/api/api.rst

@@ -0,0 +1,111 b''
+.. _api:
+
+
+API
+===
+
+
+Starting from RhodeCode version 1.2 a simple API was implemented.
+There's a single schema for calling all api methods. API is implemented
+with JSON protocol both ways. An url to send API request in RhodeCode is 
+<your_server>/_admin/api
+
+
+All clients need to send JSON data in such format::
+
+    {
+        "api_key":"<api_key>",
+        "method":"<method_name>",
+        "args":{"<arg_key>":"<arg_val>"}
+    }
+
+Example call for autopulling remotes repos using curl::
+    curl https://server.com/_admin/api -X POST -H 'content-type:text/plain' --data-binary '{"api_key":"xe7cdb2v278e4evbdf5vs04v832v0efvcbcve4a3","method":"pull","args":{"repo":"CPython"}}'
+
+Simply provide 
+ - *api_key* for access and permission validation.
+ - *method* is name of method to call
+ - *args* is an key:value list of arguments to pass to method
+    
+.. note::
+    
+    api_key can be found in your user account page    
+    
+    
+RhodeCode API will return always a JSON formatted answer::
+    
+    {
+        "result": "<result>", 
+        "error": null
+    }
+
+All responses from API will be `HTTP/1.0 200 OK`, if there's an error while
+calling api *error* key from response will contain failure description 
+and result will be null.
+
+API METHODS
++++++++++++
+
+    
+pull
+----
+
+Pulls given repo from remote location. Can be used to automatically keep 
+remote repos up to date. This command can be executed only using api_key 
+belonging to user with admin rights
+
+INPUT::
+
+    api_key:"<api_key>"
+    method: "pull"
+    args: {"repo":<repo_name>}
+
+OUTPUT::
+
+    result:"Pulled from <repo_name>"
+    error:null
+
+    
+create_user
+-----------
+
+Creates new user in RhodeCode. This command can be executed only using api_key 
+belonging to user with admin rights
+
+INPUT::
+
+    api_key:"<api_key>"
+    method: "create_user"
+    args: {"username": "<username>", 
+           "password": "<password>", 
+           "active":   "<bool>", 
+           "admin":    "<bool>", 
+           "name":     "<firstname>", 
+           "lastname": "<lastname>", 
+           "email":    "<useremail>"}
+
+OUTPUT::
+
+    result:{"id": <newuserid>,
+            "msg":"created new user <username>"}
+    error:null
+    
+    
+create_users_group
+------------------
+
+creates new users group. This command can be executed only using api_key 
+belonging to user with admin rights
+
+INPUT::
+
+    api_key:"<api_key>"
+    method: "create_user"
+    args: {"name":  "<groupname>", 
+           "active":"<bool>"}
+
+OUTPUT::
+
+    result:{"id": <newusersgroupid>,
+            "msg":"created new users group <groupname>"}
+    error:null    

docs/usage/api_key_access.rst

@@ -0,0 +1,11 b''
+.. _api_key_access:
+
+Access to RhodeCode via API KEY
+===============================
+
+Starting from version 1.2 rss/atom feeds and journal feeds
+can be accessed via **api_key**. This unique key is automatically generated for
+each user in RhodeCode application. Using this key it is possible to access 
+feeds without having to log in. When user changes his password a new API KEY
+is generated for him automatically. You can check your API KEY in account 
+settings page. 
  No newline at end of file

docs/usage/backup.rst

@@ -0,0 +1,25 b''
+.. _backup:
+
+Backing up RhodeCode
+====================
+
+
+Settings
+--------
+
+Just copy your .ini file, it contains all RhodeCode settings.
+
+Whoosh index
+------------
+
+Whoosh index is located in **/data/index** directory where you installed
+RhodeCode ie. the same place where the ini file is located
+
+
+Database
+--------
+
+When using sqlite just copy rhodecode.db.
+Any other database engine requires a manual backup operation.
+
+Database backup will contain all gathered statistics
  No newline at end of file

docs/usage/general.rst

@@ -0,0 +1,54 b''
+.. _general:
+
+General RhodeCode usage
+=======================
+
+
+Repository deleting
+-------------------
+
+Currently when admin/owner deletes a repository, RhodeCode does not physically
+delete a repository from filesystem, it renames it in a special way so it's
+not possible to push,clone or access repository. It's worth a notice that,
+even if someone will be given administrative access to RhodeCode and will 
+delete a repository You can easy restore such action by restoring `rm__<date>`
+from the repository name, and internal repository storage (.hg/.git)
+
+Follow current branch in file view
+----------------------------------
+
+In file view when this checkbox is checked the << and >> arrows will jump
+to changesets within the same branch currently viewing. So for example
+if someone is viewing files at 'beta' branch and marks `follow current branch`
+checkbox the << and >> buttons will only show him revisions for 'beta' branch
+
+
+Compare view from changelog
+---------------------------
+
+Checkboxes in compare view allow users to view combined compare view. You can
+only show the range between the first and last checkbox (no cherry pick).
+Clicking more than one checkbox will activate a link in top saying
+`Show selected changes <from-rev> -> <to-rev>` clicking this will bring
+compare view
+
+Compare view is also available from the journal on pushes having more than
+one changeset
+
+
+
+Mailing
+-------
+
+When administrator will fill up the mailing settings in .ini files
+RhodeCode will send mails on user registration, or when RhodeCode errors occur
+on errors the mails will have a detailed traceback of error.
+
+
+Trending source files
+---------------------
+
+Trending source files are calculated based on pre defined dict of known
+types and extensions. If You miss some extension or Would like to scan some
+custom files it's possible to add new types in `LANGUAGES_EXTENSIONS_MAP` dict
+located in `/rhodecode/lib/celerylib/tasks.py`
  No newline at end of file

rhodecode/controllers/admin/repos_groups.py

@@ -0,0 +1,223 b''
+import logging
+import traceback
+import formencode
+
+from formencode import htmlfill
+from operator import itemgetter
+
+from pylons import request, response, session, tmpl_context as c, url
+from pylons.controllers.util import abort, redirect
+from pylons.i18n.translation import _
+
+from rhodecode.lib import helpers as h
+from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator, \
+    HasPermissionAnyDecorator
+from rhodecode.lib.base import BaseController, render
+from rhodecode.model.db import Group
+from rhodecode.model.repos_group import ReposGroupModel
+from rhodecode.model.forms import ReposGroupForm
+
+log = logging.getLogger(__name__)
+
+
+class ReposGroupsController(BaseController):
+    """REST Controller styled on the Atom Publishing Protocol"""
+    # To properly map this controller, ensure your config/routing.py
+    # file has a resource setup:
+    #     map.resource('repos_group', 'repos_groups')
+
+    @LoginRequired()
+    def __before__(self):
+        super(ReposGroupsController, self).__before__()
+
+    def __load_defaults(self):
+
+        c.repo_groups = [('', '')]
+        parents_link = lambda k: h.literal('»'.join(
+                                    map(lambda k: k.group_name,
+                                        k.parents + [k])
+                                    )
+                                )
+
+        c.repo_groups.extend([(x.group_id, parents_link(x)) for \
+                                            x in self.sa.query(Group).all()])
+
+        c.repo_groups = sorted(c.repo_groups,
+                               key=lambda t: t[1].split('»')[0])
+        c.repo_groups_choices = map(lambda k: unicode(k[0]), c.repo_groups)
+
+    def __load_data(self, group_id):
+        """
+        Load defaults settings for edit, and update
+
+        :param group_id:
+        """
+        self.__load_defaults()
+
+        repo_group = Group.get(group_id)
+
+        data = repo_group.get_dict()
+
+        return data
+
+    @HasPermissionAnyDecorator('hg.admin')
+    def index(self, format='html'):
+        """GET /repos_groups: All items in the collection"""
+        # url('repos_groups')
+
+        sk = lambda g:g.parents[0].group_name if g.parents else g.group_name
+        c.groups = sorted(Group.query().all(), key=sk)
+        return render('admin/repos_groups/repos_groups_show.html')
+
+    @HasPermissionAnyDecorator('hg.admin')
+    def create(self):
+        """POST /repos_groups: Create a new item"""
+        # url('repos_groups')
+        self.__load_defaults()
+        repos_group_model = ReposGroupModel()
+        repos_group_form = ReposGroupForm(available_groups=
+                                          c.repo_groups_choices)()
+        try:
+            form_result = repos_group_form.to_python(dict(request.POST))
+            repos_group_model.create(form_result)
+            h.flash(_('created repos group %s') \
+                    % form_result['group_name'], category='success')
+            #TODO: in futureaction_logger(, '', '', '', self.sa)
+        except formencode.Invalid, errors:
+
+            return htmlfill.render(
+                render('admin/repos_groups/repos_groups_add.html'),
+                defaults=errors.value,
+                errors=errors.error_dict or {},
+                prefix_error=False,
+                encoding="UTF-8")
+        except Exception:
+            log.error(traceback.format_exc())
+            h.flash(_('error occurred during creation of repos group %s') \
+                    % request.POST.get('group_name'), category='error')
+
+        return redirect(url('repos_groups'))
+
+
+    @HasPermissionAnyDecorator('hg.admin')
+    def new(self, format='html'):
+        """GET /repos_groups/new: Form to create a new item"""
+        # url('new_repos_group')
+        self.__load_defaults()
+        return render('admin/repos_groups/repos_groups_add.html')
+
+    @HasPermissionAnyDecorator('hg.admin')
+    def update(self, id):
+        """PUT /repos_groups/id: Update an existing item"""
+        # Forms posted to this method should contain a hidden field:
+        #    <input type="hidden" name="_method" value="PUT" />
+        # Or using helpers:
+        #    h.form(url('repos_group', id=ID),
+        #           method='put')
+        # url('repos_group', id=ID)
+
+        self.__load_defaults()
+        c.repos_group = Group.get(id)
+
+        repos_group_model = ReposGroupModel()
+        repos_group_form = ReposGroupForm(edit=True,
+                                          old_data=c.repos_group.get_dict(),
+                                          available_groups=
+                                            c.repo_groups_choices)()
+        try:
+            form_result = repos_group_form.to_python(dict(request.POST))
+            repos_group_model.update(id, form_result)
+            h.flash(_('updated repos group %s') \
+                    % form_result['group_name'], category='success')
+            #TODO: in futureaction_logger(, '', '', '', self.sa)
+        except formencode.Invalid, errors:
+
+            return htmlfill.render(
+                render('admin/repos_groups/repos_groups_edit.html'),
+                defaults=errors.value,
+                errors=errors.error_dict or {},
+                prefix_error=False,
+                encoding="UTF-8")
+        except Exception:
+            log.error(traceback.format_exc())
+            h.flash(_('error occurred during update of repos group %s') \
+                    % request.POST.get('group_name'), category='error')
+
+        return redirect(url('repos_groups'))
+
+
+    @HasPermissionAnyDecorator('hg.admin')
+    def delete(self, id):
+        """DELETE /repos_groups/id: Delete an existing item"""
+        # Forms posted to this method should contain a hidden field:
+        #    <input type="hidden" name="_method" value="DELETE" />
+        # Or using helpers:
+        #    h.form(url('repos_group', id=ID),
+        #           method='delete')
+        # url('repos_group', id=ID)
+
+        repos_group_model = ReposGroupModel()
+        gr = Group.get(id)
+        repos = gr.repositories.all()
+        if repos:
+            h.flash(_('This group contains %s repositores and cannot be '
+                      'deleted' % len(repos)),
+                    category='error')
+            return redirect(url('repos_groups'))
+
+        try:
+            repos_group_model.delete(id)
+            h.flash(_('removed repos group %s' % gr.group_name), category='success')
+            #TODO: in future action_logger(, '', '', '', self.sa)
+        except Exception:
+            log.error(traceback.format_exc())
+            h.flash(_('error occurred during deletion of repos group %s' % gr.group_name),
+                    category='error')
+
+        return redirect(url('repos_groups'))
+
+    def show(self, id, format='html'):
+        """GET /repos_groups/id: Show a specific item"""
+        # url('repos_group', id=ID)
+
+        c.group = Group.get(id)
+
+        if c.group:
+            c.group_repos = c.group.repositories.all()
+        else:
+            return redirect(url('home'))
+
+        #overwrite our cached list with current filter
+        gr_filter = c.group_repos
+        c.cached_repo_list = self.scm_model.get_repos(all_repos=gr_filter)
+
+        c.repos_list = c.cached_repo_list
+
+        c.repo_cnt = 0
+
+        c.groups = self.sa.query(Group).order_by(Group.group_name)\
+            .filter(Group.group_parent_id == id).all()
+
+        return render('admin/repos_groups/repos_groups.html')
+
+    @HasPermissionAnyDecorator('hg.admin')
+    def edit(self, id, format='html'):
+        """GET /repos_groups/id/edit: Form to edit an existing item"""
+        # url('edit_repos_group', id=ID)
+
+        id_ = int(id)
+
+        c.repos_group = Group.get(id_)
+        defaults = self.__load_data(id_)
+
+        # we need to exclude this group from the group list for editing
+        c.repo_groups = filter(lambda x:x[0] != id_, c.repo_groups)
+
+        return htmlfill.render(
+            render('admin/repos_groups/repos_groups_edit.html'),
+            defaults=defaults,
+            encoding="UTF-8",
+            force_defaults=False
+        )
+
+

rhodecode/controllers/admin/users_groups.py

@@ -0,0 +1,214 b''
+# -*- coding: utf-8 -*-
+"""
+    rhodecode.controllers.admin.users_groups
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    Users Groups crud controller for pylons
+
+    :created_on: Jan 25, 2011
+    :author: marcink
+    :copyright: (C) 2009-2011 Marcin Kuzminski <[e-mail]>
+    :license: GPLv3, see COPYING for more details.
+"""
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import logging
+import traceback
+import formencode
+
+from formencode import htmlfill
+from pylons import request, session, tmpl_context as c, url, config
+from pylons.controllers.util import abort, redirect
+from pylons.i18n.translation import _
+
+from rhodecode.lib.exceptions import UsersGroupsAssignedException
+from rhodecode.lib import helpers as h
+from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator
+from rhodecode.lib.base import BaseController, render
+
+from rhodecode.model.db import User, UsersGroup, Permission, UsersGroupToPerm
+from rhodecode.model.forms import UserForm, UsersGroupForm
+
+log = logging.getLogger(__name__)
+
+
+class UsersGroupsController(BaseController):
+    """REST Controller styled on the Atom Publishing Protocol"""
+    # To properly map this controller, ensure your config/routing.py
+    # file has a resource setup:
+    #     map.resource('users_group', 'users_groups')
+
+    @LoginRequired()
+    @HasPermissionAllDecorator('hg.admin')
+    def __before__(self):
+        c.admin_user = session.get('admin_user')
+        c.admin_username = session.get('admin_username')
+        super(UsersGroupsController, self).__before__()
+        c.available_permissions = config['available_permissions']
+
+    def index(self, format='html'):
+        """GET /users_groups: All items in the collection"""
+        # url('users_groups')
+        c.users_groups_list = self.sa.query(UsersGroup).all()
+        return render('admin/users_groups/users_groups.html')
+
+    def create(self):
+        """POST /users_groups: Create a new item"""
+        # url('users_groups')
+
+        users_group_form = UsersGroupForm()()
+        try:
+            form_result = users_group_form.to_python(dict(request.POST))
+            UsersGroup.create(form_result)
+            h.flash(_('created users group %s') \
+                    % form_result['users_group_name'], category='success')
+            #action_logger(self.rhodecode_user, 'new_user', '', '', self.sa)
+        except formencode.Invalid, errors:
+            return htmlfill.render(
+                render('admin/users_groups/users_group_add.html'),
+                defaults=errors.value,
+                errors=errors.error_dict or {},
+                prefix_error=False,
+                encoding="UTF-8")
+        except Exception:
+            log.error(traceback.format_exc())
+            h.flash(_('error occurred during creation of users group %s') \
+                    % request.POST.get('users_group_name'), category='error')
+
+        return redirect(url('users_groups'))
+
+    def new(self, format='html'):
+        """GET /users_groups/new: Form to create a new item"""
+        # url('new_users_group')
+        return render('admin/users_groups/users_group_add.html')
+
+    def update(self, id):
+        """PUT /users_groups/id: Update an existing item"""
+        # Forms posted to this method should contain a hidden field:
+        #    <input type="hidden" name="_method" value="PUT" />
+        # Or using helpers:
+        #    h.form(url('users_group', id=ID),
+        #           method='put')
+        # url('users_group', id=ID)
+
+        c.users_group = UsersGroup.get(id)
+        c.group_members = [(x.user_id, x.user.username) for x in
+                           c.users_group.members]
+
+        c.available_members = [(x.user_id, x.username) for x in
+                               self.sa.query(User).all()]
+        users_group_form = UsersGroupForm(edit=True,
+                                          old_data=c.users_group.get_dict(),
+                                          available_members=[str(x[0]) for x
+                                                in c.available_members])()
+
+        try:
+            form_result = users_group_form.to_python(request.POST)
+            UsersGroup.update(id, form_result)
+            h.flash(_('updated users group %s') \
+                        % form_result['users_group_name'],
+                    category='success')
+            #action_logger(self.rhodecode_user, 'new_user', '', '', self.sa)
+        except formencode.Invalid, errors:
+            e = errors.error_dict or {}
+
+            perm = Permission.get_by_key('hg.create.repository')
+            e.update({'create_repo_perm':
+                         UsersGroupToPerm.has_perm(id, perm)})
+
+            return htmlfill.render(
+                render('admin/users_groups/users_group_edit.html'),
+                defaults=errors.value,
+                errors=e,
+                prefix_error=False,
+                encoding="UTF-8")
+        except Exception:
+            log.error(traceback.format_exc())
+            h.flash(_('error occurred during update of users group %s') \
+                    % request.POST.get('users_group_name'), category='error')
+
+        return redirect(url('users_groups'))
+
+    def delete(self, id):
+        """DELETE /users_groups/id: Delete an existing item"""
+        # Forms posted to this method should contain a hidden field:
+        #    <input type="hidden" name="_method" value="DELETE" />
+        # Or using helpers:
+        #    h.form(url('users_group', id=ID),
+        #           method='delete')
+        # url('users_group', id=ID)
+
+        try:
+            UsersGroup.delete(id)
+            h.flash(_('successfully deleted users group'), category='success')
+        except UsersGroupsAssignedException, e:
+            h.flash(e, category='error')
+        except Exception:
+            h.flash(_('An error occurred during deletion of users group'),
+                    category='error')
+        return redirect(url('users_groups'))
+
+    def show(self, id, format='html'):
+        """GET /users_groups/id: Show a specific item"""
+        # url('users_group', id=ID)
+
+    def edit(self, id, format='html'):
+        """GET /users_groups/id/edit: Form to edit an existing item"""
+        # url('edit_users_group', id=ID)
+
+        c.users_group = self.sa.query(UsersGroup).get(id)
+        if not c.users_group:
+            return redirect(url('users_groups'))
+
+        c.users_group.permissions = {}
+        c.group_members = [(x.user_id, x.user.username) for x in
+                           c.users_group.members]
+        c.available_members = [(x.user_id, x.username) for x in
+                               self.sa.query(User).all()]
+        defaults = c.users_group.get_dict()
+        perm = Permission.get_by_key('hg.create.repository')
+        defaults.update({'create_repo_perm':
+                         UsersGroupToPerm.has_perm(id, perm)})
+        return htmlfill.render(
+            render('admin/users_groups/users_group_edit.html'),
+            defaults=defaults,
+            encoding="UTF-8",
+            force_defaults=False
+        )
+
+    def update_perm(self, id):
+        """PUT /users_perm/id: Update an existing item"""
+        # url('users_group_perm', id=ID, method='put')
+
+        grant_perm = request.POST.get('create_repo_perm', False)
+
+        if grant_perm:
+            perm = Permission.get_by_key('hg.create.none')
+            UsersGroupToPerm.revoke_perm(id, perm)
+
+            perm = Permission.get_by_key('hg.create.repository')
+            UsersGroupToPerm.grant_perm(id, perm)
+            h.flash(_("Granted 'repository create' permission to user"),
+                    category='success')
+
+        else:
+            perm = Permission.get_by_key('hg.create.repository')
+            UsersGroupToPerm.revoke_perm(id, perm)
+
+            perm = Permission.get_by_key('hg.create.none')
+            UsersGroupToPerm.grant_perm(id, perm)
+            h.flash(_("Revoked 'repository create' permission to user"),
+                    category='success')
+
+        return redirect(url('edit_users_group', id=id))

rhodecode/controllers/api/__init__.py

@@ -0,0 +1,241 b''
+# -*- coding: utf-8 -*-
+"""
+    rhodecode.controllers.api
+    ~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    JSON RPC controller
+    
+    :created_on: Aug 20, 2011
+    :author: marcink
+    :copyright: (C) 2009-2010 Marcin Kuzminski <[e-mail]>    
+    :license: GPLv3, see COPYING for more details.
+"""
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; version 2
+# of the License or (at your opinion) any later version of the license.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.
+
+import inspect
+import json
+import logging
+import types
+import urllib
+import traceback
+from itertools import izip_longest
+
+from paste.response import replace_header
+
+from pylons.controllers import WSGIController
+from pylons.controllers.util import Response
+
+from webob.exc import HTTPNotFound, HTTPForbidden, HTTPInternalServerError, \
+HTTPBadRequest, HTTPError
+
+from rhodecode.model.db import User
+from rhodecode.lib.auth import AuthUser
+
+log = logging.getLogger('JSONRPC')
+
+class JSONRPCError(BaseException):
+
+    def __init__(self, message):
+        self.message = message
+
+    def __str__(self):
+        return str(self.message)
+
+
+def jsonrpc_error(message, code=None):
+    """Generate a Response object with a JSON-RPC error body"""
+    return Response(body=json.dumps(dict(result=None,
+                                         error=message)))
+
+
+class JSONRPCController(WSGIController):
+    """
+     A WSGI-speaking JSON-RPC controller class
+    
+     See the specification:
+     <http://json-rpc.org/wiki/specification>`.
+   
+     Valid controller return values should be json-serializable objects.
+    
+     Sub-classes should catch their exceptions and raise JSONRPCError
+     if they want to pass meaningful errors to the client.
+    
+     """
+
+    def _get_method_args(self):
+        """
+        Return `self._rpc_args` to dispatched controller method
+        chosen by __call__
+        """
+        return self._rpc_args
+
+    def __call__(self, environ, start_response):
+        """
+        Parse the request body as JSON, look up the method on the
+        controller and if it exists, dispatch to it.
+        """
+        if 'CONTENT_LENGTH' not in environ:
+            log.debug("No Content-Length")
+            return jsonrpc_error(message="No Content-Length in request")
+        else:
+            length = environ['CONTENT_LENGTH'] or 0
+            length = int(environ['CONTENT_LENGTH'])
+            log.debug('Content-Length: %s', length)
+
+        if length == 0:
+            log.debug("Content-Length is 0")
+            return jsonrpc_error(message="Content-Length is 0")
+
+        raw_body = environ['wsgi.input'].read(length)
+
+        try:
+            json_body = json.loads(urllib.unquote_plus(raw_body))
+        except ValueError as e:
+            #catch JSON errors Here
+            return jsonrpc_error(message="JSON parse error ERR:%s RAW:%r" \
+                                 % (e, urllib.unquote_plus(raw_body)))
+
+        #check AUTH based on API KEY
+        try:
+            self._req_api_key = json_body['api_key']
+            self._req_method = json_body['method']
+            self._req_params = json_body['args']
+            log.debug('method: %s, params: %s',
+                      self._req_method,
+                      self._req_params)
+        except KeyError as e:
+            return jsonrpc_error(message='Incorrect JSON query missing %s' % e)
+
+        #check if we can find this session using api_key
+        try:
+            u = User.get_by_api_key(self._req_api_key)
+            auth_u = AuthUser(u.user_id, self._req_api_key)
+        except Exception as e:
+            return jsonrpc_error(message='Invalid API KEY')
+
+        self._error = None
+        try:
+            self._func = self._find_method()
+        except AttributeError, e:
+            return jsonrpc_error(message=str(e))
+
+        # now that we have a method, add self._req_params to
+        # self.kargs and dispatch control to WGIController
+        argspec = inspect.getargspec(self._func)
+        arglist = argspec[0][1:]
+        defaults = argspec[3] or []
+        default_empty = types.NotImplementedType
+        
+        kwarglist = list(izip_longest(reversed(arglist),reversed(defaults),
+                                fillvalue=default_empty))
+
+        # this is little trick to inject logged in user for 
+        # perms decorators to work they expect the controller class to have
+        # rhodecode_user attribute set
+        self.rhodecode_user = auth_u
+
+        # This attribute will need to be first param of a method that uses
+        # api_key, which is translated to instance of user at that name
+        USER_SESSION_ATTR = 'apiuser'
+
+        if USER_SESSION_ATTR not in arglist:
+            return jsonrpc_error(message='This method [%s] does not support '
+                                 'authentication (missing %s param)' %
+                                 (self._func.__name__, USER_SESSION_ATTR))
+
+        # get our arglist and check if we provided them as args
+        for arg,default in kwarglist:
+            if arg == USER_SESSION_ATTR:
+                # USER_SESSION_ATTR is something translated from api key and 
+                # this is checked before so we don't need validate it
+                continue
+            
+            # skip the required param check if it's default value is 
+            # NotImplementedType (default_empty)
+            if not self._req_params or (type(default) == default_empty
+                                        and arg not in self._req_params):
+                return jsonrpc_error(message=('Missing non optional %s arg '
+                                              'in JSON DATA') % arg)
+
+        self._rpc_args = {USER_SESSION_ATTR:u}
+        self._rpc_args.update(self._req_params)
+
+        self._rpc_args['action'] = self._req_method
+        self._rpc_args['environ'] = environ
+        self._rpc_args['start_response'] = start_response
+
+        status = []
+        headers = []
+        exc_info = []
+        def change_content(new_status, new_headers, new_exc_info=None):
+            status.append(new_status)
+            headers.extend(new_headers)
+            exc_info.append(new_exc_info)
+
+        output = WSGIController.__call__(self, environ, change_content)
+        output = list(output)
+        headers.append(('Content-Length', str(len(output[0]))))
+        replace_header(headers, 'Content-Type', 'application/json')
+        start_response(status[0], headers, exc_info[0])
+
+        return output
+
+    def _dispatch_call(self):
+        """
+        Implement dispatch interface specified by WSGIController
+        """
+        try:
+            raw_response = self._inspect_call(self._func)
+            if isinstance(raw_response, HTTPError):
+                self._error = str(raw_response)
+        except JSONRPCError as e:
+            self._error = str(e)
+        except Exception as e:
+            log.error('Encountered unhandled exception: %s' % traceback.format_exc())
+            json_exc = JSONRPCError('Internal server error')
+            self._error = str(json_exc)
+
+        if self._error is not None:
+            raw_response = None
+
+        response = dict(result=raw_response, error=self._error)
+
+        try:
+            return json.dumps(response)
+        except TypeError, e:
+            log.debug('Error encoding response: %s', e)
+            return json.dumps(dict(result=None,
+                                   error="Error encoding response"))
+
+    def _find_method(self):
+        """
+        Return method named by `self._req_method` in controller if able
+        """
+        log.debug('Trying to find JSON-RPC method: %s', self._req_method)
+        if self._req_method.startswith('_'):
+            raise AttributeError("Method not allowed")
+
+        try:
+            func = getattr(self, self._req_method, None)
+        except UnicodeEncodeError:
+            raise AttributeError("Problem decoding unicode in requested "
+                                 "method name.")
+
+        if isinstance(func, types.MethodType):
+            return func
+        else:
+            raise AttributeError("No such method: %s" % self._req_method)
+

rhodecode/controllers/api/api.py

@@ -0,0 +1,98 b''
+import traceback
+import logging
+
+from rhodecode.controllers.api import JSONRPCController, JSONRPCError
+from rhodecode.lib.auth import HasPermissionAllDecorator
+from rhodecode.model.scm import ScmModel
+
+from rhodecode.model.db import User, UsersGroup, Repository
+
+log = logging.getLogger(__name__)
+
+
+class ApiController(JSONRPCController):
+    """
+    API Controller
+    
+    
+    Each method needs to have USER as argument this is then based on given
+    API_KEY propagated as instance of user object
+    
+    Preferably this should be first argument also
+    
+    
+    Each function should also **raise** JSONRPCError for any 
+    errors that happens
+    
+    """
+
+    @HasPermissionAllDecorator('hg.admin')
+    def pull(self, apiuser, repo):
+        """
+        Dispatch pull action on given repo
+        
+        
+        :param user:
+        :param repo:
+        """
+
+        if Repository.is_valid(repo) is False:
+            raise JSONRPCError('Unknown repo "%s"' % repo)
+        
+        try:
+            ScmModel().pull_changes(repo, self.rhodecode_user.username)
+            return 'Pulled from %s' % repo
+        except Exception:
+            raise JSONRPCError('Unable to pull changes from "%s"' % repo)
+
+
+    @HasPermissionAllDecorator('hg.admin')
+    def create_user(self, apiuser, username, password, active, admin, name, 
+                    lastname, email):
+        """
+        Creates new user
+        
+        :param apiuser:
+        :param username:
+        :param password:
+        :param active:
+        :param admin:
+        :param name:
+        :param lastname:
+        :param email:
+        """
+        
+        form_data = dict(username=username,
+                         password=password,
+                         active=active,
+                         admin=admin,
+                         name=name,
+                         lastname=lastname,
+                         email=email)
+        try:
+            u = User.create(form_data)
+            return {'id':u.user_id,
+                    'msg':'created new user %s' % name}
+        except Exception:
+            log.error(traceback.format_exc())
+            raise JSONRPCError('failed to create user %s' % name)
+
+
+    @HasPermissionAllDecorator('hg.admin')
+    def create_users_group(self, apiuser, name, active):
+        """
+        Creates an new usergroup
+        
+        :param name:
+        :param active:
+        """
+        form_data = {'users_group_name':name,
+                     'users_group_active':active}
+        try:
+            ug = UsersGroup.create(form_data)
+            return {'id':ug.users_group_id,
+                    'msg':'created new users group %s' % name}
+        except Exception:
+            log.error(traceback.format_exc())
+            raise JSONRPCError('failed to create group %s' % name)
+        
  No newline at end of file

rhodecode/controllers/followers.py

@@ -0,0 +1,57 b''
+# -*- coding: utf-8 -*-
+"""
+    rhodecode.controllers.followers
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    Followers controller for rhodecode
+
+    :created_on: Apr 23, 2011
+    :author: marcink
+    :copyright: (C) 2009-2011 Marcin Kuzminski <[e-mail]>
+    :license: GPLv3, see COPYING for more details.
+"""
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+import logging
+
+from pylons import tmpl_context as c, request
+
+from rhodecode.lib.helpers import Page
+from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
+from rhodecode.lib.base import BaseRepoController, render
+from rhodecode.model.db import Repository, User, UserFollowing
+
+log = logging.getLogger(__name__)
+
+
+class FollowersController(BaseRepoController):
+
+    @LoginRequired()
+    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
+                                   'repository.admin')
+    def __before__(self):
+        super(FollowersController, self).__before__()
+
+    def followers(self, repo_name):
+        p = int(request.params.get('page', 1))
+        repo_id = c.rhodecode_db_repo.repo_id
+        d = UserFollowing.get_repo_followers(repo_id)\
+            .order_by(UserFollowing.follows_from)
+        c.followers_pager = Page(d, page=p, items_per_page=20)
+
+        c.followers_data = render('/followers/followers_data.html')
+
+        if request.environ.get('HTTP_X_PARTIAL_XHR'):
+            return c.followers_data
+
+        return render('/followers/followers.html')

rhodecode/controllers/forks.py

@@ -0,0 +1,56 b''
+# -*- coding: utf-8 -*-
+"""
+    rhodecode.controllers.forks
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    forks controller for rhodecode
+
+    :created_on: Apr 23, 2011
+    :author: marcink
+    :copyright: (C) 2009-2011 Marcin Kuzminski <[e-mail]>
+    :license: GPLv3, see COPYING for more details.
+"""
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+import logging
+
+from pylons import tmpl_context as c, request
+
+from rhodecode.lib.helpers import Page
+from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
+from rhodecode.lib.base import BaseRepoController, render
+from rhodecode.model.db import Repository, User, UserFollowing
+
+log = logging.getLogger(__name__)
+
+
+class ForksController(BaseRepoController):
+
+    @LoginRequired()
+    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
+                                   'repository.admin')
+    def __before__(self):
+        super(ForksController, self).__before__()
+
+    def forks(self, repo_name):
+        p = int(request.params.get('page', 1))
+        repo_id = c.rhodecode_db_repo.repo_id
+        d = Repository.get_repo_forks(repo_id)
+        c.forks_pager = Page(d, page=p, items_per_page=20)
+
+        c.forks_data = render('/forks/forks_data.html')
+
+        if request.environ.get('HTTP_X_PARTIAL_XHR'):
+            return c.forks_data
+
+        return render('/forks/forks.html')

rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.po

@@ -0,0 +1,2530 b''
+# Portuguese (Brazil) translations for RhodeCode.
+# Copyright (C) 2011 Augusto Herrmann
+# This file is distributed under the same license as the RhodeCode project.
+# Augusto Herrmann <[e-mail]>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: RhodeCode 1.2.0\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2011-09-14 15:50-0300\n"
+"PO-Revision-Date: 2011-09-14 15:53-0300\n"
+"Last-Translator: Augusto Herrmann <[e-mail]>\n"
+"Language-Team: pt_BR <[e-mail]>\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
+
+#: rhodecode/controllers/changeset.py:108
+#: rhodecode/controllers/changeset.py:149
+#: rhodecode/controllers/changeset.py:216
+#: rhodecode/controllers/changeset.py:229
+msgid "binary file"
+msgstr "arquivo binário"
+
+#: rhodecode/controllers/changeset.py:123
+#: rhodecode/controllers/changeset.py:168
+msgid "Changeset is to big and was cut off, see raw changeset instead"
+msgstr "Conjunto de mudanças é grande demais e foi cortado, em vez disso veja o conjunto de mudanças bruto"
+
+#: rhodecode/controllers/changeset.py:159
+msgid "Diff is to big and was cut off, see raw diff instead"
+msgstr "Diff é grande demais e foi cortado, em vez disso veja diff bruto"
+
+#: rhodecode/controllers/error.py:69
+msgid "Home page"
+msgstr "Página inicial"
+
+#: rhodecode/controllers/error.py:98
+msgid "The request could not be understood by the server due to malformed syntax."
+msgstr "A requisição não pôde ser compreendida pelo servidor devido à sintaxe mal formada"
+
+#: rhodecode/controllers/error.py:101
+msgid "Unauthorized access to resource"
+msgstr "Acesso não autorizado ao recurso"
+
+#: rhodecode/controllers/error.py:103
+msgid "You don't have permission to view this page"
+msgstr "Você não tem permissão para ver esta página"
+
+#: rhodecode/controllers/error.py:105
+msgid "The resource could not be found"
+msgstr "O recurso não pôde ser encontrado"
+
+#: rhodecode/controllers/error.py:107
+msgid "The server encountered an unexpected condition which prevented it from fulfilling the request."
+msgstr "O servidor encontrou uma condição inesperada que o impediu de satisfazer a requisição"
+
+#: rhodecode/controllers/feed.py:48
+#, python-format
+msgid "Changes on %s repository"
+msgstr "Alterações no repositório %s"
+
+#: rhodecode/controllers/feed.py:49
+#, python-format
+msgid "%s %s feed"
+msgstr "%s - feed %s"
+
+#: rhodecode/controllers/files.py:72
+msgid "There are no files yet"
+msgstr "Ainda não há arquivos"
+
+#: rhodecode/controllers/files.py:262
+#, python-format
+msgid "Edited %s via RhodeCode"
+msgstr "Editado %s via RhodeCode"
+
+#: rhodecode/controllers/files.py:267
+#: rhodecode/templates/files/file_diff.html:40
+msgid "No changes"
+msgstr "Sem alterações"
+
+#: rhodecode/controllers/files.py:278
+#, python-format
+msgid "Successfully committed to %s"
+msgstr "Commit realizado com sucesso para %s"
+
+#: rhodecode/controllers/files.py:283
+msgid "Error occurred during commit"
+msgstr "Ocorreu um erro ao realizar commit"
+
+#: rhodecode/controllers/files.py:308
+msgid "downloads disabled"
+msgstr "downloads desabilitados"
+
+#: rhodecode/controllers/files.py:313
+#, python-format
+msgid "Unknown revision %s"
+msgstr "Revisão desconhecida %s"
+
+#: rhodecode/controllers/files.py:315
+msgid "Empty repository"
+msgstr "Repositório vazio"
+
+#: rhodecode/controllers/files.py:317
+msgid "Unknown archive type"
+msgstr "Arquivo de tipo desconhecido"
+
+#: rhodecode/controllers/files.py:385
+#: rhodecode/controllers/files.py:398
+msgid "Binary file"
+msgstr "Arquivo binário"
+
+#: rhodecode/controllers/files.py:417
+#: rhodecode/templates/changeset/changeset_range.html:4
+#: rhodecode/templates/changeset/changeset_range.html:12
+#: rhodecode/templates/changeset/changeset_range.html:29
+msgid "Changesets"
+msgstr "Conjuntos de mudanças"
+
+#: rhodecode/controllers/files.py:418
+#: rhodecode/controllers/summary.py:175
+#: rhodecode/templates/branches/branches.html:5
+#: rhodecode/templates/summary/summary.html:690
+msgid "Branches"
+msgstr "Ramos"
+
+#: rhodecode/controllers/files.py:419
+#: rhodecode/controllers/summary.py:176
+#: rhodecode/templates/summary/summary.html:679
+#: rhodecode/templates/tags/tags.html:5
+msgid "Tags"
+msgstr "Etiquetas"
+
+#: rhodecode/controllers/journal.py:50
+#, python-format
+msgid "%s public journal %s feed"
+msgstr "diário público de %s - feed %s"
+
+#: rhodecode/controllers/journal.py:178
+#: rhodecode/controllers/journal.py:212
+#: rhodecode/templates/admin/repos/repo_edit.html:171
+#: rhodecode/templates/base/base.html:50
+msgid "Public journal"
+msgstr "Diário público"
+
+#: rhodecode/controllers/login.py:111
+msgid "You have successfully registered into rhodecode"
+msgstr "Você se registrou com sucesso no rhodecode"
+
+#: rhodecode/controllers/login.py:133
+msgid "Your password reset link was sent"
+msgstr "Seu link de reinicialização de senha foi enviado"
+
+#: rhodecode/controllers/login.py:155
+msgid "Your password reset was successful, new password has been sent to your email"
+msgstr "Sua reinicialização de senha foi bem sucedida, sua senha foi enviada ao seu e-mail"
+
+#: rhodecode/controllers/search.py:109
+msgid "Invalid search query. Try quoting it."
+msgstr "Consulta de busca inválida. Tente usar aspas."
+
+#: rhodecode/controllers/search.py:114
+msgid "There is no index to search in. Please run whoosh indexer"
+msgstr "Não há índice onde pesquisa. Por favor execute o indexador whoosh"
+
+#: rhodecode/controllers/search.py:118
+msgid "An error occurred during this search operation"
+msgstr "Ocorreu um erro durante essa operação de busca"
+
+#: rhodecode/controllers/settings.py:61
+#: rhodecode/controllers/settings.py:171
+#, python-format
+msgid "%s repository is not mapped to db perhaps it was created or renamed from the file system please run the application again in order to rescan repositories"
+msgstr "repositório %s não está mapeado ao bd. Talvez ele tenha sido criado ou renomeado a partir do sistema de arquivos. Por favor execute a aplicação outra vez para varrer novamente por repositórios"
+
+#: rhodecode/controllers/settings.py:109
+#: rhodecode/controllers/admin/repos.py:239
+#, python-format
+msgid "Repository %s updated successfully"
+msgstr "Repositório %s atualizado com sucesso"
+
+#: rhodecode/controllers/settings.py:126
+#: rhodecode/controllers/admin/repos.py:257
+#, python-format
+msgid "error occurred during update of repository %s"
+msgstr "ocorreu um erro ao atualizar o repositório %s"
+
+#: rhodecode/controllers/settings.py:144
+#: rhodecode/controllers/admin/repos.py:275
+#, python-format
+msgid "%s repository is not mapped to db perhaps it was moved or renamed  from the filesystem please run the application again in order to rescan repositories"
+msgstr "repositório %s não está mapeado ao bd. Talvez ele tenha sido movido ou renomeado a partir do sistema de arquivos. Por favor execute a aplicação outra vez para varrer novamente por repositórios"
+
+#: rhodecode/controllers/settings.py:156
+#: rhodecode/controllers/admin/repos.py:287
+#, python-format
+msgid "deleted repository %s"
+msgstr "excluído o repositório %s"
+
+#: rhodecode/controllers/settings.py:159
+#: rhodecode/controllers/admin/repos.py:297
+#: rhodecode/controllers/admin/repos.py:303
+#, python-format
+msgid "An error occurred during deletion of %s"
+msgstr "Ocorreu um erro durante a exclusão de %s"
+
+#: rhodecode/controllers/settings.py:193
+#, python-format
+msgid "forked %s repository as %s"
+msgstr "bifurcado repositório %s como %s"
+
+#: rhodecode/controllers/settings.py:211
+#, python-format
+msgid "An error occurred during repository forking %s"
+msgstr "Ocorreu um erro ao bifurcar o repositório %s"
+
+#: rhodecode/controllers/summary.py:123
+msgid "No data loaded yet"
+msgstr "Ainda não há dados carregados"
+
+#: rhodecode/controllers/summary.py:126
+msgid "Statistics are disabled for this repository"
+msgstr "As estatísticas estão desabillitadas para este repositório"
+
+#: rhodecode/controllers/admin/ldap_settings.py:49
+msgid "BASE"
+msgstr "BASE"
+
+#: rhodecode/controllers/admin/ldap_settings.py:50
+msgid "ONELEVEL"
+msgstr "UMNÍVEL"
+
+#: rhodecode/controllers/admin/ldap_settings.py:51
+msgid "SUBTREE"
+msgstr "SUBÁRVORE"
+
+#: rhodecode/controllers/admin/ldap_settings.py:55
+msgid "NEVER"
+msgstr "NUNCA"
+
+#: rhodecode/controllers/admin/ldap_settings.py:56
+msgid "ALLOW"
+msgstr "PERMITIR"
+
+#: rhodecode/controllers/admin/ldap_settings.py:57
+msgid "TRY"
+msgstr "TENTAR"
+
+#: rhodecode/controllers/admin/ldap_settings.py:58
+msgid "DEMAND"
+msgstr "EXIGIR"
+
+#: rhodecode/controllers/admin/ldap_settings.py:59
+msgid "HARD"
+msgstr "DIFÍCIL"
+
+#: rhodecode/controllers/admin/ldap_settings.py:63
+msgid "No encryption"
+msgstr "Sem criptografia"
+
+#: rhodecode/controllers/admin/ldap_settings.py:64
+msgid "LDAPS connection"
+msgstr "Conexão LDAPS"
+
+#: rhodecode/controllers/admin/ldap_settings.py:65
+msgid "START_TLS on LDAP connection"
+msgstr "START_TLS na conexão LDAP"
+
+#: rhodecode/controllers/admin/ldap_settings.py:115
+msgid "Ldap settings updated successfully"
+msgstr "Configurações de LDAP atualizadas com sucesso"
+
+#: rhodecode/controllers/admin/ldap_settings.py:120
+msgid "Unable to activate ldap. The \"python-ldap\" library is missing."
+msgstr "Não foi possível ativar LDAP. A biblioteca \"python-ldap\" está faltando."
+
+#: rhodecode/controllers/admin/ldap_settings.py:134
+msgid "error occurred during update of ldap settings"
+msgstr "ocorreu um erro ao atualizar as configurações de LDAP"
+
+#: rhodecode/controllers/admin/permissions.py:56
+msgid "None"
+msgstr "Nenhum"
+
+#: rhodecode/controllers/admin/permissions.py:57
+msgid "Read"
+msgstr "Ler"
+
+#: rhodecode/controllers/admin/permissions.py:58
+msgid "Write"
+msgstr "Gravar"
+
+#: rhodecode/controllers/admin/permissions.py:59
+#: rhodecode/templates/admin/ldap/ldap.html:9
+#: rhodecode/templates/admin/permissions/permissions.html:9
+#: rhodecode/templates/admin/repos/repo_add.html:9
+#: rhodecode/templates/admin/repos/repo_edit.html:9
+#: rhodecode/templates/admin/repos/repos.html:10
+#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:8
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:8
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10
+#: rhodecode/templates/admin/settings/hooks.html:9
+#: rhodecode/templates/admin/settings/settings.html:9
+#: rhodecode/templates/admin/users/user_add.html:8
+#: rhodecode/templates/admin/users/user_edit.html:9
+#: rhodecode/templates/admin/users/user_edit.html:110
+#: rhodecode/templates/admin/users/users.html:9
+#: rhodecode/templates/admin/users_groups/users_group_add.html:8
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:9
+#: rhodecode/templates/admin/users_groups/users_groups.html:9
+#: rhodecode/templates/base/base.html:279
+#: rhodecode/templates/base/base.html:366
+#: rhodecode/templates/base/base.html:368
+#: rhodecode/templates/base/base.html:370
+msgid "Admin"
+msgstr "Administrador"
+
+#: rhodecode/controllers/admin/permissions.py:62
+msgid "disabled"
+msgstr "desabilitado"
+
+#: rhodecode/controllers/admin/permissions.py:64
+msgid "allowed with manual account activation"
+msgstr "permitido com ativação manual de conta"
+
+#: rhodecode/controllers/admin/permissions.py:66
+msgid "allowed with automatic account activation"
+msgstr "permitido com ativação automática de conta"
+
+#: rhodecode/controllers/admin/permissions.py:68
+msgid "Disabled"
+msgstr "Desabilitado"
+
+#: rhodecode/controllers/admin/permissions.py:69
+msgid "Enabled"
+msgstr "Habilitado"
+
+#: rhodecode/controllers/admin/permissions.py:102
+msgid "Default permissions updated successfully"
+msgstr "Permissões padrões atualizadas com sucesso"
+
+#: rhodecode/controllers/admin/permissions.py:119
+msgid "error occurred during update of permissions"
+msgstr "ocorreu um erro ao atualizar as permissões"
+
+#: rhodecode/controllers/admin/repos.py:96
+#, python-format
+msgid "%s repository is not mapped to db perhaps it was created or renamed from the filesystem please run the application again in order to rescan repositories"
+msgstr "repositório %s não está mapeado ao bd. Talvez ele tenha sido criado ou renomeado a partir do sistema de arquivos. Por favor execute a aplicação outra vez para varrer novamente por repositórios"
+
+#: rhodecode/controllers/admin/repos.py:172
+#, python-format
+msgid "created repository %s from %s"
+msgstr "repositório %s criado a partir de %s"
+
+#: rhodecode/controllers/admin/repos.py:176
+#, python-format
+msgid "created repository %s"
+msgstr "repositório %s criado"
+
+#: rhodecode/controllers/admin/repos.py:205
+#, python-format
+msgid "error occurred during creation of repository %s"
+msgstr "ocorreu um erro ao criar o repositório %s"
+
+#: rhodecode/controllers/admin/repos.py:292
+#, python-format
+msgid "Cannot delete %s it still contains attached forks"
+msgstr "Nao é possível excluir %s pois ele ainda contém bifurcações vinculadas"
+
+#: rhodecode/controllers/admin/repos.py:320
+msgid "An error occurred during deletion of repository user"
+msgstr "Ocorreu um erro ao excluir usuário de repositório"
+
+#: rhodecode/controllers/admin/repos.py:335
+msgid "An error occurred during deletion of repository users groups"
+msgstr "Ocorreu um erro ao excluir grupo de usuário de repositório"
+
+#: rhodecode/controllers/admin/repos.py:352
+msgid "An error occurred during deletion of repository stats"
+msgstr "Ocorreu um erro ao excluir estatísticas de repositório"
+
+#: rhodecode/controllers/admin/repos.py:367
+msgid "An error occurred during cache invalidation"
+msgstr "Ocorreu um erro ao invalidar o cache"
+
+#: rhodecode/controllers/admin/repos.py:387
+msgid "Updated repository visibility in public journal"
+msgstr "Atualizada a visibilidade do repositório no diário público"
+
+#: rhodecode/controllers/admin/repos.py:390
+msgid "An error occurred during setting this repository in public journal"
+msgstr "Ocorreu um erro ao ajustar esse repositório no diário público"
+
+#: rhodecode/controllers/admin/repos.py:395
+#: rhodecode/model/forms.py:53
+msgid "Token mismatch"
+msgstr "Descompasso de Token"
+
+#: rhodecode/controllers/admin/repos.py:408
+msgid "Pulled from remote location"
+msgstr "Realizado pull de localização remota"
+
+#: rhodecode/controllers/admin/repos.py:410
+msgid "An error occurred during pull from remote location"
+msgstr "Ocorreu um erro ao realizar pull de localização remota"
+
+#: rhodecode/controllers/admin/repos_groups.py:83
+#, python-format
+msgid "created repos group %s"
+msgstr "criado grupo de repositórios %s"
+
+#: rhodecode/controllers/admin/repos_groups.py:96
+#, python-format
+msgid "error occurred during creation of repos group %s"
+msgstr "ccorreu um erro ao criar grupo de repositório %s"
+
+#: rhodecode/controllers/admin/repos_groups.py:130
+#, python-format
+msgid "updated repos group %s"
+msgstr "atualizado grupo de repositórios %s"
+
+#: rhodecode/controllers/admin/repos_groups.py:143
+#, python-format
+msgid "error occurred during update of repos group %s"
+msgstr "ocorreu um erro ao atualizar grupo de repositórios %s"
+
+#: rhodecode/controllers/admin/repos_groups.py:164
+#, python-format
+msgid "This group contains %s repositores and cannot be deleted"
+msgstr "Esse grupo contém %s repositórios e não pode ser excluído"
+
+#: rhodecode/controllers/admin/repos_groups.py:171
+#, python-format
+msgid "removed repos group %s"
+msgstr "removido grupo de repositórios %s"
+
+#: rhodecode/controllers/admin/repos_groups.py:175
+#, python-format
+msgid "error occurred during deletion of repos group %s"
+msgstr "ccorreu um erro ao excluir grupo de repositórios %s"
+
+#: rhodecode/controllers/admin/settings.py:109
+#, python-format
+msgid "Repositories successfully rescanned added: %s,removed: %s"
+msgstr "Repositórios varridos com sucesso adicionados: %s, removidos: %s"
+
+#: rhodecode/controllers/admin/settings.py:118
+msgid "Whoosh reindex task scheduled"
+msgstr "Tarefa de reindexação do whoosh agendada"
+
+#: rhodecode/controllers/admin/settings.py:143
+msgid "Updated application settings"
+msgstr "Configurações da aplicação atualizadas"
+
+#: rhodecode/controllers/admin/settings.py:148
+#: rhodecode/controllers/admin/settings.py:215
+msgid "error occurred during updating application settings"
+msgstr "ocorreu um erro ao atualizar as configurações da aplicação"
+
+#: rhodecode/controllers/admin/settings.py:210
+msgid "Updated mercurial settings"
+msgstr "Atualizadas as configurações do mercurial"
+
+#: rhodecode/controllers/admin/settings.py:236
+msgid "Added new hook"
+msgstr "Adicionado novo gancho"
+
+#: rhodecode/controllers/admin/settings.py:247
+msgid "Updated hooks"
+msgstr "Atualizados os ganchos"
+
+#: rhodecode/controllers/admin/settings.py:251
+msgid "error occurred during hook creation"
+msgstr "ocorreu um erro ao criar gancho"
+
+#: rhodecode/controllers/admin/settings.py:310
+msgid "You can't edit this user since it's crucial for entire application"
+msgstr "Você não pode editar esse usuário pois ele é crucial para toda a aplicação"
+
+#: rhodecode/controllers/admin/settings.py:339
+msgid "Your account was updated successfully"
+msgstr "Sua conta foi atualizada com sucesso"
+
+#: rhodecode/controllers/admin/settings.py:359
+#: rhodecode/controllers/admin/users.py:130
+#, python-format
+msgid "error occurred during update of user %s"
+msgstr "ocorreu um erro ao atualizar o usuário %s"
+
+#: rhodecode/controllers/admin/users.py:78
+#, python-format
+msgid "created user %s"
+msgstr "usuário %s criado"
+
+#: rhodecode/controllers/admin/users.py:90
+#, python-format
+msgid "error occurred during creation of user %s"
+msgstr "ocorreu um erro ao criar o usuário %s"
+
+#: rhodecode/controllers/admin/users.py:116
+msgid "User updated successfully"
+msgstr "Usuário atualizado com sucesso"
+
+#: rhodecode/controllers/admin/users.py:146
+msgid "successfully deleted user"
+msgstr "usuário excluído com sucesso"
+
+#: rhodecode/controllers/admin/users.py:150
+msgid "An error occurred during deletion of user"
+msgstr "Ocorreu um erro ao excluir o usuário"
+
+#: rhodecode/controllers/admin/users.py:166
+msgid "You can't edit this user"
+msgstr "Você não pode editar esse usuário"
+
+#: rhodecode/controllers/admin/users.py:195
+#: rhodecode/controllers/admin/users_groups.py:202
+msgid "Granted 'repository create' permission to user"
+msgstr "Concedida permissão de 'criar repositório' ao usuário"
+
+#: rhodecode/controllers/admin/users.py:204
+#: rhodecode/controllers/admin/users_groups.py:211
+msgid "Revoked 'repository create' permission to user"
+msgstr "Revogada permissão de 'criar repositório' ao usuário"
+
+#: rhodecode/controllers/admin/users_groups.py:74
+#, python-format
+msgid "created users group %s"
+msgstr "criado grupo de usuários %s"
+
+#: rhodecode/controllers/admin/users_groups.py:86
+#, python-format
+msgid "error occurred during creation of users group %s"
+msgstr "ocorreu um erro ao criar o grupo de usuários %s"
+
+#: rhodecode/controllers/admin/users_groups.py:119
+#, python-format
+msgid "updated users group %s"
+msgstr "grupo de usuários %s atualizado"
+
+#: rhodecode/controllers/admin/users_groups.py:138
+#, python-format
+msgid "error occurred during update of users group %s"
+msgstr "ocorreu um erro ao atualizar o grupo de usuários %s"
+
+#: rhodecode/controllers/admin/users_groups.py:154
+msgid "successfully deleted users group"
+msgstr "grupo de usuários excluído com sucesso"
+
+#: rhodecode/controllers/admin/users_groups.py:158
+msgid "An error occurred during deletion of users group"
+msgstr "Ocorreu um erro ao excluir o grupo de usuários"
+
+#: rhodecode/lib/__init__.py:279
+msgid "year"
+msgstr "ano"
+
+#: rhodecode/lib/__init__.py:280
+msgid "month"
+msgstr "mês"
+
+#: rhodecode/lib/__init__.py:281
+msgid "day"
+msgstr "dia"
+
+#: rhodecode/lib/__init__.py:282
+msgid "hour"
+msgstr "hora"
+
+#: rhodecode/lib/__init__.py:283
+msgid "minute"
+msgstr "minuto"
+
+#: rhodecode/lib/__init__.py:284
+msgid "second"
+msgstr "segundo"
+
+#: rhodecode/lib/__init__.py:293
+msgid "ago"
+msgstr "atrás"
+
+#: rhodecode/lib/__init__.py:296
+msgid "just now"
+msgstr "agora há pouco"
+
+#: rhodecode/lib/auth.py:377
+msgid "You need to be a registered user to perform this action"
+msgstr "Você precisa ser um usuário registrado para realizar essa ação"
+
+#: rhodecode/lib/auth.py:421
+msgid "You need to be a signed in to view this page"
+msgstr "Você precisa estar logado para ver essa página"
+
+#: rhodecode/lib/helpers.py:307
+msgid "True"
+msgstr "Verdadeiro"
+
+#: rhodecode/lib/helpers.py:311
+msgid "False"
+msgstr "Falso"
+
+#: rhodecode/lib/helpers.py:352
+#, python-format
+msgid "Show all combined changesets %s->%s"
+msgstr "Ver todos os conjuntos de mudanças combinados %s->%s"
+
+#: rhodecode/lib/helpers.py:356
+msgid "compare view"
+msgstr "comparar exibir"
+
+#: rhodecode/lib/helpers.py:365
+msgid "and"
+msgstr "e"
+
+#: rhodecode/lib/helpers.py:365
+#, python-format
+msgid "%s more"
+msgstr "%s mais"
+
+#: rhodecode/lib/helpers.py:367
+#: rhodecode/templates/changelog/changelog.html:14
+#: rhodecode/templates/changelog/changelog.html:39
+msgid "revisions"
+msgstr "revisões"
+
+#: rhodecode/lib/helpers.py:385
+msgid "fork name "
+msgstr "nome da bifurcação"
+
+#: rhodecode/lib/helpers.py:388
+msgid "[deleted] repository"
+msgstr "repositório [excluído]"
+
+#: rhodecode/lib/helpers.py:389
+#: rhodecode/lib/helpers.py:393
+msgid "[created] repository"
+msgstr "repositório [criado]"
+
+#: rhodecode/lib/helpers.py:390
+#: rhodecode/lib/helpers.py:394
+msgid "[forked] repository"
+msgstr "repositório [bifurcado]"
+
+#: rhodecode/lib/helpers.py:391
+#: rhodecode/lib/helpers.py:395
+msgid "[updated] repository"
+msgstr "repositório [atualizado]"
+
+#: rhodecode/lib/helpers.py:392
+msgid "[delete] repository"
+msgstr "[excluir] repositório"
+
+#: rhodecode/lib/helpers.py:396
+msgid "[pushed] into"
+msgstr "[realizado push] para"
+
+#: rhodecode/lib/helpers.py:397
+msgid "[committed via RhodeCode] into"
+msgstr "[realizado commit via RhodeCode] para"
+
+#: rhodecode/lib/helpers.py:398
+msgid "[pulled from remote] into"
+msgstr "[realizado pull remoto] para"
+
+#: rhodecode/lib/helpers.py:399
+msgid "[pulled] from"
+msgstr "[realizado pull] a partir de"
+
+#: rhodecode/lib/helpers.py:400
+msgid "[started following] repository"
+msgstr "[passou a seguir] o repositório"
+
+#: rhodecode/lib/helpers.py:401
+msgid "[stopped following] repository"
+msgstr "[parou de seguir] o repositório"
+
+#: rhodecode/lib/helpers.py:577
+#, python-format
+msgid " and %s more"
+msgstr " e mais %s"
+
+#: rhodecode/lib/helpers.py:581
+msgid "No Files"
+msgstr "Nenhum Arquivo"
+
+#: rhodecode/model/forms.py:66
+msgid "Invalid username"
+msgstr "Nome de usuário inválido"
+
+#: rhodecode/model/forms.py:75
+msgid "This username already exists"
+msgstr "Esse nome de usuário já existe"
+
+#: rhodecode/model/forms.py:79
+msgid "Username may only contain alphanumeric characters underscores, periods or dashes and must begin with alphanumeric character"
+msgstr "Nome de usuário pode conter somente caracteres alfanuméricos, sublinha, pontos e hífens e deve iniciar com caractere alfanumérico"
+
+#: rhodecode/model/forms.py:94
+msgid "Invalid group name"
+msgstr "Nome de grupo inválido"
+
+#: rhodecode/model/forms.py:104
+msgid "This users group already exists"
+msgstr "Esse grupo de usuários já existe"
+
+#: rhodecode/model/forms.py:110
+msgid "Group name may only contain alphanumeric characters underscores, periods or dashes and must begin with alphanumeric character"
+msgstr "Nome de grupo pode conter somente caracteres alfanuméricos, sublinha, pontos e hífens e deve iniciar com caractere alfanumérico"
+
+#: rhodecode/model/forms.py:132
+msgid "Cannot assign this group as parent"
+msgstr "Não é possível associar esse grupo como progenitor"
+
+#: rhodecode/model/forms.py:148
+msgid "This group already exists"
+msgstr "Esse grupo já existe"
+
+#: rhodecode/model/forms.py:164
+#: rhodecode/model/forms.py:172
+#: rhodecode/model/forms.py:180
+msgid "Invalid characters in password"
+msgstr "Caracteres inválidos na senha"
+
+#: rhodecode/model/forms.py:191
+msgid "Passwords do not match"
+msgstr "Senhas não conferem"
+
+#: rhodecode/model/forms.py:196
+msgid "invalid password"
+msgstr "senha inválida"
+
+#: rhodecode/model/forms.py:197
+msgid "invalid user name"
+msgstr "nome de usuário inválido"
+
+#: rhodecode/model/forms.py:198
+msgid "Your account is disabled"
+msgstr "Sua conta está desabilitada"
+
+#: rhodecode/model/forms.py:233
+msgid "This username is not valid"
+msgstr "Esse nome de usuário não é válido"
+
+#: rhodecode/model/forms.py:245
+msgid "This repository name is disallowed"
+msgstr "Esse nome de repositório não é permitido"
+
+#: rhodecode/model/forms.py:266
+#, python-format
+msgid "This repository already exists in group \"%s\""
+msgstr "Esse repositório já existe no grupo \"%s\""
+
+#: rhodecode/model/forms.py:274
+msgid "This repository already exists"
+msgstr "Esse repositório já existe"
+
+#: rhodecode/model/forms.py:312
+#: rhodecode/model/forms.py:319
+msgid "invalid clone url"
+msgstr "URL de clonagem inválida"
+
+#: rhodecode/model/forms.py:322
+msgid "Invalid clone url, provide a valid clone http\\s url"
+msgstr "URL de clonagem inválida, forneça uma URL válida de clonagem http\\s"
+
+#: rhodecode/model/forms.py:334
+msgid "Fork have to be the same type as original"
+msgstr "Bifurcação precisa ser do mesmo tipo que o original"
+
+#: rhodecode/model/forms.py:341
+msgid "This username or users group name is not valid"
+msgstr "Esse nome de usuário ou nome de grupo de usuários não é válido"
+
+#: rhodecode/model/forms.py:403
+msgid "This is not a valid path"
+msgstr "Esse não é um caminho válido"
+
+#: rhodecode/model/forms.py:416
+msgid "This e-mail address is already taken"
+msgstr "Esse endereço de e-mail já está tomado"
+
+#: rhodecode/model/forms.py:427
+msgid "This e-mail address doesn't exist."
+msgstr "Esse endereço de e-mail não existe."
+
+#: rhodecode/model/forms.py:447
+msgid "The LDAP Login attribute of the CN must be specified - this is the name of the attribute that is equivalent to 'username'"
+msgstr "O atributo de login LDAP do CN deve ser especificado - isto é o nome do atributo que é equivalente ao 'nome de usuário'"
+
+#: rhodecode/model/forms.py:466
+msgid "Please enter a login"
+msgstr "Por favor entre um login"
+
+#: rhodecode/model/forms.py:467
+#, python-format
+msgid "Enter a value %(min)i characters long or more"
+msgstr "Entre um valor com %(min)i caracteres ou mais"
+
+#: rhodecode/model/forms.py:475
+msgid "Please enter a password"
+msgstr "Por favor entre com uma senha"
+
+#: rhodecode/model/forms.py:476
+#, python-format
+msgid "Enter %(min)i characters or more"
+msgstr "Entre com %(min)i caracteres ou mais"
+
+#: rhodecode/model/user.py:145
+msgid "[RhodeCode] New User registration"
+msgstr "[RhodeCode] Registro de Novo Usuário"
+
+#: rhodecode/model/user.py:157
+#: rhodecode/model/user.py:179
+msgid "You can't Edit this user since it's crucial for entire application"
+msgstr "Você não pode Editar esse usuário, pois ele é crucial para toda a aplicação"
+
+#: rhodecode/model/user.py:201
+msgid "You can't remove this user since it's crucial for entire application"
+msgstr "Você não pode remover esse usuário, pois ele é crucial para toda a aplicação"
+
+#: rhodecode/model/user.py:204
+#, python-format
+msgid "This user still owns %s repositories and cannot be removed. Switch owners or remove those repositories"
+msgstr "Esse usuário ainda é dono de %s repositórios e não pode ser removido. Troque os donos ou remova esses repositórios"
+
+#: rhodecode/templates/index.html:4
+msgid "Dashboard"
+msgstr "Painel de Controle"
+
+#: rhodecode/templates/index_base.html:22
+#: rhodecode/templates/admin/users/user_edit_my_account.html:102
+msgid "quick filter..."
+msgstr "filtro rápido..."
+
+#: rhodecode/templates/index_base.html:23
+#: rhodecode/templates/base/base.html:300
+msgid "repositories"
+msgstr "repositórios"
+
+#: rhodecode/templates/index_base.html:29
+#: rhodecode/templates/admin/repos/repos.html:22
+msgid "ADD NEW REPOSITORY"
+msgstr "ADICIONAR NOVO REPOSITÓRIO"
+
+#: rhodecode/templates/index_base.html:41
+#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:32
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:32
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:33
+#: rhodecode/templates/admin/users_groups/users_group_add.html:32
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:33
+msgid "Group name"
+msgstr "Nome do grupo"
+
+#: rhodecode/templates/index_base.html:42
+#: rhodecode/templates/index_base.html:73
+#: rhodecode/templates/admin/repos/repo_add_base.html:44
+#: rhodecode/templates/admin/repos/repo_edit.html:64
+#: rhodecode/templates/admin/repos/repos.html:31
+#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:41
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:41
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:34
+#: rhodecode/templates/settings/repo_fork.html:40
+#: rhodecode/templates/settings/repo_settings.html:40
+#: rhodecode/templates/summary/summary.html:92
+msgid "Description"
+msgstr "Descrição"
+
+#: rhodecode/templates/index_base.html:53
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:46
+msgid "Repositories group"
+msgstr "Grupo de repositórios"
+
+#: rhodecode/templates/index_base.html:72
+#: rhodecode/templates/admin/repos/repo_add_base.html:9
+#: rhodecode/templates/admin/repos/repo_edit.html:32
+#: rhodecode/templates/admin/repos/repos.html:30
+#: rhodecode/templates/admin/users/user_edit_my_account.html:117
+#: rhodecode/templates/files/files_browser.html:157
+#: rhodecode/templates/settings/repo_settings.html:31
+#: rhodecode/templates/summary/summary.html:31
+#: rhodecode/templates/summary/summary.html:107
+msgid "Name"
+msgstr "Nome"
+
+#: rhodecode/templates/index_base.html:74
+#: rhodecode/templates/admin/repos/repos.html:32
+#: rhodecode/templates/summary/summary.html:114
+msgid "Last change"
+msgstr "Última alteração"
+
+#: rhodecode/templates/index_base.html:75
+#: rhodecode/templates/admin/repos/repos.html:33
+msgid "Tip"
+msgstr "Ponta"
+
+#: rhodecode/templates/index_base.html:76
+#: rhodecode/templates/admin/repos/repo_edit.html:97
+msgid "Owner"
+msgstr "Dono"
+
+#: rhodecode/templates/index_base.html:77
+#: rhodecode/templates/journal/public_journal.html:20
+#: rhodecode/templates/summary/summary.html:180
+#: rhodecode/templates/summary/summary.html:183
+msgid "RSS"
+msgstr "RSS"
+
+#: rhodecode/templates/index_base.html:78
+#: rhodecode/templates/journal/public_journal.html:23
+#: rhodecode/templates/summary/summary.html:181
+#: rhodecode/templates/summary/summary.html:184
+msgid "Atom"
+msgstr "Atom"
+
+#: rhodecode/templates/index_base.html:87
+#: rhodecode/templates/index_base.html:89
+#: rhodecode/templates/index_base.html:91
+#: rhodecode/templates/base/base.html:209
+#: rhodecode/templates/base/base.html:211
+#: rhodecode/templates/base/base.html:213
+#: rhodecode/templates/summary/summary.html:4
+msgid "Summary"
+msgstr "Sumário"
+
+#: rhodecode/templates/index_base.html:95
+#: rhodecode/templates/index_base.html:97
+#: rhodecode/templates/index_base.html:99
+#: rhodecode/templates/base/base.html:225
+#: rhodecode/templates/base/base.html:227
+#: rhodecode/templates/base/base.html:229
+#: rhodecode/templates/changelog/changelog.html:6
+#: rhodecode/templates/changelog/changelog.html:14
+msgid "Changelog"
+msgstr "Registro de alterações"
+
+#: rhodecode/templates/index_base.html:103
+#: rhodecode/templates/index_base.html:105
+#: rhodecode/templates/index_base.html:107
+#: rhodecode/templates/base/base.html:268
+#: rhodecode/templates/base/base.html:270
+#: rhodecode/templates/base/base.html:272
+#: rhodecode/templates/files/files.html:4
+msgid "Files"
+msgstr "Arquivos"
+
+#: rhodecode/templates/index_base.html:116
+#: rhodecode/templates/admin/repos/repos.html:42
+#: rhodecode/templates/admin/users/user_edit_my_account.html:127
+#: rhodecode/templates/summary/summary.html:48
+msgid "Mercurial repository"
+msgstr "Repositório Mercurial"
+
+#: rhodecode/templates/index_base.html:118
+#: rhodecode/templates/admin/repos/repos.html:44
+#: rhodecode/templates/admin/users/user_edit_my_account.html:129
+#: rhodecode/templates/summary/summary.html:51
+msgid "Git repository"
+msgstr "Repositório Git"
+
+#: rhodecode/templates/index_base.html:123
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:16
+#: rhodecode/templates/journal/journal.html:53
+#: rhodecode/templates/summary/summary.html:56
+msgid "private repository"
+msgstr "repositório privado"
+
+#: rhodecode/templates/index_base.html:125
+#: rhodecode/templates/journal/journal.html:55
+#: rhodecode/templates/summary/summary.html:58
+msgid "public repository"
+msgstr "repositório público"
+
+#: rhodecode/templates/index_base.html:133
+#: rhodecode/templates/base/base.html:291
+#: rhodecode/templates/settings/repo_fork.html:13
+msgid "fork"
+msgstr "bifurcação"
+
+#: rhodecode/templates/index_base.html:134
+#: rhodecode/templates/admin/repos/repos.html:60
+#: rhodecode/templates/admin/users/user_edit_my_account.html:143
+#: rhodecode/templates/summary/summary.html:69
+#: rhodecode/templates/summary/summary.html:71
+msgid "Fork of"
+msgstr "Bifurcação de"
+
+#: rhodecode/templates/index_base.html:155
+#: rhodecode/templates/admin/repos/repos.html:73
+msgid "No changesets yet"
+msgstr "Ainda não há conjuntos de mudanças"
+
+#: rhodecode/templates/index_base.html:161
+#: rhodecode/templates/index_base.html:163
+#, python-format
+msgid "Subscribe to %s rss feed"
+msgstr "Assinar o feed rss de %s"
+
+#: rhodecode/templates/index_base.html:168
+#: rhodecode/templates/index_base.html:170
+#, python-format
+msgid "Subscribe to %s atom feed"
+msgstr "Assinar o feed atom de %s"
+
+#: rhodecode/templates/login.html:5
+#: rhodecode/templates/login.html:54
+#: rhodecode/templates/base/base.html:38
+msgid "Sign In"
+msgstr "Entrar"
+
+#: rhodecode/templates/login.html:21
+msgid "Sign In to"
+msgstr "Entrar em"
+
+#: rhodecode/templates/login.html:31
+#: rhodecode/templates/register.html:20
+#: rhodecode/templates/admin/admin_log.html:5
+#: rhodecode/templates/admin/users/user_add.html:32
+#: rhodecode/templates/admin/users/user_edit.html:47
+#: rhodecode/templates/admin/users/user_edit_my_account.html:45
+#: rhodecode/templates/base/base.html:15
+#: rhodecode/templates/summary/summary.html:106
+msgid "Username"
+msgstr "Nome de usuário"
+
+#: rhodecode/templates/login.html:40
+#: rhodecode/templates/register.html:29
+#: rhodecode/templates/admin/ldap/ldap.html:46
+#: rhodecode/templates/admin/users/user_add.html:41
+#: rhodecode/templates/base/base.html:24
+msgid "Password"
+msgstr "Senha"
+
+#: rhodecode/templates/login.html:60
+msgid "Forgot your password ?"
+msgstr "Esqueceu sua senha ?"
+
+#: rhodecode/templates/login.html:63
+#: rhodecode/templates/base/base.html:35
+msgid "Don't have an account ?"
+msgstr "Não possui uma conta ?"
+
+#: rhodecode/templates/password_reset.html:5
+msgid "Reset your password"
+msgstr "Reinicializar sua senha"
+
+#: rhodecode/templates/password_reset.html:11
+msgid "Reset your password to"
+msgstr "Reinicializar sua senha para"
+
+#: rhodecode/templates/password_reset.html:21
+msgid "Email address"
+msgstr "Endereço de e-mail"
+
+#: rhodecode/templates/password_reset.html:30
+msgid "Reset my password"
+msgstr "Reinicializar minha senha"
+
+#: rhodecode/templates/password_reset.html:31
+msgid "Password reset link will be send to matching email address"
+msgstr "Link de reinicialização de senha será enviado ao endereço de e-mail correspondente"
+
+#: rhodecode/templates/register.html:5
+#: rhodecode/templates/register.html:74
+msgid "Sign Up"
+msgstr "Inscrever-se"
+
+#: rhodecode/templates/register.html:11
+msgid "Sign Up to"
+msgstr "Inscrever-se em"
+
+#: rhodecode/templates/register.html:38
+msgid "Re-enter password"
+msgstr "Repita a senha"
+
+#: rhodecode/templates/register.html:47
+#: rhodecode/templates/admin/users/user_add.html:50
+#: rhodecode/templates/admin/users/user_edit.html:74
+#: rhodecode/templates/admin/users/user_edit_my_account.html:63
+msgid "First Name"
+msgstr "Primeiro Nome"
+
+#: rhodecode/templates/register.html:56
+#: rhodecode/templates/admin/users/user_add.html:59
+#: rhodecode/templates/admin/users/user_edit.html:83
+#: rhodecode/templates/admin/users/user_edit_my_account.html:72
+msgid "Last Name"
+msgstr "Último Nome"
+
+#: rhodecode/templates/register.html:65
+#: rhodecode/templates/admin/users/user_add.html:68
+#: rhodecode/templates/admin/users/user_edit.html:92
+#: rhodecode/templates/admin/users/user_edit_my_account.html:81
+#: rhodecode/templates/summary/summary.html:108
+msgid "Email"
+msgstr "E-mail"
+
+#: rhodecode/templates/register.html:76
+msgid "Your account will be activated right after registration"
+msgstr "Sua conta será ativada logo após o registro ser concluído"
+
+#: rhodecode/templates/register.html:78
+msgid "Your account must wait for activation by administrator"
+msgstr "Sua conta precisa esperar ativação por um administrador"
+
+#: rhodecode/templates/repo_switcher_list.html:14
+msgid "Private repository"
+msgstr "Repositório privado"
+
+#: rhodecode/templates/repo_switcher_list.html:19
+msgid "Public repository"
+msgstr "Repositório público"
+
+#: rhodecode/templates/admin/admin.html:5
+#: rhodecode/templates/admin/admin.html:9
+msgid "Admin journal"
+msgstr "Diário do administrador"
+
+#: rhodecode/templates/admin/admin_log.html:6
+msgid "Action"
+msgstr "Ação"
+
+#: rhodecode/templates/admin/admin_log.html:7
+msgid "Repository"
+msgstr "Repositório"
+
+#: rhodecode/templates/admin/admin_log.html:8
+msgid "Date"
+msgstr "Data"
+
+#: rhodecode/templates/admin/admin_log.html:9
+msgid "From IP"
+msgstr "A partir do IP"
+
+#: rhodecode/templates/admin/admin_log.html:52
+msgid "No actions yet"
+msgstr "Ainda não há ações"
+
+#: rhodecode/templates/admin/ldap/ldap.html:5
+msgid "LDAP administration"
+msgstr "Administração de LDAP"
+
+#: rhodecode/templates/admin/ldap/ldap.html:11
+msgid "Ldap"
+msgstr "LDAP"
+
+#: rhodecode/templates/admin/ldap/ldap.html:28
+msgid "Connection settings"
+msgstr "Configurações de conexão"
+
+#: rhodecode/templates/admin/ldap/ldap.html:30
+msgid "Enable LDAP"
+msgstr "Habilitar LDAP"
+
+#: rhodecode/templates/admin/ldap/ldap.html:34
+msgid "Host"
+msgstr "Host"
+
+#: rhodecode/templates/admin/ldap/ldap.html:38
+msgid "Port"
+msgstr "Porta"
+
+#: rhodecode/templates/admin/ldap/ldap.html:42
+msgid "Account"
+msgstr "Conta"
+
+#: rhodecode/templates/admin/ldap/ldap.html:50
+msgid "Connection security"
+msgstr "Segurança da conexão"
+
+#: rhodecode/templates/admin/ldap/ldap.html:54
+msgid "Certificate Checks"
+msgstr "Verificações de Certificados"
+
+#: rhodecode/templates/admin/ldap/ldap.html:57
+msgid "Search settings"
+msgstr "Configurações de busca"
+
+#: rhodecode/templates/admin/ldap/ldap.html:59
+msgid "Base DN"
+msgstr "DN Base"
+
+#: rhodecode/templates/admin/ldap/ldap.html:63
+msgid "LDAP Filter"
+msgstr "Filtro LDAP"
+
+#: rhodecode/templates/admin/ldap/ldap.html:67
+msgid "LDAP Search Scope"
+msgstr "Escopo de Buscas LDAP"
+
+#: rhodecode/templates/admin/ldap/ldap.html:70
+msgid "Attribute mappings"
+msgstr "Mapeamento de atributos"
+
+#: rhodecode/templates/admin/ldap/ldap.html:72
+msgid "Login Attribute"
+msgstr "Atributo de Login"
+
+#: rhodecode/templates/admin/ldap/ldap.html:76
+msgid "First Name Attribute"
+msgstr "Atributo do Primeiro Nome"
+
+#: rhodecode/templates/admin/ldap/ldap.html:80
+msgid "Last Name Attribute"
+msgstr "Atributo do Último Nome"
+
+#: rhodecode/templates/admin/ldap/ldap.html:84
+msgid "E-mail Attribute"
+msgstr "Atributo de E-mail"
+
+#: rhodecode/templates/admin/ldap/ldap.html:89
+#: rhodecode/templates/admin/settings/hooks.html:73
+#: rhodecode/templates/admin/users/user_edit.html:117
+#: rhodecode/templates/admin/users/user_edit.html:142
+#: rhodecode/templates/admin/users/user_edit_my_account.html:89
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:263
+msgid "Save"
+msgstr "Salvar"
+
+#: rhodecode/templates/admin/permissions/permissions.html:5
+msgid "Permissions administration"
+msgstr "Administração de permissões"
+
+#: rhodecode/templates/admin/permissions/permissions.html:11
+#: rhodecode/templates/admin/repos/repo_edit.html:109
+#: rhodecode/templates/admin/users/user_edit.html:127
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:248
+#: rhodecode/templates/settings/repo_settings.html:58
+msgid "Permissions"
+msgstr "Permissões"
+
+#: rhodecode/templates/admin/permissions/permissions.html:24
+msgid "Default permissions"
+msgstr "Permissões padrão"
+
+#: rhodecode/templates/admin/permissions/permissions.html:31
+msgid "Anonymous access"
+msgstr "Acesso anônimo"
+
+#: rhodecode/templates/admin/permissions/permissions.html:41
+msgid "Repository permission"
+msgstr "Permissão de repositório"
+
+#: rhodecode/templates/admin/permissions/permissions.html:49
+msgid "All default permissions on each repository will be reset to choosen permission, note that all custom default permission on repositories will be lost"
+msgstr "Todas as permissões padrão em cada repositório serão reinicializadas para as permissões escolhidas. Note que todas as permissões padrão customizadas nos repositórios serão perdidas"
+
+#: rhodecode/templates/admin/permissions/permissions.html:50
+msgid "overwrite existing settings"
+msgstr "sobrescrever configurações existentes"
+
+#: rhodecode/templates/admin/permissions/permissions.html:55
+msgid "Registration"
+msgstr "Registro"
+
+#: rhodecode/templates/admin/permissions/permissions.html:63
+msgid "Repository creation"
+msgstr "Criação de repositório"
+
+#: rhodecode/templates/admin/permissions/permissions.html:71
+msgid "set"
+msgstr "ajustar"
+
+#: rhodecode/templates/admin/repos/repo_add.html:5
+#: rhodecode/templates/admin/repos/repo_add_create_repository.html:5
+msgid "Add repository"
+msgstr "Adicionar repositório"
+
+#: rhodecode/templates/admin/repos/repo_add.html:11
+#: rhodecode/templates/admin/repos/repo_edit.html:11
+#: rhodecode/templates/admin/repos/repos.html:10
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10
+msgid "Repositories"
+msgstr "Repositórios"
+
+#: rhodecode/templates/admin/repos/repo_add.html:13
+msgid "add new"
+msgstr "adicionar novo"
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:20
+#: rhodecode/templates/summary/summary.html:80
+#: rhodecode/templates/summary/summary.html:82
+msgid "Clone from"
+msgstr "Clonar de"
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:28
+#: rhodecode/templates/admin/repos/repo_edit.html:48
+#: rhodecode/templates/admin/repos_groups/repos_groups.html:4
+msgid "Repository group"
+msgstr "Grupo de repositórios"
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:36
+#: rhodecode/templates/admin/repos/repo_edit.html:56
+msgid "Type"
+msgstr "Tipo"
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:52
+#: rhodecode/templates/admin/repos/repo_edit.html:73
+#: rhodecode/templates/settings/repo_fork.html:48
+#: rhodecode/templates/settings/repo_settings.html:49
+msgid "Private"
+msgstr "Privado"
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:59
+msgid "add"
+msgstr "adicionar"
+
+#: rhodecode/templates/admin/repos/repo_add_create_repository.html:9
+msgid "add new repository"
+msgstr "adicionar novo repositório"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:5
+msgid "Edit repository"
+msgstr "Editar repositório"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:13
+#: rhodecode/templates/admin/users/user_edit.html:13
+#: rhodecode/templates/admin/users/user_edit_my_account.html:148
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:13
+#: rhodecode/templates/files/files_annotate.html:49
+#: rhodecode/templates/files/files_source.html:20
+msgid "edit"
+msgstr "editar"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:40
+msgid "Clone uri"
+msgstr "URI de clonagem"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:81
+msgid "Enable statistics"
+msgstr "Habilitar estatísticas"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:89
+msgid "Enable downloads"
+msgstr "Habilitar downloads"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:127
+msgid "Administration"
+msgstr "Administração"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:130
+msgid "Statistics"
+msgstr "Estatísticas"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:134
+msgid "Reset current statistics"
+msgstr "Reinicializar estatísticas atuais"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:134
+msgid "Confirm to remove current statistics"
+msgstr "Confirma remover atuais estatísticas"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:137
+msgid "Fetched to rev"
+msgstr "Trazida à rev"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:138
+msgid "Percentage of stats gathered"
+msgstr "Porcentagem das estatísticas totalizadas"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:147
+msgid "Remote"
+msgstr "Remoto"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:151
+msgid "Pull changes from remote location"
+msgstr "Realizar pull de alterações a partir de localização remota"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:151
+msgid "Confirm to pull changes from remote side"
+msgstr "Confirma realizar pull de alterações a partir de lado remoto"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:162
+msgid "Cache"
+msgstr "Cache"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:166
+msgid "Invalidate repository cache"
+msgstr "Invalidar cache do repositório"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:166
+msgid "Confirm to invalidate repository cache"
+msgstr "Confirma invalidar cache do repositório"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:177
+msgid "Remove from public journal"
+msgstr "Remover do diário público"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:179
+msgid "Add to public journal"
+msgstr "Adicionar ao diário público"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:185
+msgid "Delete"
+msgstr "Excluir"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:189
+msgid "Remove this repository"
+msgstr "Remover deste repositório"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:189
+#: rhodecode/templates/admin/repos/repos.html:79
+msgid "Confirm to delete this repository"
+msgstr "Confirma excluir este repositório"
+
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:3
+msgid "none"
+msgstr "nenhum"
+
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:4
+msgid "read"
+msgstr "ler"
+
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:5
+msgid "write"
+msgstr "escrever"
+
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:6
+#: rhodecode/templates/admin/users/users.html:38
+#: rhodecode/templates/base/base.html:296
+msgid "admin"
+msgstr "administrador"
+
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:7
+msgid "member"
+msgstr "membro"
+
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:33
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:53
+msgid "revoke"
+msgstr "revogar"
+
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:75
+msgid "Add another member"
+msgstr "Adicionar outro membro"
+
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:89
+msgid "Failed to remove user"
+msgstr "Falha ao reomver usuário"
+
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:104
+msgid "Failed to remove users group"
+msgstr "Falha ao remover grupo de usuários"
+
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:205
+msgid "Group"
+msgstr "Grupo"
+
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:206
+#: rhodecode/templates/admin/users_groups/users_groups.html:33
+msgid "members"
+msgstr "membros"
+
+#: rhodecode/templates/admin/repos/repos.html:5
+msgid "Repositories administration"
+msgstr "Administração de repositórios"
+
+#: rhodecode/templates/admin/repos/repos.html:34
+#: rhodecode/templates/summary/summary.html:100
+msgid "Contact"
+msgstr "Contato"
+
+#: rhodecode/templates/admin/repos/repos.html:35
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:36
+#: rhodecode/templates/admin/users/user_edit_my_account.html:119
+#: rhodecode/templates/admin/users/users.html:40
+#: rhodecode/templates/admin/users_groups/users_groups.html:35
+msgid "action"
+msgstr "ação"
+
+#: rhodecode/templates/admin/repos/repos.html:51
+#: rhodecode/templates/admin/users/user_edit_my_account.html:134
+#: rhodecode/templates/admin/users/user_edit_my_account.html:148
+msgid "private"
+msgstr "privado"
+
+#: rhodecode/templates/admin/repos/repos.html:53
+#: rhodecode/templates/admin/repos/repos.html:59
+#: rhodecode/templates/admin/users/user_edit_my_account.html:136
+#: rhodecode/templates/admin/users/user_edit_my_account.html:142
+#: rhodecode/templates/summary/summary.html:68
+msgid "public"
+msgstr "público"
+
+#: rhodecode/templates/admin/repos/repos.html:79
+#: rhodecode/templates/admin/users/users.html:55
+msgid "delete"
+msgstr "excluir"
+
+#: rhodecode/templates/admin/repos_groups/repos_groups.html:8
+msgid "Groups"
+msgstr "Grupos"
+
+#: rhodecode/templates/admin/repos_groups/repos_groups.html:13
+msgid "with"
+msgstr "com"
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:5
+msgid "Add repos group"
+msgstr "Adicionar grupo de repositórios"
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:10
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:10
+msgid "Repos groups"
+msgstr "Grupo de repositórios"
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:12
+msgid "add new repos group"
+msgstr "adicionar novo grupo de repositórios"
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:50
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:50
+msgid "Group parent"
+msgstr "Progenitor do grupo"
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:58
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:58
+#: rhodecode/templates/admin/users/user_add.html:85
+#: rhodecode/templates/admin/users_groups/users_group_add.html:49
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:90
+msgid "save"
+msgstr "salvar"
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:5
+msgid "Edit repos group"
+msgstr "Editar grupo de repositórios"
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:12
+msgid "edit repos group"
+msgstr "editar grupo de repositórios"
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:5
+msgid "Repositories groups administration"
+msgstr "Administração de grupos de repositórios"
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:22
+msgid "ADD NEW GROUP"
+msgstr "ADICIONAR NOVO GRUPO"
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:35
+msgid "Number of repositories"
+msgstr "Número de repositórios"
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54
+msgid "Confirm to delete this group"
+msgstr "Confirme para excluir este grupo"
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:62
+msgid "There are no repositories groups yet"
+msgstr "Ainda não há grupos de repositórios"
+
+#: rhodecode/templates/admin/settings/hooks.html:5
+#: rhodecode/templates/admin/settings/settings.html:5
+msgid "Settings administration"
+msgstr "Administração de configurações"
+
+#: rhodecode/templates/admin/settings/hooks.html:9
+#: rhodecode/templates/admin/settings/settings.html:9
+#: rhodecode/templates/settings/repo_settings.html:5
+#: rhodecode/templates/settings/repo_settings.html:13
+msgid "Settings"
+msgstr "Configurações"
+
+#: rhodecode/templates/admin/settings/hooks.html:24
+msgid "Built in hooks - read only"
+msgstr "Ganchos pré-definidos - somente leitura"
+
+#: rhodecode/templates/admin/settings/hooks.html:40
+msgid "Custom hooks"
+msgstr "Ganchos customizados"
+
+#: rhodecode/templates/admin/settings/hooks.html:56
+msgid "remove"
+msgstr "remover"
+
+#: rhodecode/templates/admin/settings/hooks.html:88
+msgid "Failed to remove hook"
+msgstr "Falha ao remover gancho"
+
+#: rhodecode/templates/admin/settings/settings.html:24
+msgid "Remap and rescan repositories"
+msgstr "Remapear e varrer novamente repositórios"
+
+#: rhodecode/templates/admin/settings/settings.html:32
+msgid "rescan option"
+msgstr "opção de varredura"
+
+#: rhodecode/templates/admin/settings/settings.html:38
+msgid "In case a repository was deleted from filesystem and there are leftovers in the database check this option to scan obsolete data in database and remove it."
+msgstr "Caso um repositório tenha sido excluído do sistema de arquivos e haja restos no banco de dados, marque esta opção para varrer dados obsoletos no banco e removê-los."
+
+#: rhodecode/templates/admin/settings/settings.html:39
+msgid "destroy old data"
+msgstr "destruir dados antigos"
+
+#: rhodecode/templates/admin/settings/settings.html:45
+msgid "Rescan repositories"
+msgstr "Varrer repositórios"
+
+#: rhodecode/templates/admin/settings/settings.html:51
+msgid "Whoosh indexing"
+msgstr "Indexação do Whoosh"
+
+#: rhodecode/templates/admin/settings/settings.html:59
+msgid "index build option"
+msgstr "opção de construção de índice"
+
+#: rhodecode/templates/admin/settings/settings.html:64
+msgid "build from scratch"
+msgstr "construir do início"
+
+#: rhodecode/templates/admin/settings/settings.html:70
+msgid "Reindex"
+msgstr "Reindexar"
+
+#: rhodecode/templates/admin/settings/settings.html:76
+msgid "Global application settings"
+msgstr "Configurações globais da aplicação"
+
+#: rhodecode/templates/admin/settings/settings.html:85
+msgid "Application name"
+msgstr "Nome da aplicação"
+
+#: rhodecode/templates/admin/settings/settings.html:94
+msgid "Realm text"
+msgstr "Texto de esfera"
+
+#: rhodecode/templates/admin/settings/settings.html:103
+msgid "GA code"
+msgstr "Código GA"
+
+#: rhodecode/templates/admin/settings/settings.html:111
+#: rhodecode/templates/admin/settings/settings.html:177
+msgid "Save settings"
+msgstr "Salvar configurações"
+
+#: rhodecode/templates/admin/settings/settings.html:112
+#: rhodecode/templates/admin/settings/settings.html:178
+#: rhodecode/templates/admin/users/user_edit.html:118
+#: rhodecode/templates/admin/users/user_edit.html:143
+#: rhodecode/templates/admin/users/user_edit_my_account.html:90
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:264
+#: rhodecode/templates/files/files_edit.html:50
+msgid "Reset"
+msgstr "Limpar"
+
+#: rhodecode/templates/admin/settings/settings.html:118
+msgid "Mercurial settings"
+msgstr "Configurações do Mercurial"
+
+#: rhodecode/templates/admin/settings/settings.html:127
+msgid "Web"
+msgstr "Web"
+
+#: rhodecode/templates/admin/settings/settings.html:132
+msgid "require ssl for pushing"
+msgstr "exigir ssl para realizar push"
+
+#: rhodecode/templates/admin/settings/settings.html:139
+msgid "Hooks"
+msgstr "Ganchos"
+
+#: rhodecode/templates/admin/settings/settings.html:142
+msgid "advanced setup"
+msgstr "confirguações avançadas"
+
+#: rhodecode/templates/admin/settings/settings.html:147
+msgid "Update repository after push (hg update)"
+msgstr "Atualizar repositório após realizar push (hg update)"
+
+#: rhodecode/templates/admin/settings/settings.html:151
+msgid "Show repository size after push"
+msgstr "Mostrar tamanho do repositório após o push"
+
+#: rhodecode/templates/admin/settings/settings.html:155
+msgid "Log user push commands"
+msgstr "Armazenar registro de comandos de push dos usuários"
+
+#: rhodecode/templates/admin/settings/settings.html:159
+msgid "Log user pull commands"
+msgstr "Armazenar registro de comandos de pull dos usuários"
+
+#: rhodecode/templates/admin/settings/settings.html:166
+msgid "Repositories location"
+msgstr "Localização dos repositórios"
+
+#: rhodecode/templates/admin/settings/settings.html:171
+msgid "This a crucial application setting. If you are really sure you need to change this, you must restart application in order to make this setting take effect. Click this label to unlock."
+msgstr "Essa é uma configuração crucial da aplicação. Se você realmente tem certeza de que quer mudar isto, você precisa reiniciar a aplicação para que essa configuração tenha efeito. Clique este rótulo para destravar."
+
+#: rhodecode/templates/admin/settings/settings.html:172
+msgid "unlock"
+msgstr "destravar"
+
+#: rhodecode/templates/admin/users/user_add.html:5
+msgid "Add user"
+msgstr "Adicionar usuário"
+
+#: rhodecode/templates/admin/users/user_add.html:10
+#: rhodecode/templates/admin/users/user_edit.html:11
+#: rhodecode/templates/admin/users/users.html:9
+msgid "Users"
+msgstr "Usuários"
+
+#: rhodecode/templates/admin/users/user_add.html:12
+msgid "add new user"
+msgstr "adicionar novo usuário"
+
+#: rhodecode/templates/admin/users/user_add.html:77
+#: rhodecode/templates/admin/users/user_edit.html:101
+#: rhodecode/templates/admin/users_groups/users_group_add.html:41
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:42
+msgid "Active"
+msgstr "Ativo"
+
+#: rhodecode/templates/admin/users/user_edit.html:5
+msgid "Edit user"
+msgstr "Editar usuário"
+
+#: rhodecode/templates/admin/users/user_edit.html:33
+#: rhodecode/templates/admin/users/user_edit_my_account.html:32
+msgid "Change your avatar at"
+msgstr "Altere o seu avatar em"
+
+#: rhodecode/templates/admin/users/user_edit.html:34
+#: rhodecode/templates/admin/users/user_edit_my_account.html:33
+msgid "Using"
+msgstr "Usando"
+
+#: rhodecode/templates/admin/users/user_edit.html:40
+#: rhodecode/templates/admin/users/user_edit_my_account.html:39
+msgid "API key"
+msgstr "Chave de API"
+
+#: rhodecode/templates/admin/users/user_edit.html:56
+msgid "LDAP DN"
+msgstr "DN LDAP"
+
+#: rhodecode/templates/admin/users/user_edit.html:65
+#: rhodecode/templates/admin/users/user_edit_my_account.html:54
+msgid "New password"
+msgstr "Nova senha"
+
+#: rhodecode/templates/admin/users/user_edit.html:135
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:256
+msgid "Create repositories"
+msgstr "Criar repositórios"
+
+#: rhodecode/templates/admin/users/user_edit_my_account.html:5
+msgid "My account"
+msgstr "Minha conta"
+
+#: rhodecode/templates/admin/users/user_edit_my_account.html:9
+msgid "My Account"
+msgstr "Minha Conta"
+
+#: rhodecode/templates/admin/users/user_edit_my_account.html:101
+msgid "My repositories"
+msgstr "Meus repositórios"
+
+#: rhodecode/templates/admin/users/user_edit_my_account.html:107
+msgid "ADD REPOSITORY"
+msgstr "ADICIONAR REPOSITÓRIO"
+
+#: rhodecode/templates/admin/users/user_edit_my_account.html:118
+#: rhodecode/templates/branches/branches_data.html:7
+#: rhodecode/templates/shortlog/shortlog_data.html:8
+#: rhodecode/templates/tags/tags_data.html:7
+msgid "revision"
+msgstr "revisão"
+
+#: rhodecode/templates/admin/users/user_edit_my_account.html:157
+msgid "No repositories yet"
+msgstr "Ainda não há repositórios"
+
+#: rhodecode/templates/admin/users/user_edit_my_account.html:159
+msgid "create one now"
+msgstr "criar um agora"
+
+#: rhodecode/templates/admin/users/users.html:5
+msgid "Users administration"
+msgstr "Administração de usuários"
+
+#: rhodecode/templates/admin/users/users.html:23
+msgid "ADD NEW USER"
+msgstr "ADICIONAR NOVO USUÁRIO"
+
+#: rhodecode/templates/admin/users/users.html:33
+msgid "username"
+msgstr "nome de usuário"
+
+#: rhodecode/templates/admin/users/users.html:34
+#: rhodecode/templates/branches/branches_data.html:5
+#: rhodecode/templates/tags/tags_data.html:5
+msgid "name"
+msgstr "nome"
+
+#: rhodecode/templates/admin/users/users.html:35
+msgid "lastname"
+msgstr "sobrenome"
+
+#: rhodecode/templates/admin/users/users.html:36
+msgid "last login"
+msgstr "último login"
+
+#: rhodecode/templates/admin/users/users.html:37
+#: rhodecode/templates/admin/users_groups/users_groups.html:34
+msgid "active"
+msgstr "ativo"
+
+#: rhodecode/templates/admin/users/users.html:39
+#: rhodecode/templates/base/base.html:305
+msgid "ldap"
+msgstr "ldap"
+
+#: rhodecode/templates/admin/users/users.html:56
+msgid "Confirm to delete this user"
+msgstr "Conforma excluir este usuário"
+
+#: rhodecode/templates/admin/users_groups/users_group_add.html:5
+msgid "Add users group"
+msgstr "Adicionar grupo de usuários"
+
+#: rhodecode/templates/admin/users_groups/users_group_add.html:10
+#: rhodecode/templates/admin/users_groups/users_groups.html:9
+msgid "Users groups"
+msgstr "Grupos de usuários"
+
+#: rhodecode/templates/admin/users_groups/users_group_add.html:12
+msgid "add new users group"
+msgstr "Adicionar novo grupo de usuários"
+
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:5
+msgid "Edit users group"
+msgstr "Editar grupo de usuários"
+
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:11
+msgid "UsersGroups"
+msgstr "Grupos de Usuários"
+
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:50
+msgid "Members"
+msgstr "Membros"
+
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:58
+msgid "Choosen group members"
+msgstr "Membros escolhidos do grupo"
+
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:61
+msgid "Remove all elements"
+msgstr "Remover todos os elementos"
+
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:75
+msgid "Available members"
+msgstr "Membros disponíveis"
+
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:79
+msgid "Add all elements"
+msgstr "Adicionar todos os elementos"
+
+#: rhodecode/templates/admin/users_groups/users_groups.html:5
+msgid "Users groups administration"
+msgstr "Administração de grupos de usuários"
+
+#: rhodecode/templates/admin/users_groups/users_groups.html:23
+msgid "ADD NEW USER GROUP"
+msgstr "ADICIONAR NOVO GRUPO DE USUÁRIOS"
+
+#: rhodecode/templates/admin/users_groups/users_groups.html:32
+msgid "group name"
+msgstr "nome do grupo"
+
+#: rhodecode/templates/base/base.html:32
+msgid "Forgot password ?"
+msgstr "Esqueceu a senha ?"
+
+#: rhodecode/templates/base/base.html:57
+#: rhodecode/templates/base/base.html:338
+#: rhodecode/templates/base/base.html:340
+#: rhodecode/templates/base/base.html:342
+msgid "Home"
+msgstr "Início"
+
+#: rhodecode/templates/base/base.html:61
+#: rhodecode/templates/base/base.html:347
+#: rhodecode/templates/base/base.html:349
+#: rhodecode/templates/base/base.html:351
+#: rhodecode/templates/journal/journal.html:4
+#: rhodecode/templates/journal/journal.html:17
+#: rhodecode/templates/journal/public_journal.html:4
+msgid "Journal"
+msgstr "Diário"
+
+#: rhodecode/templates/base/base.html:66
+msgid "Login"
+msgstr "Entrar"
+
+#: rhodecode/templates/base/base.html:68
+msgid "Log Out"
+msgstr "Sair"
+
+#: rhodecode/templates/base/base.html:107
+msgid "Submit a bug"
+msgstr "Encaminhe um bug"
+
+#: rhodecode/templates/base/base.html:141
+msgid "Switch repository"
+msgstr "Trocar repositório"
+
+#: rhodecode/templates/base/base.html:143
+msgid "Products"
+msgstr "Produtos"
+
+#: rhodecode/templates/base/base.html:149
+msgid "loading..."
+msgstr "carregando..."
+
+#: rhodecode/templates/base/base.html:234
+#: rhodecode/templates/base/base.html:236
+#: rhodecode/templates/base/base.html:238
+msgid "Switch to"
+msgstr "Trocar para"
+
+#: rhodecode/templates/base/base.html:242
+#: rhodecode/templates/branches/branches.html:13
+msgid "branches"
+msgstr "ramos"
+
+#: rhodecode/templates/base/base.html:249
+#: rhodecode/templates/branches/branches_data.html:52
+msgid "There are no branches yet"
+msgstr "Ainda não há ramos"
+
+#: rhodecode/templates/base/base.html:254
+#: rhodecode/templates/shortlog/shortlog_data.html:10
+#: rhodecode/templates/tags/tags.html:14
+msgid "tags"
+msgstr "etiquetas"
+
+#: rhodecode/templates/base/base.html:261
+#: rhodecode/templates/tags/tags_data.html:32
+msgid "There are no tags yet"
+msgstr "Ainda não há etiquetas"
+
+#: rhodecode/templates/base/base.html:277
+#: rhodecode/templates/base/base.html:281
+#: rhodecode/templates/files/files_annotate.html:40
+#: rhodecode/templates/files/files_source.html:11
+msgid "Options"
+msgstr "Opções"
+
+#: rhodecode/templates/base/base.html:286
+#: rhodecode/templates/base/base.html:288
+#: rhodecode/templates/base/base.html:306
+msgid "settings"
+msgstr "configurações"
+
+#: rhodecode/templates/base/base.html:292
+msgid "search"
+msgstr "pesquisar"
+
+#: rhodecode/templates/base/base.html:299
+msgid "journal"
+msgstr "diário"
+
+#: rhodecode/templates/base/base.html:301
+msgid "repositories groups"
+msgstr "grupos de repositórios"
+
+#: rhodecode/templates/base/base.html:302
+msgid "users"
+msgstr "usuários"
+
+#: rhodecode/templates/base/base.html:303
+msgid "users groups"
+msgstr "grupos de usuários"
+
+#: rhodecode/templates/base/base.html:304
+msgid "permissions"
+msgstr "permissões"
+
+#: rhodecode/templates/base/base.html:317
+#: rhodecode/templates/base/base.html:319
+#: rhodecode/templates/followers/followers.html:5
+msgid "Followers"
+msgstr "Seguidores"
+
+#: rhodecode/templates/base/base.html:325
+#: rhodecode/templates/base/base.html:327
+#: rhodecode/templates/forks/forks.html:5
+msgid "Forks"
+msgstr "Bifurcações"
+
+#: rhodecode/templates/base/base.html:356
+#: rhodecode/templates/base/base.html:358
+#: rhodecode/templates/base/base.html:360
+#: rhodecode/templates/search/search.html:4
+#: rhodecode/templates/search/search.html:24
+#: rhodecode/templates/search/search.html:46
+msgid "Search"
+msgstr "Pesquisar"
+
+#: rhodecode/templates/base/root.html:57
+#: rhodecode/templates/journal/journal.html:48
+#: rhodecode/templates/summary/summary.html:36
+msgid "Stop following this repository"
+msgstr "Parar de seguir este repositório"
+
+#: rhodecode/templates/base/root.html:66
+#: rhodecode/templates/summary/summary.html:40
+msgid "Start following this repository"
+msgstr "Passar a seguir este repositório"
+
+#: rhodecode/templates/branches/branches_data.html:4
+#: rhodecode/templates/tags/tags_data.html:4
+msgid "date"
+msgstr "data"
+
+#: rhodecode/templates/branches/branches_data.html:6
+#: rhodecode/templates/shortlog/shortlog_data.html:7
+#: rhodecode/templates/tags/tags_data.html:6
+msgid "author"
+msgstr "autor"
+
+#: rhodecode/templates/branches/branches_data.html:8
+#: rhodecode/templates/shortlog/shortlog_data.html:11
+#: rhodecode/templates/tags/tags_data.html:8
+msgid "links"
+msgstr "inks"
+
+#: rhodecode/templates/branches/branches_data.html:23
+#: rhodecode/templates/branches/branches_data.html:43
+#: rhodecode/templates/shortlog/shortlog_data.html:39
+#: rhodecode/templates/tags/tags_data.html:24
+msgid "changeset"
+msgstr "conjunto de mudanças"
+
+#: rhodecode/templates/branches/branches_data.html:25
+#: rhodecode/templates/branches/branches_data.html:45
+#: rhodecode/templates/files/files.html:12
+#: rhodecode/templates/shortlog/shortlog_data.html:41
+#: rhodecode/templates/summary/summary.html:233
+#: rhodecode/templates/tags/tags_data.html:26
+msgid "files"
+msgstr "arquivos"
+
+#: rhodecode/templates/changelog/changelog.html:14
+msgid "showing "
+msgstr "mostrando "
+
+#: rhodecode/templates/changelog/changelog.html:14
+msgid "out of"
+msgstr "de"
+
+#: rhodecode/templates/changelog/changelog.html:37
+msgid "Show"
+msgstr "Mostrar"
+
+#: rhodecode/templates/changelog/changelog.html:50
+#: rhodecode/templates/changeset/changeset.html:42
+#: rhodecode/templates/summary/summary.html:609
+msgid "commit"
+msgstr "commit"
+
+#: rhodecode/templates/changelog/changelog.html:63
+msgid "Affected number of files, click to show more details"
+msgstr "Número de arquivos afetados, clique para mostrar mais detalhes"
+
+#: rhodecode/templates/changelog/changelog.html:67
+#: rhodecode/templates/changeset/changeset.html:66
+msgid "merge"
+msgstr "mesclar"
+
+#: rhodecode/templates/changelog/changelog.html:72
+#: rhodecode/templates/changeset/changeset.html:72
+msgid "Parent"
+msgstr "Progenitor"
+
+#: rhodecode/templates/changelog/changelog.html:77
+#: rhodecode/templates/changeset/changeset.html:77
+msgid "No parents"
+msgstr "Sem progenitores"
+
+#: rhodecode/templates/changelog/changelog.html:82
+#: rhodecode/templates/changeset/changeset.html:80
+#: rhodecode/templates/files/files.html:29
+#: rhodecode/templates/files/files_annotate.html:25
+#: rhodecode/templates/files/files_edit.html:33
+#: rhodecode/templates/shortlog/shortlog_data.html:9
+msgid "branch"
+msgstr "ramo"
+
+#: rhodecode/templates/changelog/changelog.html:86
+#: rhodecode/templates/changeset/changeset.html:83
+msgid "tag"
+msgstr "etiqueta"
+
+#: rhodecode/templates/changelog/changelog.html:122
+msgid "Show selected changes __S -> __E"
+msgstr "Mostrar alterações selecionadas __S -> __E"
+
+#: rhodecode/templates/changelog/changelog.html:172
+#: rhodecode/templates/shortlog/shortlog_data.html:61
+msgid "There are no changes yet"
+msgstr "Ainda não há alteações"
+
+#: rhodecode/templates/changelog/changelog_details.html:2
+#: rhodecode/templates/changeset/changeset.html:55
+msgid "removed"
+msgstr "removidos"
+
+#: rhodecode/templates/changelog/changelog_details.html:3
+#: rhodecode/templates/changeset/changeset.html:56
+msgid "changed"
+msgstr "alterados"
+
+#: rhodecode/templates/changelog/changelog_details.html:4
+#: rhodecode/templates/changeset/changeset.html:57
+msgid "added"
+msgstr "adicionados"
+
+#: rhodecode/templates/changelog/changelog_details.html:6
+#: rhodecode/templates/changelog/changelog_details.html:7
+#: rhodecode/templates/changelog/changelog_details.html:8
+#: rhodecode/templates/changeset/changeset.html:59
+#: rhodecode/templates/changeset/changeset.html:60
+#: rhodecode/templates/changeset/changeset.html:61
+#, python-format
+msgid "affected %s files"
+msgstr "%s arquivos afetados"
+
+#: rhodecode/templates/changeset/changeset.html:6
+#: rhodecode/templates/changeset/changeset.html:14
+#: rhodecode/templates/changeset/changeset.html:31
+msgid "Changeset"
+msgstr "Conjunto de Mudanças"
+
+#: rhodecode/templates/changeset/changeset.html:32
+#: rhodecode/templates/changeset/changeset.html:121
+#: rhodecode/templates/changeset/changeset_range.html:78
+#: rhodecode/templates/files/file_diff.html:32
+#: rhodecode/templates/files/file_diff.html:42
+msgid "raw diff"
+msgstr "diff bruto"
+
+#: rhodecode/templates/changeset/changeset.html:34
+#: rhodecode/templates/changeset/changeset.html:123
+#: rhodecode/templates/changeset/changeset_range.html:80
+#: rhodecode/templates/files/file_diff.html:34
+msgid "download diff"
+msgstr "descarregar diff"
+
+#: rhodecode/templates/changeset/changeset.html:90
+#, python-format
+msgid "%s files affected with %s additions and %s deletions."
+msgstr "%s arquivos afetados com %s adições e %s exclusões"
+
+#: rhodecode/templates/changeset/changeset.html:101
+msgid "Changeset was too big and was cut off..."
+msgstr "Conjunto de mudanças era grande demais e foi cortado..."
+
+#: rhodecode/templates/changeset/changeset.html:119
+#: rhodecode/templates/changeset/changeset_range.html:76
+#: rhodecode/templates/files/file_diff.html:30
+msgid "diff"
+msgstr "diff"
+
+#: rhodecode/templates/changeset/changeset.html:132
+#: rhodecode/templates/changeset/changeset_range.html:89
+msgid "No changes in this file"
+msgstr "Nenhuma alteração nesse arquivo"
+
+#: rhodecode/templates/changeset/changeset_range.html:30
+msgid "Compare View"
+msgstr "Exibir Comparação"
+
+#: rhodecode/templates/changeset/changeset_range.html:52
+msgid "Files affected"
+msgstr "Arquivos afetados"
+
+#: rhodecode/templates/errors/error_document.html:44
+#, python-format
+msgid "You will be redirected to %s in %s seconds"
+msgstr "Você será redirecionado para %s em %s segundos"
+
+#: rhodecode/templates/files/file_diff.html:4
+#: rhodecode/templates/files/file_diff.html:12
+msgid "File diff"
+msgstr "Diff do arquivo"
+
+#: rhodecode/templates/files/file_diff.html:42
+msgid "Diff is to big to display"
+msgstr "Diff é grande demais para exibir"
+
+#: rhodecode/templates/files/files.html:37
+#: rhodecode/templates/files/files_annotate.html:31
+#: rhodecode/templates/files/files_edit.html:39
+msgid "Location"
+msgstr "Local"
+
+#: rhodecode/templates/files/files.html:46
+msgid "Go back"
+msgstr "Voltar"
+
+#: rhodecode/templates/files/files.html:47
+msgid "No files at given path"
+msgstr "Nenhum arquivo no caminho especificado"
+
+#: rhodecode/templates/files/files_annotate.html:4
+msgid "File annotate"
+msgstr "Anotar arquivo"
+
+#: rhodecode/templates/files/files_annotate.html:12
+msgid "annotate"
+msgstr "anotar"
+
+#: rhodecode/templates/files/files_annotate.html:33
+#: rhodecode/templates/files/files_browser.html:160
+#: rhodecode/templates/files/files_source.html:2
+msgid "Revision"
+msgstr "Revisão"
+
+#: rhodecode/templates/files/files_annotate.html:36
+#: rhodecode/templates/files/files_browser.html:158
+#: rhodecode/templates/files/files_source.html:7
+msgid "Size"
+msgstr "Tamanho"
+
+#: rhodecode/templates/files/files_annotate.html:38
+#: rhodecode/templates/files/files_browser.html:159
+#: rhodecode/templates/files/files_source.html:9
+msgid "Mimetype"
+msgstr "Mimetype"
+
+#: rhodecode/templates/files/files_annotate.html:41
+msgid "show source"
+msgstr "mostrar fonte"
+
+#: rhodecode/templates/files/files_annotate.html:43
+#: rhodecode/templates/files/files_annotate.html:78
+#: rhodecode/templates/files/files_source.html:14
+#: rhodecode/templates/files/files_source.html:51
+msgid "show as raw"
+msgstr "mostrar como bruto"
+
+#: rhodecode/templates/files/files_annotate.html:45
+#: rhodecode/templates/files/files_source.html:16
+msgid "download as raw"
+msgstr "descarregar como bruto"
+
+#: rhodecode/templates/files/files_annotate.html:54
+#: rhodecode/templates/files/files_source.html:25
+msgid "History"
+msgstr "Histórico"
+
+#: rhodecode/templates/files/files_annotate.html:73
+#: rhodecode/templates/files/files_source.html:46
+#, python-format
+msgid "Binary file (%s)"
+msgstr "Arquivo binário (%s)"
+
+#: rhodecode/templates/files/files_annotate.html:78
+#: rhodecode/templates/files/files_source.html:51
+msgid "File is too big to display"
+msgstr "Arquivo é grande demais para exibir"
+
+#: rhodecode/templates/files/files_browser.html:13
+msgid "view"
+msgstr "ver"
+
+#: rhodecode/templates/files/files_browser.html:14
+msgid "previous revision"
+msgstr "revisão anterior"
+
+#: rhodecode/templates/files/files_browser.html:16
+msgid "next revision"
+msgstr "próxima revisão"
+
+#: rhodecode/templates/files/files_browser.html:23
+msgid "follow current branch"
+msgstr "seguir ramo atual"
+
+#: rhodecode/templates/files/files_browser.html:27
+msgid "search file list"
+msgstr "pesquisar lista de arquivos"
+
+#: rhodecode/templates/files/files_browser.html:32
+msgid "Loading file list..."
+msgstr "Carregando lista de arquivos..."
+
+#: rhodecode/templates/files/files_browser.html:111
+msgid "search truncated"
+msgstr "pesquisa truncada"
+
+#: rhodecode/templates/files/files_browser.html:122
+msgid "no matching files"
+msgstr "nenhum arquivo corresponde"
+
+#: rhodecode/templates/files/files_browser.html:161
+msgid "Last modified"
+msgstr "Última alteração"
+
+#: rhodecode/templates/files/files_browser.html:162
+msgid "Last commiter"
+msgstr "Último commiter"
+
+#: rhodecode/templates/files/files_edit.html:4
+msgid "Edit file"
+msgstr "Editar arquivo"
+
+#: rhodecode/templates/files/files_edit.html:19
+msgid "edit file"
+msgstr "editar arquivo"
+
+#: rhodecode/templates/files/files_edit.html:45
+#: rhodecode/templates/shortlog/shortlog_data.html:5
+msgid "commit message"
+msgstr "mensagem de commit"
+
+#: rhodecode/templates/files/files_edit.html:51
+msgid "Commit changes"
+msgstr "Realizar commit das alterações"
+
+#: rhodecode/templates/files/files_source.html:12
+msgid "show annotation"
+msgstr "mostrar anotação"
+
+#: rhodecode/templates/files/files_source.html:153
+msgid "Selection link"
+msgstr "Link da seleção"
+
+#: rhodecode/templates/followers/followers.html:13
+msgid "followers"
+msgstr "seguidores"
+
+#: rhodecode/templates/followers/followers_data.html:12
+msgid "Started following"
+msgstr "Passou a seguir"
+
+#: rhodecode/templates/forks/forks.html:13
+msgid "forks"
+msgstr "bifurcações"
+
+#: rhodecode/templates/forks/forks_data.html:17
+msgid "forked"
+msgstr "bifurcado"
+
+#: rhodecode/templates/forks/forks_data.html:34
+msgid "There are no forks yet"
+msgstr "Ainda não há bifurcações"
+
+#: rhodecode/templates/journal/journal.html:34
+msgid "Following"
+msgstr "Seguindo"
+
+#: rhodecode/templates/journal/journal.html:41
+msgid "following user"
+msgstr "seguindo usuário"
+
+#: rhodecode/templates/journal/journal.html:41
+msgid "user"
+msgstr "usuário"
+
+#: rhodecode/templates/journal/journal.html:65
+msgid "You are not following any users or repositories"
+msgstr "Você não está seguindo quaisquer usuários ou repositórios"
+
+#: rhodecode/templates/journal/journal_data.html:46
+msgid "No entries yet"
+msgstr "Ainda não há entradas"
+
+#: rhodecode/templates/journal/public_journal.html:17
+msgid "Public Journal"
+msgstr "Diário Público"
+
+#: rhodecode/templates/search/search.html:7
+#: rhodecode/templates/search/search.html:26
+msgid "in repository: "
+msgstr "no repositório"
+
+#: rhodecode/templates/search/search.html:9
+#: rhodecode/templates/search/search.html:28
+msgid "in all repositories"
+msgstr "em todos os repositórios"
+
+#: rhodecode/templates/search/search.html:42
+msgid "Search term"
+msgstr "Termo de pesquisa"
+
+#: rhodecode/templates/search/search.html:54
+msgid "Search in"
+msgstr "Pesquisando em"
+
+#: rhodecode/templates/search/search.html:57
+msgid "File contents"
+msgstr "Conteúdo dos arquivos"
+
+#: rhodecode/templates/search/search.html:59
+msgid "File names"
+msgstr "Nomes dos arquivos"
+
+#: rhodecode/templates/search/search_content.html:20
+#: rhodecode/templates/search/search_path.html:15
+msgid "Permission denied"
+msgstr "Permissão negada"
+
+#: rhodecode/templates/settings/repo_fork.html:5
+msgid "Fork"
+msgstr "Bifurcação"
+
+#: rhodecode/templates/settings/repo_fork.html:31
+msgid "Fork name"
+msgstr "Nome da bifurcação"
+
+#: rhodecode/templates/settings/repo_fork.html:55
+msgid "fork this repository"
+msgstr "bifurcar este repositório"
+
+#: rhodecode/templates/shortlog/shortlog.html:5
+#: rhodecode/templates/summary/summary.html:666
+msgid "Shortlog"
+msgstr "Log resumido"
+
+#: rhodecode/templates/shortlog/shortlog.html:14
+msgid "shortlog"
+msgstr "log resumido"
+
+#: rhodecode/templates/shortlog/shortlog_data.html:6
+msgid "age"
+msgstr "idade"
+
+#: rhodecode/templates/summary/summary.html:12
+msgid "summary"
+msgstr "sumário"
+
+#: rhodecode/templates/summary/summary.html:79
+msgid "remote clone"
+msgstr "clone remoto"
+
+#: rhodecode/templates/summary/summary.html:121
+msgid "by"
+msgstr "por"
+
+#: rhodecode/templates/summary/summary.html:128
+msgid "Clone url"
+msgstr "URL de clonagem"
+
+#: rhodecode/templates/summary/summary.html:137
+msgid "Trending source files"
+msgstr "Tendências nos arquivos fonte"
+
+#: rhodecode/templates/summary/summary.html:146
+msgid "Download"
+msgstr "Download"
+
+#: rhodecode/templates/summary/summary.html:150
+msgid "There are no downloads yet"
+msgstr "Ainda não há downloads"
+
+#: rhodecode/templates/summary/summary.html:152
+msgid "Downloads are disabled for this repository"
+msgstr "Downloads estão desabilitados para este repositório"
+
+#: rhodecode/templates/summary/summary.html:154
+#: rhodecode/templates/summary/summary.html:320
+msgid "enable"
+msgstr "habilitar"
+
+#: rhodecode/templates/summary/summary.html:162
+#: rhodecode/templates/summary/summary.html:297
+#, python-format
+msgid "Download %s as %s"
+msgstr "Descarregar %s como %s"
+
+#: rhodecode/templates/summary/summary.html:168
+msgid "Check this to download archive with subrepos"
+msgstr "Marque isto para descarregar arquivo com subrepositórios"
+
+#: rhodecode/templates/summary/summary.html:168
+msgid "with subrepos"
+msgstr "com subrepositórios"
+
+#: rhodecode/templates/summary/summary.html:176
+msgid "Feeds"
+msgstr "Feeds"
+
+#: rhodecode/templates/summary/summary.html:257
+#: rhodecode/templates/summary/summary.html:684
+#: rhodecode/templates/summary/summary.html:695
+msgid "show more"
+msgstr "mostrar mais"
+
+#: rhodecode/templates/summary/summary.html:312
+msgid "Commit activity by day / author"
+msgstr "Atividade de commit por dia / autor"
+
+#: rhodecode/templates/summary/summary.html:324
+msgid "Loaded in"
+msgstr "Carregado em"
+
+#: rhodecode/templates/summary/summary.html:603
+msgid "commits"
+msgstr "commits"
+
+#: rhodecode/templates/summary/summary.html:604
+msgid "files added"
+msgstr "arquivos adicionados"
+
+#: rhodecode/templates/summary/summary.html:605
+msgid "files changed"
+msgstr "arquivos alterados"
+
+#: rhodecode/templates/summary/summary.html:606
+msgid "files removed"
+msgstr "arquivos removidos"
+
+#: rhodecode/templates/summary/summary.html:610
+msgid "file added"
+msgstr "arquivo adicionado"
+
+#: rhodecode/templates/summary/summary.html:611
+msgid "file changed"
+msgstr "arquivo alterado"
+
+#: rhodecode/templates/summary/summary.html:612
+msgid "file removed"
+msgstr "arquivo removido"
+

CONTRIBUTORS

@@ -4,4 +4,12 b' List of contributors to RhodeCode projec'
     Jason Harris <[e-mail]>
     Thayne Harbaugh  <[e-mail]>
     cejones
-    Thomas Waldmann <[e-mail]>
  No newline at end of file
+    Thomas Waldmann <[e-mail]>
+    Lorenzo M. Catucci <[e-mail]>
+    Dmitri Kuznetsov
+    Jared Bunting <[e-mail]>
+    Steve Romanow <[e-mail]>
+    Augosto Hermann <[e-mail]>    
+    Ankit Solanki <[e-mail]>    
+    Liad Shani <[e-mail]>
+    
  No newline at end of file

MANIFEST.in

@@ -14,9 +14,6 b' recursive-include init.d *'
 recursive-include rhodecode/public/css *
 recursive-include rhodecode/public/images *
 #js
-include rhodecode/public/js/yui2a.js
-include rhodecode/public/js/excanvas.min.js
-include rhodecode/public/js/yui.flot.js
-include rhodecode/public/js/graph.js
+recursive-include rhodecode/public/js *
 #templates
 recursive-include rhodecode/templates *

README.rst

@@ -1,4 +1,3 b''
-
 =================================================
 Welcome to RhodeCode (RhodiumCode) documentation!
 =================================================
@@ -26,13 +25,13 b' The default access is anonymous but you '
 using the following credentials:
 
 - username: demo
-- password: demo
+- password: demo12
 
 Source code
 -----------
 
 The latest sources can be obtained from official RhodeCode instance
-https://hg.rhodecode.org 
+https://secure.rhodecode.org 
 
 
 MIRRORS:
@@ -60,20 +59,28 b' RhodeCode Features'
   Supports http/https and LDAP
 - Full permissions (private/read/write/admin) and authentication per project. 
   One account for web interface and mercurial_ push/pull/clone operations.
+- Have built in users groups for easier permission management
+- Repository groups let you group repos and manage them easier.
+- Users can fork other users repo. RhodeCode have also compare view to see
+  combined changeset for all changeset made within single push.
+- Build in commit-api let's you add, edit and commit files right from RhodeCode
+  interface using simple editor or upload form for binaries.
 - Mako templates let's you customize the look and feel of the application.
-- Beautiful diffs, annotations and source code browsing all colored by pygments.
+- Beautiful diffs, annotations and source code browsing all colored by pygments. 
+  Raw diffs are made in git-diff format, including git_ binary-patches
 - Mercurial_ branch graph and yui-flot powered graphs with zooming and statistics
 - Admin interface with user/permission management. Admin activity journal, logs
   pulls, pushes, forks, registrations and other actions made by all users.
-- Server side forks. It is possible to fork a project and modify it freely without
-  breaking the main repository.
+- Server side forks. It is possible to fork a project and modify it freely 
+  without breaking the main repository. You can even write Your own hooks 
+  and install them
 - Full text search powered by Whoosh on the source files, and file names.
   Build in indexing daemons, with optional incremental index build
   (no external search servers required all in one application)
 - Setup project descriptions and info inside built in db for easy, non 
   file-system operations
-- Intelligent cache with invalidation after push or project change, provides high 
-  performance and always up to date data.
+- Intelligent cache with invalidation after push or project change, provides 
+  high performance and always up to date data.
 - Rss / atom feeds, gravatar support, download sources as zip/tar/gz
 - Async tasks for speed and performance using celery_ (works without them too)  
 - Backup scripts can do backup of whole app and send it over scp to desired 
@@ -87,17 +94,17 b' RhodeCode Features'
 Incoming / Plans
 ----------------
 
-- Project grouping
-- User groups/teams
+- Finer granular permissions per branch, repo group or subrepo
+- pull requests and web based merges
+- notification and message system 
 - SSH based authentication with server side key management
 - Code review (probably based on hg-review)
 - Full git_ support, with push/pull server (currently in beta tests)
-- Redmine integration
-- Public accessible activity feeds
+- Redmine and other bugtrackers integration
 - Commit based built in wiki system
-- Clone points and cloning from remote repositories into RhodeCode
 - More statistics and graph (global annotation + some more statistics)
-- Other advancements as development continues (or you can of course make additions and or requests)
+- Other advancements as development continues (or you can of course make 
+  additions and or requests)
 
 License
 -------

development.ini

@@ -7,6 +7,7 b''
 
 [DEFAULT]
 debug = true
+pdebug = false
 ################################################################################
 ## Uncomment and replace with the address which should receive                ## 
 ## any error reports after application crash                                  ##
@@ -48,6 +49,8 b' index_dir = %(here)s/data/index'
 app_instance_uuid = develop
 cut_off_limit = 256000
 force_https = false
+commit_parse_limit = 25
+use_gravatar = true
 
 ####################################
 ###        CELERY CONFIG        ####
@@ -139,8 +142,9 b' logview.pylons.util = #eee'
 #########################################################
 ### DB CONFIGS - EACH DB WILL HAVE IT'S OWN CONFIG    ###
 #########################################################
-sqlalchemy.db1.url = sqlite:///%(here)s/rhodecode.db
-sqlalchemy.db1.echo = True
+#sqlalchemy.db1.url = sqlite:///%(here)s/rhodecode.db
+sqlalchemy.db1.url = postgresql://postgres:qwe@localhost/rhodecode
+sqlalchemy.db1.echo = false
 sqlalchemy.db1.pool_recycle = 3600
 sqlalchemy.convert_unicode = true
 
@@ -201,13 +205,13 b' propagate = 0'
 [handler_console]
 class = StreamHandler
 args = (sys.stderr,)
-level = NOTSET
+level = DEBUG
 formatter = color_formatter
 
 [handler_console_sql]
 class = StreamHandler
 args = (sys.stderr,)
-level = NOTSET
+level = DEBUG
 formatter = color_formatter_sql
 
 ################
@@ -226,4 +230,4 b' datefmt = %Y-%m-%d %H:%M:%S'
 [formatter_color_formatter_sql]
 class=rhodecode.lib.colored_formatter.ColorFormatterSql
 format= %(asctime)s.%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s
-datefmt = %Y-%m-%d %H:%M:%S
  No newline at end of file
+datefmt = %Y-%m-%d %H:%M:%S

docs/api/index.rst

@@ -7,4 +7,4 b' API Reference'
    :maxdepth: 3
 
    models
-    
  No newline at end of file
+   api 
  No newline at end of file

docs/changelog.rst

@@ -3,7 +3,79 b''
 Changelog
 =========
 
+1.2.0 (**2011-10-07**)
+======================
 
+
+news
+----
+
+- implemented #47 repository groups
+- implemented #89 Can setup google analytics code from settings menu
+- implemented #91 added nicer looking archive urls with more download options
+  like tags, branches
+- implemented #44 into file browsing, and added follow branch option
+- implemented #84 downloads can be enabled/disabled for each repository
+- anonymous repository can be cloned without having to pass default:default
+  into clone url
+- fixed #90 whoosh indexer can index chooses repositories passed in command 
+  line
+- extended journal with day aggregates and paging
+- implemented #107 source code lines highlight ranges
+- implemented #93 customizable changelog on combined revision ranges - 
+  equivalent of githubs compare view 
+- implemented #108 extended and more powerful LDAP configuration
+- implemented #56 users groups
+- major code rewrites optimized codes for speed and memory usage
+- raw and diff downloads are now in git format
+- setup command checks for write access to given path
+- fixed many issues with international characters and unicode. It uses utf8
+  decode with replace to provide less errors even with non utf8 encoded strings
+- #125 added API KEY access to feeds
+- #109 Repository can be created from external Mercurial link (aka. remote 
+  repository, and manually updated (via pull) from admin panel
+- beta git support - push/pull server + basic view for git repos
+- added followers page and forks page
+- server side file creation (with binary file upload interface) 
+  and edition with commits powered by codemirror 
+- #111 file browser file finder, quick lookup files on whole file tree 
+- added quick login sliding menu into main page
+- changelog uses lazy loading of affected files details, in some scenarios 
+  this can improve speed of changelog page dramatically especially for 
+  larger repositories.
+- implements #214 added support for downloading subrepos in download menu.
+- Added basic API for direct operations on rhodecode via JSON
+- Implemented advanced hook management
+
+fixes
+-----
+
+- fixed file browser bug, when switching into given form revision the url was 
+  not changing
+- fixed propagation to error controller on simplehg and simplegit middlewares
+- fixed error when trying to make a download on empty repository
+- fixed problem with '[' chars in commit messages in journal
+- fixed #99 Unicode errors, on file node paths with non utf-8 characters
+- journal fork fixes
+- removed issue with space inside renamed repository after deletion
+- fixed strange issue on formencode imports
+- fixed #126 Deleting repository on Windows, rename used incompatible chars. 
+- #150 fixes for errors on repositories mapped in db but corrupted in 
+  filesystem
+- fixed problem with ascendant characters in realm #181
+- fixed problem with sqlite file based database connection pool
+- whoosh indexer and code stats share the same dynamic extensions map
+- fixes #188 - relationship delete of repo_to_perm entry on user removal
+- fixes issue #189 Trending source files shows "show more" when no more exist
+- fixes issue #197 Relative paths for pidlocks
+- fixes issue #198 password will require only 3 chars now for login form
+- fixes issue #199 wrong redirection for non admin users after creating a repository
+- fixes issues #202, bad db constraint made impossible to attach same group 
+  more than one time. Affects only mysql/postgres
+- fixes #218 os.kill patch for windows was missing sig param
+- improved rendering of dag (they are not trimmed anymore when number of 
+  heads exceeds 5)
+    
 1.1.8 (**2011-04-12**)
 ======================
 
@@ -34,6 +106,7 b' fixes'
   Thomas Waldmann
 - fixed issue #166 summary pager was skipping 10 revisions on second page
 
+
 1.1.7 (**2011-03-23**)
 ======================
 
@@ -93,7 +166,6 b' fixes'
 - journal fixes
 - fixed option to access repository just by entering http://server/<repo_name> 
 
-
 1.1.3 (**2011-02-16**)
 ======================
 

docs/index.rst

@@ -19,8 +19,11 b' Documentation'
 .. toctree::
    :maxdepth: 1
 
-   enable_git
-   statistics
+   usage/general
+   usage/enable_git
+   usage/statistics
+   usage/backup
+   usage/api_key_access
    
 **Develop**
 

docs/installation.rst

@@ -3,19 +3,12 b''
 Installation
 ============
 
-``RhodeCode`` is written entirely in Python. In order to gain maximum performance
-there are some third-party you must install. When RhodeCode is used 
-together with celery you have to install some kind of message broker,
-recommended one is rabbitmq_ to make the async tasks work.
+``RhodeCode`` is written entirely in Python. Before posting any issues make 
+sure, your not missing any system libraries and using right version of 
+libraries required by RhodeCode. There's also restriction in terms of mercurial
+clients. Minimal version of hg client known working fine with RhodeCode is
+**1.6**. If you're using older client, please upgrade.
 
-Of course RhodeCode works in sync mode also and then you do not have to install
-any third party applications. However, using Celery_ will give you a large 
-speed improvement when using many big repositories. If you plan to use 
-RhodeCode for say 7 to 10 small repositories, RhodeCode will perform perfectly 
-well without celery running.
-   
-If you make the decision to run RhodeCode with celery make sure you run 
-celeryd using paster and message broker together with the application.   
 
 Installing RhodeCode from Cheese Shop
 -------------------------------------
@@ -40,7 +33,12 b' Step by step installation example'
 ---------------------------------
 
 
-- Assuming you have installed virtualenv_ create a new virtual environment using virtualenv:: 
+For installing RhodeCode i highly recommend using separate virtualenv_. This
+way many required by RhodeCode libraries will remain sandboxed from your main
+python and making things less problematic when doing system python updates. 
+
+- Assuming you have installed virtualenv_ create a new virtual environment 
+  using virtualenv command:: 
 
     virtualenv --no-site-packages /var/www/rhodecode-venv
 
@@ -64,21 +62,40 b' Step by step installation example'
    ``virtualenv`` script.  It's perfectly acceptable (and desirable)
    to create a virtualenv as a normal user.
      
-- Make a folder for rhodecode somewhere on the filesystem for example::
+- Make a folder for rhodecode data files, and configuration somewhere on the 
+  filesystem. For example::
 
     mkdir /var/www/rhodecode
   
     
-- Run this command to install rhodecode::
+- Go into the created directory run this command to install rhodecode::
 
-    easy_install rhodecode 
+    easy_install rhodecode
+  
+  or::
+ 
+    pip install rhodecode 
 
-- This will install rhodecode together with pylons and all other required python
-  libraries
+- This will install rhodecode together with pylons and all other required 
+  python libraries into activated virtualenv
 
 Requirements for Celery (optional)
 ----------------------------------
 
+In order to gain maximum performance
+there are some third-party you must install. When RhodeCode is used 
+together with celery you have to install some kind of message broker,
+recommended one is rabbitmq_ to make the async tasks work.
+
+Of course RhodeCode works in sync mode also and then you do not have to install
+any third party applications. However, using Celery_ will give you a large 
+speed improvement when using many big repositories. If you plan to use 
+RhodeCode for say 7 to 10 repositories, RhodeCode will perform perfectly well 
+without celery running.
+   
+If you make the decision to run RhodeCode with celery make sure you run 
+celeryd using paster and message broker together with the application. 
+
 .. note::
    Installing message broker and using celery is optional, RhodeCode will
    work perfectly fine without them.

docs/setup.rst

@@ -5,16 +5,17 b' Setup'
 
 
 Setting up RhodeCode
---------------------------
+--------------------
 
-First, you will need to create a RhodeCode configuration file. Run the following
-command to do this::
+First, you will need to create a RhodeCode configuration file. Run the 
+following command to do this::
  
     paster make-config RhodeCode production.ini
 
 - This will create the file `production.ini` in the current directory. This
-  configuration file contains the various settings for RhodeCode, e.g proxy port,
-  email settings, usage of static files, cache, celery settings and logging.
+  configuration file contains the various settings for RhodeCode, e.g proxy 
+  port, email settings, usage of static files, cache, celery settings and 
+  logging.
 
 
 Next, you need to create the databases used by RhodeCode. I recommend that you
@@ -27,19 +28,19 b' the following command::'
 
 This will prompt you for a "root" path. This "root" path is the location where
 RhodeCode will store all of its repositories on the current machine. After
-entering this "root" path ``setup-app`` will also prompt you for a username and password
-for the initial admin account which ``setup-app`` sets up for you.
+entering this "root" path ``setup-app`` will also prompt you for a username 
+and password for the initial admin account which ``setup-app`` sets up for you.
 
 - The ``setup-app`` command will create all of the needed tables and an admin
-  account. When choosing a root path you can either use a new empty location, or a
-  location which already contains existing repositories. If you choose a location
-  which contains existing repositories RhodeCode will simply add all of the
-  repositories at the chosen location to it's database. (Note: make sure you
-  specify the correct path to the root).
+  account. When choosing a root path you can either use a new empty location, 
+  or a location which already contains existing repositories. If you choose a 
+  location which contains existing repositories RhodeCode will simply add all 
+  of the repositories at the chosen location to it's database. (Note: make 
+  sure you specify the correct path to the root).
 - Note: the given path for mercurial_ repositories **must** be write accessible
-  for the application. It's very important since the RhodeCode web interface will
-  work without write access, but when trying to do a push it will eventually fail
-  with permission denied errors unless it has write access.
+  for the application. It's very important since the RhodeCode web interface 
+  will work without write access, but when trying to do a push it will 
+  eventually fail with permission denied errors unless it has write access.
 
 You are now ready to use RhodeCode, to run it simply execute::
  
@@ -48,7 +49,8 b' You are now ready to use RhodeCode, to r'
 - This command runs the RhodeCode server. The web app should be available at the 
   127.0.0.1:5000. This ip and port is configurable via the production.ini 
   file created in previous step
-- Use the admin account you created above when running ``setup-app`` to login to the web app.
+- Use the admin account you created above when running ``setup-app`` to login 
+  to the web app.
 - The default permissions on each repository is read, and the owner is admin. 
   Remember to update these if needed.
 - In the admin panel you can toggle ldap, anonymous, permissions settings. As
@@ -56,9 +58,9 b' You are now ready to use RhodeCode, to r'
 
 Try copying your own mercurial repository into the "root" directory you are
 using, then from within the RhodeCode web application choose Admin >
-repositories. Then choose Add New Repository. Add the repository you copied into
-the root. Test that you can browse your repository from within RhodeCode and then
-try cloning your repository from RhodeCode with::
+repositories. Then choose Add New Repository. Add the repository you copied 
+into the root. Test that you can browse your repository from within RhodeCode 
+and then try cloning your repository from RhodeCode with::
 
     hg clone http://127.0.0.1:5000/<repository name>
 
@@ -67,8 +69,8 b' where *repository name* is replaced by t'
 Using RhodeCode with SSH
 ------------------------
 
-RhodeCode currently only hosts repositories using http and https. (The addition of
-ssh hosting is a planned future feature.) However you can easily use ssh in
+RhodeCode currently only hosts repositories using http and https. (The addition
+of ssh hosting is a planned future feature.) However you can easily use ssh in
 parallel with RhodeCode. (Repository access via ssh is a standard "out of
 the box" feature of mercurial_ and you can use this to access any of the
 repositories that RhodeCode is hosting. See PublishingRepositories_)
@@ -77,10 +79,10 b' RhodeCode repository structures are kept'
 as the project. When using repository groups, each group is a subdirectory.
 This allows you to easily use ssh for accessing repositories.
 
-In order to use ssh you need to make sure that your web-server and the users login
-accounts have the correct permissions set on the appropriate directories. (Note
-that these permissions are independent of any permissions you have set up using
-the RhodeCode web interface.)
+In order to use ssh you need to make sure that your web-server and the users 
+login accounts have the correct permissions set on the appropriate directories.
+(Note that these permissions are independent of any permissions you have set up
+using the RhodeCode web interface.)
 
 If your main directory (the same as set in RhodeCode settings) is for example
 set to **/home/hg** and the repository you are using is named `rhodecode`, then
@@ -95,35 +97,41 b' Note: In an advanced setup, in order for'
 permissions as set up via the RhodeCode web interface, you can create an
 authentication hook to connect to the rhodecode db and runs check functions for
 permissions against that.
-
-
     
 Setting up Whoosh full text search
 ----------------------------------
 
 Starting from version 1.1 the whoosh index can be build by using the paster
 command ``make-index``. To use ``make-index`` you must specify the configuration
-file that stores the location of the index, and the location of the repositories
-(`--repo-location`).
+file that stores the location of the index. You may specify the location of the 
+repositories (`--repo-location`).  If not specified, this value is retrieved 
+from the RhodeCode database.  This was required prior to 1.2.  Starting from 
+version 1.2 it is also possible to specify a comma separated list of 
+repositories (`--index-only`) to build index only on chooses repositories 
+skipping any other found in repos location
 
 You may optionally pass the option `-f` to enable a full index rebuild. Without
 the `-f` option, indexing will run always in "incremental" mode.
 
 For an incremental index build use::
 
-	paster make-index production.ini --repo-location=<location for repos> 
+	paster make-index production.ini 
 
 For a full index rebuild use::
 
-	paster make-index production.ini -f --repo-location=<location for repos>
+	paster make-index production.ini -f 
+
 
-- For full text search you can either put crontab entry for
+building index just for chosen repositories is possible with such command::
+ 
+ paster make-index production.ini --index-only=vcs,rhodecode
+
 
 In order to do periodical index builds and keep your index always up to date.
 It's recommended to do a crontab entry for incremental indexing. 
 An example entry might look like this::
  
- /path/to/python/bin/paster /path/to/rhodecode/production.ini --repo-location=<location for repos> 
+    /path/to/python/bin/paster make-index /path/to/rhodecode/production.ini 
   
 When using incremental mode (the default) whoosh will check the last
 modification date of each file and add it to be reindexed if a newer file is
@@ -138,55 +146,221 b' Setting up LDAP support'
 -----------------------
 
 RhodeCode starting from version 1.1 supports ldap authentication. In order
-to use LDAP, you have to install the python-ldap_ package. This package is available
-via pypi, so you can install it by running
+to use LDAP, you have to install the python-ldap_ package. This package is 
+available via pypi, so you can install it by running
 
-::
+using easy_install::
 
- easy_install python-ldap
+    easy_install python-ldap
  
-::
+using pip::
 
- pip install python-ldap
+    pip install python-ldap
 
 .. note::
    python-ldap requires some certain libs on your system, so before installing 
    it check that you have at least `openldap`, and `sasl` libraries.
 
-ldap settings are located in admin->ldap section,
+LDAP settings are located in admin->ldap section,
 
 Here's a typical ldap setup::
 
- Enable ldap  = checked                 #controls if ldap access is enabled
- Host         = host.domain.org         #actual ldap server to connect
- Port         = 389 or 689 for ldaps    #ldap server ports
- Enable LDAPS = unchecked               #enable disable ldaps
- Account      = <account>               #access for ldap server(if required)
- Password     = <password>              #password for ldap server(if required)
- Base DN      = uid=%(user)s,CN=users,DC=host,DC=domain,DC=org
- 
+ Connection settings
+ Enable LDAP          = checked
+ Host                 = host.example.org
+ Port                 = 389
+ Account              = <account>
+ Password             = <password>
+ Connection Security  = LDAPS connection
+ Certificate Checks   = DEMAND
+
+ Search settings
+ Base DN              = CN=users,DC=host,DC=example,DC=org
+ LDAP Filter          = (&(objectClass=user)(!(objectClass=computer)))
+ LDAP Search Scope    = SUBTREE
+
+ Attribute mappings
+ Login Attribute      = uid
+ First Name Attribute = firstName
+ Last Name Attribute  = lastName
+ E-mail Attribute     = mail
+
+.. _enable_ldap:
+
+Enable LDAP : required
+    Whether to use LDAP for authenticating users.
+
+.. _ldap_host:
+
+Host : required
+    LDAP server hostname or IP address.
+
+.. _Port:
+
+Port : required
+    389 for un-encrypted LDAP, 636 for SSL-encrypted LDAP.
+
+.. _ldap_account:
+
+Account : optional
+    Only required if the LDAP server does not allow anonymous browsing of
+    records.  This should be a special account for record browsing.  This
+    will require `LDAP Password`_ below.
+
+.. _LDAP Password:
+
+Password : optional
+    Only required if the LDAP server does not allow anonymous browsing of
+    records.
 
-`Account` and `Password` are optional, and used for two-phase ldap 
-authentication so those are credentials to access your ldap, if it doesn't 
-support anonymous search/user lookups. 
+.. _Enable LDAPS:
+
+Connection Security : required
+    Defines the connection to LDAP server
+
+    No encryption
+        Plain non encrypted connection
+        
+    LDAPS connection
+        Enable ldaps connection. It will likely require `Port`_ to be set to 
+        a different value (standard LDAPS port is 636). When LDAPS is enabled 
+        then `Certificate Checks`_ is required.
+        
+    START_TLS on LDAP connection
+        START TLS connection
+
+.. _Certificate Checks:
+
+Certificate Checks : optional
+    How SSL certificates verification is handled - this is only useful when
+    `Enable LDAPS`_ is enabled.  Only DEMAND or HARD offer full SSL security 
+    while the other options are susceptible to man-in-the-middle attacks.  SSL
+    certificates can be installed to /etc/openldap/cacerts so that the
+    DEMAND or HARD options can be used with self-signed certificates or
+    certificates that do not have traceable certificates of authority.
+
+    NEVER
+        A serve certificate will never be requested or checked.
+
+    ALLOW
+        A server certificate is requested.  Failure to provide a
+        certificate or providing a bad certificate will not terminate the
+        session.
+
+    TRY
+        A server certificate is requested.  Failure to provide a
+        certificate does not halt the session; providing a bad certificate
+        halts the session.
+
+    DEMAND
+        A server certificate is requested and must be provided and
+        authenticated for the session to proceed.
+
+    HARD
+        The same as DEMAND.
+
+.. _Base DN:
 
-Base DN must have the %(user)s template inside, it's a place holder where your uid
-used to login would go. It allows admins to specify non-standard schema for the
-uid variable.
+Base DN : required
+    The Distinguished Name (DN) where searches for users will be performed.
+    Searches can be controlled by `LDAP Filter`_ and `LDAP Search Scope`_.
+
+.. _LDAP Filter:
+
+LDAP Filter : optional
+    A LDAP filter defined by RFC 2254.  This is more useful when `LDAP
+    Search Scope`_ is set to SUBTREE.  The filter is useful for limiting
+    which LDAP objects are identified as representing Users for
+    authentication.  The filter is augmented by `Login Attribute`_ below.
+    This can commonly be left blank.
+
+.. _LDAP Search Scope:
+
+LDAP Search Scope : required
+    This limits how far LDAP will search for a matching object.
+
+    BASE
+        Only allows searching of `Base DN`_ and is usually not what you
+        want.
+
+    ONELEVEL
+        Searches all entries under `Base DN`_, but not Base DN itself.
+
+    SUBTREE
+        Searches all entries below `Base DN`_, but not Base DN itself.
+        When using SUBTREE `LDAP Filter`_ is useful to limit object
+        location.
+
+.. _Login Attribute:
+
+Login Attribute : required        
+    The LDAP record attribute that will be matched as the USERNAME or
+    ACCOUNT used to connect to RhodeCode.  This will be added to `LDAP
+    Filter`_ for locating the User object.  If `LDAP Filter`_ is specified as
+    "LDAPFILTER", `Login Attribute`_ is specified as "uid" and the user has
+    connected as "jsmith" then the `LDAP Filter`_ will be augmented as below
+    ::
+
+        (&(LDAPFILTER)(uid=jsmith))
+
+.. _ldap_attr_firstname:
+
+First Name Attribute : required
+    The LDAP record attribute which represents the user's first name.
+
+.. _ldap_attr_lastname:
 
-If all of the data is correctly entered, and `python-ldap` is properly
-installed, then users should be granted access to RhodeCode with ldap accounts.
-When logging in the first time a special ldap account is created inside
-RhodeCode, so you can control the permissions even on ldap users. If such users
-already exist in the RhodeCode database, then the ldap user with the same
-username would be not be able to access RhodeCode.
+Last Name Attribute : required
+    The LDAP record attribute which represents the user's last name.
+
+.. _ldap_attr_email:
+
+Email Attribute : required
+    The LDAP record attribute which represents the user's email address.
+
+If all data are entered correctly, and python-ldap_ is properly installed
+users should be granted access to RhodeCode with ldap accounts.  At this
+time user information is copied from LDAP into the RhodeCode user database.
+This means that updates of an LDAP user object may not be reflected as a
+user update in RhodeCode.
+
+If You have problems with LDAP access and believe You entered correct
+information check out the RhodeCode logs, any error messages sent from LDAP
+will be saved there.
+
+Active Directory
+''''''''''''''''
 
-If you have problems with ldap access and believe you have correctly entered the
-required information then proceed by investigating the RhodeCode logs. Any
-error messages sent from ldap will be saved there.
+RhodeCode can use Microsoft Active Directory for user authentication.  This
+is done through an LDAP or LDAPS connection to Active Directory.  The
+following LDAP configuration settings are typical for using Active
+Directory ::
+
+ Base DN              = OU=SBSUsers,OU=Users,OU=MyBusiness,DC=v3sys,DC=local
+ Login Attribute      = sAMAccountName
+ First Name Attribute = givenName
+ Last Name Attribute  = sn
+ E-mail Attribute     = mail
+
+All other LDAP settings will likely be site-specific and should be
+appropriately configured.
 
 
 
+Hook management
+---------------
+
+Hooks can be managed in similar way to this used in .hgrc files.
+To access hooks setting click `advanced setup` on Hooks section of Mercurial
+Settings in Admin. 
+
+There are 4 built in hooks that cannot be changed (only enable/disable by
+checkboxes on previos section).
+To add another custom hook simply fill in first section with 
+<name>.<hook_type> and the second one with hook path. Example hooks
+can be found at *rhodecode.lib.hooks*. 
+
+
 Setting Up Celery
 -----------------
 
@@ -204,8 +378,8 b' In order to start using celery run::'
 
 
 .. note::
-   Make sure you run this command from the same virtualenv, and with the same user
-   that rhodecode runs.
+   Make sure you run this command from the same virtualenv, and with the same 
+   user that rhodecode runs.
    
 HTTPS support
 -------------
@@ -214,8 +388,8 b' There are two ways to enable https:'
 
 - Set HTTP_X_URL_SCHEME in your http server headers, than rhodecode will
   recognize this headers and make proper https redirections
-- Alternatively, set `force_https = true` in the ini configuration to force using
-  https, no headers are needed than to enable https
+- Alternatively, change the `force_https = true` flag in the ini configuration 
+  to force using https, no headers are needed than to enable https
 
 
 Nginx virtual host example
@@ -251,13 +425,10 b' pushes or large pushes::'
     client_max_body_size        400m;
     client_body_buffer_size     128k;
     proxy_buffering             off;
-    proxy_connect_timeout       3600;
-    proxy_send_timeout          3600;
-    proxy_read_timeout          3600;
-    proxy_buffer_size           16k;
-    proxy_buffers               4 16k;
-    proxy_busy_buffers_size     64k;
-    proxy_temp_file_write_size  64k;
+    proxy_connect_timeout       7200;
+    proxy_send_timeout          7200;
+    proxy_read_timeout          7200;
+    proxy_buffers               8 32k;
  
 Also, when using root path with nginx you might set the static files to false
 in the production.ini file::
@@ -315,7 +486,8 b' Apache subdirectory part::'
       SetEnvIf X-Url-Scheme https HTTPS=1
     </Location> 
 
-Besides the regular apache setup you will need to add the following to your .ini file::
+Besides the regular apache setup you will need to add the following line
+into [app:main] section of your .ini file::
 
     filter-with = proxy-prefix
 
@@ -328,59 +500,24 b' Add the following at the end of the .ini'
 
 then change <someprefix> into your choosen prefix
 
-Apache's example WSGI+SSL config
---------------------------------
-
-virtual host example::
-
-    <VirtualHost *:443>
-        ServerName hg.domain.eu:443
-        DocumentRoot /var/www
-    
-        SSLEngine on
-        SSLCertificateFile /etc/apache2/ssl/hg.domain.eu.cert
-        SSLCertificateKeyFile /etc/apache2/ssl/hg.domain.eu.key
-        SSLCertificateChainFile /etc/apache2/ssl/ca.cert
-        SetEnv HTTP_X_URL_SCHEME https
-    
-        Alias /css /home/web/virtualenvs/hg/lib/python2.6/site-packages/rhodecode/public/css
-        Alias /images /home/web/virtualenvs/hg/lib/python2.6/site-packages/rhodecode/public/images
-        Alias /js /home/web/virtualenvs/hg/lib/python2.6/site-packages/rhodecode/public/js
-    
-        WSGIDaemonProcess hg user=web group=web processes=1 threads=10 display-name=%{GROUP} python-path=/home/web/virtualenvs/hg/lib/python2.6/site-packages
-    
-        WSGIPassAuthorization On
-        WSGIProcessGroup hg
-        WSGIApplicationGroup hg
-        WSGIScriptAlias / /home/web/apache/conf/hg.wsgi
-    
-        <Directory /home/web/apache/conf>
-            Order deny,allow
-            Allow from all
-        </Directory>
-        <Directory /var/www>
-            Order deny,allow
-            Allow from all
-        </Directory>
-    
-    </VirtualHost>
-
-    <VirtualHost *:80>
-        ServerName hg.domain.eu
-        Redirect permanent / https://hg.domain.eu/
-    </VirtualHost>
+Apache's WSGI config
+--------------------
 
 
-HG.WSGI::
+Example wsgi dispatch script::
 
     import os
     os.environ["HGENCODING"] = "UTF-8"
+    os.environ['PYTHON_EGG_CACHE'] = '/home/web/rhodecode/.egg-cache'
+    
+    # sometimes it's needed to set the curent dir
+    os.chdir('/home/web/rhodecode/') 
     
     from paste.deploy import loadapp
     from paste.script.util.logging_config import fileConfig
-    
-    fileConfig('/home/web/virtualenvs/hg/config/production.ini')
-    application = loadapp('config:/home/web/virtualenvs/hg/config/production.ini'
+
+    fileConfig('/home/web/rhodecode/production.ini')
+    application = loadapp('config:/home/web/rhodecode/production.ini')
 
 
 Other configuration files
@@ -421,7 +558,8 b' Troubleshooting'
 :Q: **Apache doesn't pass basicAuth on pull/push?**
 :A: Make sure you added `WSGIPassAuthorization true`.
 
-For further questions search the `Issues tracker`_, or post a message in the `google group rhodecode`_
+For further questions search the `Issues tracker`_, or post a message in the 
+`google group rhodecode`_
 
 .. _virtualenv: http://pypi.python.org/pypi/virtualenv
 .. _python: http://www.python.org/

docs/usage/enable_git.rst

@@ -4,9 +4,10 b' Enabling GIT support (beta)'
 ===========================
 
 
-Git support in RhodeCode 1.1 was disabled due to current instability issues. However,
-if you would like to test git support please feel free to re-enable it. To re-enable GIT support just
-uncomment the git line in the file rhodecode/__init__.py
+Git support in RhodeCode 1.1 was disabled due to current instability issues. 
+However,if you would like to test git support please feel free to re-enable it. 
+To re-enable GIT support just uncomment the git line in the 
+file **rhodecode/__init__.py**
 
 .. code-block:: python
  
@@ -19,4 +20,5 b' uncomment the git line in the file rhode'
    Please note that the git support provided by RhodeCode is not yet fully
    stable and RhodeCode might crash while using git repositories. (That is why
    it is currently disabled.) Thus be careful about enabling git support, and
-   certainly don't use it in a production setting!
  No newline at end of file
+   certainly don't use it in a production setting!
+   
  No newline at end of file

docs/usage/statistics.rst

@@ -10,7 +10,7 b' cached inside db and are gathered increm'
 this:
 
 With Celery disabled
-++++++++++++++++++++
+--------------------
 
 - On each first visit to the summary page a set of 250 commits are parsed and
   updates statistics cache.
@@ -21,7 +21,7 b' With Celery disabled'
 
 
 With Celery enabled
-+++++++++++++++++++
+-------------------
 
 - On the first visit to the summary page RhodeCode will create tasks that will
   execute on celery workers. This task will gather all of the stats until all
@@ -30,4 +30,4 b' With Celery enabled'
 
 .. note::
    At any time you can disable statistics on each repository via the repository
-   edit form in the admin panel. To do this just uncheck the statistics checkbox.
  No newline at end of file
+   edit form in the admin panel. To do this just uncheck the statistics checkbox.

ez_setup.py

@@ -202,14 +202,13 b' def main(argv, version=DEFAULT_VERSION):'
         except ImportError:
             from easy_install import main
         main(list(argv) + [download_setuptools(delay=0)])
-        sys.exit(0)  # try to force an exit
+        sys.exit(0) # try to force an exit
     else:
         if argv:
             from setuptools.command.easy_install import main
             main(argv)
         else:
-            print "Setuptools version", version, ("or greater has "
-                                                  "been installed.")
+            print "Setuptools version", version, "or greater has been installed."
             print '(Run "ez_setup.py -U setuptools" to reinstall or upgrade.)'
 
 

init.d/rhodecode-daemon2

@@ -1,6 +1,6 b''
 #!/bin/sh -e
 ########################################
-#### THIS IS AN DEBIAN INIT.D SCRIPT####
+#### THIS IS A DEBIAN INIT.D SCRIPT ####
 ########################################
 
 ### BEGIN INIT INFO
@@ -29,49 +29,48 b' RUN_AS="marcink"'
 DAEMON="$PYTHON_PATH/bin/paster"
 
 DAEMON_OPTS="serve --daemon \
---user=$RUN_AS \
---group=$RUN_AS \
---pid-file=$PID_PATH \
---log-file=$LOG_PATH  $APP_PATH/$CONF_NAME"
+  --user=$RUN_AS \
+  --group=$RUN_AS \
+  --pid-file=$PID_PATH \
+  --log-file=$LOG_PATH  $APP_PATH/$CONF_NAME"
+
 
+start() {
+  echo "Starting $APP_NAME"
+  PYTHON_EGG_CACHE="/tmp" start-stop-daemon -d $APP_PATH \
+      --start --quiet \
+      --pidfile $PID_PATH \
+      --user $RUN_AS \
+      --exec $DAEMON -- $DAEMON_OPTS
+}
+
+stop() {
+  echo "Stopping $APP_NAME"
+  start-stop-daemon -d $APP_PATH \
+      --stop --quiet \
+      --pidfile $PID_PATH || echo "$APP_NAME - Not running!"
+  
+  if [ -f $PID_PATH ]; then
+    rm $PID_PATH
+  fi
+}
 
 case "$1" in
   start)
-    echo "Starting $APP_NAME"
-    start-stop-daemon -d $APP_PATH -e PYTHON_EGG_CACHE="/tmp" \
-        --start --quiet \
-        --pidfile $PID_PATH \
-        --user $RUN_AS \
-        --exec $DAEMON -- $DAEMON_OPTS
+    start
     ;;
   stop)
-    echo "Stopping $APP_NAME"
-    start-stop-daemon -d $APP_PATH \
-        --stop --quiet \
-        --pidfile $PID_PATH || echo "$APP_NAME - Not running!"
-    if [ -f $PID_PATH ]; then
-        rm $PID_PATH
-    fi
+    stop
     ;;
   restart)
     echo "Restarting $APP_NAME"
     ### stop ###
-    echo "Stopping $APP_NAME"
-    start-stop-daemon -d $APP_PATH \
-        --stop --quiet \
-        --pidfile $PID_PATH || echo "$APP_NAME - Not running!"
-    if [ -f $PID_PATH ]; then
-        rm $PID_PATH
-    fi
+    stop
+    wait
     ### start ###
-    echo "Starting $APP_NAME"
-    start-stop-daemon -d $APP_PATH -e PYTHON_EGG_CACHE="/tmp" \
-        --start --quiet \
-        --pidfile $PID_PATH \
-        --user $RUN_AS \
-        --exec $DAEMON -- $DAEMON_OPTS
+    start
     ;;
   *)
     echo "Usage: $0 {start|stop|restart}"
     exit 1
-esac
  No newline at end of file
+esac

production.ini

@@ -7,6 +7,7 b''
 
 [DEFAULT]
 debug = true
+pdebug = false
 ################################################################################
 ## Uncomment and replace with the address which should receive                ## 
 ## any error reports after application crash                                  ##
@@ -29,7 +30,7 b' debug = true'
 threadpool_workers = 5
 
 ##max request before thread respawn
-threadpool_max_requests = 2
+threadpool_max_requests = 10
 
 ##option to use threads of process
 use_threadpool = true
@@ -41,12 +42,15 b' port = 8001'
 [app:main]
 use = egg:rhodecode
 full_stack = true
-static_files = false
+static_files = true
 lang=en
 cache_dir = %(here)s/data
 index_dir = %(here)s/data/index
+app_instance_uuid = prod1234
 cut_off_limit = 256000
-force_https = false
+force_https = false 
+commit_parse_limit = 50
+use_gravatar = true
 
 ####################################
 ###        CELERY CONFIG        ####
@@ -70,7 +74,7 b' celery.result.serialier = json'
 celeryd.concurrency = 2
 #celeryd.log.file = celeryd.log
 celeryd.log.level = debug
-celeryd.max.tasks.per.child = 3
+celeryd.max.tasks.per.child = 1
 
 #tasks will never be sent to the queue, but executed locally instead.
 celery.always.eager = false
@@ -92,9 +96,8 b' beaker.cache.short_term.expire=60'
 beaker.cache.long_term.type=memory
 beaker.cache.long_term.expire=36000
 
-
 beaker.cache.sql_cache_short.type=memory
-beaker.cache.sql_cache_short.expire=5
+beaker.cache.sql_cache_short.expire=10
 
 beaker.cache.sql_cache_med.type=memory
 beaker.cache.sql_cache_med.expire=360
@@ -139,9 +142,10 b' logview.pylons.util = #eee'
 #########################################################
 ### DB CONFIGS - EACH DB WILL HAVE IT'S OWN CONFIG    ###
 #########################################################
-sqlalchemy.db1.url = sqlite:///%(here)s/rhodecode.db
-#sqlalchemy.db1.echo = False
-#sqlalchemy.db1.pool_recycle = 3600
+#sqlalchemy.db1.url = sqlite:///%(here)s/rhodecode.db
+sqlalchemy.db1.url = postgresql://postgres:qwe@localhost/rhodecode
+sqlalchemy.db1.echo = false
+sqlalchemy.db1.pool_recycle = 3600
 sqlalchemy.convert_unicode = true
 
 ################################
@@ -202,13 +206,13 b' propagate = 0'
 class = StreamHandler
 args = (sys.stderr,)
 level = INFO
-formatter = color_formatter
+formatter = generic
 
 [handler_console_sql]
 class = StreamHandler
 args = (sys.stderr,)
 level = WARN
-formatter = color_formatter_sql
+formatter = generic
 
 ################
 ## FORMATTERS ##

rhodecode/__init__.py

@@ -25,14 +25,14 b''
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import platform
 
-VERSION = (1, 1, 8)
+VERSION = (1, 2, 0)
 __version__ = '.'.join((str(each) for each in VERSION[:4]))
-__dbversion__ = 2  # defines current db version for migrations
+__dbversion__ = 3 #defines current db version for migrations
 __platform__ = platform.system()
 __license__ = 'GPLv3'
 
 PLATFORM_WIN = ('Windows')
-PLATFORM_OTHERS = ('Linux', 'Darwin', 'FreeBSD', 'OpenBSD')
+PLATFORM_OTHERS = ('Linux', 'Darwin', 'FreeBSD', 'OpenBSD', 'SunOS')
 
 try:
     from rhodecode.lib.utils import get_current_revision

rhodecode/config/deployment.ini_tmpl

@@ -7,6 +7,7 b''
 
 [DEFAULT]
 debug = true
+pdebug = false
 ################################################################################
 ## Uncomment and replace with the address which should receive                ## 
 ## any error reports after application crash                                  ##
@@ -48,6 +49,8 b' index_dir = %(here)s/data/index'
 app_instance_uuid = ${app_instance_uuid}
 cut_off_limit = 256000
 force_https = false 
+commit_parse_limit = 50
+use_gravatar = true
 
 ####################################
 ###        CELERY CONFIG        ####
@@ -139,58 +142,68 b' logview.pylons.util = #eee'
 #########################################################
 ### DB CONFIGS - EACH DB WILL HAVE IT'S OWN CONFIG    ###
 #########################################################
+
+# SQLITE [default]
 sqlalchemy.db1.url = sqlite:///%(here)s/rhodecode.db
-#sqlalchemy.db1.echo = False
-#sqlalchemy.db1.pool_recycle = 3600
+ 
+# POSTGRES
+# sqlalchemy.db1.url = postgresql://user:pass@localhost/rhodecode
+
+# MySQL
+# sqlalchemy.db1.url = mysql://user:pass@localhost/rhodecode
+
+
+sqlalchemy.db1.echo = false
+sqlalchemy.db1.pool_recycle = 3600
 sqlalchemy.convert_unicode = true
 
 ################################
 ### LOGGING CONFIGURATION   ####
 ################################
 [loggers]
-keys = root, routes, rhodecode, sqlalchemy,beaker,templates
+keys = root, routes, rhodecode, sqlalchemy, beaker, templates
 
 [handlers]
-keys = console
+keys = console, console_sql
 
 [formatters]
-keys = generic,color_formatter
+keys = generic, color_formatter, color_formatter_sql
 
 #############
 ## LOGGERS ##
 #############
 [logger_root]
-level = INFO
+level = NOTSET
 handlers = console
 
 [logger_routes]
-level = INFO
-handlers = console
+level = DEBUG
+handlers = 
 qualname = routes.middleware
 # "level = DEBUG" logs the route matched and routing variables.
-propagate = 0
+propagate = 1
 
 [logger_beaker]
-level = ERROR
-handlers = console
+level = DEBUG
+handlers = 
 qualname = beaker.container
-propagate = 0
+propagate = 1
 
 [logger_templates]
 level = INFO
-handlers = console
+handlers = 
 qualname = pylons.templating
-propagate = 0
+propagate = 1
 
 [logger_rhodecode]
 level = DEBUG
-handlers = console
+handlers = 
 qualname = rhodecode
-propagate = 0
+propagate = 1
 
 [logger_sqlalchemy]
-level = ERROR
-handlers = console
+level = INFO
+handlers = console_sql
 qualname = sqlalchemy.engine
 propagate = 0
 
@@ -201,9 +214,15 b' propagate = 0'
 [handler_console]
 class = StreamHandler
 args = (sys.stderr,)
-level = NOTSET
+level = INFO
 formatter = color_formatter
 
+[handler_console_sql]
+class = StreamHandler
+args = (sys.stderr,)
+level = WARN
+formatter = color_formatter_sql
+
 ################
 ## FORMATTERS ##
 ################
@@ -215,4 +234,9 b' datefmt = %Y-%m-%d %H:%M:%S'
 [formatter_color_formatter]
 class=rhodecode.lib.colored_formatter.ColorFormatter
 format= %(asctime)s.%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s
+datefmt = %Y-%m-%d %H:%M:%S
+
+[formatter_color_formatter_sql]
+class=rhodecode.lib.colored_formatter.ColorFormatterSql
+format= %(asctime)s.%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s
 datefmt = %Y-%m-%d %H:%M:%S
  No newline at end of file

rhodecode/config/environment.py

@@ -6,18 +6,18 b' import logging'
 from mako.lookup import TemplateLookup
 from pylons.configuration import PylonsConfig
 from pylons.error import handle_mako_error
-from sqlalchemy import engine_from_config
 
 import rhodecode.lib.app_globals as app_globals
 import rhodecode.lib.helpers
 
 from rhodecode.config.routing import make_map
 from rhodecode.lib import celerypylons
-from rhodecode.lib.auth import set_available_permissions, set_base_path
+from rhodecode.lib import engine_from_config
+from rhodecode.lib.timerproxy import TimerProxy
+from rhodecode.lib.auth import set_available_permissions
 from rhodecode.lib.utils import repo2db_mapper, make_ui, set_rhodecode_config
 from rhodecode.model import init_model
 from rhodecode.model.scm import ScmModel
-from rhodecode.lib.timerproxy import TimerProxy
 
 log = logging.getLogger(__name__)
 
@@ -61,25 +61,18 b' def load_environment(global_conf, app_co'
         from rhodecode.lib.utils import create_test_env, create_test_index
         from rhodecode.tests import  TESTS_TMP_PATH
         create_test_env(TESTS_TMP_PATH, config)
-        create_test_index(TESTS_TMP_PATH, True)
+        create_test_index(TESTS_TMP_PATH, config, True)
 
     #MULTIPLE DB configs
     # Setup the SQLAlchemy database engine
-    if config['debug'] and not test:
-        #use query time debugging.
-        sa_engine_db1 = engine_from_config(config, 'sqlalchemy.db1.',
-                                           proxy=TimerProxy())
-    else:
-        sa_engine_db1 = engine_from_config(config, 'sqlalchemy.db1.')
+    sa_engine_db1 = engine_from_config(config, 'sqlalchemy.db1.')
 
     init_model(sa_engine_db1)
-    #init baseui
-    config['pylons.app_globals'].baseui = make_ui('db')
 
-    g = config['pylons.app_globals']
-    repo2db_mapper(ScmModel().repo_scan(g.paths[0][1], g.baseui))
+    repos_path = make_ui('db').configitems('paths')[0][1]
+    repo2db_mapper(ScmModel().repo_scan(repos_path))
     set_available_permissions(config)
-    set_base_path(config)
+    config['base_path'] = repos_path
     set_rhodecode_config(config)
     # CONFIGURATION OPTIONS HERE (note: all config options will override
     # any Pylons config options)

rhodecode/config/middleware.py

@@ -47,9 +47,9 b' def make_app(global_conf, full_stack=Tru'
     app = SessionMiddleware(app, config)
 
     # CUSTOM MIDDLEWARE HERE (filtered by error handling middlewares)
-
-    app = SimpleHg(app, config)
-    app = SimpleGit(app, config)
+    if asbool(config['pdebug']):
+        from rhodecode.lib.profiler import ProfilingMiddleware
+        app = ProfilingMiddleware(app)
 
     if asbool(full_stack):
         # Handle Python exceptions
@@ -74,6 +74,11 b' def make_app(global_conf, full_stack=Tru'
         app = Cascade([static_app, app])
         app = make_gzip_middleware(app, global_conf, compress_level=1)
 
+    # we want our low level middleware to get to the request ASAP. We don't
+    # need any pylons stack middleware in them
+    app = SimpleHg(app, config)
+    app = SimpleGit(app, config)
+
     app.config = config
 
     return app

rhodecode/config/routing.py

@@ -7,7 +7,10 b' refer to the routes manual at http://rou'
 """
 from __future__ import with_statement
 from routes import Mapper
-from rhodecode.lib.utils import check_repo_fast as cr
+
+
+# prefix for non repository related links needs to be prefixed with `/`
+ADMIN_PREFIX = '/_admin'
 
 
 def make_map(config):
@@ -16,15 +19,35 b' def make_map(config):'
                  always_scan=config['debug'])
     rmap.minimization = False
     rmap.explicit = False
-
+    
+    from rhodecode.lib.utils import is_valid_repo
+    from rhodecode.lib.utils import is_valid_repos_group
+    
     def check_repo(environ, match_dict):
         """
         check for valid repository for proper 404 handling
+        
         :param environ:
         :param match_dict:
         """
+         
         repo_name = match_dict.get('repo_name')
-        return not cr(repo_name, config['base_path'])
+        return is_valid_repo(repo_name, config['base_path'])
+
+    def check_group(environ, match_dict):
+        """
+        check for valid repositories group for proper 404 handling
+        
+        :param environ:
+        :param match_dict:
+        """
+        repos_group_name = match_dict.get('group_name')
+        
+        return is_valid_repos_group(repos_group_name, config['base_path'])
+
+
+    def check_int(environ, match_dict):
+        return match_dict.get('id').isdigit()
 
     # The ErrorController route (handles 404/500 error pages); it should
     # likely stay at the top, ensuring it can always be resolved
@@ -37,13 +60,16 b' def make_map(config):'
 
     #MAIN PAGE
     rmap.connect('home', '/', controller='home', action='index')
+    rmap.connect('repo_switcher', '/repos', controller='home',
+                 action='repo_switcher')
     rmap.connect('bugtracker',
                  "http://bitbucket.org/marcinkuzminski/rhodecode/issues",
                  _static=True)
     rmap.connect('rhodecode_official', "http://rhodecode.org", _static=True)
 
     #ADMIN REPOSITORY REST ROUTES
-    with rmap.submapper(path_prefix='/_admin', controller='admin/repos') as m:
+    with rmap.submapper(path_prefix=ADMIN_PREFIX,
+                        controller='admin/repos') as m:
         m.connect("repos", "/repos",
              action="create", conditions=dict(method=["POST"]))
         m.connect("repos", "/repos",
@@ -77,6 +103,12 b' def make_map(config):'
         m.connect('delete_repo_user', "/repos_delete_user/{repo_name:.*}",
              action="delete_perm_user", conditions=dict(method=["DELETE"],
                                                         function=check_repo))
+        #ajax delete repo perm users_group
+        m.connect('delete_repo_users_group',
+                  "/repos_delete_users_group/{repo_name:.*}",
+                  action="delete_perm_users_group",
+                  conditions=dict(method=["DELETE"], function=check_repo))
+
         #settings actions
         m.connect('repo_stats', "/repos_stats/{repo_name:.*}",
              action="repo_stats", conditions=dict(method=["DELETE"],
@@ -84,23 +116,126 b' def make_map(config):'
         m.connect('repo_cache', "/repos_cache/{repo_name:.*}",
              action="repo_cache", conditions=dict(method=["DELETE"],
                                                         function=check_repo))
+        m.connect('repo_public_journal',
+                  "/repos_public_journal/{repo_name:.*}",
+                  action="repo_public_journal", conditions=dict(method=["PUT"],
+                  function=check_repo))
+        m.connect('repo_pull', "/repo_pull/{repo_name:.*}",
+             action="repo_pull", conditions=dict(method=["PUT"],
+                                                        function=check_repo))
+
+    with rmap.submapper(path_prefix=ADMIN_PREFIX,
+                        controller='admin/repos_groups') as m:
+        m.connect("repos_groups", "/repos_groups",
+                  action="create", conditions=dict(method=["POST"]))
+        m.connect("repos_groups", "/repos_groups",
+                  action="index", conditions=dict(method=["GET"]))
+        m.connect("formatted_repos_groups", "/repos_groups.{format}",
+                  action="index", conditions=dict(method=["GET"]))
+        m.connect("new_repos_group", "/repos_groups/new",
+                  action="new", conditions=dict(method=["GET"]))
+        m.connect("formatted_new_repos_group", "/repos_groups/new.{format}",
+                  action="new", conditions=dict(method=["GET"]))
+        m.connect("update_repos_group", "/repos_groups/{id}",
+                  action="update", conditions=dict(method=["PUT"],
+                                                   function=check_int))
+        m.connect("delete_repos_group", "/repos_groups/{id}",
+                  action="delete", conditions=dict(method=["DELETE"],
+                                                   function=check_int))
+        m.connect("edit_repos_group", "/repos_groups/{id}/edit",
+                  action="edit", conditions=dict(method=["GET"],
+                                                 function=check_int))
+        m.connect("formatted_edit_repos_group",
+                  "/repos_groups/{id}.{format}/edit",
+                  action="edit", conditions=dict(method=["GET"],
+                                                 function=check_int))
+        m.connect("repos_group", "/repos_groups/{id}",
+                  action="show", conditions=dict(method=["GET"],
+                                                 function=check_int))
+        m.connect("formatted_repos_group", "/repos_groups/{id}.{format}",
+                  action="show", conditions=dict(method=["GET"],
+                                                 function=check_int))
+
     #ADMIN USER REST ROUTES
-    rmap.resource('user', 'users', controller='admin/users',
-                  path_prefix='/_admin')
+    with rmap.submapper(path_prefix=ADMIN_PREFIX,
+                        controller='admin/users') as m:
+        m.connect("users", "/users",
+                  action="create", conditions=dict(method=["POST"]))
+        m.connect("users", "/users",
+                  action="index", conditions=dict(method=["GET"]))
+        m.connect("formatted_users", "/users.{format}",
+                  action="index", conditions=dict(method=["GET"]))
+        m.connect("new_user", "/users/new",
+                  action="new", conditions=dict(method=["GET"]))
+        m.connect("formatted_new_user", "/users/new.{format}",
+                  action="new", conditions=dict(method=["GET"]))
+        m.connect("update_user", "/users/{id}",
+                  action="update", conditions=dict(method=["PUT"]))
+        m.connect("delete_user", "/users/{id}",
+                  action="delete", conditions=dict(method=["DELETE"]))
+        m.connect("edit_user", "/users/{id}/edit",
+                  action="edit", conditions=dict(method=["GET"]))
+        m.connect("formatted_edit_user",
+                  "/users/{id}.{format}/edit",
+                  action="edit", conditions=dict(method=["GET"]))
+        m.connect("user", "/users/{id}",
+                  action="show", conditions=dict(method=["GET"]))
+        m.connect("formatted_user", "/users/{id}.{format}",
+                  action="show", conditions=dict(method=["GET"]))
+
+        #EXTRAS USER ROUTES
+        m.connect("user_perm", "/users_perm/{id}",
+                  action="update_perm", conditions=dict(method=["PUT"]))
+
+    #ADMIN USERS REST ROUTES
+    with rmap.submapper(path_prefix=ADMIN_PREFIX,
+                        controller='admin/users_groups') as m:
+        m.connect("users_groups", "/users_groups",
+                  action="create", conditions=dict(method=["POST"]))
+        m.connect("users_groups", "/users_groups",
+                  action="index", conditions=dict(method=["GET"]))
+        m.connect("formatted_users_groups", "/users_groups.{format}",
+                  action="index", conditions=dict(method=["GET"]))
+        m.connect("new_users_group", "/users_groups/new",
+                  action="new", conditions=dict(method=["GET"]))
+        m.connect("formatted_new_users_group", "/users_groups/new.{format}",
+                  action="new", conditions=dict(method=["GET"]))
+        m.connect("update_users_group", "/users_groups/{id}",
+                  action="update", conditions=dict(method=["PUT"]))
+        m.connect("delete_users_group", "/users_groups/{id}",
+                  action="delete", conditions=dict(method=["DELETE"]))
+        m.connect("edit_users_group", "/users_groups/{id}/edit",
+                  action="edit", conditions=dict(method=["GET"]))
+        m.connect("formatted_edit_users_group",
+                  "/users_groups/{id}.{format}/edit",
+                  action="edit", conditions=dict(method=["GET"]))
+        m.connect("users_group", "/users_groups/{id}",
+                  action="show", conditions=dict(method=["GET"]))
+        m.connect("formatted_users_group", "/users_groups/{id}.{format}",
+                  action="show", conditions=dict(method=["GET"]))
+
+        #EXTRAS USER ROUTES
+        m.connect("users_group_perm", "/users_groups_perm/{id}",
+                  action="update_perm", conditions=dict(method=["PUT"]))
+
+    #ADMIN GROUP REST ROUTES
+    rmap.resource('group', 'groups',
+                  controller='admin/groups', path_prefix=ADMIN_PREFIX)
 
     #ADMIN PERMISSIONS REST ROUTES
-    rmap.resource('permission', 'permissions', controller='admin/permissions',
-                  path_prefix='/_admin')
+    rmap.resource('permission', 'permissions',
+                  controller='admin/permissions', path_prefix=ADMIN_PREFIX)
 
     ##ADMIN LDAP SETTINGS
-    rmap.connect('ldap_settings', '/_admin/ldap',
+    rmap.connect('ldap_settings', '%s/ldap' % ADMIN_PREFIX,
                  controller='admin/ldap_settings', action='ldap_settings',
                  conditions=dict(method=["POST"]))
-    rmap.connect('ldap_home', '/_admin/ldap',
-                 controller='admin/ldap_settings',)
+
+    rmap.connect('ldap_home', '%s/ldap' % ADMIN_PREFIX,
+                 controller='admin/ldap_settings')
 
     #ADMIN SETTINGS REST ROUTES
-    with rmap.submapper(path_prefix='/_admin',
+    with rmap.submapper(path_prefix=ADMIN_PREFIX,
                         controller='admin/settings') as m:
         m.connect("admin_settings", "/settings",
                   action="create", conditions=dict(method=["POST"]))
@@ -132,41 +267,79 b' def make_map(config):'
         m.connect("admin_settings_create_repository", "/create_repository",
                   action="create_repository", conditions=dict(method=["GET"]))
 
+
     #ADMIN MAIN PAGES
-    with rmap.submapper(path_prefix='/_admin', controller='admin/admin') as m:
+    with rmap.submapper(path_prefix=ADMIN_PREFIX,
+                        controller='admin/admin') as m:
         m.connect('admin_home', '', action='index')
         m.connect('admin_add_repo', '/add_repo/{new_repo:[a-z0-9\. _-]*}',
                   action='add_repo')
 
+    #==========================================================================
+    # API V1
+    #==========================================================================
+    with rmap.submapper(path_prefix=ADMIN_PREFIX,
+                        controller='api/api') as m:
+        m.connect('api', '/api')
+
+
     #USER JOURNAL
-    rmap.connect('journal', '/_admin/journal', controller='journal',)
-    rmap.connect('toggle_following', '/_admin/toggle_following',
+    rmap.connect('journal', '%s/journal' % ADMIN_PREFIX, controller='journal')
+
+    rmap.connect('public_journal', '%s/public_journal' % ADMIN_PREFIX,
+                 controller='journal', action="public_journal")
+
+    rmap.connect('public_journal_rss', '%s/public_journal_rss' % ADMIN_PREFIX,
+                 controller='journal', action="public_journal_rss")
+
+    rmap.connect('public_journal_atom',
+                 '%s/public_journal_atom' % ADMIN_PREFIX, controller='journal',
+                 action="public_journal_atom")
+
+    rmap.connect('toggle_following', '%s/toggle_following' % ADMIN_PREFIX,
                  controller='journal', action='toggle_following',
                  conditions=dict(method=["POST"]))
 
     #SEARCH
-    rmap.connect('search', '/_admin/search', controller='search',)
-    rmap.connect('search_repo', '/_admin/search/{search_repo:.*}',
+    rmap.connect('search', '%s/search' % ADMIN_PREFIX, controller='search',)
+    rmap.connect('search_repo', '%s/search/{search_repo:.*}' % ADMIN_PREFIX,
                   controller='search')
 
     #LOGIN/LOGOUT/REGISTER/SIGN IN
-    rmap.connect('login_home', '/_admin/login', controller='login')
-    rmap.connect('logout_home', '/_admin/logout', controller='login',
+    rmap.connect('login_home', '%s/login' % ADMIN_PREFIX, controller='login')
+    rmap.connect('logout_home', '%s/logout' % ADMIN_PREFIX, controller='login',
                  action='logout')
-    rmap.connect('register', '/_admin/register', controller='login',
+
+    rmap.connect('register', '%s/register' % ADMIN_PREFIX, controller='login',
                  action='register')
-    rmap.connect('reset_password', '/_admin/password_reset',
+
+    rmap.connect('reset_password', '%s/password_reset' % ADMIN_PREFIX,
                  controller='login', action='password_reset')
 
+    rmap.connect('reset_password_confirmation',
+                 '%s/password_reset_confirmation' % ADMIN_PREFIX,
+                 controller='login', action='password_reset_confirmation')
+
     #FEEDS
     rmap.connect('rss_feed_home', '/{repo_name:.*}/feed/rss',
                 controller='feed', action='rss',
                 conditions=dict(function=check_repo))
+
     rmap.connect('atom_feed_home', '/{repo_name:.*}/feed/atom',
                 controller='feed', action='atom',
                 conditions=dict(function=check_repo))
 
-    #REPOSITORY ROUTES
+    #==========================================================================
+    # REPOSITORY ROUTES
+    #==========================================================================
+    rmap.connect('summary_home', '/{repo_name:.*}',
+                controller='summary', 
+                conditions=dict(function=check_repo))
+    
+#    rmap.connect('repo_group_home', '/{group_name:.*}',
+#                controller='admin/repos_groups',action="show_by_name", 
+#                conditions=dict(function=check_group))
+    
     rmap.connect('changeset_home', '/{repo_name:.*}/changeset/{revision}',
                 controller='changeset', revision='tip',
                 conditions=dict(function=check_repo))
@@ -176,9 +349,6 b' def make_map(config):'
                  controller='changeset', action='raw_changeset',
                  revision='tip', conditions=dict(function=check_repo))
 
-    rmap.connect('summary_home_', '/{repo_name:.*}',
-                controller='summary', conditions=dict(function=check_repo))
-
     rmap.connect('summary_home', '/{repo_name:.*}/summary',
                 controller='summary', conditions=dict(function=check_repo))
 
@@ -194,6 +364,10 b' def make_map(config):'
     rmap.connect('changelog_home', '/{repo_name:.*}/changelog',
                 controller='changelog', conditions=dict(function=check_repo))
 
+    rmap.connect('changelog_details', '/{repo_name:.*}/changelog_details/{cs}',
+                controller='changelog', action='changelog_details',
+                conditions=dict(function=check_repo))
+
     rmap.connect('files_home', '/{repo_name:.*}/files/{revision}/{f_path:.*}',
                 controller='files', revision='tip', f_path='',
                 conditions=dict(function=check_repo))
@@ -217,28 +391,51 b' def make_map(config):'
                  controller='files', action='annotate', revision='tip',
                  f_path='', conditions=dict(function=check_repo))
 
-    rmap.connect('files_archive_home',
-                 '/{repo_name:.*}/archive/{revision}/{fileformat}',
-                 controller='files', action='archivefile', revision='tip',
-                 conditions=dict(function=check_repo))
+    rmap.connect('files_edit_home',
+                 '/{repo_name:.*}/edit/{revision}/{f_path:.*}',
+                 controller='files', action='edit', revision='tip',
+                 f_path='', conditions=dict(function=check_repo))
+
+    rmap.connect('files_add_home',
+                 '/{repo_name:.*}/add/{revision}/{f_path:.*}',
+                 controller='files', action='add', revision='tip',
+                 f_path='', conditions=dict(function=check_repo))
+
+    rmap.connect('files_archive_home', '/{repo_name:.*}/archive/{fname}',
+                controller='files', action='archivefile',
+                conditions=dict(function=check_repo))
+
+    rmap.connect('files_nodelist_home',
+                 '/{repo_name:.*}/nodelist/{revision}/{f_path:.*}',
+                controller='files', action='nodelist',
+                conditions=dict(function=check_repo))
 
     rmap.connect('repo_settings_delete', '/{repo_name:.*}/settings',
-                 controller='settings', action="delete",
-                 conditions=dict(method=["DELETE"], function=check_repo))
+                controller='settings', action="delete",
+                conditions=dict(method=["DELETE"], function=check_repo))
 
     rmap.connect('repo_settings_update', '/{repo_name:.*}/settings',
-                 controller='settings', action="update",
-                 conditions=dict(method=["PUT"], function=check_repo))
+                controller='settings', action="update",
+                conditions=dict(method=["PUT"], function=check_repo))
 
     rmap.connect('repo_settings_home', '/{repo_name:.*}/settings',
-                 controller='settings', action='index',
-                 conditions=dict(function=check_repo))
+                controller='settings', action='index',
+                conditions=dict(function=check_repo))
 
     rmap.connect('repo_fork_create_home', '/{repo_name:.*}/fork',
                 controller='settings', action='fork_create',
                 conditions=dict(function=check_repo, method=["POST"]))
+
     rmap.connect('repo_fork_home', '/{repo_name:.*}/fork',
                 controller='settings', action='fork',
                 conditions=dict(function=check_repo))
 
+    rmap.connect('repo_followers_home', '/{repo_name:.*}/followers',
+                 controller='followers', action='followers',
+                 conditions=dict(function=check_repo))
+
+    rmap.connect('repo_forks_home', '/{repo_name:.*}/forks',
+                 controller='forks', action='forks',
+                 conditions=dict(function=check_repo))
+
     return rmap

rhodecode/controllers/admin/admin.py

@@ -4,10 +4,10 b''
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     Controller for Admin panel of Rhodecode
-    
+
     :created_on: Apr 7, 2010
     :author: marcink
-    :copyright: (C) 2009-2010 Marcin Kuzminski <[e-mail]>    
+    :copyright: (C) 2009-2011 Marcin Kuzminski <[e-mail]>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software: you can redistribute it and/or modify
@@ -24,14 +24,18 b''
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import logging
+
 from pylons import request, tmpl_context as c
+from sqlalchemy.orm import joinedload
+from webhelpers.paginate import Page
+
+from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator
 from rhodecode.lib.base import BaseController, render
 from rhodecode.model.db import UserLog
-from webhelpers.paginate import Page
-from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator
 
 log = logging.getLogger(__name__)
 
+
 class AdminController(BaseController):
 
     @LoginRequired()
@@ -41,11 +45,15 b' class AdminController(BaseController):'
     @HasPermissionAllDecorator('hg.admin')
     def index(self):
 
-        users_log = self.sa.query(UserLog).order_by(UserLog.action_date.desc())
+        users_log = self.sa.query(UserLog)\
+                .options(joinedload(UserLog.user))\
+                .options(joinedload(UserLog.repository))\
+                .order_by(UserLog.action_date.desc())
+
         p = int(request.params.get('page', 1))
         c.users_log = Page(users_log, page=p, items_per_page=10)
         c.log_data = render('admin/admin_log.html')
-        if request.params.get('partial'):
+
+        if request.environ.get('HTTP_X_PARTIAL_XHR'):
             return c.log_data
         return render('admin/admin.html')
-

rhodecode/controllers/admin/ldap_settings.py

@@ -4,10 +4,10 b''
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     ldap controller for RhodeCode
-    
+
     :created_on: Nov 26, 2010
     :author: marcink
-    :copyright: (C) 2009-2010 Marcin Kuzminski <[e-mail]>    
+    :copyright: (C) 2009-2011 Marcin Kuzminski <[e-mail]>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software: you can redistribute it and/or modify
@@ -32,29 +32,61 b' from pylons import request, response, se'
 from pylons.controllers.util import abort, redirect
 from pylons.i18n.translation import _
 
+from sqlalchemy.exc import DatabaseError
+
 from rhodecode.lib.base import BaseController, render
 from rhodecode.lib import helpers as h
 from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator
-from rhodecode.lib.auth_ldap import LdapImportError
-from rhodecode.model.settings import SettingsModel
+from rhodecode.lib.exceptions import LdapImportError
 from rhodecode.model.forms import LdapSettingsForm
-from sqlalchemy.exc import DatabaseError
+from rhodecode.model.db import RhodeCodeSettings
 
 log = logging.getLogger(__name__)
 
 
+class LdapSettingsController(BaseController):
 
-class LdapSettingsController(BaseController):
+    search_scope_choices = [('BASE', _('BASE'),),
+                            ('ONELEVEL', _('ONELEVEL'),),
+                            ('SUBTREE', _('SUBTREE'),),
+                            ]
+    search_scope_default = 'SUBTREE'
+
+    tls_reqcert_choices = [('NEVER', _('NEVER'),),
+                           ('ALLOW', _('ALLOW'),),
+                           ('TRY', _('TRY'),),
+                           ('DEMAND', _('DEMAND'),),
+                           ('HARD', _('HARD'),),
+                           ]
+    tls_reqcert_default = 'DEMAND'
+
+    tls_kind_choices = [('PLAIN', _('No encryption'),),
+                        ('LDAPS', _('LDAPS connection'),),
+                        ('START_TLS', _('START_TLS on LDAP connection'),)
+                        ]
+
+    tls_kind_default = 'PLAIN'
 
     @LoginRequired()
     @HasPermissionAllDecorator('hg.admin')
     def __before__(self):
         c.admin_user = session.get('admin_user')
         c.admin_username = session.get('admin_username')
+        c.search_scope_choices = self.search_scope_choices
+        c.tls_reqcert_choices = self.tls_reqcert_choices
+        c.tls_kind_choices = self.tls_kind_choices
+
+        c.search_scope_cur = self.search_scope_default
+        c.tls_reqcert_cur = self.tls_reqcert_default
+        c.tls_kind_cur = self.tls_kind_default
+
         super(LdapSettingsController, self).__before__()
 
     def index(self):
-        defaults = SettingsModel().get_ldap_settings()
+        defaults = RhodeCodeSettings.get_ldap_settings()
+        c.search_scope_cur = defaults.get('ldap_search_scope')
+        c.tls_reqcert_cur = defaults.get('ldap_tls_reqcert')
+        c.tls_kind_cur = defaults.get('ldap_tls_kind')
 
         return htmlfill.render(
                     render('admin/ldap/ldap.html'),
@@ -65,17 +97,17 b' class LdapSettingsController(BaseControl'
     def ldap_settings(self):
         """POST ldap create and store ldap settings"""
 
-        settings_model = SettingsModel()
-        post_data = dict(request.POST)
-        _form = LdapSettingsForm(post_data.get('ldap_active'))()
+        _form = LdapSettingsForm([x[0] for x in self.tls_reqcert_choices],
+                                 [x[0] for x in self.search_scope_choices],
+                                 [x[0] for x in self.tls_kind_choices])()
 
         try:
-            form_result = _form.to_python(post_data)
+            form_result = _form.to_python(dict(request.POST))
             try:
 
                 for k, v in form_result.items():
                     if k.startswith('ldap_'):
-                        setting = settings_model.get(k)
+                        setting = RhodeCodeSettings.get_by_name(k)
                         setting.app_settings_value = v
                         self.sa.add(setting)
 
@@ -89,11 +121,12 b' class LdapSettingsController(BaseControl'
                       'is missing.'), category='warning')
 
         except formencode.Invalid, errors:
+            e = errors.error_dict or {}
 
             return htmlfill.render(
                 render('admin/ldap/ldap.html'),
                 defaults=errors.value,
-                errors=errors.error_dict or {},
+                errors=e,
                 prefix_error=False,
                 encoding="UTF-8")
         except Exception:

rhodecode/controllers/admin/permissions.py

@@ -2,12 +2,12 b''
 """
     rhodecode.controllers.admin.permissions
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    
+
     permissions controller for Rhodecode
-    
+
     :created_on: Apr 27, 2010
     :author: marcink
-    :copyright: (C) 2009-2010 Marcin Kuzminski <[e-mail]>    
+    :copyright: (C) 2009-2011 Marcin Kuzminski <[e-mail]>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software: you can redistribute it and/or modify
@@ -23,24 +23,25 b''
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import logging
+import traceback
+import formencode
 from formencode import htmlfill
+
 from pylons import request, session, tmpl_context as c, url
 from pylons.controllers.util import abort, redirect
 from pylons.i18n.translation import _
+
 from rhodecode.lib import helpers as h
 from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator
-from rhodecode.lib.auth_ldap import LdapImportError
 from rhodecode.lib.base import BaseController, render
-from rhodecode.model.forms import LdapSettingsForm, DefaultPermissionsForm
+from rhodecode.model.forms import DefaultPermissionsForm
 from rhodecode.model.permission import PermissionModel
-from rhodecode.model.settings import SettingsModel
-from rhodecode.model.user import UserModel
-import formencode
-import logging
-import traceback
+from rhodecode.model.db import User
 
 log = logging.getLogger(__name__)
 
+
 class PermissionsController(BaseController):
     """REST Controller styled on the Atom Publishing Protocol"""
     # To properly map this controller, ensure your config/routing.py
@@ -69,7 +70,6 b' class PermissionsController(BaseControll'
         self.create_choices = [('hg.create.none', _('Disabled')),
                                ('hg.create.repository', _('Enabled'))]
 
-
     def index(self, format='html'):
         """GET /permissions: All items in the collection"""
         # url('permissions')
@@ -99,7 +99,7 b' class PermissionsController(BaseControll'
 
         try:
             form_result = _form.to_python(dict(request.POST))
-            form_result.update({'perm_user_name':id})
+            form_result.update({'perm_user_name': id})
             permission_model.update(form_result)
             h.flash(_('Default permissions updated successfully'),
                     category='success')
@@ -123,8 +123,6 b' class PermissionsController(BaseControll'
 
         return redirect(url('edit_permission', id=id))
 
-
-
     def delete(self, id):
         """DELETE /permissions/id: Delete an existing item"""
         # Forms posted to this method should contain a hidden field:
@@ -146,9 +144,9 b' class PermissionsController(BaseControll'
         c.create_choices = self.create_choices
 
         if id == 'default':
-            default_user = UserModel().get_by_username('default')
-            defaults = {'_method':'put',
-                        'anonymous':default_user.active}
+            default_user = User.by_username('default')
+            defaults = {'_method': 'put',
+                        'anonymous': default_user.active}
 
             for p in default_user.user_perms:
                 if p.permission.permission_name.startswith('repository.'):

rhodecode/controllers/admin/repos.py

@@ -2,12 +2,12 b''
 """
     rhodecode.controllers.admin.repos
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    
+
     Admin controller for RhodeCode
-    
+
     :created_on: Apr 7, 2010
     :author: marcink
-    :copyright: (C) 2009-2011 Marcin Kuzminski <[e-mail]>    
+    :copyright: (C) 2009-2011 Marcin Kuzminski <[e-mail]>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software: you can redistribute it and/or modify
@@ -38,17 +38,20 b' from rhodecode.lib import helpers as h'
 from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator, \
     HasPermissionAnyDecorator
 from rhodecode.lib.base import BaseController, render
-from rhodecode.lib.utils import invalidate_cache, action_logger
-from rhodecode.model.db import User
+from rhodecode.lib.utils import invalidate_cache, action_logger, repo_name_slug
+from rhodecode.lib.helpers import get_token
+from rhodecode.model.db import User, Repository, UserFollowing, Group
 from rhodecode.model.forms import RepoForm
 from rhodecode.model.scm import ScmModel
 from rhodecode.model.repo import RepoModel
-
+from sqlalchemy.exc import IntegrityError
 
 log = logging.getLogger(__name__)
 
+
 class ReposController(BaseController):
-    """REST Controller styled on the Atom Publishing Protocol"""
+    """
+    REST Controller styled on the Atom Publishing Protocol"""
     # To properly map this controller, ensure your config/routing.py
     # file has a resource setup:
     #     map.resource('repo', 'repos')
@@ -60,35 +63,129 b' class ReposController(BaseController):'
         c.admin_username = session.get('admin_username')
         super(ReposController, self).__before__()
 
+    def __load_defaults(self):
+        repo_model = RepoModel()
+
+        c.repo_groups = [('', '')]
+        parents_link = lambda k: h.literal('&raquo;'.join(
+                                    map(lambda k: k.group_name,
+                                        k.parents + [k])
+                                    )
+                                )
+
+        c.repo_groups.extend([(x.group_id, parents_link(x)) for \
+                                            x in self.sa.query(Group).all()])
+        c.repo_groups = sorted(c.repo_groups,
+                               key=lambda t: t[1].split('&raquo;')[0])
+        c.repo_groups_choices = map(lambda k: unicode(k[0]), c.repo_groups)
+        c.users_array = repo_model.get_users_js()
+        c.users_groups_array = repo_model.get_users_groups_js()
+
+    def __load_data(self, repo_name=None):
+        """
+        Load defaults settings for edit, and update
+
+        :param repo_name:
+        """
+        self.__load_defaults()
+
+        c.repo_info = db_repo = Repository.by_repo_name(repo_name)
+        repo = scm_repo = db_repo.scm_instance
+
+        if c.repo_info is None:
+            h.flash(_('%s repository is not mapped to db perhaps'
+                      ' it was created or renamed from the filesystem'
+                      ' please run the application again'
+                      ' in order to rescan repositories') % repo_name,
+                      category='error')
+
+            return redirect(url('repos'))
+
+        c.default_user_id = User.by_username('default').user_id
+        c.in_public_journal = self.sa.query(UserFollowing)\
+            .filter(UserFollowing.user_id == c.default_user_id)\
+            .filter(UserFollowing.follows_repository == c.repo_info).scalar()
+
+        if c.repo_info.stats:
+            last_rev = c.repo_info.stats.stat_on_revision
+        else:
+            last_rev = 0
+        c.stats_revision = last_rev
+
+        c.repo_last_rev = repo.count() - 1 if repo.revisions else 0
+
+        if last_rev == 0 or c.repo_last_rev == 0:
+            c.stats_percentage = 0
+        else:
+            c.stats_percentage = '%.2f' % ((float((last_rev)) /
+                                            c.repo_last_rev) * 100)
+
+        defaults = c.repo_info.get_dict()
+        group, repo_name = c.repo_info.groups_and_repo
+        defaults['repo_name'] = repo_name
+        defaults['repo_group'] = getattr(group[-1] if group else None,
+                                         'group_id', None)
+
+        #fill owner
+        if c.repo_info.user:
+            defaults.update({'user': c.repo_info.user.username})
+        else:
+            replacement_user = self.sa.query(User)\
+            .filter(User.admin == True).first().username
+            defaults.update({'user': replacement_user})
+
+        #fill repository users
+        for p in c.repo_info.repo_to_perm:
+            defaults.update({'u_perm_%s' % p.user.username:
+                             p.permission.permission_name})
+
+        #fill repository groups
+        for p in c.repo_info.users_group_to_perm:
+            defaults.update({'g_perm_%s' % p.users_group.users_group_name:
+                             p.permission.permission_name})
+
+        return defaults
+
     @HasPermissionAllDecorator('hg.admin')
     def index(self, format='html'):
         """GET /repos: All items in the collection"""
         # url('repos')
-        cached_repo_list = ScmModel().get_repos()
-        c.repos_list = sorted(cached_repo_list, key=itemgetter('name_sort'))
+
+        c.repos_list = ScmModel().get_repos(Repository.query()
+                                            .order_by(Repository.repo_name)
+                                            .all(), sort_key='name_sort')
         return render('admin/repos/repos.html')
 
     @HasPermissionAnyDecorator('hg.admin', 'hg.create.repository')
     def create(self):
-        """POST /repos: Create a new item"""
+        """
+        POST /repos: Create a new item"""
         # url('repos')
         repo_model = RepoModel()
-        _form = RepoForm()()
+        self.__load_defaults()
         form_result = {}
         try:
-            form_result = _form.to_python(dict(request.POST))
-            repo_model.create(form_result, c.rhodecode_user)
-            h.flash(_('created repository %s') % form_result['repo_name'],
+            form_result = RepoForm(repo_groups=c.repo_groups_choices)()\
+                            .to_python(dict(request.POST))
+            repo_model.create(form_result, self.rhodecode_user)
+            if form_result['clone_uri']:
+                h.flash(_('created repository %s from %s') \
+                    % (form_result['repo_name'], form_result['clone_uri']),
+                    category='success')
+            else:
+                h.flash(_('created repository %s') % form_result['repo_name'],
                     category='success')
 
             if request.POST.get('user_created'):
+                #created by regular non admin user
                 action_logger(self.rhodecode_user, 'user_created_repo',
-                              form_result['repo_name'], '', self.sa)
+                              form_result['repo_name_full'], '', self.sa)
             else:
                 action_logger(self.rhodecode_user, 'admin_created_repo',
-                              form_result['repo_name'], '', self.sa)
+                              form_result['repo_name_full'], '', self.sa)
 
         except formencode.Invalid, errors:
+
             c.new_repo = errors.value['repo_name']
 
             if request.POST.get('user_created'):
@@ -116,54 +213,41 b' class ReposController(BaseController):'
     def new(self, format='html'):
         """GET /repos/new: Form to create a new item"""
         new_repo = request.GET.get('repo', '')
-        c.new_repo = h.repo_name_slug(new_repo)
-
+        c.new_repo = repo_name_slug(new_repo)
+        self.__load_defaults()
         return render('admin/repos/repo_add.html')
 
     @HasPermissionAllDecorator('hg.admin')
     def update(self, repo_name):
-        """PUT /repos/repo_name: Update an existing item"""
+        """
+        PUT /repos/repo_name: Update an existing item"""
         # Forms posted to this method should contain a hidden field:
         #    <input type="hidden" name="_method" value="PUT" />
         # Or using helpers:
         #    h.form(url('repo', repo_name=ID),
         #           method='put')
         # url('repo', repo_name=ID)
+        self.__load_defaults()
         repo_model = RepoModel()
         changed_name = repo_name
-        _form = RepoForm(edit=True, old_data={'repo_name':repo_name})()
-
+        _form = RepoForm(edit=True, old_data={'repo_name': repo_name},
+                         repo_groups=c.repo_groups_choices)()
         try:
             form_result = _form.to_python(dict(request.POST))
             repo_model.update(repo_name, form_result)
             invalidate_cache('get_repo_cached_%s' % repo_name)
             h.flash(_('Repository %s updated successfully' % repo_name),
                     category='success')
-            changed_name = form_result['repo_name']
+            changed_name = form_result['repo_name_full']
             action_logger(self.rhodecode_user, 'admin_updated_repo',
                               changed_name, '', self.sa)
 
         except formencode.Invalid, errors:
-            c.repo_info = repo_model.get_by_repo_name(repo_name)
-            if c.repo_info.stats:
-                last_rev = c.repo_info.stats.stat_on_revision
-            else:
-                last_rev = 0
-            c.stats_revision = last_rev
-            r = ScmModel().get(repo_name)
-            c.repo_last_rev = r.revisions[-1] if r.revisions else 0
-
-            if last_rev == 0:
-                c.stats_percentage = 0
-            else:
-                c.stats_percentage = '%.2f' % ((float((last_rev)) /
-                                                c.repo_last_rev) * 100)
-
-            c.users_array = repo_model.get_users_js()
-            errors.value.update({'user':c.repo_info.user.username})
+            defaults = self.__load_data(repo_name)
+            defaults.update(errors.value)
             return htmlfill.render(
                 render('admin/repos/repo_edit.html'),
-                defaults=errors.value,
+                defaults=defaults,
                 errors=errors.error_dict or {},
                 prefix_error=False,
                 encoding="UTF-8")
@@ -172,12 +256,12 b' class ReposController(BaseController):'
             log.error(traceback.format_exc())
             h.flash(_('error occurred during update of repository %s') \
                     % repo_name, category='error')
-
         return redirect(url('edit_repo', repo_name=changed_name))
 
     @HasPermissionAllDecorator('hg.admin')
     def delete(self, repo_name):
-        """DELETE /repos/repo_name: Delete an existing item"""
+        """
+        DELETE /repos/repo_name: Delete an existing item"""
         # Forms posted to this method should contain a hidden field:
         #    <input type="hidden" name="_method" value="DELETE" />
         # Or using helpers:
@@ -202,6 +286,18 b' class ReposController(BaseController):'
             invalidate_cache('get_repo_cached_%s' % repo_name)
             h.flash(_('deleted repository %s') % repo_name, category='success')
 
+        except IntegrityError, e:
+            if e.message.find('repositories_fork_id_fkey'):
+                log.error(traceback.format_exc())
+                h.flash(_('Cannot delete %s it still contains attached '
+                          'forks') % repo_name,
+                        category='warning')
+            else:
+                log.error(traceback.format_exc())
+                h.flash(_('An error occurred during '
+                          'deletion of %s') % repo_name,
+                        category='error')
+
         except Exception, e:
             log.error(traceback.format_exc())
             h.flash(_('An error occurred during deletion of %s') % repo_name,
@@ -213,6 +309,7 b' class ReposController(BaseController):'
     def delete_perm_user(self, repo_name):
         """
         DELETE an existing repository permission user
+
         :param repo_name:
         """
 
@@ -225,9 +322,26 b' class ReposController(BaseController):'
             raise HTTPInternalServerError()
 
     @HasPermissionAllDecorator('hg.admin')
+    def delete_perm_users_group(self, repo_name):
+        """
+        DELETE an existing repository permission users group
+
+        :param repo_name:
+        """
+        try:
+            repo_model = RepoModel()
+            repo_model.delete_perm_users_group(request.POST, repo_name)
+        except Exception, e:
+            h.flash(_('An error occurred during deletion of repository'
+                      ' users groups'),
+                    category='error')
+            raise HTTPInternalServerError()
+
+    @HasPermissionAllDecorator('hg.admin')
     def repo_stats(self, repo_name):
         """
         DELETE an existing repository statistics
+
         :param repo_name:
         """
 
@@ -243,6 +357,7 b' class ReposController(BaseController):'
     def repo_cache(self, repo_name):
         """
         INVALIDATE existing repository cache
+
         :param repo_name:
         """
 
@@ -254,6 +369,50 b' class ReposController(BaseController):'
         return redirect(url('edit_repo', repo_name=repo_name))
 
     @HasPermissionAllDecorator('hg.admin')
+    def repo_public_journal(self, repo_name):
+        """
+        Set's this repository to be visible in public journal,
+        in other words assing default user to follow this repo
+
+        :param repo_name:
+        """
+
+        cur_token = request.POST.get('auth_token')
+        token = get_token()
+        if cur_token == token:
+            try:
+                repo_id = Repository.by_repo_name(repo_name).repo_id
+                user_id = User.by_username('default').user_id
+                self.scm_model.toggle_following_repo(repo_id, user_id)
+                h.flash(_('Updated repository visibility in public journal'),
+                        category='success')
+            except:
+                h.flash(_('An error occurred during setting this'
+                          ' repository in public journal'),
+                        category='error')
+
+        else:
+            h.flash(_('Token mismatch'), category='error')
+        return redirect(url('edit_repo', repo_name=repo_name))
+
+    @HasPermissionAllDecorator('hg.admin')
+    def repo_pull(self, repo_name):
+        """
+        Runs task to update given repository with remote changes,
+        ie. make pull on remote location
+
+        :param repo_name:
+        """
+        try:
+            ScmModel().pull_changes(repo_name, self.rhodecode_user.username)
+            h.flash(_('Pulled from remote location'), category='success')
+        except Exception, e:
+            h.flash(_('An error occurred during pull from remote location'),
+                    category='error')
+
+        return redirect(url('edit_repo', repo_name=repo_name))
+
+    @HasPermissionAllDecorator('hg.admin')
     def show(self, repo_name, format='html'):
         """GET /repos/repo_name: Show a specific item"""
         # url('repo', repo_name=ID)
@@ -262,46 +421,7 b' class ReposController(BaseController):'
     def edit(self, repo_name, format='html'):
         """GET /repos/repo_name/edit: Form to edit an existing item"""
         # url('edit_repo', repo_name=ID)
-        repo_model = RepoModel()
-        r = ScmModel().get(repo_name)
-        c.repo_info = repo_model.get_by_repo_name(repo_name)
-
-        if c.repo_info is None:
-            h.flash(_('%s repository is not mapped to db perhaps'
-                      ' it was created or renamed from the filesystem'
-                      ' please run the application again'
-                      ' in order to rescan repositories') % repo_name,
-                      category='error')
-
-            return redirect(url('repos'))
-
-        if c.repo_info.stats:
-            last_rev = c.repo_info.stats.stat_on_revision
-        else:
-            last_rev = 0
-        c.stats_revision = last_rev
-
-        c.repo_last_rev = r.revisions[-1] if r.revisions else 0
-
-        if last_rev == 0 or c.repo_last_rev == 0:
-            c.stats_percentage = 0
-        else:
-            c.stats_percentage = '%.2f' % ((float((last_rev)) /
-                                            c.repo_last_rev) * 100)
-
-        defaults = c.repo_info.get_dict()
-        if c.repo_info.user:
-            defaults.update({'user':c.repo_info.user.username})
-        else:
-            replacement_user = self.sa.query(User)\
-            .filter(User.admin == True).first().username
-            defaults.update({'user':replacement_user})
-
-        c.users_array = repo_model.get_users_js()
-
-        for p in c.repo_info.repo_to_perm:
-            defaults.update({'perm_%s' % p.user.username:
-                             p.permission.permission_name})
+        defaults = self.__load_data(repo_name)
 
         return htmlfill.render(
             render('admin/repos/repo_edit.html'),

rhodecode/controllers/admin/settings.py

@@ -2,12 +2,12 b''
 """
     rhodecode.controllers.admin.settings
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    
+
     settings controller for rhodecode admin
-        
+
     :created_on: Jul 14, 2010
     :author: marcink
-    :copyright: (C) 2009-2010 Marcin Kuzminski <[e-mail]>    
+    :copyright: (C) 2009-2011 Marcin Kuzminski <[e-mail]>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software: you can redistribute it and/or modify
@@ -23,28 +23,30 b''
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import logging
+import traceback
+import formencode
+
+from sqlalchemy import func
 from formencode import htmlfill
-from pylons import request, session, tmpl_context as c, url, app_globals as g, \
-    config
+from pylons import request, session, tmpl_context as c, url, config
 from pylons.controllers.util import abort, redirect
 from pylons.i18n.translation import _
+
 from rhodecode.lib import helpers as h
 from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator, \
     HasPermissionAnyDecorator, NotAnonymous
 from rhodecode.lib.base import BaseController, render
 from rhodecode.lib.celerylib import tasks, run_task
 from rhodecode.lib.utils import repo2db_mapper, invalidate_cache, \
-    set_rhodecode_config
-from rhodecode.model.db import RhodeCodeUi, Repository
+    set_rhodecode_config, repo_name_slug
+from rhodecode.model.db import RhodeCodeUi, Repository, Group, \
+    RhodeCodeSettings
 from rhodecode.model.forms import UserForm, ApplicationSettingsForm, \
     ApplicationUiSettingsForm
 from rhodecode.model.scm import ScmModel
-from rhodecode.model.settings import SettingsModel
 from rhodecode.model.user import UserModel
-from sqlalchemy import func
-import formencode
-import logging
-import traceback
+from rhodecode.model.db import User
 
 log = logging.getLogger(__name__)
 
@@ -53,23 +55,21 b' class SettingsController(BaseController)'
     """REST Controller styled on the Atom Publishing Protocol"""
     # To properly map this controller, ensure your config/routing.py
     # file has a resource setup:
-    #     map.resource('setting', 'settings', controller='admin/settings', 
+    #     map.resource('setting', 'settings', controller='admin/settings',
     #         path_prefix='/admin', name_prefix='admin_')
 
-
     @LoginRequired()
     def __before__(self):
         c.admin_user = session.get('admin_user')
         c.admin_username = session.get('admin_username')
         super(SettingsController, self).__before__()
 
-
     @HasPermissionAllDecorator('hg.admin')
     def index(self, format='html'):
         """GET /admin/settings: All items in the collection"""
         # url('admin_settings')
 
-        defaults = SettingsModel().get_app_settings()
+        defaults = RhodeCodeSettings.get_app_settings()
         defaults.update(self.get_hg_ui_settings())
         return htmlfill.render(
             render('admin/settings/settings.html'),
@@ -100,19 +100,21 b' class SettingsController(BaseController)'
         if setting_id == 'mapping':
             rm_obsolete = request.POST.get('destroy', False)
             log.debug('Rescanning directories with destroy=%s', rm_obsolete)
-
-            initial = ScmModel().repo_scan(g.paths[0][1], g.baseui)
+            initial = ScmModel().repo_scan()
+            log.debug('invalidating all repositories')
             for repo_name in initial.keys():
                 invalidate_cache('get_repo_cached_%s' % repo_name)
 
-            repo2db_mapper(initial, rm_obsolete)
+            added, removed = repo2db_mapper(initial, rm_obsolete)
 
-            h.flash(_('Repositories successfully rescanned'), category='success')
+            h.flash(_('Repositories successfully'
+                      ' rescanned added: %s,removed: %s') % (added, removed),
+                    category='success')
 
         if setting_id == 'whoosh':
             repo_location = self.get_hg_ui_settings()['paths_root_path']
             full_index = request.POST.get('full_index', False)
-            task = run_task(tasks.whoosh_index, repo_location, full_index)
+            run_task(tasks.whoosh_index, repo_location, full_index)
 
             h.flash(_('Whoosh reindex task scheduled'), category='success')
         if setting_id == 'global':
@@ -120,30 +122,36 b' class SettingsController(BaseController)'
             application_form = ApplicationSettingsForm()()
             try:
                 form_result = application_form.to_python(dict(request.POST))
-                settings_model = SettingsModel()
+
                 try:
-                    hgsettings1 = settings_model.get('title')
-                    hgsettings1.app_settings_value = form_result['rhodecode_title']
+                    hgsettings1 = RhodeCodeSettings.get_by_name('title')
+                    hgsettings1.app_settings_value = \
+                        form_result['rhodecode_title']
 
-                    hgsettings2 = settings_model.get('realm')
-                    hgsettings2.app_settings_value = form_result['rhodecode_realm']
+                    hgsettings2 = RhodeCodeSettings.get_by_name('realm')
+                    hgsettings2.app_settings_value = \
+                        form_result['rhodecode_realm']
 
+                    hgsettings3 = RhodeCodeSettings.get_by_name('ga_code')
+                    hgsettings3.app_settings_value = \
+                        form_result['rhodecode_ga_code']
 
                     self.sa.add(hgsettings1)
                     self.sa.add(hgsettings2)
+                    self.sa.add(hgsettings3)
                     self.sa.commit()
                     set_rhodecode_config(config)
                     h.flash(_('Updated application settings'),
                             category='success')
 
-                except:
+                except Exception:
                     log.error(traceback.format_exc())
-                    h.flash(_('error occurred during updating'
-                              ' application settings'), category='error')
+                    h.flash(_('error occurred during updating '
+                              'application settings'),
+                            category='error')
 
                     self.sa.rollback()
 
-
             except formencode.Invalid, errors:
                 return htmlfill.render(
                      render('admin/settings/settings.html'),
@@ -167,24 +175,30 b' class SettingsController(BaseController)'
                     .filter(RhodeCodeUi.ui_key == '/').one()
                     hgsettings2.ui_value = form_result['paths_root_path']
 
-
                     #HOOKS
                     hgsettings3 = self.sa.query(RhodeCodeUi)\
                     .filter(RhodeCodeUi.ui_key == 'changegroup.update').one()
-                    hgsettings3.ui_active = bool(form_result['hooks_changegroup_update'])
+                    hgsettings3.ui_active = \
+                        bool(form_result['hooks_changegroup_update'])
 
                     hgsettings4 = self.sa.query(RhodeCodeUi)\
-                    .filter(RhodeCodeUi.ui_key == 'changegroup.repo_size').one()
-                    hgsettings4.ui_active = bool(form_result['hooks_changegroup_repo_size'])
+                    .filter(RhodeCodeUi.ui_key ==
+                            'changegroup.repo_size').one()
+                    hgsettings4.ui_active = \
+                        bool(form_result['hooks_changegroup_repo_size'])
 
                     hgsettings5 = self.sa.query(RhodeCodeUi)\
-                    .filter(RhodeCodeUi.ui_key == 'pretxnchangegroup.push_logger').one()
-                    hgsettings5.ui_active = bool(form_result['hooks_pretxnchangegroup_push_logger'])
+                    .filter(RhodeCodeUi.ui_key ==
+                            'pretxnchangegroup.push_logger').one()
+                    hgsettings5.ui_active = \
+                        bool(form_result['hooks_pretxnchangegroup'
+                                         '_push_logger'])
 
                     hgsettings6 = self.sa.query(RhodeCodeUi)\
-                    .filter(RhodeCodeUi.ui_key == 'preoutgoing.pull_logger').one()
-                    hgsettings6.ui_active = bool(form_result['hooks_preoutgoing_pull_logger'])
-
+                    .filter(RhodeCodeUi.ui_key ==
+                            'preoutgoing.pull_logger').one()
+                    hgsettings6.ui_active = \
+                        bool(form_result['hooks_preoutgoing_pull_logger'])
 
                     self.sa.add(hgsettings1)
                     self.sa.add(hgsettings2)
@@ -199,12 +213,11 b' class SettingsController(BaseController)'
 
                 except:
                     log.error(traceback.format_exc())
-                    h.flash(_('error occurred during updating application settings'),
-                            category='error')
+                    h.flash(_('error occurred during updating '
+                              'application settings'), category='error')
 
                     self.sa.rollback()
 
-
             except formencode.Invalid, errors:
                 return htmlfill.render(
                      render('admin/settings/settings.html'),
@@ -214,6 +227,32 b' class SettingsController(BaseController)'
                      encoding="UTF-8")
 
 
+        if setting_id == 'hooks':
+            ui_key = request.POST.get('new_hook_ui_key')
+            ui_value = request.POST.get('new_hook_ui_value')
+            try:
+                
+                if ui_value and ui_key:
+                    RhodeCodeUi.create_or_update_hook(ui_key, ui_value)
+                    h.flash(_('Added new hook'),
+                            category='success')
+
+                # check for edits
+                update = False
+                _d = request.POST.dict_of_lists()
+                for k, v in zip(_d.get('hook_ui_key',[]), _d.get('hook_ui_value_new',[])):
+                    RhodeCodeUi.create_or_update_hook(k, v)
+                    update = True
+
+                if update:
+                    h.flash(_('Updated hooks'), category='success')
+
+            except:
+                log.error(traceback.format_exc())
+                h.flash(_('error occurred during hook creation'),
+                        category='error')
+
+            return redirect(url('admin_edit_setting', setting_id='hooks'))
 
         return redirect(url('admin_settings'))
 
@@ -226,29 +265,45 b' class SettingsController(BaseController)'
         #    h.form(url('admin_setting', setting_id=ID),
         #           method='delete')
         # url('admin_setting', setting_id=ID)
-
+        if setting_id == 'hooks':
+            hook_id = request.POST.get('hook_id')
+            RhodeCodeUi.delete(hook_id)
+            
+            
     @HasPermissionAllDecorator('hg.admin')
     def show(self, setting_id, format='html'):
-        """GET /admin/settings/setting_id: Show a specific item"""
+        """
+        GET /admin/settings/setting_id: Show a specific item"""
         # url('admin_setting', setting_id=ID)
 
     @HasPermissionAllDecorator('hg.admin')
     def edit(self, setting_id, format='html'):
-        """GET /admin/settings/setting_id/edit: Form to edit an existing item"""
+        """
+        GET /admin/settings/setting_id/edit: Form to
+        edit an existing item"""
         # url('admin_edit_setting', setting_id=ID)
 
+        c.hooks = RhodeCodeUi.get_builtin_hooks()
+        c.custom_hooks = RhodeCodeUi.get_custom_hooks()
+
+        return htmlfill.render(
+            render('admin/settings/hooks.html'),
+            defaults={},
+            encoding="UTF-8",
+            force_defaults=False
+        )
+
     @NotAnonymous()
     def my_account(self):
         """
-        GET /_admin/my_account Displays info about my account 
+        GET /_admin/my_account Displays info about my account
         """
         # url('admin_settings_my_account')
 
-        c.user = UserModel().get(c.rhodecode_user.user_id, cache=False)
+        c.user = User.get(self.rhodecode_user.user_id)
         all_repos = self.sa.query(Repository)\
-            .filter(Repository.user_id == c.user.user_id)\
-            .order_by(func.lower(Repository.repo_name))\
-            .all()
+                     .filter(Repository.user_id == c.user.user_id)\
+                     .order_by(func.lower(Repository.repo_name)).all()
 
         c.user_repos = ScmModel().get_repos(all_repos)
 
@@ -274,9 +329,10 b' class SettingsController(BaseController)'
         #           method='put')
         # url('admin_settings_my_account_update', id=ID)
         user_model = UserModel()
-        uid = c.rhodecode_user.user_id
-        _form = UserForm(edit=True, old_data={'user_id':uid,
-                                              'email':c.rhodecode_user.email})()
+        uid = self.rhodecode_user.user_id
+        _form = UserForm(edit=True,
+                         old_data={'user_id': uid,
+                                   'email': self.rhodecode_user.email})()
         form_result = {}
         try:
             form_result = _form.to_python(dict(request.POST))
@@ -285,8 +341,7 b' class SettingsController(BaseController)'
                     category='success')
 
         except formencode.Invalid, errors:
-            c.user = user_model.get(c.rhodecode_user.user_id, cache=False)
-            c.user = UserModel().get(c.rhodecode_user.user_id, cache=False)
+            c.user = User.get(self.rhodecode_user.user_id)
             all_repos = self.sa.query(Repository)\
                 .filter(Repository.user_id == c.user.user_id)\
                 .order_by(func.lower(Repository.repo_name))\
@@ -310,8 +365,22 b' class SettingsController(BaseController)'
     @HasPermissionAnyDecorator('hg.admin', 'hg.create.repository')
     def create_repository(self):
         """GET /_admin/create_repository: Form to create a new item"""
+
+        c.repo_groups = [('', '')]
+        parents_link = lambda k: h.literal('&raquo;'.join(
+                                    map(lambda k: k.group_name,
+                                        k.parents + [k])
+                                    )
+                                )
+
+        c.repo_groups.extend([(x.group_id, parents_link(x)) for \
+                                            x in self.sa.query(Group).all()])
+        c.repo_groups = sorted(c.repo_groups,
+                               key=lambda t: t[1].split('&raquo;')[0])
+        c.repo_groups_choices = map(lambda k: unicode(k[0]), c.repo_groups)
+
         new_repo = request.GET.get('repo', '')
-        c.new_repo = h.repo_name_slug(new_repo)
+        c.new_repo = repo_name_slug(new_repo)
 
         return render('admin/repos/repo_add_create_repository.html')
 

rhodecode/controllers/admin/users.py

@@ -4,10 +4,10 b''
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     Users crud controller for pylons
-    
+
     :created_on: Apr 4, 2010
     :author: marcink
-    :copyright: (C) 2009-2010 Marcin Kuzminski <[e-mail]>    
+    :copyright: (C) 2009-2011 Marcin Kuzminski <[e-mail]>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software: you can redistribute it and/or modify
@@ -28,21 +28,23 b' import traceback'
 import formencode
 
 from formencode import htmlfill
-from pylons import request, session, tmpl_context as c, url
+from pylons import request, session, tmpl_context as c, url, config
 from pylons.controllers.util import abort, redirect
 from pylons.i18n.translation import _
 
-from rhodecode.lib.exceptions import *
+from rhodecode.lib.exceptions import DefaultUserException, \
+    UserOwnsReposException
 from rhodecode.lib import helpers as h
 from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator
 from rhodecode.lib.base import BaseController, render
 
-from rhodecode.model.db import User
+from rhodecode.model.db import User, RepoToPerm, UserToPerm, Permission
 from rhodecode.model.forms import UserForm
 from rhodecode.model.user import UserModel
 
 log = logging.getLogger(__name__)
 
+
 class UsersController(BaseController):
     """REST Controller styled on the Atom Publishing Protocol"""
     # To properly map this controller, ensure your config/routing.py
@@ -55,7 +57,7 b' class UsersController(BaseController):'
         c.admin_user = session.get('admin_user')
         c.admin_username = session.get('admin_username')
         super(UsersController, self).__before__()
-
+        c.available_permissions = config['available_permissions']
 
     def index(self, format='html'):
         """GET /users: All items in the collection"""
@@ -99,25 +101,28 b' class UsersController(BaseController):'
         # Forms posted to this method should contain a hidden field:
         #    <input type="hidden" name="_method" value="PUT" />
         # Or using helpers:
-        #    h.form(url('user', id=ID),
+        #    h.form(url('update_user', id=ID),
         #           method='put')
         # url('user', id=ID)
         user_model = UserModel()
         c.user = user_model.get(id)
 
-        _form = UserForm(edit=True, old_data={'user_id':id,
-                                              'email':c.user.email})()
+        _form = UserForm(edit=True, old_data={'user_id': id,
+                                              'email': c.user.email})()
         form_result = {}
         try:
             form_result = _form.to_python(dict(request.POST))
             user_model.update(id, form_result)
-            h.flash(_('User updated succesfully'), category='success')
+            h.flash(_('User updated successfully'), category='success')
 
         except formencode.Invalid, errors:
+            e = errors.error_dict or {}
+            perm = Permission.get_by_key('hg.create.repository')
+            e.update({'create_repo_perm': UserToPerm.has_perm(id, perm)})
             return htmlfill.render(
                 render('admin/users/user_edit.html'),
                 defaults=errors.value,
-                errors=errors.error_dict or {},
+                errors=e,
                 prefix_error=False,
                 encoding="UTF-8")
         except Exception:
@@ -132,13 +137,13 b' class UsersController(BaseController):'
         # Forms posted to this method should contain a hidden field:
         #    <input type="hidden" name="_method" value="DELETE" />
         # Or using helpers:
-        #    h.form(url('user', id=ID),
+        #    h.form(url('delete_user', id=ID),
         #           method='delete')
         # url('user', id=ID)
         user_model = UserModel()
         try:
             user_model.delete(id)
-            h.flash(_('sucessfully deleted user'), category='success')
+            h.flash(_('successfully deleted user'), category='success')
         except (UserOwnsReposException, DefaultUserException), e:
             h.flash(str(e), category='warning')
         except Exception:
@@ -150,21 +155,53 b' class UsersController(BaseController):'
         """GET /users/id: Show a specific item"""
         # url('user', id=ID)
 
-
     def edit(self, id, format='html'):
         """GET /users/id/edit: Form to edit an existing item"""
         # url('edit_user', id=ID)
-        c.user = self.sa.query(User).get(id)
+        user_model = UserModel()
+        c.user = user_model.get(id)
         if not c.user:
             return redirect(url('users'))
         if c.user.username == 'default':
             h.flash(_("You can't edit this user"), category='warning')
             return redirect(url('users'))
+        c.user.permissions = {}
+        c.granted_permissions = user_model.fill_perms(c.user)\
+            .permissions['global']
 
         defaults = c.user.get_dict()
+        perm = Permission.get_by_key('hg.create.repository')
+        defaults.update({'create_repo_perm': UserToPerm.has_perm(id, perm)})
+
         return htmlfill.render(
             render('admin/users/user_edit.html'),
             defaults=defaults,
             encoding="UTF-8",
             force_defaults=False
         )
+
+    def update_perm(self, id):
+        """PUT /users_perm/id: Update an existing item"""
+        # url('user_perm', id=ID, method='put')
+
+        grant_perm = request.POST.get('create_repo_perm', False)
+
+        if grant_perm:
+            perm = Permission.get_by_key('hg.create.none')
+            UserToPerm.revoke_perm(id, perm)
+
+            perm = Permission.get_by_key('hg.create.repository')
+            UserToPerm.grant_perm(id, perm)
+            h.flash(_("Granted 'repository create' permission to user"),
+                    category='success')
+
+        else:
+            perm = Permission.get_by_key('hg.create.repository')
+            UserToPerm.revoke_perm(id, perm)
+
+            perm = Permission.get_by_key('hg.create.none')
+            UserToPerm.grant_perm(id, perm)
+            h.flash(_("Revoked 'repository create' permission to user"),
+                    category='success')
+
+        return redirect(url('edit_user', id=id))

rhodecode/controllers/branches.py

@@ -4,10 +4,10 b''
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     branches controller for rhodecode
-    
+
     :created_on: Apr 21, 2010
     :author: marcink
-    :copyright: (C) 2009-2010 Marcin Kuzminski <[e-mail]>    
+    :copyright: (C) 2009-2011 Marcin Kuzminski <[e-mail]>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software: you can redistribute it and/or modify
@@ -26,15 +26,16 b''
 import logging
 
 from pylons import tmpl_context as c
+import binascii
 
 from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
-from rhodecode.lib.base import BaseController, render
-from rhodecode.lib.utils import OrderedDict
-from rhodecode.model.scm import ScmModel
-
+from rhodecode.lib.base import BaseRepoController, render
+from rhodecode.lib.odict import OrderedDict
+from rhodecode.lib import safe_unicode
 log = logging.getLogger(__name__)
 
-class BranchesController(BaseController):
+
+class BranchesController(BaseRepoController):
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
@@ -43,10 +44,35 b' class BranchesController(BaseController)'
         super(BranchesController, self).__before__()
 
     def index(self):
-        hg_model = ScmModel()
-        c.repo_info = hg_model.get_repo(c.repo_name)
-        c.repo_branches = OrderedDict()
-        for name, hash_ in c.repo_info.branches.items():
-            c.repo_branches[name] = c.repo_info.get_changeset(hash_)
+
+        def _branchtags(localrepo):
+
+            bt = {}
+            bt_closed = {}
+
+            for bn, heads in localrepo.branchmap().iteritems():
+                tip = heads[-1]
+                if 'close' not in localrepo.changelog.read(tip)[5]:
+                    bt[bn] = tip
+                else:
+                    bt_closed[bn] = tip
+            return bt, bt_closed
+
+
+        bt, bt_closed = _branchtags(c.rhodecode_repo._repo)
+        cs_g = c.rhodecode_repo.get_changeset
+        _branches = [(safe_unicode(n), cs_g(binascii.hexlify(h)),) for n, h in
+                     bt.items()]
+
+        _closed_branches = [(safe_unicode(n), cs_g(binascii.hexlify(h)),) for n, h in
+                     bt_closed.items()]
+
+        c.repo_branches = OrderedDict(sorted(_branches,
+                                             key=lambda ctx: ctx[0],
+                                             reverse=False))
+        c.repo_closed_branches = OrderedDict(sorted(_closed_branches,
+                                                    key=lambda ctx: ctx[0],
+                                                    reverse=False))
+
 
         return render('branches/branches.html')

rhodecode/controllers/changelog.py

@@ -4,10 +4,10 b''
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     changelog controller for rhodecode
-    
+
     :created_on: Apr 21, 2010
     :author: marcink
-    :copyright: (C) 2009-2010 Marcin Kuzminski <[e-mail]>    
+    :copyright: (C) 2009-2011 Marcin Kuzminski <[e-mail]>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software: you can redistribute it and/or modify
@@ -31,24 +31,24 b' except ImportError:'
     #python 2.5 compatibility
     import simplejson as json
 
-from mercurial.graphmod import colored, CHANGESET, revisions as graph_rev
+from mercurial import graphmod
 from pylons import request, session, tmpl_context as c
 
 from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
-from rhodecode.lib.base import BaseController, render
-from rhodecode.model.scm import ScmModel
-
-from webhelpers.paginate import Page
+from rhodecode.lib.base import BaseRepoController, render
+from rhodecode.lib.helpers import RepoPage
 
 log = logging.getLogger(__name__)
 
-class ChangelogController(BaseController):
+
+class ChangelogController(BaseRepoController):
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
                                    'repository.admin')
     def __before__(self):
         super(ChangelogController, self).__before__()
+        c.affected_files_cut_off = 60
 
     def index(self):
         limit = 100
@@ -65,40 +65,57 b' class ChangelogController(BaseController'
         else:
             c.size = int(session.get('changelog_size', default))
 
-        changesets = ScmModel().get_repo(c.repo_name)
+        p = int(request.params.get('page', 1))
+        branch_name = request.params.get('branch', None)
+        c.total_cs = len(c.rhodecode_repo)
+        c.pagination = RepoPage(c.rhodecode_repo, page=p,
+                                item_count=c.total_cs, items_per_page=c.size,
+                                branch_name=branch_name)
 
-        p = int(request.params.get('page', 1))
-        c.total_cs = len(changesets)
-        c.pagination = Page(changesets, page=p, item_count=c.total_cs,
-                            items_per_page=c.size)
-
-        self._graph(changesets, c.size, p)
+        self._graph(c.rhodecode_repo, c.total_cs, c.size, p)
 
         return render('changelog/changelog.html')
 
+    def changelog_details(self, cs):
+        if request.environ.get('HTTP_X_PARTIAL_XHR'):
+            c.cs = c.rhodecode_repo.get_changeset(cs)
+            return render('changelog/changelog_details.html')
 
-    def _graph(self, repo, size, p):
-        revcount = size
-        if not repo.revisions or repo.alias == 'git':
+    def _graph(self, repo, repo_size, size, p):
+        """
+        Generates a DAG graph for mercurial
+
+        :param repo: repo instance
+        :param size: number of commits to show
+        :param p: page number
+        """
+        if not repo.revisions:
             c.jsdata = json.dumps([])
             return
 
-        max_rev = repo.revisions[-1]
-
+        revcount = min(repo_size, size)
         offset = 1 if p == 1 else  ((p - 1) * revcount + 1)
+        try:
+            rev_end = repo.revisions.index(repo.revisions[(-1 * offset)])
+        except IndexError:
+            rev_end = repo.revisions.index(repo.revisions[-1])
+        rev_start = max(0, rev_end - revcount)
 
-        rev_start = repo.revisions[(-1 * offset)]
+        data = []
+        rev_end += 1
 
-        revcount = min(max_rev, revcount)
-        rev_end = max(0, rev_start - revcount)
-        dag = graph_rev(repo.repo, rev_start, rev_end)
+        if repo.alias == 'git':
+            for _ in xrange(rev_start, rev_end):
+                vtx = [0, 1]
+                edges = [[0, 0, 1]]
+                data.append(['', vtx, edges])
 
-        c.dag = tree = list(colored(dag))
-        data = []
-        for (id, type, ctx, vtx, edges) in tree:
-            if type != CHANGESET:
-                continue
-            data.append(('', vtx, edges))
+        elif repo.alias == 'hg':
+            revs = list(reversed(xrange(rev_start, rev_end)))
+            c.dag = graphmod.colored(graphmod.dagwalker(repo._repo, revs))
+            for (id, type, ctx, vtx, edges) in c.dag:
+                if type != graphmod.CHANGESET:
+                    continue
+                data.append(['', vtx, edges])
 
         c.jsdata = json.dumps(data)
-

rhodecode/controllers/changeset.py

@@ -3,11 +3,12 b''
     rhodecode.controllers.changeset
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    changeset controller for pylons
-    
+    changeset controller for pylons showoing changes beetween
+    revisions
+
     :created_on: Apr 25, 2010
     :author: marcink
-    :copyright: (C) 2009-2010 Marcin Kuzminski <[e-mail]>    
+    :copyright: (C) 2009-2011 Marcin Kuzminski <[e-mail]>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software: you can redistribute it and/or modify
@@ -31,26 +32,28 b' from pylons.controllers.util import redi'
 
 import rhodecode.lib.helpers as h
 from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
-from rhodecode.lib.base import BaseController, render
+from rhodecode.lib.base import BaseRepoController, render
 from rhodecode.lib.utils import EmptyChangeset
-from rhodecode.model.scm import ScmModel
+from rhodecode.lib.odict import OrderedDict
 
-from vcs.exceptions import RepositoryError, ChangesetError
+from vcs.exceptions import RepositoryError, ChangesetError, \
+ChangesetDoesNotExistError
 from vcs.nodes import FileNode
 from vcs.utils import diffs as differ
 
 log = logging.getLogger(__name__)
 
-class ChangesetController(BaseController):
+
+class ChangesetController(BaseRepoController):
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
                                    'repository.admin')
     def __before__(self):
         super(ChangesetController, self).__before__()
+        c.affected_files_cut_off = 60
 
     def index(self, revision):
-        hg_model = ScmModel()
 
         def wrap_to_table(str):
 
@@ -61,94 +64,150 b' class ChangesetController(BaseController'
                         </tr>
                       </table>''' % str
 
+        #get ranges of revisions if preset
+        rev_range = revision.split('...')[:2]
+
         try:
-            c.changeset = hg_model.get_repo(c.repo_name).get_changeset(revision)
-        except RepositoryError, e:
+            if len(rev_range) == 2:
+                rev_start = rev_range[0]
+                rev_end = rev_range[1]
+                rev_ranges = c.rhodecode_repo.get_changesets(start=rev_start,
+                                                            end=rev_end)
+            else:
+                rev_ranges = [c.rhodecode_repo.get_changeset(revision)]
+
+            c.cs_ranges = list(rev_ranges)
+
+        except (RepositoryError, ChangesetDoesNotExistError, Exception), e:
             log.error(traceback.format_exc())
             h.flash(str(e), category='warning')
             return redirect(url('home'))
-        else:
+
+        c.changes = OrderedDict()
+        c.sum_added = 0
+        c.sum_removed = 0
+        c.lines_added = 0
+        c.lines_deleted = 0
+        c.cut_off = False  # defines if cut off limit is reached
+
+        # Iterate over ranges (default changeset view is always one changeset)
+        for changeset in c.cs_ranges:
+            c.changes[changeset.raw_id] = []
             try:
-                c.changeset_old = c.changeset.parents[0]
+                changeset_parent = changeset.parents[0]
             except IndexError:
-                c.changeset_old = None
-            c.changes = []
+                changeset_parent = None
 
-            #===================================================================
+            #==================================================================
             # ADDED FILES
-            #===================================================================
-            c.sum_added = 0
-            for node in c.changeset.added:
+            #==================================================================
+            for node in changeset.added:
 
                 filenode_old = FileNode(node.path, '', EmptyChangeset())
                 if filenode_old.is_binary or node.is_binary:
                     diff = wrap_to_table(_('binary file'))
+                    st = (0, 0)
                 else:
+                    # in this case node.size is good parameter since those are
+                    # added nodes and their size defines how many changes were
+                    # made
                     c.sum_added += node.size
                     if c.sum_added < self.cut_off_limit:
-                        f_udiff = differ.get_udiff(filenode_old, node)
-                        diff = differ.DiffProcessor(f_udiff).as_html()
+                        f_gitdiff = differ.get_gitdiff(filenode_old, node)
+                        d = differ.DiffProcessor(f_gitdiff, format='gitdiff')
+
+                        st = d.stat()
+                        diff = d.as_html()
 
                     else:
-                        diff = wrap_to_table(_('Changeset is to big and was cut'
-                                            ' off, see raw changeset instead'))
+                        diff = wrap_to_table(_('Changeset is to big and '
+                                               'was cut off, see raw '
+                                               'changeset instead'))
+                        c.cut_off = True
+                        break
 
                 cs1 = None
                 cs2 = node.last_changeset.raw_id
-                c.changes.append(('added', node, diff, cs1, cs2))
+                c.lines_added += st[0]
+                c.lines_deleted += st[1]
+                c.changes[changeset.raw_id].append(('added', node, diff,
+                                                    cs1, cs2, st))
 
-            #===================================================================
+            #==================================================================
             # CHANGED FILES
-            #===================================================================
-            c.sum_removed = 0
-            for node in c.changeset.changed:
-                try:
-                    filenode_old = c.changeset_old.get_node(node.path)
-                except ChangesetError:
-                    filenode_old = FileNode(node.path, '', EmptyChangeset())
+            #==================================================================
+            if not c.cut_off:
+                for node in changeset.changed:
+                    try:
+                        filenode_old = changeset_parent.get_node(node.path)
+                    except ChangesetError:
+                        log.warning('Unable to fetch parent node for diff')
+                        filenode_old = FileNode(node.path, '',
+                                                EmptyChangeset())
 
-                if filenode_old.is_binary or node.is_binary:
-                    diff = wrap_to_table(_('binary file'))
-                else:
+                    if filenode_old.is_binary or node.is_binary:
+                        diff = wrap_to_table(_('binary file'))
+                        st = (0, 0)
+                    else:
 
-                    if c.sum_removed < self.cut_off_limit:
-                        f_udiff = differ.get_udiff(filenode_old, node)
-                        diff = differ.DiffProcessor(f_udiff).as_html()
-                        if diff:
-                            c.sum_removed += len(diff)
-                    else:
-                        diff = wrap_to_table(_('Changeset is to big and was cut'
-                                            ' off, see raw changeset instead'))
+                        if c.sum_removed < self.cut_off_limit:
+                            f_gitdiff = differ.get_gitdiff(filenode_old, node)
+                            d = differ.DiffProcessor(f_gitdiff,
+                                                     format='gitdiff')
+                            st = d.stat()
+                            if (st[0] + st[1]) * 256 > self.cut_off_limit:
+                                diff = wrap_to_table(_('Diff is to big '
+                                                       'and was cut off, see '
+                                                       'raw diff instead'))
+                            else:
+                                diff = d.as_html()
 
+                            if diff:
+                                c.sum_removed += len(diff)
+                        else:
+                            diff = wrap_to_table(_('Changeset is to big and '
+                                                   'was cut off, see raw '
+                                                   'changeset instead'))
+                            c.cut_off = True
+                            break
 
-                cs1 = filenode_old.last_changeset.raw_id
-                cs2 = node.last_changeset.raw_id
-                c.changes.append(('changed', node, diff, cs1, cs2))
+                    cs1 = filenode_old.last_changeset.raw_id
+                    cs2 = node.last_changeset.raw_id
+                    c.lines_added += st[0]
+                    c.lines_deleted += st[1]
+                    c.changes[changeset.raw_id].append(('changed', node, diff,
+                                                        cs1, cs2, st))
 
-            #===================================================================
-            # REMOVED FILES    
-            #===================================================================
-            for node in c.changeset.removed:
-                c.changes.append(('removed', node, None, None, None))
+            #==================================================================
+            # REMOVED FILES
+            #==================================================================
+            if not c.cut_off:
+                for node in changeset.removed:
+                    c.changes[changeset.raw_id].append(('removed', node, None,
+                                                        None, None, (0, 0)))
 
-        return render('changeset/changeset.html')
+        if len(c.cs_ranges) == 1:
+            c.changeset = c.cs_ranges[0]
+            c.changes = c.changes[c.changeset.raw_id]
+
+            return render('changeset/changeset.html')
+        else:
+            return render('changeset/changeset_range.html')
 
     def raw_changeset(self, revision):
 
-        hg_model = ScmModel()
         method = request.GET.get('diff', 'show')
         try:
-            r = hg_model.get_repo(c.repo_name)
-            c.scm_type = r.alias
-            c.changeset = r.get_changeset(revision)
+            c.scm_type = c.rhodecode_repo.alias
+            c.changeset = c.rhodecode_repo.get_changeset(revision)
         except RepositoryError:
             log.error(traceback.format_exc())
             return redirect(url('home'))
         else:
             try:
-                c.changeset_old = c.changeset.parents[0]
+                c.changeset_parent = c.changeset.parents[0]
             except IndexError:
-                c.changeset_old = None
+                c.changeset_parent = None
             c.changes = []
 
             for node in c.changeset.added:
@@ -156,20 +215,22 b' class ChangesetController(BaseController'
                 if filenode_old.is_binary or node.is_binary:
                     diff = _('binary file') + '\n'
                 else:
-                    f_udiff = differ.get_udiff(filenode_old, node)
-                    diff = differ.DiffProcessor(f_udiff).raw_diff()
+                    f_gitdiff = differ.get_gitdiff(filenode_old, node)
+                    diff = differ.DiffProcessor(f_gitdiff,
+                                                format='gitdiff').raw_diff()
 
                 cs1 = None
                 cs2 = node.last_changeset.raw_id
                 c.changes.append(('added', node, diff, cs1, cs2))
 
             for node in c.changeset.changed:
-                filenode_old = c.changeset_old.get_node(node.path)
+                filenode_old = c.changeset_parent.get_node(node.path)
                 if filenode_old.is_binary or node.is_binary:
                     diff = _('binary file')
                 else:
-                    f_udiff = differ.get_udiff(filenode_old, node)
-                    diff = differ.DiffProcessor(f_udiff).raw_diff()
+                    f_gitdiff = differ.get_gitdiff(filenode_old, node)
+                    diff = differ.DiffProcessor(f_gitdiff,
+                                                format='gitdiff').raw_diff()
 
                 cs1 = filenode_old.last_changeset.raw_id
                 cs2 = node.last_changeset.raw_id
@@ -178,10 +239,11 b' class ChangesetController(BaseController'
         response.content_type = 'text/plain'
 
         if method == 'download':
-            response.content_disposition = 'attachment; filename=%s.patch' % revision
+            response.content_disposition = 'attachment; filename=%s.patch' \
+                                            % revision
 
-        parent = True if len(c.changeset.parents) > 0 else False
-        c.parent_tmpl = 'Parent  %s' % c.changeset.parents[0].raw_id if parent else ''
+        c.parent_tmpl = ''.join(['# Parent  %s\n' % x.raw_id for x in
+                                                 c.changeset.parents])
 
         c.diffs = ''
         for x in c.changes:

rhodecode/controllers/error.py

@@ -1,13 +1,13 b''
 # -*- coding: utf-8 -*-
 """
-    package.rhodecode.controllers.error
-    ~~~~~~~~~~~~~~
+    rhodecode.controllers.error
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     RhodeCode error controller
-    
+
     :created_on: Dec 8, 2010
     :author: marcink
-    :copyright: (C) 2009-2010 Marcin Kuzminski <[e-mail]>    
+    :copyright: (C) 2009-2011 Marcin Kuzminski <[e-mail]>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software: you can redistribute it and/or modify
@@ -27,7 +27,7 b' import cgi'
 import logging
 import paste.fileapp
 
-from pylons import tmpl_context as c, request, config
+from pylons import tmpl_context as c, request, config, url
 from pylons.i18n.translation import _
 from pylons.middleware import  media_path
 
@@ -35,6 +35,7 b' from rhodecode.lib.base import BaseContr'
 
 log = logging.getLogger(__name__)
 
+
 class ErrorController(BaseController):
     """Generates error documents as and when they are required.
 
@@ -46,31 +47,30 b' class ErrorController(BaseController):'
     """
 
     def __before__(self):
-        c.rhodecode_name = config.get('rhodecode_title')
+        #disable all base actions since we don't need them here
+        pass
 
     def document(self):
         resp = request.environ.get('pylons.original_response')
+        c.rhodecode_name = config.get('rhodecode_title')
 
         log.debug('### %s ###', resp.status)
 
         e = request.environ
-        c.serv_p = r'%(protocol)s://%(host)s/' % {
-                                                'protocol': e.get('wsgi.url_scheme'),
-                                                'host':e.get('HTTP_HOST'),
-                                                }
-
+        c.serv_p = r'%(protocol)s://%(host)s/' \
+                                    % {'protocol': e.get('wsgi.url_scheme'),
+                                       'host': e.get('HTTP_HOST'), }
 
         c.error_message = cgi.escape(request.GET.get('code', str(resp.status)))
         c.error_explanation = self.get_error_explanation(resp.status_int)
 
-        #redirect to when error with given seconds
+        #  redirect to when error with given seconds
         c.redirect_time = 0
-        c.redirect_module = _('Home page')# name to what your going to be redirected
+        c.redirect_module = _('Home page')
         c.url_redirect = "/"
 
         return render('/errors/error_document.html')
 
-
     def img(self, id):
         """Serve Pylons' stock images"""
         return self._serve_file(os.path.join(media_path, 'img', id))
@@ -95,7 +95,8 b' class ErrorController(BaseController):'
             code = 500
 
         if code == 400:
-            return _('The request could not be understood by the server due to malformed syntax.')
+            return _('The request could not be understood by the server'
+                     ' due to malformed syntax.')
         if code == 401:
             return _('Unauthorized access to resource')
         if code == 403:
@@ -103,6 +104,5 b' class ErrorController(BaseController):'
         if code == 404:
             return _('The resource could not be found')
         if code == 500:
-            return _('The server encountered an unexpected condition which prevented it from fulfilling the request.')
-
-
+            return _('The server encountered an unexpected condition'
+                     ' which prevented it from fulfilling the request.')

rhodecode/controllers/feed.py

@@ -25,64 +25,92 b''
 
 import logging
 
-from pylons import url, response
+from pylons import url, response, tmpl_context as c
+from pylons.i18n.translation import _
 
+from rhodecode.lib import safe_unicode
 from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
-from rhodecode.lib.base import BaseController
-from rhodecode.model.scm import ScmModel
+from rhodecode.lib.base import BaseRepoController
 
 from webhelpers.feedgenerator import Atom1Feed, Rss201rev2Feed
 
 log = logging.getLogger(__name__)
 
-class FeedController(BaseController):
 
-    @LoginRequired()
+class FeedController(BaseRepoController):
+
+    @LoginRequired(api_access=True)
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
                                    'repository.admin')
     def __before__(self):
         super(FeedController, self).__before__()
         #common values for feeds
-        self.description = 'Changes on %s repository'
-        self.title = "%s feed"
+        self.description = _('Changes on %s repository')
+        self.title = self.title = _('%s %s feed') % (c.rhodecode_name, '%s')
         self.language = 'en-us'
         self.ttl = "5"
         self.feed_nr = 10
 
+    def __changes(self, cs):
+        changes = []
+
+        a = [safe_unicode(n.path) for n in cs.added]
+        if a:
+            changes.append('\nA ' + '\nA '.join(a))
+
+        m = [safe_unicode(n.path) for n in cs.changed]
+        if m:
+            changes.append('\nM ' + '\nM '.join(m))
+
+        d = [safe_unicode(n.path) for n in cs.removed]
+        if d:
+            changes.append('\nD ' + '\nD '.join(d))
+
+        changes.append('</pre>')
+
+        return ''.join(changes)
+
     def atom(self, repo_name):
         """Produce an atom-1.0 feed via feedgenerator module"""
         feed = Atom1Feed(title=self.title % repo_name,
-                         link=url('summary_home', repo_name=repo_name, qualified=True),
+                         link=url('summary_home', repo_name=repo_name,
+                                  qualified=True),
                          description=self.description % repo_name,
                          language=self.language,
                          ttl=self.ttl)
+        desc_msg = []
+        for cs in reversed(list(c.rhodecode_repo[-self.feed_nr:])):
+            desc_msg.append('%s - %s<br/><pre>' % (cs.author, cs.date))
+            desc_msg.append(self.__changes(cs))
 
-        changesets = ScmModel().get_repo(repo_name)
-
-        for cs in changesets[:self.feed_nr]:
             feed.add_item(title=cs.message,
                           link=url('changeset_home', repo_name=repo_name,
                                    revision=cs.raw_id, qualified=True),
-                                   description=str(cs.date))
+                          author_name=cs.author,
+                          description=''.join(desc_msg))
 
         response.content_type = feed.mime_type
         return feed.writeString('utf-8')
 
-
     def rss(self, repo_name):
         """Produce an rss2 feed via feedgenerator module"""
         feed = Rss201rev2Feed(title=self.title % repo_name,
-                         link=url('summary_home', repo_name=repo_name, qualified=True),
+                         link=url('summary_home', repo_name=repo_name,
+                                  qualified=True),
                          description=self.description % repo_name,
                          language=self.language,
                          ttl=self.ttl)
+        desc_msg = []
+        for cs in reversed(list(c.rhodecode_repo[-self.feed_nr:])):
+            desc_msg.append('%s - %s<br/><pre>' % (cs.author, cs.date))
+            desc_msg.append(self.__changes(cs))
 
-        changesets = ScmModel().get_repo(repo_name)
-        for cs in changesets[:self.feed_nr]:
             feed.add_item(title=cs.message,
                           link=url('changeset_home', repo_name=repo_name,
                                    revision=cs.raw_id, qualified=True),
-                          description=str(cs.date))
+                          author_name=cs.author,
+                          description=''.join(desc_msg),
+                         )
 
         response.content_type = feed.mime_type
         return feed.writeString('utf-8')

rhodecode/controllers/files.py

@@ -22,40 +22,42 b''
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 import os
-import tempfile
 import logging
-import rhodecode.lib.helpers as h
+import traceback
 
-from mercurial import archival
+from os.path import join as jn
 
 from pylons import request, response, session, tmpl_context as c, url
 from pylons.i18n.translation import _
 from pylons.controllers.util import redirect
+from pylons.decorators import jsonify
 
+from vcs.conf import settings
+from vcs.exceptions import RepositoryError, ChangesetDoesNotExistError, \
+    EmptyRepositoryError, ImproperArchiveTypeError, VCSError, NodeAlreadyExistsError
+from vcs.nodes import FileNode, NodeKind
+from vcs.utils import diffs as differ
+
+from rhodecode.lib import convert_line_endings, detect_mode, safe_str
 from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
-from rhodecode.lib.base import BaseController, render
+from rhodecode.lib.base import BaseRepoController, render
 from rhodecode.lib.utils import EmptyChangeset
-from rhodecode.model.scm import ScmModel
-
-from vcs.exceptions import RepositoryError, ChangesetError, \
-    ChangesetDoesNotExistError, EmptyRepositoryError
-from vcs.nodes import FileNode
-from vcs.utils import diffs as differ
+import rhodecode.lib.helpers as h
+from rhodecode.model.repo import RepoModel
 
 log = logging.getLogger(__name__)
 
 
-class FilesController(BaseController):
+class FilesController(BaseRepoController):
 
     @LoginRequired()
-    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
-                                   'repository.admin')
     def __before__(self):
         super(FilesController, self).__before__()
         c.cut_off_limit = self.cut_off_limit
 
-    def __get_cs_or_redirect(self, rev, repo_name):
+    def __get_cs_or_redirect(self, rev, repo_name, redirect_after=True):
         """
         Safe way to get changeset if error occur it redirects to tip with
         proper message
@@ -64,196 +66,412 b' class FilesController(BaseController):'
         :param repo_name: repo name to redirect after
         """
 
-        _repo = ScmModel().get_repo(c.repo_name)
         try:
-            return _repo.get_changeset(rev)
+            return c.rhodecode_repo.get_changeset(rev)
         except EmptyRepositoryError, e:
-            h.flash(_('There are no files yet'), category='warning')
+            if not redirect_after:
+                return None
+            url_ = url('files_add_home',
+                       repo_name=c.repo_name,
+                       revision=0, f_path='')
+            add_new = '<a href="%s">[%s]</a>' % (url_, _('add new'))
+            h.flash(h.literal(_('There are no files yet %s' % add_new)),
+                    category='warning')
             redirect(h.url('summary_home', repo_name=repo_name))
 
         except RepositoryError, e:
             h.flash(str(e), category='warning')
             redirect(h.url('files_home', repo_name=repo_name, revision='tip'))
 
-    def index(self, repo_name, revision, f_path):
-        cs = self.__get_cs_or_redirect(revision, repo_name)
-        c.repo = ScmModel().get_repo(c.repo_name)
-
-        revision = request.POST.get('at_rev', None) or revision
-
-        def get_next_rev(cur):
-            max_rev = len(c.repo.revisions) - 1
-            r = cur + 1
-            if r > max_rev:
-                r = max_rev
-            return r
+    def __get_filenode_or_redirect(self, repo_name, cs, path):
+        """
+        Returns file_node, if error occurs or given path is directory,
+        it'll redirect to top level path
 
-        def get_prev_rev(cur):
-            r = cur - 1
-            return r
-
-        c.f_path = f_path
-        c.changeset = cs
-        cur_rev = c.changeset.revision
-        prev_rev = c.repo.get_changeset(get_prev_rev(cur_rev)).raw_id
-        next_rev = c.repo.get_changeset(get_next_rev(cur_rev)).raw_id
-
-        c.url_prev = url('files_home', repo_name=c.repo_name,
-                         revision=prev_rev, f_path=f_path)
-        c.url_next = url('files_home', repo_name=c.repo_name,
-                     revision=next_rev, f_path=f_path)
+        :param repo_name: repo_name
+        :param cs: given changeset
+        :param path: path to lookup
+        """
 
         try:
-            c.files_list = c.changeset.get_node(f_path)
-            c.file_history = self._get_history(c.repo, c.files_list, f_path)
-        except RepositoryError, e:
-            h.flash(str(e), category='warning')
-            redirect(h.url('files_home', repo_name=repo_name,
-                           revision=revision))
-
-
-        return render('files/files.html')
-
-    def rawfile(self, repo_name, revision, f_path):
-        cs = self.__get_cs_or_redirect(revision, repo_name)
-        try:
-            file_node = cs.get_node(f_path)
-        except RepositoryError, e:
-            h.flash(str(e), category='warning')
-            redirect(h.url('files_home', repo_name=repo_name,
-                           revision=cs.raw_id))
-
-        fname = f_path.split(os.sep)[-1].encode('utf8', 'replace')
-
-        response.content_disposition = 'attachment; filename=%s' % fname
-        response.content_type = file_node.mimetype
-        return file_node.content
-
-    def raw(self, repo_name, revision, f_path):
-        cs = self.__get_cs_or_redirect(revision, repo_name)
-        try:
-            file_node = cs.get_node(f_path)
+            file_node = cs.get_node(path)
+            if file_node.is_dir():
+                raise RepositoryError('given path is a directory')
         except RepositoryError, e:
             h.flash(str(e), category='warning')
             redirect(h.url('files_home', repo_name=repo_name,
                            revision=cs.raw_id))
 
-        response.content_type = 'text/plain'
-        return file_node.content
+        return file_node
+
 
-    def annotate(self, repo_name, revision, f_path):
-        cs = self.__get_cs_or_redirect(revision, repo_name)
+    def __get_paths(self, changeset, starting_path):
+        """recursive walk in root dir and return a set of all path in that dir
+        based on repository walk function
+        """
+        _files = list()
+        _dirs = list()
+
         try:
-            c.file = cs.get_node(f_path)
+            tip = changeset
+            for topnode, dirs, files in tip.walk(starting_path):
+                for f in files:
+                    _files.append(f.path)
+                for d in dirs:
+                    _dirs.append(d.path)
         except RepositoryError, e:
-            h.flash(str(e), category='warning')
-            redirect(h.url('files_home', repo_name=repo_name, revision=cs.raw_id))
+            log.debug(traceback.format_exc())
+            pass
+        return _dirs, _files
 
-        c.file_history = self._get_history(ScmModel().get_repo(c.repo_name), c.file, f_path)
-        c.cs = cs
+    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
+                                   'repository.admin')
+    def index(self, repo_name, revision, f_path):
+        #reditect to given revision from form if given
+        post_revision = request.POST.get('at_rev', None)
+        if post_revision:
+            cs = self.__get_cs_or_redirect(post_revision, repo_name)
+            redirect(url('files_home', repo_name=c.repo_name,
+                         revision=cs.raw_id, f_path=f_path))
+
+        c.changeset = self.__get_cs_or_redirect(revision, repo_name)
+        c.branch = request.GET.get('branch', None)
         c.f_path = f_path
 
+        cur_rev = c.changeset.revision
+
+        #prev link
+        try:
+            prev_rev = c.rhodecode_repo.get_changeset(cur_rev).prev(c.branch)
+            c.url_prev = url('files_home', repo_name=c.repo_name,
+                         revision=prev_rev.raw_id, f_path=f_path)
+            if c.branch:
+                c.url_prev += '?branch=%s' % c.branch
+        except (ChangesetDoesNotExistError, VCSError):
+            c.url_prev = '#'
+
+        #next link
+        try:
+            next_rev = c.rhodecode_repo.get_changeset(cur_rev).next(c.branch)
+            c.url_next = url('files_home', repo_name=c.repo_name,
+                     revision=next_rev.raw_id, f_path=f_path)
+            if c.branch:
+                c.url_next += '?branch=%s' % c.branch
+        except (ChangesetDoesNotExistError, VCSError):
+            c.url_next = '#'
+
+        #files or dirs
+        try:
+            c.files_list = c.changeset.get_node(f_path)
+
+            if c.files_list.is_file():
+                c.file_history = self._get_node_history(c.changeset, f_path)
+            else:
+                c.file_history = []
+        except RepositoryError, e:
+            h.flash(str(e), category='warning')
+            redirect(h.url('files_home', repo_name=repo_name,
+                           revision=revision))
+
+        return render('files/files.html')
+
+    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
+                                   'repository.admin')
+    def rawfile(self, repo_name, revision, f_path):
+        cs = self.__get_cs_or_redirect(revision, repo_name)
+        file_node = self.__get_filenode_or_redirect(repo_name, cs, f_path)
+
+        response.content_disposition = 'attachment; filename=%s' % \
+            safe_str(f_path.split(os.sep)[-1])
+
+        response.content_type = file_node.mimetype
+        return file_node.content
+
+    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
+                                   'repository.admin')
+    def raw(self, repo_name, revision, f_path):
+        cs = self.__get_cs_or_redirect(revision, repo_name)
+        file_node = self.__get_filenode_or_redirect(repo_name, cs, f_path)
+
+        raw_mimetype_mapping = {
+            # map original mimetype to a mimetype used for "show as raw"
+            # you can also provide a content-disposition to override the
+            # default "attachment" disposition.
+            # orig_type: (new_type, new_dispo)
+
+            # show images inline:
+            'image/x-icon': ('image/x-icon', 'inline'),
+            'image/png': ('image/png', 'inline'),
+            'image/gif': ('image/gif', 'inline'),
+            'image/jpeg': ('image/jpeg', 'inline'),
+            'image/svg+xml': ('image/svg+xml', 'inline'),
+        }
+
+        mimetype = file_node.mimetype
+        try:
+            mimetype, dispo = raw_mimetype_mapping[mimetype]
+        except KeyError:
+            # we don't know anything special about this, handle it safely
+            if file_node.is_binary:
+                # do same as download raw for binary files
+                mimetype, dispo = 'application/octet-stream', 'attachment'
+            else:
+                # do not just use the original mimetype, but force text/plain,
+                # otherwise it would serve text/html and that might be unsafe.
+                # Note: underlying vcs library fakes text/plain mimetype if the
+                # mimetype can not be determined and it thinks it is not
+                # binary.This might lead to erroneous text display in some
+                # cases, but helps in other cases, like with text files
+                # without extension.
+                mimetype, dispo = 'text/plain', 'inline'
+
+        if dispo == 'attachment':
+            dispo = 'attachment; filename=%s' % \
+                        safe_str(f_path.split(os.sep)[-1])
+
+        response.content_disposition = dispo
+        response.content_type = mimetype
+        return file_node.content
+
+    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
+                                   'repository.admin')
+    def annotate(self, repo_name, revision, f_path):
+        c.cs = self.__get_cs_or_redirect(revision, repo_name)
+        c.file = self.__get_filenode_or_redirect(repo_name, c.cs, f_path)
+
+        c.file_history = self._get_node_history(c.cs, f_path)
+        c.f_path = f_path
         return render('files/files_annotate.html')
 
-    def archivefile(self, repo_name, revision, fileformat):
-        archive_specs = {
-          '.tar.bz2': ('application/x-bzip2', 'tbz2'),
-          '.tar.gz': ('application/x-gzip', 'tgz'),
-          '.zip': ('application/zip', 'zip'),
-        }
-        if not archive_specs.has_key(fileformat):
-            return 'Unknown archive type %s' % fileformat
+    @HasRepoPermissionAnyDecorator('repository.write', 'repository.admin')
+    def edit(self, repo_name, revision, f_path):
+        r_post = request.POST
+
+        c.cs = self.__get_cs_or_redirect(revision, repo_name)
+        c.file = self.__get_filenode_or_redirect(repo_name, c.cs, f_path)
+
+        if c.file.is_binary:
+            return redirect(url('files_home', repo_name=c.repo_name,
+                         revision=c.cs.raw_id, f_path=f_path))
+
+        c.f_path = f_path
+
+        if r_post:
+
+            old_content = c.file.content
+            sl = old_content.splitlines(1)
+            first_line = sl[0] if sl else ''
+            # modes:  0 - Unix, 1 - Mac, 2 - DOS
+            mode = detect_mode(first_line, 0)
+            content = convert_line_endings(r_post.get('content'), mode)
+
+            message = r_post.get('message') or (_('Edited %s via RhodeCode')
+                                                % (f_path))
+            author = self.rhodecode_user.full_contact
+
+            if content == old_content:
+                h.flash(_('No changes'),
+                    category='warning')
+                return redirect(url('changeset_home', repo_name=c.repo_name,
+                                    revision='tip'))
+
+            try:
+                self.scm_model.commit_change(repo=c.rhodecode_repo,
+                                             repo_name=repo_name, cs=c.cs,
+                                             user=self.rhodecode_user,
+                                             author=author, message=message,
+                                             content=content, f_path=f_path)
+                h.flash(_('Successfully committed to %s' % f_path),
+                        category='success')
+
+            except Exception:
+                log.error(traceback.format_exc())
+                h.flash(_('Error occurred during commit'), category='error')
+            return redirect(url('changeset_home',
+                                repo_name=c.repo_name, revision='tip'))
+
+        return render('files/files_edit.html')
+
+    @HasRepoPermissionAnyDecorator('repository.write', 'repository.admin')
+    def add(self, repo_name, revision, f_path):
+        r_post = request.POST
+        c.cs = self.__get_cs_or_redirect(revision, repo_name,
+                                         redirect_after=False)
+        if c.cs is None:
+            c.cs = EmptyChangeset(alias=c.rhodecode_repo.alias)
+
+        c.f_path = f_path
+
+        if r_post:
+            unix_mode = 0
+            content = convert_line_endings(r_post.get('content'), unix_mode)
+
+            message = r_post.get('message') or (_('Added %s via RhodeCode')
+                                                % (f_path))
+            location = r_post.get('location')
+            filename = r_post.get('filename')
+            file_obj = r_post.get('upload_file', None)
+
+            if file_obj is not None and hasattr(file_obj, 'filename'):
+                filename = file_obj.filename
+                content = file_obj.file
 
-        def read_in_chunks(file_object, chunk_size=1024 * 40):
-            """Lazy function (generator) to read a file piece by piece.
-            Default chunk size: 40k."""
+            node_path = os.path.join(location, filename)
+            author = self.rhodecode_user.full_contact
+
+            if not content:
+                h.flash(_('No content'), category='warning')
+                return redirect(url('changeset_home', repo_name=c.repo_name,
+                                    revision='tip'))
+            if not filename:
+                h.flash(_('No filename'), category='warning')
+                return redirect(url('changeset_home', repo_name=c.repo_name,
+                                    revision='tip'))
+
+            try:
+                self.scm_model.create_node(repo=c.rhodecode_repo,
+                                             repo_name=repo_name, cs=c.cs,
+                                             user=self.rhodecode_user,
+                                             author=author, message=message,
+                                             content=content, f_path=node_path)
+                h.flash(_('Successfully committed to %s' % node_path),
+                        category='success')
+            except NodeAlreadyExistsError, e:
+                h.flash(_(e), category='error')
+            except Exception:
+                log.error(traceback.format_exc())
+                h.flash(_('Error occurred during commit'), category='error')
+            return redirect(url('changeset_home',
+                                repo_name=c.repo_name, revision='tip'))
+
+        return render('files/files_add.html')
+
+    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
+                                   'repository.admin')
+    def archivefile(self, repo_name, fname):
+
+        fileformat = None
+        revision = None
+        ext = None
+        subrepos = request.GET.get('subrepos') == 'true'
+
+        for a_type, ext_data in settings.ARCHIVE_SPECS.items():
+            archive_spec = fname.split(ext_data[1])
+            if len(archive_spec) == 2 and archive_spec[1] == '':
+                fileformat = a_type or ext_data[1]
+                revision = archive_spec[0]
+                ext = ext_data[1]
+
+        try:
+            dbrepo = RepoModel().get_by_repo_name(repo_name)
+            if dbrepo.enable_downloads is False:
+                return _('downloads disabled')
+
+            cs = c.rhodecode_repo.get_changeset(revision)
+            content_type = settings.ARCHIVE_SPECS[fileformat][0]
+        except ChangesetDoesNotExistError:
+            return _('Unknown revision %s') % revision
+        except EmptyRepositoryError:
+            return _('Empty repository')
+        except (ImproperArchiveTypeError, KeyError):
+            return _('Unknown archive type')
+
+        response.content_type = content_type
+        response.content_disposition = 'attachment; filename=%s-%s%s' \
+            % (repo_name, revision, ext)
+
+        import tempfile
+        archive = tempfile.mkstemp()[1]
+        t = open(archive, 'wb')
+        cs.fill_archive(stream=t, kind=fileformat, subrepos=subrepos)
+
+        def get_chunked_archive(archive):
+            stream = open(archive, 'rb')
             while True:
-                data = file_object.read(chunk_size)
+                data = stream.read(4096)
                 if not data:
+                    os.remove(archive)
                     break
                 yield data
 
-        archive = tempfile.TemporaryFile()
-        repo = ScmModel().get_repo(repo_name).repo
-        fname = '%s-%s%s' % (repo_name, revision, fileformat)
-        archival.archive(repo, archive, revision, archive_specs[fileformat][1],
-                         prefix='%s-%s' % (repo_name, revision))
-        response.content_type = archive_specs[fileformat][0]
-        response.content_disposition = 'attachment; filename=%s' % fname
-        archive.seek(0)
-        return read_in_chunks(archive)
+        return get_chunked_archive(archive)
 
+    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
+                                   'repository.admin')
     def diff(self, repo_name, f_path):
-        hg_model = ScmModel()
         diff1 = request.GET.get('diff1')
         diff2 = request.GET.get('diff2')
         c.action = request.GET.get('diff')
         c.no_changes = diff1 == diff2
         c.f_path = f_path
-        c.repo = hg_model.get_repo(c.repo_name)
+        c.big_diff = False
 
         try:
             if diff1 not in ['', None, 'None', '0' * 12, '0' * 40]:
-                c.changeset_1 = c.repo.get_changeset(diff1)
+                c.changeset_1 = c.rhodecode_repo.get_changeset(diff1)
                 node1 = c.changeset_1.get_node(f_path)
             else:
-                c.changeset_1 = EmptyChangeset()
+                c.changeset_1 = EmptyChangeset(repo=c.rhodecode_repo)
                 node1 = FileNode('.', '', changeset=c.changeset_1)
 
             if diff2 not in ['', None, 'None', '0' * 12, '0' * 40]:
-                c.changeset_2 = c.repo.get_changeset(diff2)
+                c.changeset_2 = c.rhodecode_repo.get_changeset(diff2)
                 node2 = c.changeset_2.get_node(f_path)
             else:
-                c.changeset_2 = EmptyChangeset()
+                c.changeset_2 = EmptyChangeset(repo=c.rhodecode_repo)
                 node2 = FileNode('.', '', changeset=c.changeset_2)
         except RepositoryError:
             return redirect(url('files_home',
                                 repo_name=c.repo_name, f_path=f_path))
 
-        f_udiff = differ.get_udiff(node1, node2)
-        diff = differ.DiffProcessor(f_udiff)
+        if c.action == 'download':
+            diff = differ.DiffProcessor(differ.get_gitdiff(node1, node2),
+                                        format='gitdiff')
 
-        if c.action == 'download':
             diff_name = '%s_vs_%s.diff' % (diff1, diff2)
             response.content_type = 'text/plain'
             response.content_disposition = 'attachment; filename=%s' \
                                                     % diff_name
-            if node1.is_binary or node2.is_binary:
-                return _('binary file changed')
             return diff.raw_diff()
 
         elif c.action == 'raw':
+            diff = differ.DiffProcessor(differ.get_gitdiff(node1, node2),
+                                        format='gitdiff')
             response.content_type = 'text/plain'
-            if node1.is_binary or node2.is_binary:
-                return _('binary file changed')
             return diff.raw_diff()
 
         elif c.action == 'diff':
-            if  node1.is_binary or node2.is_binary:
+            if node1.is_binary or node2.is_binary:
                 c.cur_diff = _('Binary file')
             elif node1.size > self.cut_off_limit or \
                     node2.size > self.cut_off_limit:
-                c.cur_diff = _('Diff is too big to display')
+                c.cur_diff = ''
+                c.big_diff = True
             else:
+                diff = differ.DiffProcessor(differ.get_gitdiff(node1, node2),
+                                        format='gitdiff')
                 c.cur_diff = diff.as_html()
         else:
+
             #default option
-            if node1.size > self.cut_off_limit or node2.size > self.cut_off_limit:
-                c.cur_diff = _('Diff is to big to display')
-            elif node1.is_binary or node2.is_binary:
+            if node1.is_binary or node2.is_binary:
                 c.cur_diff = _('Binary file')
+            elif node1.size > self.cut_off_limit or \
+                    node2.size > self.cut_off_limit:
+                c.cur_diff = ''
+                c.big_diff = True
+
             else:
+                diff = differ.DiffProcessor(differ.get_gitdiff(node1, node2),
+                                        format='gitdiff')
                 c.cur_diff = diff.as_html()
 
-        if not c.cur_diff:
+        if not c.cur_diff and not c.big_diff:
             c.no_changes = True
         return render('files/file_diff.html')
 
-    def _get_history(self, repo, node, f_path):
-        from vcs.nodes import NodeKind
-        if not node.kind is NodeKind.FILE:
-            return []
-        changesets = node.history
+    def _get_node_history(self, cs, f_path):
+        changesets = cs.get_file_history(f_path)
         hist_l = []
 
         changesets_group = ([], _("Changesets"))
@@ -266,14 +484,24 b' class FilesController(BaseController):'
 
         hist_l.append(changesets_group)
 
-        for name, chs in c.repository_branches.items():
+        for name, chs in c.rhodecode_repo.branches.items():
             #chs = chs.split(':')[-1]
             branches_group[0].append((chs, name),)
         hist_l.append(branches_group)
 
-        for name, chs in c.repository_tags.items():
+        for name, chs in c.rhodecode_repo.tags.items():
             #chs = chs.split(':')[-1]
             tags_group[0].append((chs, name),)
         hist_l.append(tags_group)
 
         return hist_l
+
+    @jsonify
+    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
+                                   'repository.admin')
+    def nodelist(self, repo_name, revision, f_path):
+        if request.environ.get('HTTP_X_PARTIAL_XHR'):
+            cs = self.__get_cs_or_redirect(revision, repo_name)
+            _d, _f = self.__get_paths(cs, f_path)
+            return _d + _f
+

rhodecode/controllers/home.py

@@ -27,13 +27,15 b' import logging'
 from operator import itemgetter
 
 from pylons import tmpl_context as c, request
+from paste.httpexceptions import HTTPBadRequest
 
 from rhodecode.lib.auth import LoginRequired
 from rhodecode.lib.base import BaseController, render
-from rhodecode.model.scm import ScmModel
+from rhodecode.model.db import Group, Repository
 
 log = logging.getLogger(__name__)
 
+
 class HomeController(BaseController):
 
     @LoginRequired()
@@ -41,24 +43,18 b' class HomeController(BaseController):'
         super(HomeController, self).__before__()
 
     def index(self):
-        sortables = ['name', 'description', 'last_change', 'tip', 'owner']
-        current_sort = request.GET.get('sort', 'name')
-        current_sort_slug = current_sort.replace('-', '')
 
-        if current_sort_slug not in sortables:
-            c.sort_by = 'name'
-            current_sort_slug = c.sort_by
-        else:
-            c.sort_by = current_sort
-        c.sort_slug = current_sort_slug
-        cached_repo_list = ScmModel().get_repos()
+        c.repos_list = self.scm_model.get_repos()
 
-        sort_key = current_sort_slug + '_sort'
-        if c.sort_by.startswith('-'):
-            c.repos_list = sorted(cached_repo_list, key=itemgetter(sort_key),
-                                  reverse=True)
-        else:
-            c.repos_list = sorted(cached_repo_list, key=itemgetter(sort_key),
-                                  reverse=False)
+        c.groups = Group.query().filter(Group.group_parent_id == None).all()
 
         return render('/index.html')
+
+    def repo_switcher(self):
+        if request.is_xhr:
+            all_repos = Repository.query().order_by(Repository.repo_name).all()
+            c.repos_list = self.scm_model.get_repos(all_repos,
+                                                    sort_key='name_sort')
+            return render('/repo_switcher_list.html')
+        else:
+            return HTTPBadRequest()

rhodecode/controllers/journal.py

@@ -4,10 +4,10 b''
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     Journal controller for pylons
-    
+
     :created_on: Nov 21, 2010
     :author: marcink
-    :copyright: (C) 2009-2010 Marcin Kuzminski <[e-mail]>    
+    :copyright: (C) 2009-2011 Marcin Kuzminski <[e-mail]>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software: you can redistribute it and/or modify
@@ -22,77 +22,209 b''
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
 import logging
-import traceback
-
-from pylons import request, response, session, tmpl_context as c, url
-from paste.httpexceptions import HTTPInternalServerError, HTTPBadRequest
 
 from sqlalchemy import or_
+from sqlalchemy.orm import joinedload, make_transient
+from webhelpers.paginate import Page
+from itertools import groupby
 
+from paste.httpexceptions import HTTPBadRequest
+from pylons import request, tmpl_context as c, response, url
+from pylons.i18n.translation import _
+from webhelpers.feedgenerator import Atom1Feed, Rss201rev2Feed
+
+import rhodecode.lib.helpers as h
 from rhodecode.lib.auth import LoginRequired, NotAnonymous
 from rhodecode.lib.base import BaseController, render
-from rhodecode.lib.helpers import get_token
 from rhodecode.model.db import UserLog, UserFollowing
-from rhodecode.model.scm import ScmModel
 
 log = logging.getLogger(__name__)
 
+
 class JournalController(BaseController):
 
+    def __before__(self):
+        super(JournalController, self).__before__()
+        self.rhodecode_user = self.rhodecode_user
+        self.title = _('%s public journal %s feed') % (c.rhodecode_name, '%s')
+        self.language = 'en-us'
+        self.ttl = "5"
+        self.feed_nr = 20
 
     @LoginRequired()
     @NotAnonymous()
-    def __before__(self):
-        super(JournalController, self).__before__()
-
     def index(self):
         # Return a rendered template
+        p = int(request.params.get('page', 1))
 
         c.following = self.sa.query(UserFollowing)\
-            .filter(UserFollowing.user_id == c.rhodecode_user.user_id).all()
+            .filter(UserFollowing.user_id == self.rhodecode_user.user_id)\
+            .options(joinedload(UserFollowing.follows_repository))\
+            .all()
+
+        journal = self._get_journal_data(c.following)
+
+        c.journal_pager = Page(journal, page=p, items_per_page=20)
+
+        c.journal_day_aggreagate = self._get_daily_aggregate(c.journal_pager)
+
+        c.journal_data = render('journal/journal_data.html')
+        if request.environ.get('HTTP_X_PARTIAL_XHR'):
+            return c.journal_data
+        return render('journal/journal.html')
 
-        repo_ids = [x.follows_repository.repo_id for x in c.following
+    def _get_daily_aggregate(self, journal):
+        groups = []
+        for k, g in groupby(journal, lambda x: x.action_as_day):
+            user_group = []
+            for k2, g2 in groupby(list(g), lambda x: x.user.email):
+                l = list(g2)
+                user_group.append((l[0].user, l))
+
+            groups.append((k, user_group,))
+
+        return groups
+
+    def _get_journal_data(self, following_repos):
+        repo_ids = [x.follows_repository.repo_id for x in following_repos
                     if x.follows_repository is not None]
-        user_ids = [x.follows_user.user_id for x in c.following
+        user_ids = [x.follows_user.user_id for x in following_repos
                     if x.follows_user is not None]
 
-        c.journal = self.sa.query(UserLog)\
-            .filter(or_(
-                        UserLog.repository_id.in_(repo_ids),
-                        UserLog.user_id.in_(user_ids),
-                        ))\
-            .order_by(UserLog.action_date.desc())\
-            .limit(20)\
-            .all()
-        return render('/journal.html')
+        filtering_criterion = None
 
-    def toggle_following(self):
+        if repo_ids and user_ids:
+            filtering_criterion = or_(UserLog.repository_id.in_(repo_ids),
+                        UserLog.user_id.in_(user_ids))
+        if repo_ids and not user_ids:
+            filtering_criterion = UserLog.repository_id.in_(repo_ids)
+        if not repo_ids and user_ids:
+            filtering_criterion = UserLog.user_id.in_(user_ids)
+        if filtering_criterion is not None:
+            journal = self.sa.query(UserLog)\
+                .options(joinedload(UserLog.user))\
+                .options(joinedload(UserLog.repository))\
+                .filter(filtering_criterion)\
+                .order_by(UserLog.action_date.desc())
+        else:
+            journal = []
 
-        if request.POST.get('auth_token') == get_token():
-            scm_model = ScmModel()
+        return journal
+
+    @LoginRequired()
+    @NotAnonymous()
+    def toggle_following(self):
+        cur_token = request.POST.get('auth_token')
+        token = h.get_token()
+        if cur_token == token:
 
             user_id = request.POST.get('follows_user_id')
             if user_id:
                 try:
-                    scm_model.toggle_following_user(user_id,
-                                                    c.rhodecode_user.user_id)
+                    self.scm_model.toggle_following_user(user_id,
+                                                self.rhodecode_user.user_id)
                     return 'ok'
                 except:
-                    log.error(traceback.format_exc())
-                    raise HTTPInternalServerError()
+                    raise HTTPBadRequest()
 
             repo_id = request.POST.get('follows_repo_id')
             if repo_id:
                 try:
-                    scm_model.toggle_following_repo(repo_id,
-                                                    c.rhodecode_user.user_id)
+                    self.scm_model.toggle_following_repo(repo_id,
+                                                self.rhodecode_user.user_id)
                     return 'ok'
                 except:
-                    log.error(traceback.format_exc())
-                    raise HTTPInternalServerError()
+                    raise HTTPBadRequest()
+
+        log.debug('token mismatch %s vs %s', cur_token, token)
+        raise HTTPBadRequest()
+
+    @LoginRequired()
+    def public_journal(self):
+        # Return a rendered template
+        p = int(request.params.get('page', 1))
+
+        c.following = self.sa.query(UserFollowing)\
+            .filter(UserFollowing.user_id == self.rhodecode_user.user_id)\
+            .options(joinedload(UserFollowing.follows_repository))\
+            .all()
+
+        journal = self._get_journal_data(c.following)
+
+        c.journal_pager = Page(journal, page=p, items_per_page=20)
+
+        c.journal_day_aggreagate = self._get_daily_aggregate(c.journal_pager)
+
+        c.journal_data = render('journal/journal_data.html')
+        if request.environ.get('HTTP_X_PARTIAL_XHR'):
+            return c.journal_data
+        return render('journal/public_journal.html')
+
+    @LoginRequired(api_access=True)
+    def public_journal_atom(self):
+        """
+        Produce an atom-1.0 feed via feedgenerator module
+        """
+        c.following = self.sa.query(UserFollowing)\
+            .filter(UserFollowing.user_id == self.rhodecode_user.user_id)\
+            .options(joinedload(UserFollowing.follows_repository))\
+            .all()
+
+        journal = self._get_journal_data(c.following)
+
+        feed = Atom1Feed(title=self.title % 'atom',
+                         link=url('public_journal_atom', qualified=True),
+                         description=_('Public journal'),
+                         language=self.language,
+                         ttl=self.ttl)
 
+        for entry in journal[:self.feed_nr]:
+            #tmpl = h.action_parser(entry)[0]
+            action, action_extra = h.action_parser(entry, feed=True)
+            title = "%s - %s %s" % (entry.user.short_contact, action,
+                                 entry.repository.repo_name)
+            desc = action_extra()
+            feed.add_item(title=title,
+                          pubdate=entry.action_date,
+                          link=url('', qualified=True),
+                          author_email=entry.user.email,
+                          author_name=entry.user.full_contact,
+                          description=desc)
 
+        response.content_type = feed.mime_type
+        return feed.writeString('utf-8')
 
-        raise HTTPBadRequest()
+    @LoginRequired(api_access=True)
+    def public_journal_rss(self):
+        """
+        Produce an rss2 feed via feedgenerator module
+        """
+        c.following = self.sa.query(UserFollowing)\
+            .filter(UserFollowing.user_id == self.rhodecode_user.user_id)\
+            .options(joinedload(UserFollowing.follows_repository))\
+            .all()
+
+        journal = self._get_journal_data(c.following)
+
+        feed = Rss201rev2Feed(title=self.title % 'rss',
+                         link=url('public_journal_rss', qualified=True),
+                         description=_('Public journal'),
+                         language=self.language,
+                         ttl=self.ttl)
+
+        for entry in journal[:self.feed_nr]:
+            #tmpl = h.action_parser(entry)[0]
+            action, action_extra = h.action_parser(entry, feed=True)
+            title = "%s - %s %s" % (entry.user.short_contact, action,
+                                 entry.repository.repo_name)
+            desc = action_extra()
+            feed.add_item(title=title,
+                          pubdate=entry.action_date,
+                          link=url('', qualified=True),
+                          author_email=entry.user.email,
+                          author_name=entry.user.full_contact,
+                          description=desc)
+
+        response.content_type = feed.mime_type
+        return feed.writeString('utf-8')

rhodecode/controllers/login.py

@@ -4,10 +4,10 b''
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     Login controller for rhodeocode
-    
+
     :created_on: Apr 22, 2010
     :author: marcink
-    :copyright: (C) 2009-2010 Marcin Kuzminski <[e-mail]>    
+    :copyright: (C) 2009-2011 Marcin Kuzminski <[e-mail]>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software: you can redistribute it and/or modify
@@ -35,12 +35,14 b' from pylons import request, response, se'
 import rhodecode.lib.helpers as h
 from rhodecode.lib.auth import AuthUser, HasPermissionAnyDecorator
 from rhodecode.lib.base import BaseController, render
+from rhodecode.model.db import User
 from rhodecode.model.forms import LoginForm, RegisterForm, PasswordResetForm
 from rhodecode.model.user import UserModel
 
 
 log = logging.getLogger(__name__)
 
+
 class LoginController(BaseController):
 
     def __before__(self):
@@ -50,8 +52,8 b' class LoginController(BaseController):'
         #redirect if already logged in
         c.came_from = request.GET.get('came_from', None)
 
-        if c.rhodecode_user.is_authenticated \
-                            and c.rhodecode_user.username != 'default':
+        if self.rhodecode_user.is_authenticated \
+                            and self.rhodecode_user.username != 'default':
 
             return redirect(url('home'))
 
@@ -60,19 +62,17 b' class LoginController(BaseController):'
             login_form = LoginForm()
             try:
                 c.form_result = login_form.to_python(dict(request.POST))
+                #form checks for username/password, now we're authenticated
                 username = c.form_result['username']
-                user = UserModel().get_by_username(username, case_insensitive=True)
-                auth_user = AuthUser()
-                auth_user.username = user.username
-                auth_user.is_authenticated = True
-                auth_user.is_admin = user.admin
-                auth_user.user_id = user.user_id
-                auth_user.name = user.name
-                auth_user.lastname = user.lastname
+                user = User.by_username(username,
+                                                   case_insensitive=True)
+                auth_user = AuthUser(user.user_id)
+                auth_user.set_authenticated()
                 session['rhodecode_user'] = auth_user
                 session.save()
-                log.info('user %s is now authenticated', username)
 
+                log.info('user %s is now authenticated and stored in session',
+                         username)
                 user.update_lastlogin()
 
                 if c.came_from:
@@ -95,7 +95,8 b' class LoginController(BaseController):'
     def register(self):
         user_model = UserModel()
         c.auto_active = False
-        for perm in user_model.get_by_username('default', cache=False).user_perms:
+        for perm in user_model.get_by_username('default',
+                                               cache=False).user_perms:
             if perm.permission.permission_name == 'hg.register.auto_activate':
                 c.auto_active = True
                 break
@@ -128,8 +129,8 b' class LoginController(BaseController):'
             password_reset_form = PasswordResetForm()()
             try:
                 form_result = password_reset_form.to_python(dict(request.POST))
-                user_model.reset_password(form_result)
-                h.flash(_('Your new password was sent'),
+                user_model.reset_password_link(form_result)
+                h.flash(_('Your password reset link was sent'),
                             category='success')
                 return redirect(url('login_home'))
 
@@ -143,8 +144,25 b' class LoginController(BaseController):'
 
         return render('/password_reset.html')
 
+    def password_reset_confirmation(self):
+
+        if request.GET and request.GET.get('key'):
+            try:
+                user_model = UserModel()
+                user = User.get_by_api_key(request.GET.get('key'))
+                data = dict(email=user.email)
+                user_model.reset_password(data)
+                h.flash(_('Your password reset was successful, '
+                          'new password has been sent to your email'),
+                            category='success')
+            except Exception, e:
+                log.error(e)
+                return redirect(url('reset_password'))
+
+        return redirect(url('login_home'))
+
     def logout(self):
-        session['rhodecode_user'] = AuthUser()
+        del session['rhodecode_user']
         session.save()
         log.info('Logging out and setting user as Empty')
         redirect(url('home'))

rhodecode/controllers/search.py

@@ -4,10 +4,10 b''
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     Search controller for rhodecode
-    
+
     :created_on: Aug 7, 2010
     :author: marcink
-    :copyright: (C) 2009-2010 Marcin Kuzminski <[e-mail]>    
+    :copyright: (C) 2009-2011 Marcin Kuzminski <[e-mail]>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software: you can redistribute it and/or modify
@@ -26,8 +26,7 b' import logging'
 import traceback
 
 from pylons.i18n.translation import _
-from pylons import request, response, config, session, tmpl_context as c, url
-from pylons.controllers.util import abort, redirect
+from pylons import request, config, session, tmpl_context as c
 
 from rhodecode.lib.auth import LoginRequired
 from rhodecode.lib.base import BaseController, render
@@ -38,10 +37,11 b' from webhelpers.util import update_param'
 
 from whoosh.index import open_dir, EmptyIndexError
 from whoosh.qparser import QueryParser, QueryParserError
-from whoosh.query import Phrase
+from whoosh.query import Phrase, Wildcard, Term, Prefix
 
 log = logging.getLogger(__name__)
 
+
 class SearchController(BaseController):
 
     @LoginRequired()
@@ -54,13 +54,12 b' class SearchController(BaseController):'
         c.runtime = ''
         c.cur_query = request.GET.get('q', None)
         c.cur_type = request.GET.get('type', 'source')
-        c.cur_search = search_type = {'content':'content',
-                                      'commit':'content',
-                                      'path':'path',
-                                      'repository':'repository'}\
+        c.cur_search = search_type = {'content': 'content',
+                                      'commit': 'content',
+                                      'path': 'path',
+                                      'repository': 'repository'}\
                                       .get(c.cur_type, 'content')
 
-
         if c.cur_query:
             cur_query = c.cur_query.lower()
 
@@ -68,8 +67,8 b' class SearchController(BaseController):'
             p = int(request.params.get('page', 1))
             highlight_items = set()
             try:
-                idx = open_dir(config['app_conf']['index_dir']
-                               , indexname=IDX_NAME)
+                idx = open_dir(config['app_conf']['index_dir'],
+                               indexname=IDX_NAME)
                 searcher = idx.searcher()
 
                 qp = QueryParser(search_type, schema=SCHEMA)
@@ -80,6 +79,8 b' class SearchController(BaseController):'
 
                     if isinstance(query, Phrase):
                         highlight_items.update(query.words)
+                    elif isinstance(query, Prefix):
+                        highlight_items.add(query.text)
                     else:
                         for i in query.all_terms():
                             if i[0] == 'content':
@@ -104,7 +105,6 b' class SearchController(BaseController):'
                                 page=p, item_count=res_ln,
                                 items_per_page=10, url=url_generator)
 
-
                 except QueryParserError:
                     c.runtime = _('Invalid search query. Try quoting it.')
                 searcher.close()
@@ -113,6 +113,9 b' class SearchController(BaseController):'
                 log.error('Empty Index data')
                 c.runtime = _('There is no index to search in. '
                               'Please run whoosh indexer')
+            except (Exception):
+                log.error(traceback.format_exc())
+                c.runtime = _('An error occurred during this search operation')
 
         # Return a rendered template
         return render('/search/search.html')

rhodecode/controllers/settings.py

@@ -4,10 +4,10 b''
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     Settings controller for rhodecode
-    
+
     :created_on: Jun 30, 2010
     :author: marcink
-    :copyright: (C) 2009-2011 Marcin Kuzminski <[e-mail]>    
+    :copyright: (C) 2009-2011 Marcin Kuzminski <[e-mail]>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software: you can redistribute it and/or modify
@@ -34,16 +34,20 b' from pylons.controllers.util import redi'
 from pylons.i18n.translation import _
 
 import rhodecode.lib.helpers as h
+
 from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAllDecorator, \
     HasRepoPermissionAnyDecorator, NotAnonymous
-from rhodecode.lib.base import BaseController, render
+from rhodecode.lib.base import BaseRepoController, render
 from rhodecode.lib.utils import invalidate_cache, action_logger
+
 from rhodecode.model.forms import RepoSettingsForm, RepoForkForm
 from rhodecode.model.repo import RepoModel
+from rhodecode.model.db import User
 
 log = logging.getLogger(__name__)
 
-class SettingsController(BaseController):
+
+class SettingsController(BaseRepoController):
 
     @LoginRequired()
     def __before__(self):
@@ -61,12 +65,28 b' class SettingsController(BaseController)'
                       category='error')
 
             return redirect(url('home'))
-        defaults = c.repo_info.get_dict()
-        defaults.update({'user':c.repo_info.user.username})
+
         c.users_array = repo_model.get_users_js()
+        c.users_groups_array = repo_model.get_users_groups_js()
 
+        defaults = c.repo_info.get_dict()
+
+        #fill owner
+        if c.repo_info.user:
+            defaults.update({'user': c.repo_info.user.username})
+        else:
+            replacement_user = self.sa.query(User)\
+            .filter(User.admin == True).first().username
+            defaults.update({'user': replacement_user})
+
+        #fill repository users
         for p in c.repo_info.repo_to_perm:
-            defaults.update({'perm_%s' % p.user.username:
+            defaults.update({'u_perm_%s' % p.user.username:
+                             p.permission.permission_name})
+
+        #fill repository groups
+        for p in c.repo_info.users_group_to_perm:
+            defaults.update({'g_perm_%s' % p.users_group.users_group_name:
                              p.permission.permission_name})
 
         return htmlfill.render(
@@ -80,7 +100,8 b' class SettingsController(BaseController)'
     def update(self, repo_name):
         repo_model = RepoModel()
         changed_name = repo_name
-        _form = RepoSettingsForm(edit=True, old_data={'repo_name':repo_name})()
+        _form = RepoSettingsForm(edit=True,
+                                 old_data={'repo_name': repo_name})()
         try:
             form_result = _form.to_python(dict(request.POST))
             repo_model.update(repo_name, form_result)
@@ -93,7 +114,7 b' class SettingsController(BaseController)'
         except formencode.Invalid, errors:
             c.repo_info = repo_model.get_by_repo_name(repo_name)
             c.users_array = repo_model.get_users_js()
-            errors.value.update({'user':c.repo_info.user.username})
+            errors.value.update({'user': c.repo_info.user.username})
             return htmlfill.render(
                 render('settings/repo_settings.html'),
                 defaults=errors.value,
@@ -107,7 +128,6 b' class SettingsController(BaseController)'
 
         return redirect(url('repo_settings_home', repo_name=changed_name))
 
-
     @HasRepoPermissionAllDecorator('repository.admin')
     def delete(self, repo_name):
         """DELETE /repos/repo_name: Delete an existing item"""
@@ -135,6 +155,7 b' class SettingsController(BaseController)'
             invalidate_cache('get_repo_cached_%s' % repo_name)
             h.flash(_('deleted repository %s') % repo_name, category='success')
         except Exception:
+            log.error(traceback.format_exc())
             h.flash(_('An error occurred during deletion of %s') % repo_name,
                     category='error')
 
@@ -163,12 +184,12 b' class SettingsController(BaseController)'
     def fork_create(self, repo_name):
         repo_model = RepoModel()
         c.repo_info = repo_model.get_by_repo_name(repo_name)
-        _form = RepoForkForm(old_data={'repo_type':c.repo_info.repo_type})()
+        _form = RepoForkForm(old_data={'repo_type': c.repo_info.repo_type})()
         form_result = {}
         try:
             form_result = _form.to_python(dict(request.POST))
-            form_result.update({'repo_name':repo_name})
-            repo_model.create_fork(form_result, c.rhodecode_user)
+            form_result.update({'repo_name': repo_name})
+            repo_model.create_fork(form_result, self.rhodecode_user)
             h.flash(_('forked %s repository as %s') \
                       % (repo_name, form_result['fork_name']),
                     category='success')
@@ -185,4 +206,9 b' class SettingsController(BaseController)'
                 errors=errors.error_dict or {},
                 prefix_error=False,
                 encoding="UTF-8")
+        except Exception:
+            log.error(traceback.format_exc())
+            h.flash(_('An error occurred during repository forking %s') %
+                    repo_name, category='error')
+
         return redirect(url('home'))

rhodecode/controllers/shortlog.py

@@ -27,15 +27,14 b' import logging'
 
 from pylons import tmpl_context as c, request, url
 
-from webhelpers.paginate import Page
-
 from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
-from rhodecode.lib.base import BaseController, render
-from rhodecode.model.scm import ScmModel
+from rhodecode.lib.base import BaseRepoController, render
+from rhodecode.lib.helpers import RepoPage
 
 log = logging.getLogger(__name__)
 
-class ShortlogController(BaseController):
+
+class ShortlogController(BaseRepoController):
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
@@ -47,15 +46,14 b' class ShortlogController(BaseController)'
         p = int(request.params.get('page', 1))
         size = int(request.params.get('size', 20))
 
-        print repo_name
         def url_generator(**kw):
             return url('shortlog_home', repo_name=repo_name, size=size, **kw)
 
-        repo = ScmModel().get_repo(c.repo_name)
-        c.repo_changesets = Page(repo, page=p, items_per_page=size,
-                                                url=url_generator)
+        c.repo_changesets = RepoPage(c.rhodecode_repo, page=p,
+                                                       items_per_page=size,
+                                                       url=url_generator)
         c.shortlog_data = render('shortlog/shortlog_data.html')
-        if request.params.get('partial'):
+        if request.environ.get('HTTP_X_PARTIAL_XHR'):
             return c.shortlog_data
         r = render('shortlog/shortlog.html')
         return r

rhodecode/controllers/summary.py

@@ -7,7 +7,7 b''
 
     :created_on: Apr 18, 2010
     :author: marcink
-    :copyright: (C) 2009-2011 Marcin Kuzminski <[e-mail]>    
+    :copyright: (C) 2009-2011 Marcin Kuzminski <[e-mail]>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software: you can redistribute it and/or modify
@@ -33,26 +33,29 b' from vcs.exceptions import ChangesetErro'
 from pylons import tmpl_context as c, request, url
 from pylons.i18n.translation import _
 
-from rhodecode.model.scm import ScmModel
-from rhodecode.model.db import Statistics
+from rhodecode.model.db import Statistics, Repository
+from rhodecode.model.repo import RepoModel
 
 from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
-from rhodecode.lib.base import BaseController, render
-from rhodecode.lib.utils import OrderedDict, EmptyChangeset
+from rhodecode.lib.base import BaseRepoController, render
+from rhodecode.lib.utils import EmptyChangeset
+from rhodecode.lib.odict import OrderedDict
 
 from rhodecode.lib.celerylib import run_task
-from rhodecode.lib.celerylib.tasks import get_commits_stats
-
-from webhelpers.paginate import Page
+from rhodecode.lib.celerylib.tasks import get_commits_stats, \
+    LANGUAGES_EXTENSIONS_MAP
+from rhodecode.lib.helpers import RepoPage
 
 try:
     import json
 except ImportError:
     #python 2.5 compatibility
     import simplejson as json
+    
 log = logging.getLogger(__name__)
 
-class SummaryController(BaseController):
+
+class SummaryController(BaseRepoController):
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
@@ -61,42 +64,51 b' class SummaryController(BaseController):'
         super(SummaryController, self).__before__()
 
     def index(self, repo_name):
-        scm_model = ScmModel()
-        c.repo_info = scm_model.get_repo(c.repo_name)
-        c.following = scm_model.is_following_repo(c.repo_name,
-                                             c.rhodecode_user.user_id)
+
+        e = request.environ
+        c.dbrepo = dbrepo = c.rhodecode_db_repo
+
+        c.following = self.scm_model.is_following_repo(repo_name,
+                                                self.rhodecode_user.user_id)
+
         def url_generator(**kw):
             return url('shortlog_home', repo_name=repo_name, size=10, **kw)
 
-        c.repo_changesets = Page(c.repo_info, page=1,
-                                                items_per_page=10, url=url_generator)
-
-        e = request.environ
+        c.repo_changesets = RepoPage(c.rhodecode_repo, page=1,
+                                     items_per_page=10, url=url_generator)
 
         if self.rhodecode_user.username == 'default':
-            password = ':default'
+            #for default(anonymous) user we don't need to pass credentials
+            username = ''
+            password = ''
         else:
-            password = ''
+            username = str(self.rhodecode_user.username)
+            password = '@'
 
-        uri = u'%(protocol)s://%(user)s%(password)s@%(host)s%(prefix)s/%(repo_name)s' % {
-                                        'protocol': e.get('wsgi.url_scheme'),
-                                        'user':str(c.rhodecode_user.username),
-                                        'password':password,
-                                        'host':e.get('HTTP_HOST'),
-                                        'prefix':e.get('SCRIPT_NAME'),
-                                        'repo_name':c.repo_name, }
+        if e.get('wsgi.url_scheme') == 'https':
+            split_s = 'https://'
+        else:
+            split_s = 'http://'
+
+        qualified_uri = [split_s] + [url.current(qualified=True)\
+                                     .split(split_s)[-1]]
+        uri = u'%(proto)s%(user)s%(pass)s%(rest)s' \
+                % {'user': username,
+                     'pass': password,
+                     'proto': qualified_uri[0],
+                     'rest': qualified_uri[1]}
         c.clone_repo_url = uri
         c.repo_tags = OrderedDict()
-        for name, hash in c.repo_info.tags.items()[:10]:
+        for name, hash in c.rhodecode_repo.tags.items()[:10]:
             try:
-                c.repo_tags[name] = c.repo_info.get_changeset(hash)
+                c.repo_tags[name] = c.rhodecode_repo.get_changeset(hash)
             except ChangesetError:
                 c.repo_tags[name] = EmptyChangeset(hash)
 
         c.repo_branches = OrderedDict()
-        for name, hash in c.repo_info.branches.items()[:10]:
+        for name, hash in c.rhodecode_repo.branches.items()[:10]:
             try:
-                c.repo_branches[name] = c.repo_info.get_changeset(hash)
+                c.repo_branches[name] = c.rhodecode_repo.get_changeset(hash)
             except ChangesetError:
                 c.repo_branches[name] = EmptyChangeset(hash)
 
@@ -108,34 +120,70 b' class SummaryController(BaseController):'
         ts_min_y = mktime(td_1y.timetuple())
         ts_max_y = mktime(td.timetuple())
 
-        if c.repo_info.dbrepo.enable_statistics:
+        if dbrepo.enable_statistics:
             c.no_data_msg = _('No data loaded yet')
-            run_task(get_commits_stats, c.repo_info.name, ts_min_y, ts_max_y)
+            run_task(get_commits_stats, c.dbrepo.repo_name, ts_min_y, ts_max_y)
         else:
-            c.no_data_msg = _('Statistics update are disabled for this repository')
+            c.no_data_msg = _('Statistics are disabled for this repository')
         c.ts_min = ts_min_m
         c.ts_max = ts_max_y
 
         stats = self.sa.query(Statistics)\
-            .filter(Statistics.repository == c.repo_info.dbrepo)\
+            .filter(Statistics.repository == dbrepo)\
             .scalar()
 
+        c.stats_percentage = 0
 
         if stats and stats.languages:
-            c.no_data = False is c.repo_info.dbrepo.enable_statistics
-            lang_stats = json.loads(stats.languages)
+            c.no_data = False is dbrepo.enable_statistics
+            lang_stats_d = json.loads(stats.languages)
             c.commit_data = stats.commit_activity
             c.overview_data = stats.commit_activity_combined
+            
+            lang_stats = ((x, {"count": y,
+                               "desc": LANGUAGES_EXTENSIONS_MAP.get(x)})
+                          for x, y in lang_stats_d.items())
+
             c.trending_languages = json.dumps(OrderedDict(
-                                       sorted(lang_stats.items(), reverse=True,
+                                       sorted(lang_stats, reverse=True,
                                             key=lambda k: k[1])[:10]
                                         )
                                     )
+            last_rev = stats.stat_on_revision
+            c.repo_last_rev = c.rhodecode_repo.count() - 1 \
+                if c.rhodecode_repo.revisions else 0
+            if last_rev == 0 or c.repo_last_rev == 0:
+                pass
+            else:
+                c.stats_percentage = '%.2f' % ((float((last_rev)) /
+                                                c.repo_last_rev) * 100)
         else:
             c.commit_data = json.dumps({})
-            c.overview_data = json.dumps([[ts_min_y, 0], [ts_max_y, 10] ])
+            c.overview_data = json.dumps([[ts_min_y, 0], [ts_max_y, 10]])
             c.trending_languages = json.dumps({})
             c.no_data = True
+            
+        c.enable_downloads = dbrepo.enable_downloads
+        if c.enable_downloads:
+            c.download_options = self._get_download_links(c.rhodecode_repo)
 
         return render('summary/summary.html')
 
+    def _get_download_links(self, repo):
+
+        download_l = []
+
+        branches_group = ([], _("Branches"))
+        tags_group = ([], _("Tags"))
+
+        for name, chs in c.rhodecode_repo.branches.items():
+            #chs = chs.split(':')[-1]
+            branches_group[0].append((chs, name),)
+        download_l.append(branches_group)
+
+        for name, chs in c.rhodecode_repo.tags.items():
+            #chs = chs.split(':')[-1]
+            tags_group[0].append((chs, name),)
+        download_l.append(tags_group)
+
+        return download_l

rhodecode/controllers/tags.py

@@ -4,10 +4,10 b''
     ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     Tags controller for rhodecode
-    
+
     :created_on: Apr 21, 2010
     :author: marcink
-    :copyright: (C) 2009-2010 Marcin Kuzminski <[e-mail]>    
+    :copyright: (C) 2009-2011 Marcin Kuzminski <[e-mail]>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software: you can redistribute it and/or modify
@@ -27,13 +27,13 b' import logging'
 from pylons import tmpl_context as c
 
 from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
-from rhodecode.lib.base import BaseController, render
-from rhodecode.lib.utils import OrderedDict
-from rhodecode.model.scm import ScmModel
+from rhodecode.lib.base import BaseRepoController, render
+from rhodecode.lib.odict import OrderedDict
 
 log = logging.getLogger(__name__)
 
-class TagsController(BaseController):
+
+class TagsController(BaseRepoController):
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
@@ -42,10 +42,12 b' class TagsController(BaseController):'
         super(TagsController, self).__before__()
 
     def index(self):
-        hg_model = ScmModel()
-        c.repo_info = hg_model.get_repo(c.repo_name)
         c.repo_tags = OrderedDict()
-        for name, hash_ in c.repo_info.tags.items():
-            c.repo_tags[name] = c.repo_info.get_changeset(hash_)
+
+        tags = [(name, c.rhodecode_repo.get_changeset(hash_)) for \
+                 name, hash_ in c.rhodecode_repo.tags.items()]
+        ordered_tags = sorted(tags, key=lambda x: x[1].date, reverse=True)
+        for name, cs_tag in ordered_tags:
+            c.repo_tags[name] = cs_tag
 
         return render('tags/tags.html')

rhodecode/i18n/en/LC_MESSAGES/rhodecode.po

@@ -7,47 +7,2534 b' msgid ""'
 msgstr ""
 "Project-Id-Version: rhodecode 0.1\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2010-02-06 22:54+0100\n"
-"PO-Revision-Date: 2010-02-06 23:16+0100\n"
+"POT-Creation-Date: 2011-09-14 15:50-0300\n"
+"PO-Revision-Date: 2011-02-25 19:13+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: en <[e-mail]>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.4\n"
-
-#: rhodecode/controllers/error.py:34
+"Generated-By: Babel 0.9.6\n"
+
+#: rhodecode/controllers/changeset.py:108
+#: rhodecode/controllers/changeset.py:149
+#: rhodecode/controllers/changeset.py:216
+#: rhodecode/controllers/changeset.py:229
+msgid "binary file"
+msgstr ""
+
+#: rhodecode/controllers/changeset.py:123
+#: rhodecode/controllers/changeset.py:168
+msgid "Changeset is to big and was cut off, see raw changeset instead"
+msgstr ""
+
+#: rhodecode/controllers/changeset.py:159
+msgid "Diff is to big and was cut off, see raw diff instead"
+msgstr ""
+
+#: rhodecode/controllers/error.py:69
 msgid "Home page"
 msgstr ""
 
-#: rhodecode/controllers/error.py:55
+#: rhodecode/controllers/error.py:98
 msgid "The request could not be understood by the server due to malformed syntax."
 msgstr ""
 
-#: rhodecode/controllers/error.py:57
-msgid "Unathorized access to resource"
-msgstr ""
-
-#: rhodecode/controllers/error.py:59
+#: rhodecode/controllers/error.py:101
+msgid "Unauthorized access to resource"
+msgstr ""
+
+#: rhodecode/controllers/error.py:103
 msgid "You don't have permission to view this page"
 msgstr ""
 
-#: rhodecode/controllers/error.py:61
+#: rhodecode/controllers/error.py:105
 msgid "The resource could not be found"
 msgstr ""
 
-#: rhodecode/controllers/error.py:63
+#: rhodecode/controllers/error.py:107
 msgid ""
 "The server encountered an unexpected condition which prevented it from "
 "fulfilling the request."
 msgstr ""
 
-#: rhodecode/model/forms.py:29
+#: rhodecode/controllers/feed.py:48
+#, python-format
+msgid "Changes on %s repository"
+msgstr ""
+
+#: rhodecode/controllers/feed.py:49
+#, python-format
+msgid "%s %s feed"
+msgstr ""
+
+#: rhodecode/controllers/files.py:72
+msgid "There are no files yet"
+msgstr ""
+
+#: rhodecode/controllers/files.py:262
+#, python-format
+msgid "Edited %s via RhodeCode"
+msgstr ""
+
+#: rhodecode/controllers/files.py:267
+#: rhodecode/templates/files/file_diff.html:40
+msgid "No changes"
+msgstr ""
+
+#: rhodecode/controllers/files.py:278
+#, python-format
+msgid "Successfully committed to %s"
+msgstr ""
+
+#: rhodecode/controllers/files.py:283
+msgid "Error occurred during commit"
+msgstr ""
+
+#: rhodecode/controllers/files.py:308
+msgid "downloads disabled"
+msgstr ""
+
+#: rhodecode/controllers/files.py:313
+#, python-format
+msgid "Unknown revision %s"
+msgstr ""
+
+#: rhodecode/controllers/files.py:315
+msgid "Empty repository"
+msgstr ""
+
+#: rhodecode/controllers/files.py:317
+msgid "Unknown archive type"
+msgstr ""
+
+#: rhodecode/controllers/files.py:385 rhodecode/controllers/files.py:398
+msgid "Binary file"
+msgstr ""
+
+#: rhodecode/controllers/files.py:417
+#: rhodecode/templates/changeset/changeset_range.html:4
+#: rhodecode/templates/changeset/changeset_range.html:12
+#: rhodecode/templates/changeset/changeset_range.html:29
+msgid "Changesets"
+msgstr ""
+
+#: rhodecode/controllers/files.py:418 rhodecode/controllers/summary.py:175
+#: rhodecode/templates/branches/branches.html:5
+#: rhodecode/templates/summary/summary.html:690
+msgid "Branches"
+msgstr ""
+
+#: rhodecode/controllers/files.py:419 rhodecode/controllers/summary.py:176
+#: rhodecode/templates/summary/summary.html:679
+#: rhodecode/templates/tags/tags.html:5
+msgid "Tags"
+msgstr ""
+
+#: rhodecode/controllers/journal.py:50
+#, python-format
+msgid "%s public journal %s feed"
+msgstr ""
+
+#: rhodecode/controllers/journal.py:178 rhodecode/controllers/journal.py:212
+#: rhodecode/templates/admin/repos/repo_edit.html:171
+#: rhodecode/templates/base/base.html:50
+msgid "Public journal"
+msgstr ""
+
+#: rhodecode/controllers/login.py:111
+msgid "You have successfully registered into rhodecode"
+msgstr ""
+
+#: rhodecode/controllers/login.py:133
+msgid "Your password reset link was sent"
+msgstr ""
+
+#: rhodecode/controllers/login.py:155
+msgid ""
+"Your password reset was successful, new password has been sent to your "
+"email"
+msgstr ""
+
+#: rhodecode/controllers/search.py:109
+msgid "Invalid search query. Try quoting it."
+msgstr ""
+
+#: rhodecode/controllers/search.py:114
+msgid "There is no index to search in. Please run whoosh indexer"
+msgstr ""
+
+#: rhodecode/controllers/search.py:118
+msgid "An error occurred during this search operation"
+msgstr ""
+
+#: rhodecode/controllers/settings.py:61 rhodecode/controllers/settings.py:171
+#, python-format
+msgid ""
+"%s repository is not mapped to db perhaps it was created or renamed from "
+"the file system please run the application again in order to rescan "
+"repositories"
+msgstr ""
+
+#: rhodecode/controllers/settings.py:109
+#: rhodecode/controllers/admin/repos.py:239
+#, python-format
+msgid "Repository %s updated successfully"
+msgstr ""
+
+#: rhodecode/controllers/settings.py:126
+#: rhodecode/controllers/admin/repos.py:257
+#, python-format
+msgid "error occurred during update of repository %s"
+msgstr ""
+
+#: rhodecode/controllers/settings.py:144
+#: rhodecode/controllers/admin/repos.py:275
+#, python-format
+msgid ""
+"%s repository is not mapped to db perhaps it was moved or renamed  from "
+"the filesystem please run the application again in order to rescan "
+"repositories"
+msgstr ""
+
+#: rhodecode/controllers/settings.py:156
+#: rhodecode/controllers/admin/repos.py:287
+#, python-format
+msgid "deleted repository %s"
+msgstr ""
+
+#: rhodecode/controllers/settings.py:159
+#: rhodecode/controllers/admin/repos.py:297
+#: rhodecode/controllers/admin/repos.py:303
+#, python-format
+msgid "An error occurred during deletion of %s"
+msgstr ""
+
+#: rhodecode/controllers/settings.py:193
+#, python-format
+msgid "forked %s repository as %s"
+msgstr ""
+
+#: rhodecode/controllers/settings.py:211
+#, python-format
+msgid "An error occurred during repository forking %s"
+msgstr ""
+
+#: rhodecode/controllers/summary.py:123
+msgid "No data loaded yet"
+msgstr ""
+
+#: rhodecode/controllers/summary.py:126
+msgid "Statistics are disabled for this repository"
+msgstr ""
+
+#: rhodecode/controllers/admin/ldap_settings.py:49
+msgid "BASE"
+msgstr ""
+
+#: rhodecode/controllers/admin/ldap_settings.py:50
+msgid "ONELEVEL"
+msgstr ""
+
+#: rhodecode/controllers/admin/ldap_settings.py:51
+msgid "SUBTREE"
+msgstr ""
+
+#: rhodecode/controllers/admin/ldap_settings.py:55
+msgid "NEVER"
+msgstr ""
+
+#: rhodecode/controllers/admin/ldap_settings.py:56
+msgid "ALLOW"
+msgstr ""
+
+#: rhodecode/controllers/admin/ldap_settings.py:57
+msgid "TRY"
+msgstr ""
+
+#: rhodecode/controllers/admin/ldap_settings.py:58
+msgid "DEMAND"
+msgstr ""
+
+#: rhodecode/controllers/admin/ldap_settings.py:59
+msgid "HARD"
+msgstr ""
+
+#: rhodecode/controllers/admin/ldap_settings.py:63
+msgid "No encryption"
+msgstr ""
+
+#: rhodecode/controllers/admin/ldap_settings.py:64
+msgid "LDAPS connection"
+msgstr ""
+
+#: rhodecode/controllers/admin/ldap_settings.py:65
+msgid "START_TLS on LDAP connection"
+msgstr ""
+
+#: rhodecode/controllers/admin/ldap_settings.py:115
+msgid "Ldap settings updated successfully"
+msgstr ""
+
+#: rhodecode/controllers/admin/ldap_settings.py:120
+msgid "Unable to activate ldap. The \"python-ldap\" library is missing."
+msgstr ""
+
+#: rhodecode/controllers/admin/ldap_settings.py:134
+msgid "error occurred during update of ldap settings"
+msgstr ""
+
+#: rhodecode/controllers/admin/permissions.py:56
+msgid "None"
+msgstr ""
+
+#: rhodecode/controllers/admin/permissions.py:57
+msgid "Read"
+msgstr ""
+
+#: rhodecode/controllers/admin/permissions.py:58
+msgid "Write"
+msgstr ""
+
+#: rhodecode/controllers/admin/permissions.py:59
+#: rhodecode/templates/admin/ldap/ldap.html:9
+#: rhodecode/templates/admin/permissions/permissions.html:9
+#: rhodecode/templates/admin/repos/repo_add.html:9
+#: rhodecode/templates/admin/repos/repo_edit.html:9
+#: rhodecode/templates/admin/repos/repos.html:10
+#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:8
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:8
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10
+#: rhodecode/templates/admin/settings/hooks.html:9
+#: rhodecode/templates/admin/settings/settings.html:9
+#: rhodecode/templates/admin/users/user_add.html:8
+#: rhodecode/templates/admin/users/user_edit.html:9
+#: rhodecode/templates/admin/users/user_edit.html:110
+#: rhodecode/templates/admin/users/users.html:9
+#: rhodecode/templates/admin/users_groups/users_group_add.html:8
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:9
+#: rhodecode/templates/admin/users_groups/users_groups.html:9
+#: rhodecode/templates/base/base.html:279
+#: rhodecode/templates/base/base.html:366
+#: rhodecode/templates/base/base.html:368
+#: rhodecode/templates/base/base.html:370
+msgid "Admin"
+msgstr ""
+
+#: rhodecode/controllers/admin/permissions.py:62
+msgid "disabled"
+msgstr ""
+
+#: rhodecode/controllers/admin/permissions.py:64
+msgid "allowed with manual account activation"
+msgstr ""
+
+#: rhodecode/controllers/admin/permissions.py:66
+msgid "allowed with automatic account activation"
+msgstr ""
+
+#: rhodecode/controllers/admin/permissions.py:68
+msgid "Disabled"
+msgstr ""
+
+#: rhodecode/controllers/admin/permissions.py:69
+msgid "Enabled"
+msgstr ""
+
+#: rhodecode/controllers/admin/permissions.py:102
+msgid "Default permissions updated successfully"
+msgstr ""
+
+#: rhodecode/controllers/admin/permissions.py:119
+msgid "error occurred during update of permissions"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:96
+#, python-format
+msgid ""
+"%s repository is not mapped to db perhaps it was created or renamed from "
+"the filesystem please run the application again in order to rescan "
+"repositories"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:172
+#, python-format
+msgid "created repository %s from %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:176
+#, python-format
+msgid "created repository %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:205
+#, python-format
+msgid "error occurred during creation of repository %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:292
+#, python-format
+msgid "Cannot delete %s it still contains attached forks"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:320
+msgid "An error occurred during deletion of repository user"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:335
+msgid "An error occurred during deletion of repository users groups"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:352
+msgid "An error occurred during deletion of repository stats"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:367
+msgid "An error occurred during cache invalidation"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:387
+msgid "Updated repository visibility in public journal"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:390
+msgid "An error occurred during setting this repository in public journal"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:395 rhodecode/model/forms.py:53
 msgid "Token mismatch"
 msgstr ""
 
-#: rhodecode/model/forms.py:52
-msgid "Account number is invalid, it must be 26 digits"
-msgstr ""
-
+#: rhodecode/controllers/admin/repos.py:408
+msgid "Pulled from remote location"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:410
+msgid "An error occurred during pull from remote location"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos_groups.py:83
+#, python-format
+msgid "created repos group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos_groups.py:96
+#, python-format
+msgid "error occurred during creation of repos group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos_groups.py:130
+#, python-format
+msgid "updated repos group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos_groups.py:143
+#, python-format
+msgid "error occurred during update of repos group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos_groups.py:164
+#, python-format
+msgid "This group contains %s repositores and cannot be deleted"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos_groups.py:171
+#, python-format
+msgid "removed repos group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos_groups.py:175
+#, python-format
+msgid "error occurred during deletion of repos group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:109
+#, python-format
+msgid "Repositories successfully rescanned added: %s,removed: %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:118
+msgid "Whoosh reindex task scheduled"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:143
+msgid "Updated application settings"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:148
+#: rhodecode/controllers/admin/settings.py:215
+msgid "error occurred during updating application settings"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:210
+msgid "Updated mercurial settings"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:236
+msgid "Added new hook"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:247
+msgid "Updated hooks"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:251
+msgid "error occurred during hook creation"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:310
+msgid "You can't edit this user since it's crucial for entire application"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:339
+msgid "Your account was updated successfully"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:359
+#: rhodecode/controllers/admin/users.py:130
+#, python-format
+msgid "error occurred during update of user %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:78
+#, python-format
+msgid "created user %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:90
+#, python-format
+msgid "error occurred during creation of user %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:116
+msgid "User updated successfully"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:146
+msgid "successfully deleted user"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:150
+msgid "An error occurred during deletion of user"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:166
+msgid "You can't edit this user"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:195
+#: rhodecode/controllers/admin/users_groups.py:202
+msgid "Granted 'repository create' permission to user"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:204
+#: rhodecode/controllers/admin/users_groups.py:211
+msgid "Revoked 'repository create' permission to user"
+msgstr ""
+
+#: rhodecode/controllers/admin/users_groups.py:74
+#, python-format
+msgid "created users group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/users_groups.py:86
+#, python-format
+msgid "error occurred during creation of users group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/users_groups.py:119
+#, python-format
+msgid "updated users group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/users_groups.py:138
+#, python-format
+msgid "error occurred during update of users group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/users_groups.py:154
+msgid "successfully deleted users group"
+msgstr ""
+
+#: rhodecode/controllers/admin/users_groups.py:158
+msgid "An error occurred during deletion of users group"
+msgstr ""
+
+#: rhodecode/lib/__init__.py:279
+msgid "year"
+msgstr ""
+
+#: rhodecode/lib/__init__.py:280
+msgid "month"
+msgstr ""
+
+#: rhodecode/lib/__init__.py:281
+msgid "day"
+msgstr ""
+
+#: rhodecode/lib/__init__.py:282
+msgid "hour"
+msgstr ""
+
+#: rhodecode/lib/__init__.py:283
+msgid "minute"
+msgstr ""
+
+#: rhodecode/lib/__init__.py:284
+msgid "second"
+msgstr ""
+
+#: rhodecode/lib/__init__.py:293
+msgid "ago"
+msgstr ""
+
+#: rhodecode/lib/__init__.py:296
+msgid "just now"
+msgstr ""
+
+#: rhodecode/lib/auth.py:377
+msgid "You need to be a registered user to perform this action"
+msgstr ""
+
+#: rhodecode/lib/auth.py:421
+msgid "You need to be a signed in to view this page"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:307
+msgid "True"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:311
+msgid "False"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:352
+#, python-format
+msgid "Show all combined changesets %s->%s"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:356
+msgid "compare view"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:365
+msgid "and"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:365
+#, python-format
+msgid "%s more"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:367 rhodecode/templates/changelog/changelog.html:14
+#: rhodecode/templates/changelog/changelog.html:39
+msgid "revisions"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:385
+msgid "fork name "
+msgstr ""
+
+#: rhodecode/lib/helpers.py:388
+msgid "[deleted] repository"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:389 rhodecode/lib/helpers.py:393
+msgid "[created] repository"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:390 rhodecode/lib/helpers.py:394
+msgid "[forked] repository"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:391 rhodecode/lib/helpers.py:395
+msgid "[updated] repository"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:392
+msgid "[delete] repository"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:396
+msgid "[pushed] into"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:397
+msgid "[committed via RhodeCode] into"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:398
+msgid "[pulled from remote] into"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:399
+msgid "[pulled] from"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:400
+msgid "[started following] repository"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:401
+msgid "[stopped following] repository"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:577
+#, python-format
+msgid " and %s more"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:581
+msgid "No Files"
+msgstr ""
+
+#: rhodecode/model/forms.py:66
+msgid "Invalid username"
+msgstr ""
+
+#: rhodecode/model/forms.py:75
+msgid "This username already exists"
+msgstr ""
+
+#: rhodecode/model/forms.py:79
+msgid ""
+"Username may only contain alphanumeric characters underscores, periods or"
+" dashes and must begin with alphanumeric character"
+msgstr ""
+
+#: rhodecode/model/forms.py:94
+msgid "Invalid group name"
+msgstr ""
+
+#: rhodecode/model/forms.py:104
+msgid "This users group already exists"
+msgstr ""
+
+#: rhodecode/model/forms.py:110
+msgid ""
+"Group name may only contain alphanumeric characters underscores, periods "
+"or dashes and must begin with alphanumeric character"
+msgstr ""
+
+#: rhodecode/model/forms.py:132
+msgid "Cannot assign this group as parent"
+msgstr ""
+
+#: rhodecode/model/forms.py:148
+msgid "This group already exists"
+msgstr ""
+
+#: rhodecode/model/forms.py:164 rhodecode/model/forms.py:172
+#: rhodecode/model/forms.py:180
+msgid "Invalid characters in password"
+msgstr ""
+
+#: rhodecode/model/forms.py:191
+msgid "Passwords do not match"
+msgstr ""
+
+#: rhodecode/model/forms.py:196
+msgid "invalid password"
+msgstr ""
+
+#: rhodecode/model/forms.py:197
+msgid "invalid user name"
+msgstr ""
+
+#: rhodecode/model/forms.py:198
+msgid "Your account is disabled"
+msgstr ""
+
+#: rhodecode/model/forms.py:233
+msgid "This username is not valid"
+msgstr ""
+
+#: rhodecode/model/forms.py:245
+msgid "This repository name is disallowed"
+msgstr ""
+
+#: rhodecode/model/forms.py:266
+#, python-format
+msgid "This repository already exists in group \"%s\""
+msgstr ""
+
+#: rhodecode/model/forms.py:274
+msgid "This repository already exists"
+msgstr ""
+
+#: rhodecode/model/forms.py:312 rhodecode/model/forms.py:319
+msgid "invalid clone url"
+msgstr ""
+
+#: rhodecode/model/forms.py:322
+msgid "Invalid clone url, provide a valid clone http\\s url"
+msgstr ""
+
+#: rhodecode/model/forms.py:334
+msgid "Fork have to be the same type as original"
+msgstr ""
+
+#: rhodecode/model/forms.py:341
+msgid "This username or users group name is not valid"
+msgstr ""
+
+#: rhodecode/model/forms.py:403
+msgid "This is not a valid path"
+msgstr ""
+
+#: rhodecode/model/forms.py:416
+msgid "This e-mail address is already taken"
+msgstr ""
+
+#: rhodecode/model/forms.py:427
+msgid "This e-mail address doesn't exist."
+msgstr ""
+
+#: rhodecode/model/forms.py:447
+msgid ""
+"The LDAP Login attribute of the CN must be specified - this is the name "
+"of the attribute that is equivalent to 'username'"
+msgstr ""
+
+#: rhodecode/model/forms.py:466
+msgid "Please enter a login"
+msgstr ""
+
+#: rhodecode/model/forms.py:467
+#, python-format
+msgid "Enter a value %(min)i characters long or more"
+msgstr ""
+
+#: rhodecode/model/forms.py:475
+msgid "Please enter a password"
+msgstr ""
+
+#: rhodecode/model/forms.py:476
+#, python-format
+msgid "Enter %(min)i characters or more"
+msgstr ""
+
+#: rhodecode/model/user.py:145
+msgid "[RhodeCode] New User registration"
+msgstr ""
+
+#: rhodecode/model/user.py:157 rhodecode/model/user.py:179
+msgid "You can't Edit this user since it's crucial for entire application"
+msgstr ""
+
+#: rhodecode/model/user.py:201
+msgid "You can't remove this user since it's crucial for entire application"
+msgstr ""
+
+#: rhodecode/model/user.py:204
+#, python-format
+msgid ""
+"This user still owns %s repositories and cannot be removed. Switch owners"
+" or remove those repositories"
+msgstr ""
+
+#: rhodecode/templates/index.html:4
+msgid "Dashboard"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:22
+#: rhodecode/templates/admin/users/user_edit_my_account.html:102
+msgid "quick filter..."
+msgstr ""
+
+#: rhodecode/templates/index_base.html:23
+#: rhodecode/templates/base/base.html:300
+msgid "repositories"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:29
+#: rhodecode/templates/admin/repos/repos.html:22
+msgid "ADD NEW REPOSITORY"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:41
+#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:32
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:32
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:33
+#: rhodecode/templates/admin/users_groups/users_group_add.html:32
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:33
+msgid "Group name"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:42
+#: rhodecode/templates/index_base.html:73
+#: rhodecode/templates/admin/repos/repo_add_base.html:44
+#: rhodecode/templates/admin/repos/repo_edit.html:64
+#: rhodecode/templates/admin/repos/repos.html:31
+#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:41
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:41
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:34
+#: rhodecode/templates/settings/repo_fork.html:40
+#: rhodecode/templates/settings/repo_settings.html:40
+#: rhodecode/templates/summary/summary.html:92
+msgid "Description"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:53
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:46
+msgid "Repositories group"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:72
+#: rhodecode/templates/admin/repos/repo_add_base.html:9
+#: rhodecode/templates/admin/repos/repo_edit.html:32
+#: rhodecode/templates/admin/repos/repos.html:30
+#: rhodecode/templates/admin/users/user_edit_my_account.html:117
+#: rhodecode/templates/files/files_browser.html:157
+#: rhodecode/templates/settings/repo_settings.html:31
+#: rhodecode/templates/summary/summary.html:31
+#: rhodecode/templates/summary/summary.html:107
+msgid "Name"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:74
+#: rhodecode/templates/admin/repos/repos.html:32
+#: rhodecode/templates/summary/summary.html:114
+msgid "Last change"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:75
+#: rhodecode/templates/admin/repos/repos.html:33
+msgid "Tip"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:76
+#: rhodecode/templates/admin/repos/repo_edit.html:97
+msgid "Owner"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:77
+#: rhodecode/templates/journal/public_journal.html:20
+#: rhodecode/templates/summary/summary.html:180
+#: rhodecode/templates/summary/summary.html:183
+msgid "RSS"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:78
+#: rhodecode/templates/journal/public_journal.html:23
+#: rhodecode/templates/summary/summary.html:181
+#: rhodecode/templates/summary/summary.html:184
+msgid "Atom"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:87
+#: rhodecode/templates/index_base.html:89
+#: rhodecode/templates/index_base.html:91
+#: rhodecode/templates/base/base.html:209
+#: rhodecode/templates/base/base.html:211
+#: rhodecode/templates/base/base.html:213
+#: rhodecode/templates/summary/summary.html:4
+msgid "Summary"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:95
+#: rhodecode/templates/index_base.html:97
+#: rhodecode/templates/index_base.html:99
+#: rhodecode/templates/base/base.html:225
+#: rhodecode/templates/base/base.html:227
+#: rhodecode/templates/base/base.html:229
+#: rhodecode/templates/changelog/changelog.html:6
+#: rhodecode/templates/changelog/changelog.html:14
+msgid "Changelog"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:103
+#: rhodecode/templates/index_base.html:105
+#: rhodecode/templates/index_base.html:107
+#: rhodecode/templates/base/base.html:268
+#: rhodecode/templates/base/base.html:270
+#: rhodecode/templates/base/base.html:272
+#: rhodecode/templates/files/files.html:4
+msgid "Files"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:116
+#: rhodecode/templates/admin/repos/repos.html:42
+#: rhodecode/templates/admin/users/user_edit_my_account.html:127
+#: rhodecode/templates/summary/summary.html:48
+msgid "Mercurial repository"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:118
+#: rhodecode/templates/admin/repos/repos.html:44
+#: rhodecode/templates/admin/users/user_edit_my_account.html:129
+#: rhodecode/templates/summary/summary.html:51
+msgid "Git repository"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:123
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:16
+#: rhodecode/templates/journal/journal.html:53
+#: rhodecode/templates/summary/summary.html:56
+msgid "private repository"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:125
+#: rhodecode/templates/journal/journal.html:55
+#: rhodecode/templates/summary/summary.html:58
+msgid "public repository"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:133
+#: rhodecode/templates/base/base.html:291
+#: rhodecode/templates/settings/repo_fork.html:13
+msgid "fork"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:134
+#: rhodecode/templates/admin/repos/repos.html:60
+#: rhodecode/templates/admin/users/user_edit_my_account.html:143
+#: rhodecode/templates/summary/summary.html:69
+#: rhodecode/templates/summary/summary.html:71
+msgid "Fork of"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:155
+#: rhodecode/templates/admin/repos/repos.html:73
+msgid "No changesets yet"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:161
+#: rhodecode/templates/index_base.html:163
+#, python-format
+msgid "Subscribe to %s rss feed"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:168
+#: rhodecode/templates/index_base.html:170
+#, python-format
+msgid "Subscribe to %s atom feed"
+msgstr ""
+
+#: rhodecode/templates/login.html:5 rhodecode/templates/login.html:54
+#: rhodecode/templates/base/base.html:38
+msgid "Sign In"
+msgstr ""
+
+#: rhodecode/templates/login.html:21
+msgid "Sign In to"
+msgstr ""
+
+#: rhodecode/templates/login.html:31 rhodecode/templates/register.html:20
+#: rhodecode/templates/admin/admin_log.html:5
+#: rhodecode/templates/admin/users/user_add.html:32
+#: rhodecode/templates/admin/users/user_edit.html:47
+#: rhodecode/templates/admin/users/user_edit_my_account.html:45
+#: rhodecode/templates/base/base.html:15
+#: rhodecode/templates/summary/summary.html:106
+msgid "Username"
+msgstr ""
+
+#: rhodecode/templates/login.html:40 rhodecode/templates/register.html:29
+#: rhodecode/templates/admin/ldap/ldap.html:46
+#: rhodecode/templates/admin/users/user_add.html:41
+#: rhodecode/templates/base/base.html:24
+msgid "Password"
+msgstr ""
+
+#: rhodecode/templates/login.html:60
+msgid "Forgot your password ?"
+msgstr ""
+
+#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:35
+msgid "Don't have an account ?"
+msgstr ""
+
+#: rhodecode/templates/password_reset.html:5
+msgid "Reset your password"
+msgstr ""
+
+#: rhodecode/templates/password_reset.html:11
+msgid "Reset your password to"
+msgstr ""
+
+#: rhodecode/templates/password_reset.html:21
+msgid "Email address"
+msgstr ""
+
+#: rhodecode/templates/password_reset.html:30
+msgid "Reset my password"
+msgstr ""
+
+#: rhodecode/templates/password_reset.html:31
+msgid "Password reset link will be send to matching email address"
+msgstr ""
+
+#: rhodecode/templates/register.html:5 rhodecode/templates/register.html:74
+msgid "Sign Up"
+msgstr ""
+
+#: rhodecode/templates/register.html:11
+msgid "Sign Up to"
+msgstr ""
+
+#: rhodecode/templates/register.html:38
+msgid "Re-enter password"
+msgstr ""
+
+#: rhodecode/templates/register.html:47
+#: rhodecode/templates/admin/users/user_add.html:50
+#: rhodecode/templates/admin/users/user_edit.html:74
+#: rhodecode/templates/admin/users/user_edit_my_account.html:63
+msgid "First Name"
+msgstr ""
+
+#: rhodecode/templates/register.html:56
+#: rhodecode/templates/admin/users/user_add.html:59
+#: rhodecode/templates/admin/users/user_edit.html:83
+#: rhodecode/templates/admin/users/user_edit_my_account.html:72
+msgid "Last Name"
+msgstr ""
+
+#: rhodecode/templates/register.html:65
+#: rhodecode/templates/admin/users/user_add.html:68
+#: rhodecode/templates/admin/users/user_edit.html:92
+#: rhodecode/templates/admin/users/user_edit_my_account.html:81
+#: rhodecode/templates/summary/summary.html:108
+msgid "Email"
+msgstr ""
+
+#: rhodecode/templates/register.html:76
+msgid "Your account will be activated right after registration"
+msgstr ""
+
+#: rhodecode/templates/register.html:78
+msgid "Your account must wait for activation by administrator"
+msgstr ""
+
+#: rhodecode/templates/repo_switcher_list.html:14
+msgid "Private repository"
+msgstr ""
+
+#: rhodecode/templates/repo_switcher_list.html:19
+msgid "Public repository"
+msgstr ""
+
+#: rhodecode/templates/admin/admin.html:5
+#: rhodecode/templates/admin/admin.html:9
+msgid "Admin journal"
+msgstr ""
+
+#: rhodecode/templates/admin/admin_log.html:6
+msgid "Action"
+msgstr ""
+
+#: rhodecode/templates/admin/admin_log.html:7
+msgid "Repository"
+msgstr ""
+
+#: rhodecode/templates/admin/admin_log.html:8
+msgid "Date"
+msgstr ""
+
+#: rhodecode/templates/admin/admin_log.html:9
+msgid "From IP"
+msgstr ""
+
+#: rhodecode/templates/admin/admin_log.html:52
+msgid "No actions yet"
+msgstr ""
+
+#: rhodecode/templates/admin/ldap/ldap.html:5
+msgid "LDAP administration"
+msgstr ""
+
+#: rhodecode/templates/admin/ldap/ldap.html:11
+msgid "Ldap"
+msgstr ""
+
+#: rhodecode/templates/admin/ldap/ldap.html:28
+msgid "Connection settings"
+msgstr ""
+
+#: rhodecode/templates/admin/ldap/ldap.html:30
+msgid "Enable LDAP"
+msgstr ""
+
+#: rhodecode/templates/admin/ldap/ldap.html:34
+msgid "Host"
+msgstr ""
+
+#: rhodecode/templates/admin/ldap/ldap.html:38
+msgid "Port"
+msgstr ""
+
+#: rhodecode/templates/admin/ldap/ldap.html:42
+msgid "Account"
+msgstr ""
+
+#: rhodecode/templates/admin/ldap/ldap.html:50
+msgid "Connection security"
+msgstr ""
+
+#: rhodecode/templates/admin/ldap/ldap.html:54
+msgid "Certificate Checks"
+msgstr ""
+
+#: rhodecode/templates/admin/ldap/ldap.html:57
+msgid "Search settings"
+msgstr ""
+
+#: rhodecode/templates/admin/ldap/ldap.html:59
+msgid "Base DN"
+msgstr ""
+
+#: rhodecode/templates/admin/ldap/ldap.html:63
+msgid "LDAP Filter"
+msgstr ""
+
+#: rhodecode/templates/admin/ldap/ldap.html:67
+msgid "LDAP Search Scope"
+msgstr ""
+
+#: rhodecode/templates/admin/ldap/ldap.html:70
+msgid "Attribute mappings"
+msgstr ""
+
+#: rhodecode/templates/admin/ldap/ldap.html:72
+msgid "Login Attribute"
+msgstr ""
+
+#: rhodecode/templates/admin/ldap/ldap.html:76
+msgid "First Name Attribute"
+msgstr ""
+
+#: rhodecode/templates/admin/ldap/ldap.html:80
+msgid "Last Name Attribute"
+msgstr ""
+
+#: rhodecode/templates/admin/ldap/ldap.html:84
+msgid "E-mail Attribute"
+msgstr ""
+
+#: rhodecode/templates/admin/ldap/ldap.html:89
+#: rhodecode/templates/admin/settings/hooks.html:73
+#: rhodecode/templates/admin/users/user_edit.html:117
+#: rhodecode/templates/admin/users/user_edit.html:142
+#: rhodecode/templates/admin/users/user_edit_my_account.html:89
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:263
+msgid "Save"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions.html:5
+msgid "Permissions administration"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions.html:11
+#: rhodecode/templates/admin/repos/repo_edit.html:109
+#: rhodecode/templates/admin/users/user_edit.html:127
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:248
+#: rhodecode/templates/settings/repo_settings.html:58
+msgid "Permissions"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions.html:24
+msgid "Default permissions"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions.html:31
+msgid "Anonymous access"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions.html:41
+msgid "Repository permission"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions.html:49
+msgid ""
+"All default permissions on each repository will be reset to choosen "
+"permission, note that all custom default permission on repositories will "
+"be lost"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions.html:50
+msgid "overwrite existing settings"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions.html:55
+msgid "Registration"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions.html:63
+msgid "Repository creation"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions.html:71
+msgid "set"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_add.html:5
+#: rhodecode/templates/admin/repos/repo_add_create_repository.html:5
+msgid "Add repository"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_add.html:11
+#: rhodecode/templates/admin/repos/repo_edit.html:11
+#: rhodecode/templates/admin/repos/repos.html:10
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10
+msgid "Repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_add.html:13
+msgid "add new"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:20
+#: rhodecode/templates/summary/summary.html:80
+#: rhodecode/templates/summary/summary.html:82
+msgid "Clone from"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:28
+#: rhodecode/templates/admin/repos/repo_edit.html:48
+#: rhodecode/templates/admin/repos_groups/repos_groups.html:4
+msgid "Repository group"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:36
+#: rhodecode/templates/admin/repos/repo_edit.html:56
+msgid "Type"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:52
+#: rhodecode/templates/admin/repos/repo_edit.html:73
+#: rhodecode/templates/settings/repo_fork.html:48
+#: rhodecode/templates/settings/repo_settings.html:49
+msgid "Private"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:59
+msgid "add"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_add_create_repository.html:9
+msgid "add new repository"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:5
+msgid "Edit repository"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:13
+#: rhodecode/templates/admin/users/user_edit.html:13
+#: rhodecode/templates/admin/users/user_edit_my_account.html:148
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:13
+#: rhodecode/templates/files/files_annotate.html:49
+#: rhodecode/templates/files/files_source.html:20
+msgid "edit"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:40
+msgid "Clone uri"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:81
+msgid "Enable statistics"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:89
+msgid "Enable downloads"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:127
+msgid "Administration"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:130
+msgid "Statistics"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:134
+msgid "Reset current statistics"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:134
+msgid "Confirm to remove current statistics"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:137
+msgid "Fetched to rev"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:138
+msgid "Percentage of stats gathered"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:147
+msgid "Remote"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:151
+msgid "Pull changes from remote location"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:151
+msgid "Confirm to pull changes from remote side"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:162
+msgid "Cache"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:166
+msgid "Invalidate repository cache"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:166
+msgid "Confirm to invalidate repository cache"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:177
+msgid "Remove from public journal"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:179
+msgid "Add to public journal"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:185
+msgid "Delete"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:189
+msgid "Remove this repository"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:189
+#: rhodecode/templates/admin/repos/repos.html:79
+msgid "Confirm to delete this repository"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:3
+msgid "none"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:4
+msgid "read"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:5
+msgid "write"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:6
+#: rhodecode/templates/admin/users/users.html:38
+#: rhodecode/templates/base/base.html:296
+msgid "admin"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:7
+msgid "member"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:33
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:53
+msgid "revoke"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:75
+msgid "Add another member"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:89
+msgid "Failed to remove user"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:104
+msgid "Failed to remove users group"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:205
+msgid "Group"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:206
+#: rhodecode/templates/admin/users_groups/users_groups.html:33
+msgid "members"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repos.html:5
+msgid "Repositories administration"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repos.html:34
+#: rhodecode/templates/summary/summary.html:100
+msgid "Contact"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repos.html:35
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:36
+#: rhodecode/templates/admin/users/user_edit_my_account.html:119
+#: rhodecode/templates/admin/users/users.html:40
+#: rhodecode/templates/admin/users_groups/users_groups.html:35
+msgid "action"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repos.html:51
+#: rhodecode/templates/admin/users/user_edit_my_account.html:134
+#: rhodecode/templates/admin/users/user_edit_my_account.html:148
+msgid "private"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repos.html:53
+#: rhodecode/templates/admin/repos/repos.html:59
+#: rhodecode/templates/admin/users/user_edit_my_account.html:136
+#: rhodecode/templates/admin/users/user_edit_my_account.html:142
+#: rhodecode/templates/summary/summary.html:68
+msgid "public"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repos.html:79
+#: rhodecode/templates/admin/users/users.html:55
+msgid "delete"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups.html:8
+msgid "Groups"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups.html:13
+msgid "with"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:5
+msgid "Add repos group"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:10
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:10
+msgid "Repos groups"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:12
+msgid "add new repos group"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:50
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:50
+msgid "Group parent"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:58
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:58
+#: rhodecode/templates/admin/users/user_add.html:85
+#: rhodecode/templates/admin/users_groups/users_group_add.html:49
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:90
+msgid "save"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:5
+msgid "Edit repos group"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:12
+msgid "edit repos group"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:5
+msgid "Repositories groups administration"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:22
+msgid "ADD NEW GROUP"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:35
+msgid "Number of repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54
+msgid "Confirm to delete this group"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:62
+msgid "There are no repositories groups yet"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/hooks.html:5
+#: rhodecode/templates/admin/settings/settings.html:5
+msgid "Settings administration"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/hooks.html:9
+#: rhodecode/templates/admin/settings/settings.html:9
+#: rhodecode/templates/settings/repo_settings.html:5
+#: rhodecode/templates/settings/repo_settings.html:13
+msgid "Settings"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/hooks.html:24
+msgid "Built in hooks - read only"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/hooks.html:40
+msgid "Custom hooks"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/hooks.html:56
+msgid "remove"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/hooks.html:88
+msgid "Failed to remove hook"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:24
+msgid "Remap and rescan repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:32
+msgid "rescan option"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:38
+msgid ""
+"In case a repository was deleted from filesystem and there are leftovers "
+"in the database check this option to scan obsolete data in database and "
+"remove it."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:39
+msgid "destroy old data"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:45
+msgid "Rescan repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:51
+msgid "Whoosh indexing"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:59
+msgid "index build option"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:64
+msgid "build from scratch"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:70
+msgid "Reindex"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:76
+msgid "Global application settings"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:85
+msgid "Application name"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:94
+msgid "Realm text"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:103
+msgid "GA code"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:111
+#: rhodecode/templates/admin/settings/settings.html:177
+msgid "Save settings"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:112
+#: rhodecode/templates/admin/settings/settings.html:178
+#: rhodecode/templates/admin/users/user_edit.html:118
+#: rhodecode/templates/admin/users/user_edit.html:143
+#: rhodecode/templates/admin/users/user_edit_my_account.html:90
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:264
+#: rhodecode/templates/files/files_edit.html:50
+msgid "Reset"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:118
+msgid "Mercurial settings"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:127
+msgid "Web"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:132
+msgid "require ssl for pushing"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:139
+msgid "Hooks"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:142
+msgid "advanced setup"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:147
+msgid "Update repository after push (hg update)"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:151
+msgid "Show repository size after push"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:155
+msgid "Log user push commands"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:159
+msgid "Log user pull commands"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:166
+msgid "Repositories location"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:171
+msgid ""
+"This a crucial application setting. If you are really sure you need to "
+"change this, you must restart application in order to make this setting "
+"take effect. Click this label to unlock."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:172
+msgid "unlock"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_add.html:5
+msgid "Add user"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_add.html:10
+#: rhodecode/templates/admin/users/user_edit.html:11
+#: rhodecode/templates/admin/users/users.html:9
+msgid "Users"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_add.html:12
+msgid "add new user"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_add.html:77
+#: rhodecode/templates/admin/users/user_edit.html:101
+#: rhodecode/templates/admin/users_groups/users_group_add.html:41
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:42
+msgid "Active"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit.html:5
+msgid "Edit user"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit.html:33
+#: rhodecode/templates/admin/users/user_edit_my_account.html:32
+msgid "Change your avatar at"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit.html:34
+#: rhodecode/templates/admin/users/user_edit_my_account.html:33
+msgid "Using"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit.html:40
+#: rhodecode/templates/admin/users/user_edit_my_account.html:39
+msgid "API key"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit.html:56
+msgid "LDAP DN"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit.html:65
+#: rhodecode/templates/admin/users/user_edit_my_account.html:54
+msgid "New password"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit.html:135
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:256
+msgid "Create repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_my_account.html:5
+msgid "My account"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_my_account.html:9
+msgid "My Account"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_my_account.html:101
+msgid "My repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_my_account.html:107
+msgid "ADD REPOSITORY"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_my_account.html:118
+#: rhodecode/templates/branches/branches_data.html:7
+#: rhodecode/templates/shortlog/shortlog_data.html:8
+#: rhodecode/templates/tags/tags_data.html:7
+msgid "revision"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_my_account.html:157
+msgid "No repositories yet"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_my_account.html:159
+msgid "create one now"
+msgstr ""
+
+#: rhodecode/templates/admin/users/users.html:5
+msgid "Users administration"
+msgstr ""
+
+#: rhodecode/templates/admin/users/users.html:23
+msgid "ADD NEW USER"
+msgstr ""
+
+#: rhodecode/templates/admin/users/users.html:33
+msgid "username"
+msgstr ""
+
+#: rhodecode/templates/admin/users/users.html:34
+#: rhodecode/templates/branches/branches_data.html:5
+#: rhodecode/templates/tags/tags_data.html:5
+msgid "name"
+msgstr ""
+
+#: rhodecode/templates/admin/users/users.html:35
+msgid "lastname"
+msgstr ""
+
+#: rhodecode/templates/admin/users/users.html:36
+msgid "last login"
+msgstr ""
+
+#: rhodecode/templates/admin/users/users.html:37
+#: rhodecode/templates/admin/users_groups/users_groups.html:34
+msgid "active"
+msgstr ""
+
+#: rhodecode/templates/admin/users/users.html:39
+#: rhodecode/templates/base/base.html:305
+msgid "ldap"
+msgstr ""
+
+#: rhodecode/templates/admin/users/users.html:56
+msgid "Confirm to delete this user"
+msgstr ""
+
+#: rhodecode/templates/admin/users_groups/users_group_add.html:5
+msgid "Add users group"
+msgstr ""
+
+#: rhodecode/templates/admin/users_groups/users_group_add.html:10
+#: rhodecode/templates/admin/users_groups/users_groups.html:9
+msgid "Users groups"
+msgstr ""
+
+#: rhodecode/templates/admin/users_groups/users_group_add.html:12
+msgid "add new users group"
+msgstr ""
+
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:5
+msgid "Edit users group"
+msgstr ""
+
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:11
+msgid "UsersGroups"
+msgstr ""
+
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:50
+msgid "Members"
+msgstr ""
+
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:58
+msgid "Choosen group members"
+msgstr ""
+
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:61
+msgid "Remove all elements"
+msgstr ""
+
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:75
+msgid "Available members"
+msgstr ""
+
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:79
+msgid "Add all elements"
+msgstr ""
+
+#: rhodecode/templates/admin/users_groups/users_groups.html:5
+msgid "Users groups administration"
+msgstr ""
+
+#: rhodecode/templates/admin/users_groups/users_groups.html:23
+msgid "ADD NEW USER GROUP"
+msgstr ""
+
+#: rhodecode/templates/admin/users_groups/users_groups.html:32
+msgid "group name"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:32
+msgid "Forgot password ?"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:57 rhodecode/templates/base/base.html:338
+#: rhodecode/templates/base/base.html:340
+#: rhodecode/templates/base/base.html:342
+msgid "Home"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:61 rhodecode/templates/base/base.html:347
+#: rhodecode/templates/base/base.html:349
+#: rhodecode/templates/base/base.html:351
+#: rhodecode/templates/journal/journal.html:4
+#: rhodecode/templates/journal/journal.html:17
+#: rhodecode/templates/journal/public_journal.html:4
+msgid "Journal"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:66
+msgid "Login"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:68
+msgid "Log Out"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:107
+msgid "Submit a bug"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:141
+msgid "Switch repository"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:143
+msgid "Products"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:149
+msgid "loading..."
+msgstr ""
+
+#: rhodecode/templates/base/base.html:234
+#: rhodecode/templates/base/base.html:236
+#: rhodecode/templates/base/base.html:238
+msgid "Switch to"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:242
+#: rhodecode/templates/branches/branches.html:13
+msgid "branches"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:249
+#: rhodecode/templates/branches/branches_data.html:52
+msgid "There are no branches yet"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:254
+#: rhodecode/templates/shortlog/shortlog_data.html:10
+#: rhodecode/templates/tags/tags.html:14
+msgid "tags"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:261
+#: rhodecode/templates/tags/tags_data.html:32
+msgid "There are no tags yet"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:277
+#: rhodecode/templates/base/base.html:281
+#: rhodecode/templates/files/files_annotate.html:40
+#: rhodecode/templates/files/files_source.html:11
+msgid "Options"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:286
+#: rhodecode/templates/base/base.html:288
+#: rhodecode/templates/base/base.html:306
+msgid "settings"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:292
+msgid "search"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:299
+msgid "journal"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:301
+msgid "repositories groups"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:302
+msgid "users"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:303
+msgid "users groups"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:304
+msgid "permissions"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:317
+#: rhodecode/templates/base/base.html:319
+#: rhodecode/templates/followers/followers.html:5
+msgid "Followers"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:325
+#: rhodecode/templates/base/base.html:327
+#: rhodecode/templates/forks/forks.html:5
+msgid "Forks"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:356
+#: rhodecode/templates/base/base.html:358
+#: rhodecode/templates/base/base.html:360
+#: rhodecode/templates/search/search.html:4
+#: rhodecode/templates/search/search.html:24
+#: rhodecode/templates/search/search.html:46
+msgid "Search"
+msgstr ""
+
+#: rhodecode/templates/base/root.html:57
+#: rhodecode/templates/journal/journal.html:48
+#: rhodecode/templates/summary/summary.html:36
+msgid "Stop following this repository"
+msgstr ""
+
+#: rhodecode/templates/base/root.html:66
+#: rhodecode/templates/summary/summary.html:40
+msgid "Start following this repository"
+msgstr ""
+
+#: rhodecode/templates/branches/branches_data.html:4
+#: rhodecode/templates/tags/tags_data.html:4
+msgid "date"
+msgstr ""
+
+#: rhodecode/templates/branches/branches_data.html:6
+#: rhodecode/templates/shortlog/shortlog_data.html:7
+#: rhodecode/templates/tags/tags_data.html:6
+msgid "author"
+msgstr ""
+
+#: rhodecode/templates/branches/branches_data.html:8
+#: rhodecode/templates/shortlog/shortlog_data.html:11
+#: rhodecode/templates/tags/tags_data.html:8
+msgid "links"
+msgstr ""
+
+#: rhodecode/templates/branches/branches_data.html:23
+#: rhodecode/templates/branches/branches_data.html:43
+#: rhodecode/templates/shortlog/shortlog_data.html:39
+#: rhodecode/templates/tags/tags_data.html:24
+msgid "changeset"
+msgstr ""
+
+#: rhodecode/templates/branches/branches_data.html:25
+#: rhodecode/templates/branches/branches_data.html:45
+#: rhodecode/templates/files/files.html:12
+#: rhodecode/templates/shortlog/shortlog_data.html:41
+#: rhodecode/templates/summary/summary.html:233
+#: rhodecode/templates/tags/tags_data.html:26
+msgid "files"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:14
+msgid "showing "
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:14
+msgid "out of"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:37
+msgid "Show"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:50
+#: rhodecode/templates/changeset/changeset.html:42
+#: rhodecode/templates/summary/summary.html:609
+msgid "commit"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:63
+msgid "Affected number of files, click to show more details"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:67
+#: rhodecode/templates/changeset/changeset.html:66
+msgid "merge"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:72
+#: rhodecode/templates/changeset/changeset.html:72
+msgid "Parent"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:77
+#: rhodecode/templates/changeset/changeset.html:77
+msgid "No parents"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:82
+#: rhodecode/templates/changeset/changeset.html:80
+#: rhodecode/templates/files/files.html:29
+#: rhodecode/templates/files/files_annotate.html:25
+#: rhodecode/templates/files/files_edit.html:33
+#: rhodecode/templates/shortlog/shortlog_data.html:9
+msgid "branch"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:86
+#: rhodecode/templates/changeset/changeset.html:83
+msgid "tag"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:122
+msgid "Show selected changes __S -> __E"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:172
+#: rhodecode/templates/shortlog/shortlog_data.html:61
+msgid "There are no changes yet"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog_details.html:2
+#: rhodecode/templates/changeset/changeset.html:55
+msgid "removed"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog_details.html:3
+#: rhodecode/templates/changeset/changeset.html:56
+msgid "changed"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog_details.html:4
+#: rhodecode/templates/changeset/changeset.html:57
+msgid "added"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog_details.html:6
+#: rhodecode/templates/changelog/changelog_details.html:7
+#: rhodecode/templates/changelog/changelog_details.html:8
+#: rhodecode/templates/changeset/changeset.html:59
+#: rhodecode/templates/changeset/changeset.html:60
+#: rhodecode/templates/changeset/changeset.html:61
+#, python-format
+msgid "affected %s files"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:6
+#: rhodecode/templates/changeset/changeset.html:14
+#: rhodecode/templates/changeset/changeset.html:31
+msgid "Changeset"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:32
+#: rhodecode/templates/changeset/changeset.html:121
+#: rhodecode/templates/changeset/changeset_range.html:78
+#: rhodecode/templates/files/file_diff.html:32
+#: rhodecode/templates/files/file_diff.html:42
+msgid "raw diff"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:34
+#: rhodecode/templates/changeset/changeset.html:123
+#: rhodecode/templates/changeset/changeset_range.html:80
+#: rhodecode/templates/files/file_diff.html:34
+msgid "download diff"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:90
+#, python-format
+msgid "%s files affected with %s additions and %s deletions."
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:101
+msgid "Changeset was too big and was cut off..."
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:119
+#: rhodecode/templates/changeset/changeset_range.html:76
+#: rhodecode/templates/files/file_diff.html:30
+msgid "diff"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:132
+#: rhodecode/templates/changeset/changeset_range.html:89
+msgid "No changes in this file"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_range.html:30
+msgid "Compare View"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_range.html:52
+msgid "Files affected"
+msgstr ""
+
+#: rhodecode/templates/errors/error_document.html:44
+#, python-format
+msgid "You will be redirected to %s in %s seconds"
+msgstr ""
+
+#: rhodecode/templates/files/file_diff.html:4
+#: rhodecode/templates/files/file_diff.html:12
+msgid "File diff"
+msgstr ""
+
+#: rhodecode/templates/files/file_diff.html:42
+msgid "Diff is to big to display"
+msgstr ""
+
+#: rhodecode/templates/files/files.html:37
+#: rhodecode/templates/files/files_annotate.html:31
+#: rhodecode/templates/files/files_edit.html:39
+msgid "Location"
+msgstr ""
+
+#: rhodecode/templates/files/files.html:46
+msgid "Go back"
+msgstr ""
+
+#: rhodecode/templates/files/files.html:47
+msgid "No files at given path"
+msgstr ""
+
+#: rhodecode/templates/files/files_annotate.html:4
+msgid "File annotate"
+msgstr ""
+
+#: rhodecode/templates/files/files_annotate.html:12
+msgid "annotate"
+msgstr ""
+
+#: rhodecode/templates/files/files_annotate.html:33
+#: rhodecode/templates/files/files_browser.html:160
+#: rhodecode/templates/files/files_source.html:2
+msgid "Revision"
+msgstr ""
+
+#: rhodecode/templates/files/files_annotate.html:36
+#: rhodecode/templates/files/files_browser.html:158
+#: rhodecode/templates/files/files_source.html:7
+msgid "Size"
+msgstr ""
+
+#: rhodecode/templates/files/files_annotate.html:38
+#: rhodecode/templates/files/files_browser.html:159
+#: rhodecode/templates/files/files_source.html:9
+msgid "Mimetype"
+msgstr ""
+
+#: rhodecode/templates/files/files_annotate.html:41
+msgid "show source"
+msgstr ""
+
+#: rhodecode/templates/files/files_annotate.html:43
+#: rhodecode/templates/files/files_annotate.html:78
+#: rhodecode/templates/files/files_source.html:14
+#: rhodecode/templates/files/files_source.html:51
+msgid "show as raw"
+msgstr ""
+
+#: rhodecode/templates/files/files_annotate.html:45
+#: rhodecode/templates/files/files_source.html:16
+msgid "download as raw"
+msgstr ""
+
+#: rhodecode/templates/files/files_annotate.html:54
+#: rhodecode/templates/files/files_source.html:25
+msgid "History"
+msgstr ""
+
+#: rhodecode/templates/files/files_annotate.html:73
+#: rhodecode/templates/files/files_source.html:46
+#, python-format
+msgid "Binary file (%s)"
+msgstr ""
+
+#: rhodecode/templates/files/files_annotate.html:78
+#: rhodecode/templates/files/files_source.html:51
+msgid "File is too big to display"
+msgstr ""
+
+#: rhodecode/templates/files/files_browser.html:13
+msgid "view"
+msgstr ""
+
+#: rhodecode/templates/files/files_browser.html:14
+msgid "previous revision"
+msgstr ""
+
+#: rhodecode/templates/files/files_browser.html:16
+msgid "next revision"
+msgstr ""
+
+#: rhodecode/templates/files/files_browser.html:23
+msgid "follow current branch"
+msgstr ""
+
+#: rhodecode/templates/files/files_browser.html:27
+msgid "search file list"
+msgstr ""
+
+#: rhodecode/templates/files/files_browser.html:32
+msgid "Loading file list..."
+msgstr ""
+
+#: rhodecode/templates/files/files_browser.html:111
+msgid "search truncated"
+msgstr ""
+
+#: rhodecode/templates/files/files_browser.html:122
+msgid "no matching files"
+msgstr ""
+
+#: rhodecode/templates/files/files_browser.html:161
+msgid "Last modified"
+msgstr ""
+
+#: rhodecode/templates/files/files_browser.html:162
+msgid "Last commiter"
+msgstr ""
+
+#: rhodecode/templates/files/files_edit.html:4
+msgid "Edit file"
+msgstr ""
+
+#: rhodecode/templates/files/files_edit.html:19
+msgid "edit file"
+msgstr ""
+
+#: rhodecode/templates/files/files_edit.html:45
+#: rhodecode/templates/shortlog/shortlog_data.html:5
+msgid "commit message"
+msgstr ""
+
+#: rhodecode/templates/files/files_edit.html:51
+msgid "Commit changes"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:12
+msgid "show annotation"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:153
+msgid "Selection link"
+msgstr ""
+
+#: rhodecode/templates/followers/followers.html:13
+msgid "followers"
+msgstr ""
+
+#: rhodecode/templates/followers/followers_data.html:12
+msgid "Started following"
+msgstr ""
+
+#: rhodecode/templates/forks/forks.html:13
+msgid "forks"
+msgstr ""
+
+#: rhodecode/templates/forks/forks_data.html:17
+msgid "forked"
+msgstr ""
+
+#: rhodecode/templates/forks/forks_data.html:34
+msgid "There are no forks yet"
+msgstr ""
+
+#: rhodecode/templates/journal/journal.html:34
+msgid "Following"
+msgstr ""
+
+#: rhodecode/templates/journal/journal.html:41
+msgid "following user"
+msgstr ""
+
+#: rhodecode/templates/journal/journal.html:41
+msgid "user"
+msgstr ""
+
+#: rhodecode/templates/journal/journal.html:65
+msgid "You are not following any users or repositories"
+msgstr ""
+
+#: rhodecode/templates/journal/journal_data.html:46
+msgid "No entries yet"
+msgstr ""
+
+#: rhodecode/templates/journal/public_journal.html:17
+msgid "Public Journal"
+msgstr ""
+
+#: rhodecode/templates/search/search.html:7
+#: rhodecode/templates/search/search.html:26
+msgid "in repository: "
+msgstr ""
+
+#: rhodecode/templates/search/search.html:9
+#: rhodecode/templates/search/search.html:28
+msgid "in all repositories"
+msgstr ""
+
+#: rhodecode/templates/search/search.html:42
+msgid "Search term"
+msgstr ""
+
+#: rhodecode/templates/search/search.html:54
+msgid "Search in"
+msgstr ""
+
+#: rhodecode/templates/search/search.html:57
+msgid "File contents"
+msgstr ""
+
+#: rhodecode/templates/search/search.html:59
+msgid "File names"
+msgstr ""
+
+#: rhodecode/templates/search/search_content.html:20
+#: rhodecode/templates/search/search_path.html:15
+msgid "Permission denied"
+msgstr ""
+
+#: rhodecode/templates/settings/repo_fork.html:5
+msgid "Fork"
+msgstr ""
+
+#: rhodecode/templates/settings/repo_fork.html:31
+msgid "Fork name"
+msgstr ""
+
+#: rhodecode/templates/settings/repo_fork.html:55
+msgid "fork this repository"
+msgstr ""
+
+#: rhodecode/templates/shortlog/shortlog.html:5
+#: rhodecode/templates/summary/summary.html:666
+msgid "Shortlog"
+msgstr ""
+
+#: rhodecode/templates/shortlog/shortlog.html:14
+msgid "shortlog"
+msgstr ""
+
+#: rhodecode/templates/shortlog/shortlog_data.html:6
+msgid "age"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:12
+msgid "summary"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:79
+msgid "remote clone"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:121
+msgid "by"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:128
+msgid "Clone url"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:137
+msgid "Trending source files"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:146
+msgid "Download"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:150
+msgid "There are no downloads yet"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:152
+msgid "Downloads are disabled for this repository"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:154
+#: rhodecode/templates/summary/summary.html:320
+msgid "enable"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:162
+#: rhodecode/templates/summary/summary.html:297
+#, python-format
+msgid "Download %s as %s"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:168
+msgid "Check this to download archive with subrepos"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:168
+msgid "with subrepos"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:176
+msgid "Feeds"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:257
+#: rhodecode/templates/summary/summary.html:684
+#: rhodecode/templates/summary/summary.html:695
+msgid "show more"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:312
+msgid "Commit activity by day / author"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:324
+msgid "Loaded in"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:603
+msgid "commits"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:604
+msgid "files added"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:605
+msgid "files changed"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:606
+msgid "files removed"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:610
+msgid "file added"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:611
+msgid "file changed"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:612
+msgid "file removed"
+msgstr ""
+

rhodecode/i18n/how_to

@@ -1,15 +1,28 b''
-#goto pylons folder app (the on holding .ini files)
+##########################
+# to create new language #
+##########################
 
-# to create new 
+#this needs to be done on source codes, preferable default/stable branches
+ 
 python setup.py extract_messages -> get messages from project
-python setup.py init_catalog -l pl -> create a language directory
-edit the new po file with poedit
+python setup.py init_catalog -l pl -> create a language directory for <pl> lang
+edit the new po file with poedit or any other editor
 python setup.py compile_catalog -> create translation files
-#done 
- 
- # to update
+
+############# 
+# to update #
+#############
+
 python setup.py extract_messages -> get messages from project
 python setup.py update_catalog -> to update the translations
 edit the new updated po file with poedit
 python setup.py compile_catalog -> create translation files
-#done
  No newline at end of file
+
+
+###################
+# change language #
+###################
+
+`lang=en`
+
+in the .ini file
  No newline at end of file

rhodecode/i18n/rhodecode.pot

@@ -6,273 +6,477 b''
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: RhodeCode 1.1.5\n"
+"Project-Id-Version: RhodeCode 1.2.0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2011-03-17 02:38+0100\n"
+"POT-Creation-Date: 2011-09-14 15:50-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.5\n"
-
-#: rhodecode/controllers/changeset.py:87 rhodecode/controllers/changeset.py:113
-#: rhodecode/controllers/changeset.py:159 rhodecode/controllers/changeset.py:171
+"Generated-By: Babel 0.9.6\n"
+
+#: rhodecode/controllers/changeset.py:108 rhodecode/controllers/changeset.py:149
+#: rhodecode/controllers/changeset.py:216 rhodecode/controllers/changeset.py:229
 msgid "binary file"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:95 rhodecode/controllers/changeset.py:122
+#: rhodecode/controllers/changeset.py:123 rhodecode/controllers/changeset.py:168
 msgid "Changeset is to big and was cut off, see raw changeset instead"
 msgstr ""
 
-#: rhodecode/controllers/error.py:70
+#: rhodecode/controllers/changeset.py:159
+msgid "Diff is to big and was cut off, see raw diff instead"
+msgstr ""
+
+#: rhodecode/controllers/error.py:69
 msgid "Home page"
 msgstr ""
 
-#: rhodecode/controllers/error.py:100
+#: rhodecode/controllers/error.py:98
 msgid "The request could not be understood by the server due to malformed syntax."
 msgstr ""
 
-#: rhodecode/controllers/error.py:102
+#: rhodecode/controllers/error.py:101
 msgid "Unauthorized access to resource"
 msgstr ""
 
-#: rhodecode/controllers/error.py:104
+#: rhodecode/controllers/error.py:103
 msgid "You don't have permission to view this page"
 msgstr ""
 
-#: rhodecode/controllers/error.py:106
+#: rhodecode/controllers/error.py:105
 msgid "The resource could not be found"
 msgstr ""
 
-#: rhodecode/controllers/error.py:108
+#: rhodecode/controllers/error.py:107
 msgid ""
 "The server encountered an unexpected condition which prevented it from "
 "fulfilling the request."
 msgstr ""
 
-#: rhodecode/controllers/files.py:71
+#: rhodecode/controllers/feed.py:48
+#, python-format
+msgid "Changes on %s repository"
+msgstr ""
+
+#: rhodecode/controllers/feed.py:49
+#, python-format
+msgid "%s %s feed"
+msgstr ""
+
+#: rhodecode/controllers/files.py:72
 msgid "There are no files yet"
 msgstr ""
 
-#: rhodecode/controllers/files.py:222 rhodecode/controllers/files.py:228
-msgid "binary file changed"
-msgstr ""
-
-#: rhodecode/controllers/files.py:233 rhodecode/controllers/files.py:241
-msgid "Diff is to big to display"
-msgstr ""
-
-#: rhodecode/controllers/files.py:235 rhodecode/controllers/files.py:243
+#: rhodecode/controllers/files.py:262
+#, python-format
+msgid "Edited %s via RhodeCode"
+msgstr ""
+
+#: rhodecode/controllers/files.py:267 rhodecode/templates/files/file_diff.html:40
+msgid "No changes"
+msgstr ""
+
+#: rhodecode/controllers/files.py:278
+#, python-format
+msgid "Successfully committed to %s"
+msgstr ""
+
+#: rhodecode/controllers/files.py:283
+msgid "Error occurred during commit"
+msgstr ""
+
+#: rhodecode/controllers/files.py:308
+msgid "downloads disabled"
+msgstr ""
+
+#: rhodecode/controllers/files.py:313
+#, python-format
+msgid "Unknown revision %s"
+msgstr ""
+
+#: rhodecode/controllers/files.py:315
+msgid "Empty repository"
+msgstr ""
+
+#: rhodecode/controllers/files.py:317
+msgid "Unknown archive type"
+msgstr ""
+
+#: rhodecode/controllers/files.py:385 rhodecode/controllers/files.py:398
 msgid "Binary file"
 msgstr ""
 
-#: rhodecode/controllers/files.py:258
+#: rhodecode/controllers/files.py:417
+#: rhodecode/templates/changeset/changeset_range.html:4
+#: rhodecode/templates/changeset/changeset_range.html:12
+#: rhodecode/templates/changeset/changeset_range.html:29
 msgid "Changesets"
 msgstr ""
 
-#: rhodecode/controllers/files.py:259 rhodecode/templates/branches/branches.html:5
-#: rhodecode/templates/summary/summary.html:633
+#: rhodecode/controllers/files.py:418 rhodecode/controllers/summary.py:175
+#: rhodecode/templates/branches/branches.html:5
+#: rhodecode/templates/summary/summary.html:690
 msgid "Branches"
 msgstr ""
 
-#: rhodecode/controllers/files.py:260 rhodecode/templates/summary/summary.html:622
+#: rhodecode/controllers/files.py:419 rhodecode/controllers/summary.py:176
+#: rhodecode/templates/summary/summary.html:679
 #: rhodecode/templates/tags/tags.html:5
 msgid "Tags"
 msgstr ""
 
-#: rhodecode/controllers/login.py:112
+#: rhodecode/controllers/journal.py:50
+#, python-format
+msgid "%s public journal %s feed"
+msgstr ""
+
+#: rhodecode/controllers/journal.py:178 rhodecode/controllers/journal.py:212
+#: rhodecode/templates/admin/repos/repo_edit.html:171
+#: rhodecode/templates/base/base.html:50
+msgid "Public journal"
+msgstr ""
+
+#: rhodecode/controllers/login.py:111
 msgid "You have successfully registered into rhodecode"
 msgstr ""
 
-#: rhodecode/controllers/login.py:134
-msgid "Your new password was sent"
-msgstr ""
-
-#: rhodecode/controllers/search.py:111
+#: rhodecode/controllers/login.py:133
+msgid "Your password reset link was sent"
+msgstr ""
+
+#: rhodecode/controllers/login.py:155
+msgid "Your password reset was successful, new password has been sent to your email"
+msgstr ""
+
+#: rhodecode/controllers/search.py:109
 msgid "Invalid search query. Try quoting it."
 msgstr ""
 
-#: rhodecode/controllers/search.py:116
+#: rhodecode/controllers/search.py:114
 msgid "There is no index to search in. Please run whoosh indexer"
 msgstr ""
 
-#: rhodecode/controllers/settings.py:59 rhodecode/controllers/settings.py:152
+#: rhodecode/controllers/search.py:118
+msgid "An error occurred during this search operation"
+msgstr ""
+
+#: rhodecode/controllers/settings.py:61 rhodecode/controllers/settings.py:171
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was created or renamed from the "
 "file system please run the application again in order to rescan repositories"
 msgstr ""
 
-#: rhodecode/controllers/settings.py:90 rhodecode/controllers/admin/repos.py:142
+#: rhodecode/controllers/settings.py:109 rhodecode/controllers/admin/repos.py:239
 #, python-format
 msgid "Repository %s updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/settings.py:107 rhodecode/controllers/admin/repos.py:175
+#: rhodecode/controllers/settings.py:126 rhodecode/controllers/admin/repos.py:257
 #, python-format
 msgid "error occurred during update of repository %s"
 msgstr ""
 
-#: rhodecode/controllers/settings.py:126 rhodecode/controllers/admin/repos.py:193
+#: rhodecode/controllers/settings.py:144 rhodecode/controllers/admin/repos.py:275
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was moved or renamed  from the "
 "filesystem please run the application again in order to rescan repositories"
 msgstr ""
 
-#: rhodecode/controllers/settings.py:138 rhodecode/controllers/admin/repos.py:205
+#: rhodecode/controllers/settings.py:156 rhodecode/controllers/admin/repos.py:287
 #, python-format
 msgid "deleted repository %s"
 msgstr ""
 
-#: rhodecode/controllers/settings.py:140 rhodecode/controllers/admin/repos.py:209
+#: rhodecode/controllers/settings.py:159 rhodecode/controllers/admin/repos.py:297
+#: rhodecode/controllers/admin/repos.py:303
 #, python-format
 msgid "An error occurred during deletion of %s"
 msgstr ""
 
-#: rhodecode/controllers/settings.py:174
+#: rhodecode/controllers/settings.py:193
 #, python-format
 msgid "forked %s repository as %s"
 msgstr ""
 
-#: rhodecode/controllers/summary.py:114
+#: rhodecode/controllers/settings.py:211
+#, python-format
+msgid "An error occurred during repository forking %s"
+msgstr ""
+
+#: rhodecode/controllers/summary.py:123
 msgid "No data loaded yet"
 msgstr ""
 
-#: rhodecode/controllers/summary.py:117
-msgid "Statistics update are disabled for this repository"
-msgstr ""
-
-#: rhodecode/controllers/admin/ldap_settings.py:84
+#: rhodecode/controllers/summary.py:126
+msgid "Statistics are disabled for this repository"
+msgstr ""
+
+#: rhodecode/controllers/admin/ldap_settings.py:49
+msgid "BASE"
+msgstr ""
+
+#: rhodecode/controllers/admin/ldap_settings.py:50
+msgid "ONELEVEL"
+msgstr ""
+
+#: rhodecode/controllers/admin/ldap_settings.py:51
+msgid "SUBTREE"
+msgstr ""
+
+#: rhodecode/controllers/admin/ldap_settings.py:55
+msgid "NEVER"
+msgstr ""
+
+#: rhodecode/controllers/admin/ldap_settings.py:56
+msgid "ALLOW"
+msgstr ""
+
+#: rhodecode/controllers/admin/ldap_settings.py:57
+msgid "TRY"
+msgstr ""
+
+#: rhodecode/controllers/admin/ldap_settings.py:58
+msgid "DEMAND"
+msgstr ""
+
+#: rhodecode/controllers/admin/ldap_settings.py:59
+msgid "HARD"
+msgstr ""
+
+#: rhodecode/controllers/admin/ldap_settings.py:63
+msgid "No encryption"
+msgstr ""
+
+#: rhodecode/controllers/admin/ldap_settings.py:64
+msgid "LDAPS connection"
+msgstr ""
+
+#: rhodecode/controllers/admin/ldap_settings.py:65
+msgid "START_TLS on LDAP connection"
+msgstr ""
+
+#: rhodecode/controllers/admin/ldap_settings.py:115
 msgid "Ldap settings updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/admin/ldap_settings.py:89
+#: rhodecode/controllers/admin/ldap_settings.py:120
 msgid "Unable to activate ldap. The \"python-ldap\" library is missing."
 msgstr ""
 
-#: rhodecode/controllers/admin/ldap_settings.py:102
+#: rhodecode/controllers/admin/ldap_settings.py:134
 msgid "error occurred during update of ldap settings"
 msgstr ""
 
+#: rhodecode/controllers/admin/permissions.py:56
+msgid "None"
+msgstr ""
+
+#: rhodecode/controllers/admin/permissions.py:57
+msgid "Read"
+msgstr ""
+
+#: rhodecode/controllers/admin/permissions.py:58
+msgid "Write"
+msgstr ""
+
 #: rhodecode/controllers/admin/permissions.py:59
-msgid "None"
-msgstr ""
-
-#: rhodecode/controllers/admin/permissions.py:60
-msgid "Read"
-msgstr ""
-
-#: rhodecode/controllers/admin/permissions.py:61
-msgid "Write"
-msgstr ""
-
-#: rhodecode/controllers/admin/permissions.py:62
 #: rhodecode/templates/admin/ldap/ldap.html:9
 #: rhodecode/templates/admin/permissions/permissions.html:9
 #: rhodecode/templates/admin/repos/repo_add.html:9
 #: rhodecode/templates/admin/repos/repo_edit.html:9
 #: rhodecode/templates/admin/repos/repos.html:10
+#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:8
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:8
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10
+#: rhodecode/templates/admin/settings/hooks.html:9
 #: rhodecode/templates/admin/settings/settings.html:9
 #: rhodecode/templates/admin/users/user_add.html:8
 #: rhodecode/templates/admin/users/user_edit.html:9
-#: rhodecode/templates/admin/users/user_edit.html:97
+#: rhodecode/templates/admin/users/user_edit.html:110
 #: rhodecode/templates/admin/users/users.html:9
-#: rhodecode/templates/base/base.html:209 rhodecode/templates/base/base.html:297
-#: rhodecode/templates/base/base.html:299 rhodecode/templates/base/base.html:301
+#: rhodecode/templates/admin/users_groups/users_group_add.html:8
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:9
+#: rhodecode/templates/admin/users_groups/users_groups.html:9
+#: rhodecode/templates/base/base.html:279 rhodecode/templates/base/base.html:366
+#: rhodecode/templates/base/base.html:368 rhodecode/templates/base/base.html:370
 msgid "Admin"
 msgstr ""
 
-#: rhodecode/controllers/admin/permissions.py:65
+#: rhodecode/controllers/admin/permissions.py:62
 msgid "disabled"
 msgstr ""
 
-#: rhodecode/controllers/admin/permissions.py:67
+#: rhodecode/controllers/admin/permissions.py:64
 msgid "allowed with manual account activation"
 msgstr ""
 
+#: rhodecode/controllers/admin/permissions.py:66
+msgid "allowed with automatic account activation"
+msgstr ""
+
+#: rhodecode/controllers/admin/permissions.py:68
+msgid "Disabled"
+msgstr ""
+
 #: rhodecode/controllers/admin/permissions.py:69
-msgid "allowed with automatic account activation"
-msgstr ""
-
-#: rhodecode/controllers/admin/permissions.py:71
-msgid "Disabled"
-msgstr ""
-
-#: rhodecode/controllers/admin/permissions.py:72
 msgid "Enabled"
 msgstr ""
 
-#: rhodecode/controllers/admin/permissions.py:106
+#: rhodecode/controllers/admin/permissions.py:102
 msgid "Default permissions updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/admin/permissions.py:123
+#: rhodecode/controllers/admin/permissions.py:119
 msgid "error occurred during update of permissions"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:83
-#, python-format
-msgid "created repository %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:110
-#, python-format
-msgid "error occurred during creation of repository %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:225
-msgid "An error occurred during deletion of repository user"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:240
-msgid "An error occurred during deletion of repository stats"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:254
-msgid "An error occurred during cache invalidation"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:272
+#: rhodecode/controllers/admin/repos.py:96
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was created or renamed from the "
 "filesystem please run the application again in order to rescan repositories"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:112
-msgid "Repositories successfully rescanned"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:119
+#: rhodecode/controllers/admin/repos.py:172
+#, python-format
+msgid "created repository %s from %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:176
+#, python-format
+msgid "created repository %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:205
+#, python-format
+msgid "error occurred during creation of repository %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:292
+#, python-format
+msgid "Cannot delete %s it still contains attached forks"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:320
+msgid "An error occurred during deletion of repository user"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:335
+msgid "An error occurred during deletion of repository users groups"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:352
+msgid "An error occurred during deletion of repository stats"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:367
+msgid "An error occurred during cache invalidation"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:387
+msgid "Updated repository visibility in public journal"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:390
+msgid "An error occurred during setting this repository in public journal"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:395 rhodecode/model/forms.py:53
+msgid "Token mismatch"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:408
+msgid "Pulled from remote location"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:410
+msgid "An error occurred during pull from remote location"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos_groups.py:83
+#, python-format
+msgid "created repos group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos_groups.py:96
+#, python-format
+msgid "error occurred during creation of repos group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos_groups.py:130
+#, python-format
+msgid "updated repos group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos_groups.py:143
+#, python-format
+msgid "error occurred during update of repos group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos_groups.py:164
+#, python-format
+msgid "This group contains %s repositores and cannot be deleted"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos_groups.py:171
+#, python-format
+msgid "removed repos group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos_groups.py:175
+#, python-format
+msgid "error occurred during deletion of repos group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:109
+#, python-format
+msgid "Repositories successfully rescanned added: %s,removed: %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:118
 msgid "Whoosh reindex task scheduled"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:138
-msgid "Updated application settings"
-msgstr ""
-
 #: rhodecode/controllers/admin/settings.py:143
-#: rhodecode/controllers/admin/settings.py:204
+msgid "Updated application settings"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:148
+#: rhodecode/controllers/admin/settings.py:215
 msgid "error occurred during updating application settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:199
+#: rhodecode/controllers/admin/settings.py:210
 msgid "Updated mercurial settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:258
+#: rhodecode/controllers/admin/settings.py:236
+msgid "Added new hook"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:247
+msgid "Updated hooks"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:251
+msgid "error occurred during hook creation"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:310
 msgid "You can't edit this user since it's crucial for entire application"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:286
+#: rhodecode/controllers/admin/settings.py:339
 msgid "Your account was updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:306
-#: rhodecode/controllers/admin/users.py:127
+#: rhodecode/controllers/admin/settings.py:359
+#: rhodecode/controllers/admin/users.py:130
 #, python-format
 msgid "error occurred during update of user %s"
 msgstr ""
@@ -288,442 +492,600 b' msgid "error occurred during creation of'
 msgstr ""
 
 #: rhodecode/controllers/admin/users.py:116
-msgid "User updated succesfully"
-msgstr ""
-
-#: rhodecode/controllers/admin/users.py:143
-msgid "sucessfully deleted user"
-msgstr ""
-
-#: rhodecode/controllers/admin/users.py:147
+msgid "User updated successfully"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:146
+msgid "successfully deleted user"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:150
 msgid "An error occurred during deletion of user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:163
+#: rhodecode/controllers/admin/users.py:166
 msgid "You can't edit this user"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:383
+#: rhodecode/controllers/admin/users.py:195
+#: rhodecode/controllers/admin/users_groups.py:202
+msgid "Granted 'repository create' permission to user"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:204
+#: rhodecode/controllers/admin/users_groups.py:211
+msgid "Revoked 'repository create' permission to user"
+msgstr ""
+
+#: rhodecode/controllers/admin/users_groups.py:74
+#, python-format
+msgid "created users group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/users_groups.py:86
+#, python-format
+msgid "error occurred during creation of users group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/users_groups.py:119
+#, python-format
+msgid "updated users group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/users_groups.py:138
+#, python-format
+msgid "error occurred during update of users group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/users_groups.py:154
+msgid "successfully deleted users group"
+msgstr ""
+
+#: rhodecode/controllers/admin/users_groups.py:158
+msgid "An error occurred during deletion of users group"
+msgstr ""
+
+#: rhodecode/lib/__init__.py:279
+msgid "year"
+msgstr ""
+
+#: rhodecode/lib/__init__.py:280
+msgid "month"
+msgstr ""
+
+#: rhodecode/lib/__init__.py:281
+msgid "day"
+msgstr ""
+
+#: rhodecode/lib/__init__.py:282
+msgid "hour"
+msgstr ""
+
+#: rhodecode/lib/__init__.py:283
+msgid "minute"
+msgstr ""
+
+#: rhodecode/lib/__init__.py:284
+msgid "second"
+msgstr ""
+
+#: rhodecode/lib/__init__.py:293
 msgid "ago"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:386
+#: rhodecode/lib/__init__.py:296
 msgid "just now"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:404
+#: rhodecode/lib/auth.py:377
+msgid "You need to be a registered user to perform this action"
+msgstr ""
+
+#: rhodecode/lib/auth.py:421
+msgid "You need to be a signed in to view this page"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:307
 msgid "True"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:407
+#: rhodecode/lib/helpers.py:311
 msgid "False"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:439
+#: rhodecode/lib/helpers.py:352
+#, python-format
+msgid "Show all combined changesets %s->%s"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:356
+msgid "compare view"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:365
 msgid "and"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:439
+#: rhodecode/lib/helpers.py:365
 #, python-format
 msgid "%s more"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:441 rhodecode/templates/changelog/changelog.html:14
-#: rhodecode/templates/changelog/changelog.html:40
+#: rhodecode/lib/helpers.py:367 rhodecode/templates/changelog/changelog.html:14
+#: rhodecode/templates/changelog/changelog.html:39
 msgid "revisions"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:456
+#: rhodecode/lib/helpers.py:385
+msgid "fork name "
+msgstr ""
+
+#: rhodecode/lib/helpers.py:388
 msgid "[deleted] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:457 rhodecode/lib/helpers.py:461
+#: rhodecode/lib/helpers.py:389 rhodecode/lib/helpers.py:393
 msgid "[created] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:458
-msgid "[forked] repository as"
-msgstr ""
-
-#: rhodecode/lib/helpers.py:459 rhodecode/lib/helpers.py:463
+#: rhodecode/lib/helpers.py:390 rhodecode/lib/helpers.py:394
+msgid "[forked] repository"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:391 rhodecode/lib/helpers.py:395
 msgid "[updated] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:460
+#: rhodecode/lib/helpers.py:392
 msgid "[delete] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:462
-msgid "[forked] repository"
-msgstr ""
-
-#: rhodecode/lib/helpers.py:464
-msgid "[pushed] "
-msgstr ""
-
-#: rhodecode/lib/helpers.py:465
-msgid "[pulled] "
-msgstr ""
-
-#: rhodecode/lib/helpers.py:466
+#: rhodecode/lib/helpers.py:396
+msgid "[pushed] into"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:397
+msgid "[committed via RhodeCode] into"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:398
+msgid "[pulled from remote] into"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:399
+msgid "[pulled] from"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:400
 msgid "[started following] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:467
+#: rhodecode/lib/helpers.py:401
 msgid "[stopped following] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:554 rhodecode/templates/changelog/changelog.html:68
+#: rhodecode/lib/helpers.py:577
 #, python-format
 msgid " and %s more"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:557 rhodecode/templates/changelog/changelog.html:71
+#: rhodecode/lib/helpers.py:581
 msgid "No Files"
 msgstr ""
 
-#: rhodecode/model/forms.py:54
-msgid "Token mismatch"
-msgstr ""
-
-#: rhodecode/model/forms.py:67
+#: rhodecode/model/forms.py:66
 msgid "Invalid username"
 msgstr ""
 
-#: rhodecode/model/forms.py:76
+#: rhodecode/model/forms.py:75
 msgid "This username already exists"
 msgstr ""
 
-#: rhodecode/model/forms.py:81
+#: rhodecode/model/forms.py:79
 msgid ""
 "Username may only contain alphanumeric characters underscores, periods or "
 "dashes and must begin with alphanumeric character"
 msgstr ""
 
-#: rhodecode/model/forms.py:101 rhodecode/model/forms.py:109
-#: rhodecode/model/forms.py:117
+#: rhodecode/model/forms.py:94
+msgid "Invalid group name"
+msgstr ""
+
+#: rhodecode/model/forms.py:104
+msgid "This users group already exists"
+msgstr ""
+
+#: rhodecode/model/forms.py:110
+msgid ""
+"Group name may only contain alphanumeric characters underscores, periods or "
+"dashes and must begin with alphanumeric character"
+msgstr ""
+
+#: rhodecode/model/forms.py:132
+msgid "Cannot assign this group as parent"
+msgstr ""
+
+#: rhodecode/model/forms.py:148
+msgid "This group already exists"
+msgstr ""
+
+#: rhodecode/model/forms.py:164 rhodecode/model/forms.py:172
+#: rhodecode/model/forms.py:180
 msgid "Invalid characters in password"
 msgstr ""
 
-#: rhodecode/model/forms.py:128
-msgid "Password do not match"
-msgstr ""
-
-#: rhodecode/model/forms.py:133
+#: rhodecode/model/forms.py:191
+msgid "Passwords do not match"
+msgstr ""
+
+#: rhodecode/model/forms.py:196
 msgid "invalid password"
 msgstr ""
 
-#: rhodecode/model/forms.py:134
+#: rhodecode/model/forms.py:197
 msgid "invalid user name"
 msgstr ""
 
-#: rhodecode/model/forms.py:135
+#: rhodecode/model/forms.py:198
 msgid "Your account is disabled"
 msgstr ""
 
-#: rhodecode/model/forms.py:172 rhodecode/model/forms.py:207
+#: rhodecode/model/forms.py:233
 msgid "This username is not valid"
 msgstr ""
 
-#: rhodecode/model/forms.py:185
+#: rhodecode/model/forms.py:245
 msgid "This repository name is disallowed"
 msgstr ""
 
-#: rhodecode/model/forms.py:189
+#: rhodecode/model/forms.py:266
+#, python-format
+msgid "This repository already exists in group \"%s\""
+msgstr ""
+
+#: rhodecode/model/forms.py:274
 msgid "This repository already exists"
 msgstr ""
 
-#: rhodecode/model/forms.py:201
-msgid "Fork have to be the same type as original"
-msgstr ""
-
-#: rhodecode/model/forms.py:256
-msgid "This is not a valid path"
-msgstr ""
-
-#: rhodecode/model/forms.py:270
-msgid "This e-mail address is already taken"
-msgstr ""
-
-#: rhodecode/model/forms.py:286
-msgid "This e-mail address doesn't exist."
-msgstr ""
-
-#: rhodecode/model/forms.py:311
-#, python-format
-msgid ""
-"You need to specify %(user)s in template for example uid=%(user)s "
-",dc=company..."
-msgstr ""
-
-#: rhodecode/model/forms.py:317
-#, python-format
-msgid "Wrong template used, only %(user)s is an valid entry"
+#: rhodecode/model/forms.py:312 rhodecode/model/forms.py:319
+msgid "invalid clone url"
+msgstr ""
+
+#: rhodecode/model/forms.py:322
+msgid "Invalid clone url, provide a valid clone http\\s url"
 msgstr ""
 
 #: rhodecode/model/forms.py:334
+msgid "Fork have to be the same type as original"
+msgstr ""
+
+#: rhodecode/model/forms.py:341
+msgid "This username or users group name is not valid"
+msgstr ""
+
+#: rhodecode/model/forms.py:403
+msgid "This is not a valid path"
+msgstr ""
+
+#: rhodecode/model/forms.py:416
+msgid "This e-mail address is already taken"
+msgstr ""
+
+#: rhodecode/model/forms.py:427
+msgid "This e-mail address doesn't exist."
+msgstr ""
+
+#: rhodecode/model/forms.py:447
+msgid ""
+"The LDAP Login attribute of the CN must be specified - this is the name of "
+"the attribute that is equivalent to 'username'"
+msgstr ""
+
+#: rhodecode/model/forms.py:466
 msgid "Please enter a login"
 msgstr ""
 
-#: rhodecode/model/forms.py:335
+#: rhodecode/model/forms.py:467
 #, python-format
 msgid "Enter a value %(min)i characters long or more"
 msgstr ""
 
-#: rhodecode/model/forms.py:343
+#: rhodecode/model/forms.py:475
 msgid "Please enter a password"
 msgstr ""
 
-#: rhodecode/model/forms.py:344
+#: rhodecode/model/forms.py:476
 #, python-format
 msgid "Enter %(min)i characters or more"
 msgstr ""
 
-#: rhodecode/model/user.py:126
+#: rhodecode/model/user.py:145
 msgid "[RhodeCode] New User registration"
 msgstr ""
 
-#: rhodecode/model/user.py:138 rhodecode/model/user.py:159
+#: rhodecode/model/user.py:157 rhodecode/model/user.py:179
 msgid "You can't Edit this user since it's crucial for entire application"
 msgstr ""
 
-#: rhodecode/model/user.py:180
+#: rhodecode/model/user.py:201
 msgid "You can't remove this user since it's crucial for entire application"
 msgstr ""
 
-#: rhodecode/model/user.py:183
+#: rhodecode/model/user.py:204
 #, python-format
 msgid ""
 "This user still owns %s repositories and cannot be removed. Switch owners or "
 "remove those repositories"
 msgstr ""
 
-#: rhodecode/templates/index.html:4 rhodecode/templates/index.html:30
+#: rhodecode/templates/index.html:4
 msgid "Dashboard"
 msgstr ""
 
-#: rhodecode/templates/index.html:31
-#: rhodecode/templates/admin/users/user_edit_my_account.html:101
+#: rhodecode/templates/index_base.html:22
+#: rhodecode/templates/admin/users/user_edit_my_account.html:102
 msgid "quick filter..."
 msgstr ""
 
-#: rhodecode/templates/index.html:37
+#: rhodecode/templates/index_base.html:23 rhodecode/templates/base/base.html:300
+msgid "repositories"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:29
+#: rhodecode/templates/admin/repos/repos.html:22
 msgid "ADD NEW REPOSITORY"
 msgstr ""
 
-#: rhodecode/templates/index.html:48
-#: rhodecode/templates/admin/repos/repo_add.html:31
-#: rhodecode/templates/admin/repos/repo_add_create_repository.html:27
+#: rhodecode/templates/index_base.html:41
+#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:32
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:32
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:33
+#: rhodecode/templates/admin/users_groups/users_group_add.html:32
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:33
+msgid "Group name"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:42 rhodecode/templates/index_base.html:73
+#: rhodecode/templates/admin/repos/repo_add_base.html:44
+#: rhodecode/templates/admin/repos/repo_edit.html:64
+#: rhodecode/templates/admin/repos/repos.html:31
+#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:41
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:41
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:34
+#: rhodecode/templates/settings/repo_fork.html:40
+#: rhodecode/templates/settings/repo_settings.html:40
+#: rhodecode/templates/summary/summary.html:92
+msgid "Description"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:53
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:46
+msgid "Repositories group"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:72
+#: rhodecode/templates/admin/repos/repo_add_base.html:9
 #: rhodecode/templates/admin/repos/repo_edit.html:32
 #: rhodecode/templates/admin/repos/repos.html:30
-#: rhodecode/templates/admin/users/user_edit_my_account.html:116
-#: rhodecode/templates/files/files_browser.html:27
-#: rhodecode/templates/settings/repo_settings.html:29
+#: rhodecode/templates/admin/users/user_edit_my_account.html:117
+#: rhodecode/templates/files/files_browser.html:157
+#: rhodecode/templates/settings/repo_settings.html:31
 #: rhodecode/templates/summary/summary.html:31
-#: rhodecode/templates/summary/summary.html:92
+#: rhodecode/templates/summary/summary.html:107
 msgid "Name"
 msgstr ""
 
-#: rhodecode/templates/index.html:49
-#: rhodecode/templates/admin/repos/repo_add.html:47
-#: rhodecode/templates/admin/repos/repo_add_create_repository.html:44
-#: rhodecode/templates/admin/repos/repo_edit.html:48
-#: rhodecode/templates/admin/repos/repos.html:31
-#: rhodecode/templates/settings/repo_fork.html:38
-#: rhodecode/templates/settings/repo_settings.html:38
-#: rhodecode/templates/summary/summary.html:75
-msgid "Description"
-msgstr ""
-
-#: rhodecode/templates/index.html:50 rhodecode/templates/admin/repos/repos.html:32
-#: rhodecode/templates/summary/summary.html:99
+#: rhodecode/templates/index_base.html:74
+#: rhodecode/templates/admin/repos/repos.html:32
+#: rhodecode/templates/summary/summary.html:114
 msgid "Last change"
 msgstr ""
 
-#: rhodecode/templates/index.html:51 rhodecode/templates/admin/repos/repos.html:33
+#: rhodecode/templates/index_base.html:75
+#: rhodecode/templates/admin/repos/repos.html:33
 msgid "Tip"
 msgstr ""
 
-#: rhodecode/templates/index.html:52
-#: rhodecode/templates/admin/repos/repo_edit.html:73
+#: rhodecode/templates/index_base.html:76
+#: rhodecode/templates/admin/repos/repo_edit.html:97
 msgid "Owner"
 msgstr ""
 
-#: rhodecode/templates/index.html:53 rhodecode/templates/summary/summary.html:236
+#: rhodecode/templates/index_base.html:77
+#: rhodecode/templates/journal/public_journal.html:20
+#: rhodecode/templates/summary/summary.html:180
+#: rhodecode/templates/summary/summary.html:183
 msgid "RSS"
 msgstr ""
 
-#: rhodecode/templates/index.html:54 rhodecode/templates/summary/summary.html:237
+#: rhodecode/templates/index_base.html:78
+#: rhodecode/templates/journal/public_journal.html:23
+#: rhodecode/templates/summary/summary.html:181
+#: rhodecode/templates/summary/summary.html:184
 msgid "Atom"
 msgstr ""
 
-#: rhodecode/templates/index.html:64 rhodecode/templates/admin/repos/repos.html:42
-#: rhodecode/templates/admin/users/user_edit_my_account.html:126
-#: rhodecode/templates/summary/summary.html:35
+#: rhodecode/templates/index_base.html:87 rhodecode/templates/index_base.html:89
+#: rhodecode/templates/index_base.html:91 rhodecode/templates/base/base.html:209
+#: rhodecode/templates/base/base.html:211 rhodecode/templates/base/base.html:213
+#: rhodecode/templates/summary/summary.html:4
+msgid "Summary"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:95 rhodecode/templates/index_base.html:97
+#: rhodecode/templates/index_base.html:99 rhodecode/templates/base/base.html:225
+#: rhodecode/templates/base/base.html:227 rhodecode/templates/base/base.html:229
+#: rhodecode/templates/changelog/changelog.html:6
+#: rhodecode/templates/changelog/changelog.html:14
+msgid "Changelog"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:103 rhodecode/templates/index_base.html:105
+#: rhodecode/templates/index_base.html:107 rhodecode/templates/base/base.html:268
+#: rhodecode/templates/base/base.html:270 rhodecode/templates/base/base.html:272
+#: rhodecode/templates/files/files.html:4
+msgid "Files"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:116
+#: rhodecode/templates/admin/repos/repos.html:42
+#: rhodecode/templates/admin/users/user_edit_my_account.html:127
+#: rhodecode/templates/summary/summary.html:48
 msgid "Mercurial repository"
 msgstr ""
 
-#: rhodecode/templates/index.html:66 rhodecode/templates/admin/repos/repos.html:44
-#: rhodecode/templates/admin/users/user_edit_my_account.html:128
-#: rhodecode/templates/summary/summary.html:38
+#: rhodecode/templates/index_base.html:118
+#: rhodecode/templates/admin/repos/repos.html:44
+#: rhodecode/templates/admin/users/user_edit_my_account.html:129
+#: rhodecode/templates/summary/summary.html:51
 msgid "Git repository"
 msgstr ""
 
-#: rhodecode/templates/index.html:73 rhodecode/templates/journal.html:67
-#: rhodecode/templates/admin/repos/repo_edit.html:103
-#: rhodecode/templates/settings/repo_settings.html:74
-#: rhodecode/templates/summary/summary.html:42
+#: rhodecode/templates/index_base.html:123
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:16
+#: rhodecode/templates/journal/journal.html:53
+#: rhodecode/templates/summary/summary.html:56
 msgid "private repository"
 msgstr ""
 
-#: rhodecode/templates/index.html:75 rhodecode/templates/journal.html:69
-#: rhodecode/templates/summary/summary.html:44
+#: rhodecode/templates/index_base.html:125
+#: rhodecode/templates/journal/journal.html:55
+#: rhodecode/templates/summary/summary.html:58
 msgid "public repository"
 msgstr ""
 
-#: rhodecode/templates/index.html:83 rhodecode/templates/base/base.html:221
-#: rhodecode/templates/settings/repo_fork.html:11
+#: rhodecode/templates/index_base.html:133 rhodecode/templates/base/base.html:291
+#: rhodecode/templates/settings/repo_fork.html:13
 msgid "fork"
 msgstr ""
 
-#: rhodecode/templates/index.html:84 rhodecode/templates/admin/repos/repos.html:60
-#: rhodecode/templates/admin/users/user_edit_my_account.html:142
-#: rhodecode/templates/summary/summary.html:63
-#: rhodecode/templates/summary/summary.html:65
+#: rhodecode/templates/index_base.html:134
+#: rhodecode/templates/admin/repos/repos.html:60
+#: rhodecode/templates/admin/users/user_edit_my_account.html:143
+#: rhodecode/templates/summary/summary.html:69
+#: rhodecode/templates/summary/summary.html:71
 msgid "Fork of"
 msgstr ""
 
-#: rhodecode/templates/index.html:105 rhodecode/templates/admin/repos/repos.html:73
+#: rhodecode/templates/index_base.html:155
+#: rhodecode/templates/admin/repos/repos.html:73
 msgid "No changesets yet"
 msgstr ""
 
-#: rhodecode/templates/index.html:110
+#: rhodecode/templates/index_base.html:161 rhodecode/templates/index_base.html:163
 #, python-format
 msgid "Subscribe to %s rss feed"
 msgstr ""
 
-#: rhodecode/templates/index.html:113
+#: rhodecode/templates/index_base.html:168 rhodecode/templates/index_base.html:170
 #, python-format
 msgid "Subscribe to %s atom feed"
 msgstr ""
 
-#: rhodecode/templates/journal.html:4 rhodecode/templates/journal.html:17
-#: rhodecode/templates/base/base.html:41 rhodecode/templates/base/base.html:278
-#: rhodecode/templates/base/base.html:280 rhodecode/templates/base/base.html:282
-msgid "Journal"
-msgstr ""
-
-#: rhodecode/templates/journal.html:45
-msgid "No entries yet"
-msgstr ""
-
-#: rhodecode/templates/journal.html:53
-msgid "Following"
-msgstr ""
-
-#: rhodecode/templates/journal.html:60
-msgid "following user"
-msgstr ""
-
-#: rhodecode/templates/journal.html:60
-#: rhodecode/templates/admin/repos/repo_edit.html:94
-#: rhodecode/templates/settings/repo_settings.html:65
-msgid "user"
-msgstr ""
-
-#: rhodecode/templates/journal.html:79
-msgid "You are not following any users or repositories"
-msgstr ""
-
-#: rhodecode/templates/login.html:5
+#: rhodecode/templates/login.html:5 rhodecode/templates/login.html:54
+#: rhodecode/templates/base/base.html:38
 msgid "Sign In"
 msgstr ""
 
-#: rhodecode/templates/login.html:28
+#: rhodecode/templates/login.html:21
 msgid "Sign In to"
 msgstr ""
 
-#: rhodecode/templates/login.html:38 rhodecode/templates/register.html:27
+#: rhodecode/templates/login.html:31 rhodecode/templates/register.html:20
 #: rhodecode/templates/admin/admin_log.html:5
 #: rhodecode/templates/admin/users/user_add.html:32
-#: rhodecode/templates/admin/users/user_edit.html:43
-#: rhodecode/templates/admin/users/user_edit_my_account.html:41
-#: rhodecode/templates/summary/summary.html:91
+#: rhodecode/templates/admin/users/user_edit.html:47
+#: rhodecode/templates/admin/users/user_edit_my_account.html:45
+#: rhodecode/templates/base/base.html:15
+#: rhodecode/templates/summary/summary.html:106
 msgid "Username"
 msgstr ""
 
-#: rhodecode/templates/login.html:47 rhodecode/templates/register.html:36
-#: rhodecode/templates/admin/ldap/ldap.html:50
+#: rhodecode/templates/login.html:40 rhodecode/templates/register.html:29
+#: rhodecode/templates/admin/ldap/ldap.html:46
 #: rhodecode/templates/admin/users/user_add.html:41
+#: rhodecode/templates/base/base.html:24
 msgid "Password"
 msgstr ""
 
-#: rhodecode/templates/login.html:67
+#: rhodecode/templates/login.html:60
 msgid "Forgot your password ?"
 msgstr ""
 
-#: rhodecode/templates/login.html:70
+#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:35
 msgid "Don't have an account ?"
 msgstr ""
 
 #: rhodecode/templates/password_reset.html:5
-msgid "Reset You password"
-msgstr ""
-
-#: rhodecode/templates/password_reset.html:18
-msgid "Reset You password to"
-msgstr ""
-
-#: rhodecode/templates/password_reset.html:28
+msgid "Reset your password"
+msgstr ""
+
+#: rhodecode/templates/password_reset.html:11
+msgid "Reset your password to"
+msgstr ""
+
+#: rhodecode/templates/password_reset.html:21
 msgid "Email address"
 msgstr ""
 
-#: rhodecode/templates/password_reset.html:38
-msgid "Your new password will be send to matching email address"
-msgstr ""
-
-#: rhodecode/templates/register.html:5
+#: rhodecode/templates/password_reset.html:30
+msgid "Reset my password"
+msgstr ""
+
+#: rhodecode/templates/password_reset.html:31
+msgid "Password reset link will be send to matching email address"
+msgstr ""
+
+#: rhodecode/templates/register.html:5 rhodecode/templates/register.html:74
 msgid "Sign Up"
 msgstr ""
 
-#: rhodecode/templates/register.html:18
+#: rhodecode/templates/register.html:11
 msgid "Sign Up to"
 msgstr ""
 
-#: rhodecode/templates/register.html:45
+#: rhodecode/templates/register.html:38
 msgid "Re-enter password"
 msgstr ""
 
-#: rhodecode/templates/register.html:54
+#: rhodecode/templates/register.html:47
 #: rhodecode/templates/admin/users/user_add.html:50
-#: rhodecode/templates/admin/users/user_edit.html:61
-#: rhodecode/templates/admin/users/user_edit_my_account.html:59
+#: rhodecode/templates/admin/users/user_edit.html:74
+#: rhodecode/templates/admin/users/user_edit_my_account.html:63
 msgid "First Name"
 msgstr ""
 
-#: rhodecode/templates/register.html:63
+#: rhodecode/templates/register.html:56
 #: rhodecode/templates/admin/users/user_add.html:59
-#: rhodecode/templates/admin/users/user_edit.html:70
-#: rhodecode/templates/admin/users/user_edit_my_account.html:68
+#: rhodecode/templates/admin/users/user_edit.html:83
+#: rhodecode/templates/admin/users/user_edit_my_account.html:72
 msgid "Last Name"
 msgstr ""
 
-#: rhodecode/templates/register.html:72
+#: rhodecode/templates/register.html:65
 #: rhodecode/templates/admin/users/user_add.html:68
-#: rhodecode/templates/admin/users/user_edit.html:79
-#: rhodecode/templates/admin/users/user_edit_my_account.html:77
-#: rhodecode/templates/summary/summary.html:93
+#: rhodecode/templates/admin/users/user_edit.html:92
+#: rhodecode/templates/admin/users/user_edit_my_account.html:81
+#: rhodecode/templates/summary/summary.html:108
 msgid "Email"
 msgstr ""
 
-#: rhodecode/templates/register.html:83
+#: rhodecode/templates/register.html:76
 msgid "Your account will be activated right after registration"
 msgstr ""
 
-#: rhodecode/templates/register.html:85
+#: rhodecode/templates/register.html:78
 msgid "Your account must wait for activation by administrator"
 msgstr ""
 
+#: rhodecode/templates/repo_switcher_list.html:14
+msgid "Private repository"
+msgstr ""
+
+#: rhodecode/templates/repo_switcher_list.html:19
+msgid "Public repository"
+msgstr ""
+
 #: rhodecode/templates/admin/admin.html:5 rhodecode/templates/admin/admin.html:9
 msgid "Admin journal"
 msgstr ""
@@ -744,12 +1106,11 b' msgstr ""'
 msgid "From IP"
 msgstr ""
 
-#: rhodecode/templates/admin/admin_log.html:62
+#: rhodecode/templates/admin/admin_log.html:52
 msgid "No actions yet"
 msgstr ""
 
 #: rhodecode/templates/admin/ldap/ldap.html:5
-#: rhodecode/templates/admin/ldap/ldap.html:24
 msgid "LDAP administration"
 msgstr ""
 
@@ -757,8 +1118,12 b' msgstr ""'
 msgid "Ldap"
 msgstr ""
 
+#: rhodecode/templates/admin/ldap/ldap.html:28
+msgid "Connection settings"
+msgstr ""
+
 #: rhodecode/templates/admin/ldap/ldap.html:30
-msgid "Enable ldap"
+msgid "Enable LDAP"
 msgstr ""
 
 #: rhodecode/templates/admin/ldap/ldap.html:34
@@ -770,24 +1135,71 b' msgid "Port"'
 msgstr ""
 
 #: rhodecode/templates/admin/ldap/ldap.html:42
-msgid "Enable LDAPS"
-msgstr ""
-
-#: rhodecode/templates/admin/ldap/ldap.html:46
 msgid "Account"
 msgstr ""
 
+#: rhodecode/templates/admin/ldap/ldap.html:50
+msgid "Connection security"
+msgstr ""
+
 #: rhodecode/templates/admin/ldap/ldap.html:54
+msgid "Certificate Checks"
+msgstr ""
+
+#: rhodecode/templates/admin/ldap/ldap.html:57
+msgid "Search settings"
+msgstr ""
+
+#: rhodecode/templates/admin/ldap/ldap.html:59
 msgid "Base DN"
 msgstr ""
 
+#: rhodecode/templates/admin/ldap/ldap.html:63
+msgid "LDAP Filter"
+msgstr ""
+
+#: rhodecode/templates/admin/ldap/ldap.html:67
+msgid "LDAP Search Scope"
+msgstr ""
+
+#: rhodecode/templates/admin/ldap/ldap.html:70
+msgid "Attribute mappings"
+msgstr ""
+
+#: rhodecode/templates/admin/ldap/ldap.html:72
+msgid "Login Attribute"
+msgstr ""
+
+#: rhodecode/templates/admin/ldap/ldap.html:76
+msgid "First Name Attribute"
+msgstr ""
+
+#: rhodecode/templates/admin/ldap/ldap.html:80
+msgid "Last Name Attribute"
+msgstr ""
+
+#: rhodecode/templates/admin/ldap/ldap.html:84
+msgid "E-mail Attribute"
+msgstr ""
+
+#: rhodecode/templates/admin/ldap/ldap.html:89
+#: rhodecode/templates/admin/settings/hooks.html:73
+#: rhodecode/templates/admin/users/user_edit.html:117
+#: rhodecode/templates/admin/users/user_edit.html:142
+#: rhodecode/templates/admin/users/user_edit_my_account.html:89
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:263
+msgid "Save"
+msgstr ""
+
 #: rhodecode/templates/admin/permissions/permissions.html:5
 msgid "Permissions administration"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.html:11
-#: rhodecode/templates/admin/repos/repo_edit.html:85
-#: rhodecode/templates/settings/repo_settings.html:56
+#: rhodecode/templates/admin/repos/repo_edit.html:109
+#: rhodecode/templates/admin/users/user_edit.html:127
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:248
+#: rhodecode/templates/settings/repo_settings.html:58
 msgid "Permissions"
 msgstr ""
 
@@ -822,6 +1234,10 b' msgstr ""'
 msgid "Repository creation"
 msgstr ""
 
+#: rhodecode/templates/admin/permissions/permissions.html:71
+msgid "set"
+msgstr ""
+
 #: rhodecode/templates/admin/repos/repo_add.html:5
 #: rhodecode/templates/admin/repos/repo_add_create_repository.html:5
 msgid "Add repository"
@@ -830,6 +1246,7 b' msgstr ""'
 #: rhodecode/templates/admin/repos/repo_add.html:11
 #: rhodecode/templates/admin/repos/repo_edit.html:11
 #: rhodecode/templates/admin/repos/repos.html:10
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10
 msgid "Repositories"
 msgstr ""
 
@@ -837,20 +1254,34 b' msgstr ""'
 msgid "add new"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_add.html:39
-#: rhodecode/templates/admin/repos/repo_add_create_repository.html:36
-#: rhodecode/templates/admin/repos/repo_edit.html:40
+#: rhodecode/templates/admin/repos/repo_add_base.html:20
+#: rhodecode/templates/summary/summary.html:80
+#: rhodecode/templates/summary/summary.html:82
+msgid "Clone from"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:28
+#: rhodecode/templates/admin/repos/repo_edit.html:48
+#: rhodecode/templates/admin/repos_groups/repos_groups.html:4
+msgid "Repository group"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:36
+#: rhodecode/templates/admin/repos/repo_edit.html:56
 msgid "Type"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_add.html:55
-#: rhodecode/templates/admin/repos/repo_add_create_repository.html:52
-#: rhodecode/templates/admin/repos/repo_edit.html:57
-#: rhodecode/templates/settings/repo_fork.html:46
-#: rhodecode/templates/settings/repo_settings.html:47
+#: rhodecode/templates/admin/repos/repo_add_base.html:52
+#: rhodecode/templates/admin/repos/repo_edit.html:73
+#: rhodecode/templates/settings/repo_fork.html:48
+#: rhodecode/templates/settings/repo_settings.html:49
 msgid "Private"
 msgstr ""
 
+#: rhodecode/templates/admin/repos/repo_add_base.html:59
+msgid "add"
+msgstr ""
+
 #: rhodecode/templates/admin/repos/repo_add_create_repository.html:9
 msgid "add new repository"
 msgstr ""
@@ -861,121 +1292,268 b' msgstr ""'
 
 #: rhodecode/templates/admin/repos/repo_edit.html:13
 #: rhodecode/templates/admin/users/user_edit.html:13
-#: rhodecode/templates/admin/users/user_edit_my_account.html:147
+#: rhodecode/templates/admin/users/user_edit_my_account.html:148
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:13
+#: rhodecode/templates/files/files_annotate.html:49
+#: rhodecode/templates/files/files_source.html:20
 msgid "edit"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:65
+#: rhodecode/templates/admin/repos/repo_edit.html:40
+msgid "Clone uri"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:81
 msgid "Enable statistics"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:90
-#: rhodecode/templates/settings/repo_settings.html:61
-msgid "none"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:91
-#: rhodecode/templates/settings/repo_settings.html:62
-msgid "read"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:92
-#: rhodecode/templates/settings/repo_settings.html:63
-msgid "write"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:93
-#: rhodecode/templates/admin/users/users.html:37
-#: rhodecode/templates/base/base.html:226
-#: rhodecode/templates/settings/repo_settings.html:64
-msgid "admin"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:124
-#: rhodecode/templates/settings/repo_settings.html:95
-msgid "Failed to remove user"
+#: rhodecode/templates/admin/repos/repo_edit.html:89
+msgid "Enable downloads"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:127
+msgid "Administration"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:130
+msgid "Statistics"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:134
+msgid "Reset current statistics"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:134
+msgid "Confirm to remove current statistics"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:137
+msgid "Fetched to rev"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:138
+msgid "Percentage of stats gathered"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:147
+msgid "Remote"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:151
+msgid "Pull changes from remote location"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:151
-#: rhodecode/templates/settings/repo_settings.html:123
-msgid "Add another user"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:293
-msgid "Administration"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:296
-msgid "Statistics"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:301
-msgid "Reset current statistics"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:305
-msgid "Fetched to rev"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:306
-msgid "Percentage of stats gathered"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:314
+msgid "Confirm to pull changes from remote side"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:162
 msgid "Cache"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:318
+#: rhodecode/templates/admin/repos/repo_edit.html:166
 msgid "Invalidate repository cache"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:324
+#: rhodecode/templates/admin/repos/repo_edit.html:166
+msgid "Confirm to invalidate repository cache"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:177
+msgid "Remove from public journal"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:179
+msgid "Add to public journal"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:185
 msgid "Delete"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:328
+#: rhodecode/templates/admin/repos/repo_edit.html:189
 msgid "Remove this repository"
 msgstr ""
 
+#: rhodecode/templates/admin/repos/repo_edit.html:189
+#: rhodecode/templates/admin/repos/repos.html:79
+msgid "Confirm to delete this repository"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:3
+msgid "none"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:4
+msgid "read"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:5
+msgid "write"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:6
+#: rhodecode/templates/admin/users/users.html:38
+#: rhodecode/templates/base/base.html:296
+msgid "admin"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:7
+msgid "member"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:33
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:53
+msgid "revoke"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:75
+msgid "Add another member"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:89
+msgid "Failed to remove user"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:104
+msgid "Failed to remove users group"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:205
+msgid "Group"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:206
+#: rhodecode/templates/admin/users_groups/users_groups.html:33
+msgid "members"
+msgstr ""
+
 #: rhodecode/templates/admin/repos/repos.html:5
 msgid "Repositories administration"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repos.html:34
-#: rhodecode/templates/summary/summary.html:85
+#: rhodecode/templates/summary/summary.html:100
 msgid "Contact"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repos.html:35
-#: rhodecode/templates/admin/users/user_edit_my_account.html:118
-#: rhodecode/templates/admin/users/users.html:39
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:36
+#: rhodecode/templates/admin/users/user_edit_my_account.html:119
+#: rhodecode/templates/admin/users/users.html:40
+#: rhodecode/templates/admin/users_groups/users_groups.html:35
 msgid "action"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repos.html:51
-#: rhodecode/templates/admin/users/user_edit_my_account.html:133
-#: rhodecode/templates/admin/users/user_edit_my_account.html:147
+#: rhodecode/templates/admin/users/user_edit_my_account.html:134
+#: rhodecode/templates/admin/users/user_edit_my_account.html:148
 msgid "private"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repos.html:53
 #: rhodecode/templates/admin/repos/repos.html:59
-#: rhodecode/templates/admin/users/user_edit_my_account.html:135
-#: rhodecode/templates/admin/users/user_edit_my_account.html:141
-#: rhodecode/templates/summary/summary.html:62
+#: rhodecode/templates/admin/users/user_edit_my_account.html:136
+#: rhodecode/templates/admin/users/user_edit_my_account.html:142
+#: rhodecode/templates/summary/summary.html:68
 msgid "public"
 msgstr ""
 
+#: rhodecode/templates/admin/repos/repos.html:79
+#: rhodecode/templates/admin/users/users.html:55
+msgid "delete"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups.html:8
+msgid "Groups"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups.html:13
+msgid "with"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:5
+msgid "Add repos group"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:10
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:10
+msgid "Repos groups"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:12
+msgid "add new repos group"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:50
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:50
+msgid "Group parent"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:58
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:58
+#: rhodecode/templates/admin/users/user_add.html:85
+#: rhodecode/templates/admin/users_groups/users_group_add.html:49
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:90
+msgid "save"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:5
+msgid "Edit repos group"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:12
+msgid "edit repos group"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:5
+msgid "Repositories groups administration"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:22
+msgid "ADD NEW GROUP"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:35
+msgid "Number of repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54
+msgid "Confirm to delete this group"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:62
+msgid "There are no repositories groups yet"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/hooks.html:5
 #: rhodecode/templates/admin/settings/settings.html:5
 msgid "Settings administration"
 msgstr ""
 
+#: rhodecode/templates/admin/settings/hooks.html:9
 #: rhodecode/templates/admin/settings/settings.html:9
 #: rhodecode/templates/settings/repo_settings.html:5
-#: rhodecode/templates/settings/repo_settings.html:11
+#: rhodecode/templates/settings/repo_settings.html:13
 msgid "Settings"
 msgstr ""
 
+#: rhodecode/templates/admin/settings/hooks.html:24
+msgid "Built in hooks - read only"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/hooks.html:40
+msgid "Custom hooks"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/hooks.html:56
+msgid "remove"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/hooks.html:88
+msgid "Failed to remove hook"
+msgstr ""
+
 #: rhodecode/templates/admin/settings/settings.html:24
 msgid "Remap and rescan repositories"
 msgstr ""
@@ -995,6 +1573,10 b' msgstr ""'
 msgid "destroy old data"
 msgstr ""
 
+#: rhodecode/templates/admin/settings/settings.html:45
+msgid "Rescan repositories"
+msgstr ""
+
 #: rhodecode/templates/admin/settings/settings.html:51
 msgid "Whoosh indexing"
 msgstr ""
@@ -1007,6 +1589,10 b' msgstr ""'
 msgid "build from scratch"
 msgstr ""
 
+#: rhodecode/templates/admin/settings/settings.html:70
+msgid "Reindex"
+msgstr ""
+
 #: rhodecode/templates/admin/settings/settings.html:76
 msgid "Global application settings"
 msgstr ""
@@ -1019,50 +1605,73 b' msgstr ""'
 msgid "Realm text"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:109
-msgid "Mercurial settings"
+#: rhodecode/templates/admin/settings/settings.html:103
+msgid "GA code"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:111
+#: rhodecode/templates/admin/settings/settings.html:177
+msgid "Save settings"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:112
+#: rhodecode/templates/admin/settings/settings.html:178
+#: rhodecode/templates/admin/users/user_edit.html:118
+#: rhodecode/templates/admin/users/user_edit.html:143
+#: rhodecode/templates/admin/users/user_edit_my_account.html:90
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:264
+#: rhodecode/templates/files/files_edit.html:50
+msgid "Reset"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:118
+msgid "Mercurial settings"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:127
 msgid "Web"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:123
+#: rhodecode/templates/admin/settings/settings.html:132
 msgid "require ssl for pushing"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:130
-msgid "Hooks"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:135
-msgid "Update repository after push (hg update)"
-msgstr ""
-
 #: rhodecode/templates/admin/settings/settings.html:139
-msgid "Show repository size after push"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:143
-msgid "Log user push commands"
+msgid "Hooks"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:142
+msgid "advanced setup"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:147
-msgid "Log user pull commands"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:154
-msgid "Repositories location"
+msgid "Update repository after push (hg update)"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:151
+msgid "Show repository size after push"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:155
+msgid "Log user push commands"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:159
+msgid "Log user pull commands"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:166
+msgid "Repositories location"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:171
 msgid ""
-"This a crucial application setting. If You really sure you need to change "
-"this, you must restart application in order to make this settings take "
+"This a crucial application setting. If you are really sure you need to change"
+" this, you must restart application in order to make this setting take "
 "effect. Click this label to unlock."
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:160
+#: rhodecode/templates/admin/settings/settings.html:172
 msgid "unlock"
 msgstr ""
 
@@ -1081,7 +1690,9 b' msgid "add new user"'
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.html:77
-#: rhodecode/templates/admin/users/user_edit.html:88
+#: rhodecode/templates/admin/users/user_edit.html:101
+#: rhodecode/templates/admin/users_groups/users_group_add.html:41
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:42
 msgid "Active"
 msgstr ""
 
@@ -1089,16 +1700,35 b' msgstr ""'
 msgid "Edit user"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:36
+#: rhodecode/templates/admin/users/user_edit.html:33
+#: rhodecode/templates/admin/users/user_edit_my_account.html:32
+msgid "Change your avatar at"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit.html:34
 #: rhodecode/templates/admin/users/user_edit_my_account.html:33
 msgid "Using"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:52
-#: rhodecode/templates/admin/users/user_edit_my_account.html:50
+#: rhodecode/templates/admin/users/user_edit.html:40
+#: rhodecode/templates/admin/users/user_edit_my_account.html:39
+msgid "API key"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit.html:56
+msgid "LDAP DN"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit.html:65
+#: rhodecode/templates/admin/users/user_edit_my_account.html:54
 msgid "New password"
 msgstr ""
 
+#: rhodecode/templates/admin/users/user_edit.html:135
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:256
+msgid "Create repositories"
+msgstr ""
+
 #: rhodecode/templates/admin/users/user_edit_my_account.html:5
 msgid "My account"
 msgstr ""
@@ -1107,26 +1737,26 b' msgstr ""'
 msgid "My Account"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_my_account.html:100
+#: rhodecode/templates/admin/users/user_edit_my_account.html:101
 msgid "My repositories"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_my_account.html:106
+#: rhodecode/templates/admin/users/user_edit_my_account.html:107
 msgid "ADD REPOSITORY"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_my_account.html:117
+#: rhodecode/templates/admin/users/user_edit_my_account.html:118
 #: rhodecode/templates/branches/branches_data.html:7
 #: rhodecode/templates/shortlog/shortlog_data.html:8
 #: rhodecode/templates/tags/tags_data.html:7
 msgid "revision"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_my_account.html:156
+#: rhodecode/templates/admin/users/user_edit_my_account.html:157
 msgid "No repositories yet"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_my_account.html:158
+#: rhodecode/templates/admin/users/user_edit_my_account.html:159
 msgid "create one now"
 msgstr ""
 
@@ -1134,6 +1764,10 b' msgstr ""'
 msgid "Users administration"
 msgstr ""
 
+#: rhodecode/templates/admin/users/users.html:23
+msgid "ADD NEW USER"
+msgstr ""
+
 #: rhodecode/templates/admin/users/users.html:33
 msgid "username"
 msgstr ""
@@ -1149,140 +1783,203 b' msgid "lastname"'
 msgstr ""
 
 #: rhodecode/templates/admin/users/users.html:36
+msgid "last login"
+msgstr ""
+
+#: rhodecode/templates/admin/users/users.html:37
+#: rhodecode/templates/admin/users_groups/users_groups.html:34
 msgid "active"
 msgstr ""
 
-#: rhodecode/templates/admin/users/users.html:38
-#: rhodecode/templates/base/base.html:233
+#: rhodecode/templates/admin/users/users.html:39
+#: rhodecode/templates/base/base.html:305
 msgid "ldap"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:37 rhodecode/templates/base/base.html:269
-#: rhodecode/templates/base/base.html:271 rhodecode/templates/base/base.html:273
+#: rhodecode/templates/admin/users/users.html:56
+msgid "Confirm to delete this user"
+msgstr ""
+
+#: rhodecode/templates/admin/users_groups/users_group_add.html:5
+msgid "Add users group"
+msgstr ""
+
+#: rhodecode/templates/admin/users_groups/users_group_add.html:10
+#: rhodecode/templates/admin/users_groups/users_groups.html:9
+msgid "Users groups"
+msgstr ""
+
+#: rhodecode/templates/admin/users_groups/users_group_add.html:12
+msgid "add new users group"
+msgstr ""
+
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:5
+msgid "Edit users group"
+msgstr ""
+
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:11
+msgid "UsersGroups"
+msgstr ""
+
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:50
+msgid "Members"
+msgstr ""
+
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:58
+msgid "Choosen group members"
+msgstr ""
+
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:61
+msgid "Remove all elements"
+msgstr ""
+
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:75
+msgid "Available members"
+msgstr ""
+
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:79
+msgid "Add all elements"
+msgstr ""
+
+#: rhodecode/templates/admin/users_groups/users_groups.html:5
+msgid "Users groups administration"
+msgstr ""
+
+#: rhodecode/templates/admin/users_groups/users_groups.html:23
+msgid "ADD NEW USER GROUP"
+msgstr ""
+
+#: rhodecode/templates/admin/users_groups/users_groups.html:32
+msgid "group name"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:32
+msgid "Forgot password ?"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:57 rhodecode/templates/base/base.html:338
+#: rhodecode/templates/base/base.html:340 rhodecode/templates/base/base.html:342
 msgid "Home"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:87
+#: rhodecode/templates/base/base.html:61 rhodecode/templates/base/base.html:347
+#: rhodecode/templates/base/base.html:349 rhodecode/templates/base/base.html:351
+#: rhodecode/templates/journal/journal.html:4
+#: rhodecode/templates/journal/journal.html:17
+#: rhodecode/templates/journal/public_journal.html:4
+msgid "Journal"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:66
+msgid "Login"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:68
+msgid "Log Out"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:107
 msgid "Submit a bug"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:88
-msgid "GPL license"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:120
+#: rhodecode/templates/base/base.html:141
 msgid "Switch repository"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:122
+#: rhodecode/templates/base/base.html:143
 msgid "Products"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:130
-msgid "Private repository"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:132
-msgid "Public repository"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:139 rhodecode/templates/base/base.html:141
-#: rhodecode/templates/base/base.html:143
-#: rhodecode/templates/summary/summary.html:4
-msgid "Summary"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:155 rhodecode/templates/base/base.html:157
-#: rhodecode/templates/base/base.html:159
-#: rhodecode/templates/changelog/changelog.html:6
-#: rhodecode/templates/changelog/changelog.html:14
-msgid "Changelog"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:164 rhodecode/templates/base/base.html:166
-#: rhodecode/templates/base/base.html:168
+#: rhodecode/templates/base/base.html:149
+msgid "loading..."
+msgstr ""
+
+#: rhodecode/templates/base/base.html:234 rhodecode/templates/base/base.html:236
+#: rhodecode/templates/base/base.html:238
 msgid "Switch to"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:172
+#: rhodecode/templates/base/base.html:242
 #: rhodecode/templates/branches/branches.html:13
 msgid "branches"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:179
-#: rhodecode/templates/branches/branches_data.html:32
+#: rhodecode/templates/base/base.html:249
+#: rhodecode/templates/branches/branches_data.html:52
 msgid "There are no branches yet"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:184
+#: rhodecode/templates/base/base.html:254
 #: rhodecode/templates/shortlog/shortlog_data.html:10
 #: rhodecode/templates/tags/tags.html:14
 msgid "tags"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:191
+#: rhodecode/templates/base/base.html:261
 #: rhodecode/templates/tags/tags_data.html:32
 msgid "There are no tags yet"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:198 rhodecode/templates/base/base.html:200
-#: rhodecode/templates/base/base.html:202 rhodecode/templates/files/files.html:4
-msgid "Files"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:207 rhodecode/templates/base/base.html:211
+#: rhodecode/templates/base/base.html:277 rhodecode/templates/base/base.html:281
 #: rhodecode/templates/files/files_annotate.html:40
 #: rhodecode/templates/files/files_source.html:11
 msgid "Options"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:216 rhodecode/templates/base/base.html:218
-#: rhodecode/templates/base/base.html:234
+#: rhodecode/templates/base/base.html:286 rhodecode/templates/base/base.html:288
+#: rhodecode/templates/base/base.html:306
 msgid "settings"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:222
+#: rhodecode/templates/base/base.html:292
 msgid "search"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:229
+#: rhodecode/templates/base/base.html:299
 msgid "journal"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:230
-msgid "repositories"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:231
+#: rhodecode/templates/base/base.html:301
+msgid "repositories groups"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:302
 msgid "users"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:232
+#: rhodecode/templates/base/base.html:303
+msgid "users groups"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:304
 msgid "permissions"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:246 rhodecode/templates/base/base.html:248
+#: rhodecode/templates/base/base.html:317 rhodecode/templates/base/base.html:319
+#: rhodecode/templates/followers/followers.html:5
 msgid "Followers"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:254 rhodecode/templates/base/base.html:256
+#: rhodecode/templates/base/base.html:325 rhodecode/templates/base/base.html:327
+#: rhodecode/templates/forks/forks.html:5
 msgid "Forks"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:287 rhodecode/templates/base/base.html:289
-#: rhodecode/templates/base/base.html:291 rhodecode/templates/search/search.html:4
+#: rhodecode/templates/base/base.html:356 rhodecode/templates/base/base.html:358
+#: rhodecode/templates/base/base.html:360 rhodecode/templates/search/search.html:4
 #: rhodecode/templates/search/search.html:24
 #: rhodecode/templates/search/search.html:46
 msgid "Search"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:339
-#: rhodecode/templates/summary/summary.html:49
+#: rhodecode/templates/base/root.html:57
+#: rhodecode/templates/journal/journal.html:48
+#: rhodecode/templates/summary/summary.html:36
 msgid "Stop following this repository"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:343
-#: rhodecode/templates/summary/summary.html:53
+#: rhodecode/templates/base/root.html:66
+#: rhodecode/templates/summary/summary.html:40
 msgid "Start following this repository"
 msgstr ""
 
@@ -1303,16 +2000,18 b' msgstr ""'
 msgid "links"
 msgstr ""
 
-#: rhodecode/templates/branches/branches_data.html:24
+#: rhodecode/templates/branches/branches_data.html:23
+#: rhodecode/templates/branches/branches_data.html:43
 #: rhodecode/templates/shortlog/shortlog_data.html:39
 #: rhodecode/templates/tags/tags_data.html:24
 msgid "changeset"
 msgstr ""
 
-#: rhodecode/templates/branches/branches_data.html:26
+#: rhodecode/templates/branches/branches_data.html:25
+#: rhodecode/templates/branches/branches_data.html:45
 #: rhodecode/templates/files/files.html:12
 #: rhodecode/templates/shortlog/shortlog_data.html:41
-#: rhodecode/templates/summary/summary.html:161
+#: rhodecode/templates/summary/summary.html:233
 #: rhodecode/templates/tags/tags_data.html:26
 msgid "files"
 msgstr ""
@@ -1325,119 +2024,130 b' msgstr ""'
 msgid "out of"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:38
+#: rhodecode/templates/changelog/changelog.html:37
 msgid "Show"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:41
-msgid "set"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog.html:49
-#: rhodecode/templates/changeset/changeset.html:40
-#: rhodecode/templates/summary/summary.html:552
+#: rhodecode/templates/changelog/changelog.html:50
+#: rhodecode/templates/changeset/changeset.html:42
+#: rhodecode/templates/summary/summary.html:609
 msgid "commit"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:74
-#: rhodecode/templates/changeset/changeset.html:52
-msgid "removed"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog.html:75
-#: rhodecode/templates/changeset/changeset.html:53
-msgid "changed"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog.html:76
-#: rhodecode/templates/changeset/changeset.html:54
-msgid "added"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog.html:80
-#: rhodecode/templates/changeset/changeset.html:58
+#: rhodecode/templates/changelog/changelog.html:63
+msgid "Affected number of files, click to show more details"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:67
+#: rhodecode/templates/changeset/changeset.html:66
 msgid "merge"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:85
-#: rhodecode/templates/changeset/changeset.html:64
+#: rhodecode/templates/changelog/changelog.html:72
+#: rhodecode/templates/changeset/changeset.html:72
 msgid "Parent"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:90
-#: rhodecode/templates/changeset/changeset.html:69
+#: rhodecode/templates/changelog/changelog.html:77
+#: rhodecode/templates/changeset/changeset.html:77
 msgid "No parents"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:95
-#: rhodecode/templates/changeset/changeset.html:72
+#: rhodecode/templates/changelog/changelog.html:82
+#: rhodecode/templates/changeset/changeset.html:80
 #: rhodecode/templates/files/files.html:29
 #: rhodecode/templates/files/files_annotate.html:25
+#: rhodecode/templates/files/files_edit.html:33
 #: rhodecode/templates/shortlog/shortlog_data.html:9
 msgid "branch"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:99
-#: rhodecode/templates/changeset/changeset.html:75
+#: rhodecode/templates/changelog/changelog.html:86
+#: rhodecode/templates/changeset/changeset.html:83
 msgid "tag"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:132
-#: rhodecode/templates/shortlog/shortlog_data.html:64
+#: rhodecode/templates/changelog/changelog.html:122
+msgid "Show selected changes __S -> __E"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:172
+#: rhodecode/templates/shortlog/shortlog_data.html:61
 msgid "There are no changes yet"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:4
-#: rhodecode/templates/changeset/changeset.html:12
-#: rhodecode/templates/changeset/changeset.html:29
+#: rhodecode/templates/changelog/changelog_details.html:2
+#: rhodecode/templates/changeset/changeset.html:55
+msgid "removed"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog_details.html:3
+#: rhodecode/templates/changeset/changeset.html:56
+msgid "changed"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog_details.html:4
+#: rhodecode/templates/changeset/changeset.html:57
+msgid "added"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog_details.html:6
+#: rhodecode/templates/changelog/changelog_details.html:7
+#: rhodecode/templates/changelog/changelog_details.html:8
+#: rhodecode/templates/changeset/changeset.html:59
+#: rhodecode/templates/changeset/changeset.html:60
+#: rhodecode/templates/changeset/changeset.html:61
+#, python-format
+msgid "affected %s files"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:6
+#: rhodecode/templates/changeset/changeset.html:14
+#: rhodecode/templates/changeset/changeset.html:31
 msgid "Changeset"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:30
-#: rhodecode/templates/changeset/changeset.html:104
-#: rhodecode/templates/files/file_diff.html:32
-msgid "raw diff"
-msgstr ""
-
 #: rhodecode/templates/changeset/changeset.html:32
-#: rhodecode/templates/changeset/changeset.html:106
+#: rhodecode/templates/changeset/changeset.html:121
+#: rhodecode/templates/changeset/changeset_range.html:78
+#: rhodecode/templates/files/file_diff.html:32
+#: rhodecode/templates/files/file_diff.html:42
+msgid "raw diff"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:34
+#: rhodecode/templates/changeset/changeset.html:123
+#: rhodecode/templates/changeset/changeset_range.html:80
 #: rhodecode/templates/files/file_diff.html:34
 msgid "download diff"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:81
-msgid "Files affected"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset.html:102
+#: rhodecode/templates/changeset/changeset.html:90
+#, python-format
+msgid "%s files affected with %s additions and %s deletions."
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:101
+msgid "Changeset was too big and was cut off..."
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:119
+#: rhodecode/templates/changeset/changeset_range.html:76
 #: rhodecode/templates/files/file_diff.html:30
 msgid "diff"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:115
+#: rhodecode/templates/changeset/changeset.html:132
+#: rhodecode/templates/changeset/changeset_range.html:89
 msgid "No changes in this file"
 msgstr ""
 
-#: rhodecode/templates/errors/error_404.html:5
-msgid "Repository not found"
-msgstr ""
-
-#: rhodecode/templates/errors/error_404.html:22
-msgid "Not Found"
-msgstr ""
-
-#: rhodecode/templates/errors/error_404.html:23
-#, python-format
-msgid "The specified repository \"%s\" is unknown, sorry."
-msgstr ""
-
-#: rhodecode/templates/errors/error_404.html:26
-#, python-format
-msgid "Create \"%s\" repository as %s"
-msgstr ""
-
-#: rhodecode/templates/errors/error_404.html:29
-msgid "Go back to the main repository list page"
+#: rhodecode/templates/changeset/changeset_range.html:30
+msgid "Compare View"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_range.html:52
+msgid "Files affected"
 msgstr ""
 
 #: rhodecode/templates/errors/error_document.html:44
@@ -1450,12 +2160,13 b' msgstr ""'
 msgid "File diff"
 msgstr ""
 
-#: rhodecode/templates/files/file_diff.html:40
-msgid "No changes"
+#: rhodecode/templates/files/file_diff.html:42
+msgid "Diff is to big to display"
 msgstr ""
 
 #: rhodecode/templates/files/files.html:37
 #: rhodecode/templates/files/files_annotate.html:31
+#: rhodecode/templates/files/files_edit.html:39
 msgid "Location"
 msgstr ""
 
@@ -1476,19 +2187,19 b' msgid "annotate"'
 msgstr ""
 
 #: rhodecode/templates/files/files_annotate.html:33
-#: rhodecode/templates/files/files_browser.html:30
+#: rhodecode/templates/files/files_browser.html:160
 #: rhodecode/templates/files/files_source.html:2
 msgid "Revision"
 msgstr ""
 
 #: rhodecode/templates/files/files_annotate.html:36
-#: rhodecode/templates/files/files_browser.html:28
+#: rhodecode/templates/files/files_browser.html:158
 #: rhodecode/templates/files/files_source.html:7
 msgid "Size"
 msgstr ""
 
 #: rhodecode/templates/files/files_annotate.html:38
-#: rhodecode/templates/files/files_browser.html:29
+#: rhodecode/templates/files/files_browser.html:159
 #: rhodecode/templates/files/files_source.html:9
 msgid "Mimetype"
 msgstr ""
@@ -1498,9 +2209,9 b' msgid "show source"'
 msgstr ""
 
 #: rhodecode/templates/files/files_annotate.html:43
-#: rhodecode/templates/files/files_annotate.html:69
+#: rhodecode/templates/files/files_annotate.html:78
 #: rhodecode/templates/files/files_source.html:14
-#: rhodecode/templates/files/files_source.html:42
+#: rhodecode/templates/files/files_source.html:51
 msgid "show as raw"
 msgstr ""
 
@@ -1509,40 +2220,131 b' msgstr ""'
 msgid "download as raw"
 msgstr ""
 
-#: rhodecode/templates/files/files_annotate.html:48
-#: rhodecode/templates/files/files_source.html:19
+#: rhodecode/templates/files/files_annotate.html:54
+#: rhodecode/templates/files/files_source.html:25
 msgid "History"
 msgstr ""
 
-#: rhodecode/templates/files/files_annotate.html:69
-#: rhodecode/templates/files/files_source.html:42
-msgid "File is to big to display"
-msgstr ""
-
-#: rhodecode/templates/files/files_browser.html:12
-msgid "view"
+#: rhodecode/templates/files/files_annotate.html:73
+#: rhodecode/templates/files/files_source.html:46
+#, python-format
+msgid "Binary file (%s)"
+msgstr ""
+
+#: rhodecode/templates/files/files_annotate.html:78
+#: rhodecode/templates/files/files_source.html:51
+msgid "File is too big to display"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.html:13
+msgid "view"
+msgstr ""
+
+#: rhodecode/templates/files/files_browser.html:14
 msgid "previous revision"
 msgstr ""
 
-#: rhodecode/templates/files/files_browser.html:15
+#: rhodecode/templates/files/files_browser.html:16
 msgid "next revision"
 msgstr ""
 
-#: rhodecode/templates/files/files_browser.html:31
-msgid "Last modified"
+#: rhodecode/templates/files/files_browser.html:23
+msgid "follow current branch"
+msgstr ""
+
+#: rhodecode/templates/files/files_browser.html:27
+msgid "search file list"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.html:32
+msgid "Loading file list..."
+msgstr ""
+
+#: rhodecode/templates/files/files_browser.html:111
+msgid "search truncated"
+msgstr ""
+
+#: rhodecode/templates/files/files_browser.html:122
+msgid "no matching files"
+msgstr ""
+
+#: rhodecode/templates/files/files_browser.html:161
+msgid "Last modified"
+msgstr ""
+
+#: rhodecode/templates/files/files_browser.html:162
 msgid "Last commiter"
 msgstr ""
 
+#: rhodecode/templates/files/files_edit.html:4
+msgid "Edit file"
+msgstr ""
+
+#: rhodecode/templates/files/files_edit.html:19
+msgid "edit file"
+msgstr ""
+
+#: rhodecode/templates/files/files_edit.html:45
+#: rhodecode/templates/shortlog/shortlog_data.html:5
+msgid "commit message"
+msgstr ""
+
+#: rhodecode/templates/files/files_edit.html:51
+msgid "Commit changes"
+msgstr ""
+
 #: rhodecode/templates/files/files_source.html:12
 msgid "show annotation"
 msgstr ""
 
+#: rhodecode/templates/files/files_source.html:153
+msgid "Selection link"
+msgstr ""
+
+#: rhodecode/templates/followers/followers.html:13
+msgid "followers"
+msgstr ""
+
+#: rhodecode/templates/followers/followers_data.html:12
+msgid "Started following"
+msgstr ""
+
+#: rhodecode/templates/forks/forks.html:13
+msgid "forks"
+msgstr ""
+
+#: rhodecode/templates/forks/forks_data.html:17
+msgid "forked"
+msgstr ""
+
+#: rhodecode/templates/forks/forks_data.html:34
+msgid "There are no forks yet"
+msgstr ""
+
+#: rhodecode/templates/journal/journal.html:34
+msgid "Following"
+msgstr ""
+
+#: rhodecode/templates/journal/journal.html:41
+msgid "following user"
+msgstr ""
+
+#: rhodecode/templates/journal/journal.html:41
+msgid "user"
+msgstr ""
+
+#: rhodecode/templates/journal/journal.html:65
+msgid "You are not following any users or repositories"
+msgstr ""
+
+#: rhodecode/templates/journal/journal_data.html:46
+msgid "No entries yet"
+msgstr ""
+
+#: rhodecode/templates/journal/public_journal.html:17
+msgid "Public Journal"
+msgstr ""
+
 #: rhodecode/templates/search/search.html:7
 #: rhodecode/templates/search/search.html:26
 msgid "in repository: "
@@ -1562,7 +2364,7 b' msgid "Search in"'
 msgstr ""
 
 #: rhodecode/templates/search/search.html:57
-msgid "Source codes"
+msgid "File contents"
 msgstr ""
 
 #: rhodecode/templates/search/search.html:59
@@ -1578,12 +2380,16 b' msgstr ""'
 msgid "Fork"
 msgstr ""
 
-#: rhodecode/templates/settings/repo_fork.html:29
+#: rhodecode/templates/settings/repo_fork.html:31
 msgid "Fork name"
 msgstr ""
 
+#: rhodecode/templates/settings/repo_fork.html:55
+msgid "fork this repository"
+msgstr ""
+
 #: rhodecode/templates/shortlog/shortlog.html:5
-#: rhodecode/templates/summary/summary.html:609
+#: rhodecode/templates/summary/summary.html:666
 msgid "Shortlog"
 msgstr ""
 
@@ -1591,10 +2397,6 b' msgstr ""'
 msgid "shortlog"
 msgstr ""
 
-#: rhodecode/templates/shortlog/shortlog_data.html:5
-msgid "commit message"
-msgstr ""
-
 #: rhodecode/templates/shortlog/shortlog_data.html:6
 msgid "age"
 msgstr ""
@@ -1603,61 +2405,96 b' msgstr ""'
 msgid "summary"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:103
+#: rhodecode/templates/summary/summary.html:79
+msgid "remote clone"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:121
 msgid "by"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:110
+#: rhodecode/templates/summary/summary.html:128
 msgid "Clone url"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:119
+#: rhodecode/templates/summary/summary.html:137
 msgid "Trending source files"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:184
-#: rhodecode/templates/summary/summary.html:627
-#: rhodecode/templates/summary/summary.html:638
-msgid "show more"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:217
+#: rhodecode/templates/summary/summary.html:146
 msgid "Download"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:233
+#: rhodecode/templates/summary/summary.html:150
+msgid "There are no downloads yet"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:152
+msgid "Downloads are disabled for this repository"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:154
+#: rhodecode/templates/summary/summary.html:320
+msgid "enable"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:162
+#: rhodecode/templates/summary/summary.html:297
+#, python-format
+msgid "Download %s as %s"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:168
+msgid "Check this to download archive with subrepos"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:168
+msgid "with subrepos"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:176
 msgid "Feeds"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:247
+#: rhodecode/templates/summary/summary.html:257
+#: rhodecode/templates/summary/summary.html:684
+#: rhodecode/templates/summary/summary.html:695
+msgid "show more"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:312
 msgid "Commit activity by day / author"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:546
+#: rhodecode/templates/summary/summary.html:324
+msgid "Loaded in"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:603
 msgid "commits"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:547
+#: rhodecode/templates/summary/summary.html:604
 msgid "files added"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:548
+#: rhodecode/templates/summary/summary.html:605
 msgid "files changed"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:549
+#: rhodecode/templates/summary/summary.html:606
 msgid "files removed"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:553
+#: rhodecode/templates/summary/summary.html:610
 msgid "file added"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:554
+#: rhodecode/templates/summary/summary.html:611
 msgid "file changed"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:555
+#: rhodecode/templates/summary/summary.html:612
 msgid "file removed"
 msgstr ""
 

rhodecode/lib/__init__.py

@@ -24,6 +24,55 b''
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+try:
+    import json
+except ImportError:
+    #python 2.5 compatibility
+    import simplejson as json
+
+
+def __get_lem():
+    from pygments import lexers
+    from string import lower
+    from collections import defaultdict
+
+    d = defaultdict(lambda: [])
+
+    def __clean(s):
+        s = s.lstrip('*')
+        s = s.lstrip('.')
+
+        if s.find('[') != -1:
+            exts = []
+            start, stop = s.find('['), s.find(']')
+
+            for suffix in s[start + 1:stop]:
+                exts.append(s[:s.find('[')] + suffix)
+            return map(lower, exts)
+        else:
+            return map(lower, [s])
+
+    for lx, t in sorted(lexers.LEXERS.items()):
+        m = map(__clean, t[-2])
+        if m:
+            m = reduce(lambda x, y: x + y, m)
+            for ext in m:
+                desc = lx.replace('Lexer', '')
+                d[ext].append(desc)
+
+    return dict(d)
+
+# language map is also used by whoosh indexer, which for those specified
+# extensions will index it's content
+LANGUAGES_EXTENSIONS_MAP = __get_lem()
+
+# Additional mappings that are not present in the pygments lexers
+# NOTE: that this will overide any mappings in LANGUAGES_EXTENSIONS_MAP
+ADDITIONAL_MAPPINGS = {'xaml': 'XAML'}
+
+LANGUAGES_EXTENSIONS_MAP.update(ADDITIONAL_MAPPINGS)
+
+
 def str2bool(_str):
     """
     returs True/False value from given string, it tries to translate the
@@ -41,9 +90,57 b' def str2bool(_str):'
     return _str in ('t', 'true', 'y', 'yes', 'on', '1')
 
 
+def convert_line_endings(line, mode):
+    """
+    Converts a given line  "line end" accordingly to given mode
+    
+    Available modes are::
+        0 - Unix
+        1 - Mac
+        2 - DOS
+    
+    :param line: given line to convert
+    :param mode: mode to convert to
+    :rtype: str
+    :return: converted line according to mode
+    """
+    from string import replace
+
+    if mode == 0:
+            line = replace(line, '\r\n', '\n')
+            line = replace(line, '\r', '\n')
+    elif mode == 1:
+            line = replace(line, '\r\n', '\r')
+            line = replace(line, '\n', '\r')
+    elif mode == 2:
+            import re
+            line = re.sub("\r(?!\n)|(?<!\r)\n", "\r\n", line)
+    return line
+
+
+def detect_mode(line, default):
+    """
+    Detects line break for given line, if line break couldn't be found
+    given default value is returned
+
+    :param line: str line
+    :param default: default
+    :rtype: int
+    :return: value of line end on of 0 - Unix, 1 - Mac, 2 - DOS
+    """
+    if line.endswith('\r\n'):
+        return 2
+    elif line.endswith('\n'):
+        return 0
+    elif line.endswith('\r'):
+        return 1
+    else:
+        return default
+
+
 def generate_api_key(username, salt=None):
     """
-    Generates unique API key for given username,if salt is not given
+    Generates unique API key for given username, if salt is not given
     it'll be generated from some random string
 
     :param username: username as string
@@ -60,22 +157,233 b' def generate_api_key(username, salt=None'
     return hashlib.sha1(username + salt).hexdigest()
 
 
-def safe_unicode(_str, from_encoding='utf8'):
+def safe_unicode(str_, from_encoding='utf8'):
     """
-    safe unicode function. In case of UnicodeDecode error we try to return
-    unicode with errors replace
+    safe unicode function. Does few trick to turn str_ into unicode
+     
+    In case of UnicodeDecode error we try to return it with encoding detected
+    by chardet library if it fails fallback to unicode with errors replaced
 
-    :param _str: string to decode
+    :param str_: string to decode
     :rtype: unicode
     :returns: unicode object
     """
+    if isinstance(str_, unicode):
+        return str_
 
-    if isinstance(_str, unicode):
-        return _str
+    try:
+        return unicode(str_)
+    except UnicodeDecodeError:
+        pass
+
+    try:
+        return unicode(str_, from_encoding)
+    except UnicodeDecodeError:
+        pass
+
+    try:
+        import chardet
+        encoding = chardet.detect(str_)['encoding']
+        if encoding is None:
+            raise Exception()
+        return str_.decode(encoding)
+    except (ImportError, UnicodeDecodeError, Exception):
+        return unicode(str_, from_encoding, 'replace')
+
+def safe_str(unicode_, to_encoding='utf8'):
+    """
+    safe str function. Does few trick to turn unicode_ into string
+     
+    In case of UnicodeEncodeError we try to return it with encoding detected
+    by chardet library if it fails fallback to string with errors replaced
+
+    :param unicode_: unicode to encode
+    :rtype: str
+    :returns: str object
+    """
+
+    if isinstance(unicode_, str):
+        return unicode_
 
     try:
-        u_str = unicode(_str, from_encoding)
-    except UnicodeDecodeError:
-        u_str = unicode(_str, from_encoding, 'replace')
+        return unicode_.encode(to_encoding)
+    except UnicodeEncodeError:
+        pass
+    
+    try:
+        import chardet
+        encoding = chardet.detect(unicode_)['encoding']
+        print encoding
+        if encoding is None:
+            raise UnicodeEncodeError()
+        
+        return unicode_.encode(encoding)
+    except (ImportError, UnicodeEncodeError):
+        return unicode_.encode(to_encoding, 'replace')
+
+    return safe_str
+
+
+
+def engine_from_config(configuration, prefix='sqlalchemy.', **kwargs):
+    """
+    Custom engine_from_config functions that makes sure we use NullPool for
+    file based sqlite databases. This prevents errors on sqlite. This only 
+    applies to sqlalchemy versions < 0.7.0
+
+    """
+    import sqlalchemy
+    from sqlalchemy import engine_from_config as efc
+    import logging
+
+    if int(sqlalchemy.__version__.split('.')[1]) < 7:
+
+        # This solution should work for sqlalchemy < 0.7.0, and should use
+        # proxy=TimerProxy() for execution time profiling
+
+        from sqlalchemy.pool import NullPool
+        url = configuration[prefix + 'url']
+
+        if url.startswith('sqlite'):
+            kwargs.update({'poolclass': NullPool})
+        return efc(configuration, prefix, **kwargs)
+    else:
+        import time
+        from sqlalchemy import event
+        from sqlalchemy.engine import Engine
+
+        log = logging.getLogger('sqlalchemy.engine')
+        BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE = xrange(30, 38)
+        engine = efc(configuration, prefix, **kwargs)
+
+        def color_sql(sql):
+            COLOR_SEQ = "\033[1;%dm"
+            COLOR_SQL = YELLOW
+            normal = '\x1b[0m'
+            return ''.join([COLOR_SEQ % COLOR_SQL, sql, normal])
+
+        if configuration['debug']:
+            #attach events only for debug configuration
+
+            def before_cursor_execute(conn, cursor, statement,
+                                    parameters, context, executemany):
+                context._query_start_time = time.time()
+                log.info(color_sql(">>>>> STARTING QUERY >>>>>"))
+
+
+            def after_cursor_execute(conn, cursor, statement,
+                                    parameters, context, executemany):
+                total = time.time() - context._query_start_time
+                log.info(color_sql("<<<<< TOTAL TIME: %f <<<<<" % total))
+
+            event.listen(engine, "before_cursor_execute",
+                         before_cursor_execute)
+            event.listen(engine, "after_cursor_execute",
+                         after_cursor_execute)
+
+    return engine
+
+
+def age(curdate):
+    """
+    turns a datetime into an age string.
+    
+    :param curdate: datetime object
+    :rtype: unicode
+    :returns: unicode words describing age
+    """
+
+    from datetime import datetime
+    from webhelpers.date import time_ago_in_words
 
-    return u_str
+    _ = lambda s:s
+
+    if not curdate:
+        return ''
+
+    agescales = [(_(u"year"), 3600 * 24 * 365),
+                 (_(u"month"), 3600 * 24 * 30),
+                 (_(u"day"), 3600 * 24),
+                 (_(u"hour"), 3600),
+                 (_(u"minute"), 60),
+                 (_(u"second"), 1), ]
+
+    age = datetime.now() - curdate
+    age_seconds = (age.days * agescales[2][1]) + age.seconds
+    pos = 1
+    for scale in agescales:
+        if scale[1] <= age_seconds:
+            if pos == 6:pos = 5
+            return '%s %s' % (time_ago_in_words(curdate,
+                                                agescales[pos][0]), _('ago'))
+        pos += 1
+
+    return _(u'just now')
+
+
+def uri_filter(uri):
+    """
+    Removes user:password from given url string
+    
+    :param uri:
+    :rtype: unicode
+    :returns: filtered list of strings  
+    """
+    if not uri:
+        return ''
+
+    proto = ''
+
+    for pat in ('https://', 'http://'):
+        if uri.startswith(pat):
+            uri = uri[len(pat):]
+            proto = pat
+            break
+
+    # remove passwords and username
+    uri = uri[uri.find('@') + 1:]
+
+    # get the port
+    cred_pos = uri.find(':')
+    if cred_pos == -1:
+        host, port = uri, None
+    else:
+        host, port = uri[:cred_pos], uri[cred_pos + 1:]
+
+    return filter(None, [proto, host, port])
+
+
+def credentials_filter(uri):
+    """
+    Returns a url with removed credentials
+    
+    :param uri:
+    """
+
+    uri = uri_filter(uri)
+    #check if we have port
+    if len(uri) > 2 and uri[2]:
+        uri[2] = ':' + uri[2]
+
+    return ''.join(uri)
+
+def get_changeset_safe(repo, rev):
+    """
+    Safe version of get_changeset if this changeset doesn't exists for a 
+    repo it returns a Dummy one instead
+    
+    :param repo:
+    :param 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 rhodecode.lib.utils import EmptyChangeset
+        cs = EmptyChangeset(requested_revision=rev)
+    return cs
  No newline at end of file

rhodecode/lib/app_globals.py

@@ -2,7 +2,7 b''
 
 from beaker.cache import CacheManager
 from beaker.util import parse_cache_config_options
-from vcs.utils.lazy import LazyProperty
+
 
 class Globals(object):
     """Globals acts as a container for objects available throughout the
@@ -18,14 +18,3 b' class Globals(object):'
         """
         self.cache = CacheManager(**parse_cache_config_options(config))
         self.available_permissions = None   # propagated after init_model
-        self.baseui = None                  # propagated after init_model        
-
-    @LazyProperty
-    def paths(self):
-        if self.baseui:
-            return self.baseui.configitems('paths')
-
-    @LazyProperty
-    def base_path(self):
-        if self.baseui:
-            return self.paths[0][1]