kallithea Changeset - 3563bb7b4b82

Changeset - 3563bb7b4b82

Parent rev.

Child rev.

[Not reviewed]

Merge default

! ! !

Marcin Kuzminski - 13 years ago 2013-04-07 18:37:22
marcin@python-works.com

merge with rc1

43 files changed:

CONTRIBUTORS

README.rst

development.ini

docs/api/api.rst

115

docs/api/models.rst

docs/changelog.rst

179

102

docs/contributing.rst

docs/index.rst

docs/installation.rst

docs/installation_win.rst

docs/setup.rst

docs/theme/nature/layout.html

docs/theme/nature/static/pygments.css

docs/usage/backup.rst

docs/usage/debugging.rst

docs/usage/general.rst

docs/usage/git_support.rst

docs/usage/locking.rst

docs/usage/performance.rst

docs/usage/subrepos.rst

init.d/rhodecode-daemon2

production.ini

requires.txt

rhodecode/__init__.py

rhodecode/bin/ldap_sync.conf

rhodecode/bin/ldap_sync.py

237

rhodecode/bin/rhodecode_api.py

rhodecode/config/deployment.ini_tmpl

rhodecode/config/environment.py

rhodecode/config/middleware.py

rhodecode/config/rcextensions/__init__.py

rhodecode/config/routing.py

rhodecode/controllers/admin/admin.py

rhodecode/controllers/admin/defaults.py

rhodecode/controllers/admin/ldap_settings.py

rhodecode/controllers/admin/notifications.py

rhodecode/controllers/admin/permissions.py

rhodecode/controllers/admin/repos.py

181

rhodecode/controllers/admin/repos_groups.py

136

rhodecode/controllers/admin/settings.py

rhodecode/controllers/admin/users.py

rhodecode/controllers/admin/users_groups.py

rhodecode/controllers/api/api.py

146

Changeset was too big and was cut off... Show full diff anyway

0 comments (0 inline, 0 general)

CONTRIBUTORS

➞

Show inline comments

@@ @@ -30,6 +30,7 @@ List of contributors to RhodeCode projec @@
     Stefan Engel <mail@engel-stefan.de>
     Andrew Shadura <bugzilla@tut.by>
     Raoul Thill <raoul.thill@gmail.com>
     Philip Jameson <philip.j@hostdime.com>
     Mads Kiilerich <madski@unity3d.com>
     Dan Sheridan <djs@adelard.com>
     Dennis Brakhane <brakhane@googlemail.com>

README.rst

➞

Show inline comments

@@ @@ -72,13 +72,13 @@ RhodeCode Features @@
   Each request is authenticated and logged together with IP address.
 - Build for speed and performance. You can make multiple pulls/pushes simultaneous.
   Proven to work with 1000s of repositories and users
 - Supports http/https, LDAP, AD, proxy-pass authentication.
 - Full permissions (private/read/write/admin) together with IP restrictions for each repository,
   additional explicit forking and repository creation permissions.
-- Users groups for easier permission management
+- User groups for easier permission management
 - Repository groups let you group repos and manage them easier.
 - Users can fork other users repos, and compare them at any time.
 - Integrates easily with other systems, with custom created mappers you can connect it to almost
   any issue tracker, and with an JSON-RPC API you can make much more
 - Build in commit-api let's you add, edit and commit files right from RhodeCode
   web interface using simple editor or upload binary files using simple form.

development.ini

➞

Show inline comments

@@ @@ -22,78 +22,114 @@ pdebug = false @@
 #smtp_server = mail.server.com
 #smtp_username =
 #smtp_password =
 #smtp_port =
 #smtp_use_tls = false
 #smtp_use_ssl = true
 # Specify available auth parameters here (e.g. LOGIN PLAIN CRAM-MD5, etc.)
+## Specify available auth parameters here (e.g. LOGIN PLAIN CRAM-MD5, etc.)
 #smtp_auth =
 [server:main]
 ## PASTE
 ##nr of threads to spawn
+## nr of threads to spawn
 #threadpool_workers = 5
 ##max request before thread respawn
+## max request before thread respawn
 #threadpool_max_requests = 10
 ##option to use threads of process
+## option to use threads of process
 #use_threadpool = true
 #use = egg:Paste#http
 #WAITRESS
+## WAITRESS
 threads = 5
 ## 100GB
 max_request_body_size = 107374182400
 use = egg:waitress#main
 host = 0.0.0.0
 port = 5000
 [filter:proxy-prefix]
 # prefix middleware for rc
 use = egg:PasteDeploy#prefix
 prefix = /<your-prefix>
 ## prefix middleware for rc
 #[filter:proxy-prefix]
 #use = egg:PasteDeploy#prefix
 #prefix = /<your-prefix>
 [app:main]
 use = egg:rhodecode
 ## enable proxy prefix middleware
 #filter-with = proxy-prefix
 full_stack = true
 static_files = true
 # Optional Languages
 # en, fr, ja, pt_BR, zh_CN, zh_TW, pl
 ## Optional Languages
 ## en, fr, ja, pt_BR, zh_CN, zh_TW, pl
 lang = en
 cache_dir = %(here)s/data
 index_dir = %(here)s/data/index
 app_instance_uuid = rc-develop
 ## uncomment and set this path to use archive download cache
 #archive_cache_dir = /tmp/tarballcache
 ## change this to unique ID for security
 app_instance_uuid = rc-production
 ## cut off limit for large diffs (size in bytes)
 cut_off_limit = 256000
 vcs_full_cache = True
 ## use cache version of scm repo everywhere
 vcs_full_cache = true
 ## force https in RhodeCode, fixes https redirects, assumes it's always https
 force_https = false
 ## use Strict-Transport-Security headers
 use_htsts = false
 ## number of commits stats will parse on each iteration
 commit_parse_limit = 25
 # number of items displayed in lightweight dashboard before paginating
 ## number of items displayed in lightweight dashboard before paginating is shown
 dashboard_items = 100
 ## use gravatar service to display avatars
 use_gravatar = true
 ## path to git executable
 git_path = git
 ## git rev filter option, --all is the default filter, if you need to
 ## hide all refs in changelog switch this to --branches --tags
 git_rev_filter=--all
 ## RSS feed options
 rss_cut_off_limit = 256000
 rss_items_per_page = 10
 rss_include_diff = false
 ## options for showing and identifying changesets
 show_sha_length = 12
 show_revision_number = true
 ## alternative_gravatar_url allows you to use your own avatar server application
 ## the following parts of the URL will be replaced
 ## {email}        user email
 ## {md5email}     md5 hash of the user email (like at gravatar.com)
 ## {size}         size of the image that is expected from the server application
 ## {scheme}       http/https from RhodeCode server
 ## {netloc}       network location from RhodeCode server
 #alternative_gravatar_url = http://myavatarserver.com/getbyemail/{email}/{size}
 #alternative_gravatar_url = http://myavatarserver.com/getbymd5/{md5email}?s={size}
 ## container auth options
 container_auth_enabled = false
 proxypass_auth_enabled = false
 ## default encoding used to convert from and to unicode
 ## can be also a comma seperated list of encoding in case of mixed encodings
 default_encoding = utf8
 ## overwrite schema of clone url
 ## available vars:
@@ @@ -143,12 +179,17 @@ instance_id = @@
 ## alternative return HTTP header for failed authentication. Default HTTP
 ## response is 401 HTTPUnauthorized. Currently HG clients have troubles with
 ## handling that. Set this variable to 403 to return HTTPForbidden
 auth_ret_code =
 ## locking return code. When repository is locked return this HTTP code. 2XX
 ## codes don't break the transactions while 4XX codes do
 lock_ret_code = 423
 ####################################
 ###        CELERY CONFIG        ####
 ####################################
 use_celery = false
 broker.host = localhost
 broker.vhost = rabbitmqhost
@@ @@ -167,13 +208,13 @@ celery.result.serialier = json @@
 celeryd.concurrency = 2
 #celeryd.log.file = celeryd.log
 celeryd.log.level = debug
 celeryd.max.tasks.per.child = 1
 #tasks will never be sent to the queue, but executed locally instead.
+## tasks will never be sent to the queue, but executed locally instead.
 celery.always.eager = false
 ####################################
 ###         BEAKER CACHE        ####
 ####################################
 beaker.cache.data_dir=%(here)s/data/cache/data
@@ @@ -223,24 +264,25 @@ beaker.cache.sql_cache_long.key_length = @@
 ## file based cookies (default) ##
 #beaker.session.type = file
 beaker.session.key = rhodecode
 ## secure cookie requires AES python libraries ##
 #beaker.session.encrypt_key = g654dcno0-9873jhgfreyu
 #beaker.session.validate_key = 9712sds2212c--zxc123
 ## secure cookie requires AES python libraries
 #beaker.session.encrypt_key = <key_for_encryption>
 #beaker.session.validate_key = <validation_key>
 ## sets session as invalid if it haven't been accessed for given amount of time
 beaker.session.timeout = 2592000
 beaker.session.httponly = true
 #beaker.session.cookie_path = /<your-prefix>
-## uncomment for https secure cookie ##
 ## uncomment for https secure cookie
 beaker.session.secure = false
-## auto save the session to not to use .save() ##
 ## auto save the session to not to use .save()
 beaker.session.auto = False
 ## default cookie expiration time in seconds `true` expire at browser close ##
 #beaker.session.cookie_expires = 3600
@@ @@ -249,72 +291,72 @@ beaker.session.auto = False @@
 ############################
 ####################
 ### [errormator] ###
 ####################
 # Errormator is tailored to work with RhodeCode, see
 # http://errormator.com for details how to obtain an account
 # you must install python package `errormator_client` to make it work
 ## Errormator is tailored to work with RhodeCode, see
 ## http://errormator.com for details how to obtain an account
 ## you must install python package `errormator_client` to make it work
 # errormator enabled
 errormator = true
 ## errormator enabled
 errormator = false
 errormator.server_url = https://api.errormator.com
 errormator.api_key = YOUR_API_KEY
 # TWEAK AMOUNT OF INFO SENT HERE
+## TWEAK AMOUNT OF INFO SENT HERE
 # enables 404 error logging (default False)
+## enables 404 error logging (default False)
 errormator.report_404 = false
 # time in seconds after request is considered being slow (default 1)
+## time in seconds after request is considered being slow (default 1)
 errormator.slow_request_time = 1
 # record slow requests in application
 # (needs to be enabled for slow datastore recording and time tracking)
 ## record slow requests in application
 ## (needs to be enabled for slow datastore recording and time tracking)
 errormator.slow_requests = true
 # enable hooking to application loggers
+## enable hooking to application loggers
 # errormator.logging = true
 # minimum log level for log capture
+## minimum log level for log capture
 # errormator.logging.level = WARNING
 # send logs only from erroneous/slow requests
 # (saves API quota for intensive logging)
 ## send logs only from erroneous/slow requests
 ## (saves API quota for intensive logging)
 errormator.logging_on_error = false
 # list of additonal keywords that should be grabbed from environ object
 # can be string with comma separated list of words in lowercase
 # (by default client will always send following info:
 # 'REMOTE_USER', 'REMOTE_ADDR', 'SERVER_NAME', 'CONTENT_TYPE' + all keys that
 # start with HTTP* this list be extended with additional keywords here
 ## list of additonal keywords that should be grabbed from environ object
 ## can be string with comma separated list of words in lowercase
 ## (by default client will always send following info:
 ## 'REMOTE_USER', 'REMOTE_ADDR', 'SERVER_NAME', 'CONTENT_TYPE' + all keys that
 ## start with HTTP* this list be extended with additional keywords here
 errormator.environ_keys_whitelist =
 # list of keywords that should be blanked from request object
 # can be string with comma separated list of words in lowercase
 # (by default client will always blank keys that contain following words
 # 'password', 'passwd', 'pwd', 'auth_tkt', 'secret', 'csrf'
 # this list be extended with additional keywords set here
 ## list of keywords that should be blanked from request object
 ## can be string with comma separated list of words in lowercase
 ## (by default client will always blank keys that contain following words
 ## 'password', 'passwd', 'pwd', 'auth_tkt', 'secret', 'csrf'
 ## this list be extended with additional keywords set here
 errormator.request_keys_blacklist =
 # list of namespaces that should be ignores when gathering log entries
 # can be string with comma separated list of namespaces
 # (by default the client ignores own entries: errormator_client.client)
 ## list of namespaces that should be ignores when gathering log entries
 ## can be string with comma separated list of namespaces
 ## (by default the client ignores own entries: errormator_client.client)
 errormator.log_namespace_blacklist =
 ################
 ### [sentry] ###
 ################
 # sentry is a alternative open source error aggregator
 # you must install python packages `sentry` and `raven` to enable
 ## sentry is a alternative open source error aggregator
 ## you must install python packages `sentry` and `raven` to enable
 sentry.dsn = YOUR_DNS
 sentry.servers =
 sentry.name =
 sentry.key =
 sentry.public_key =
@@ @@ -368,13 +410,13 @@ level = NOTSET @@
 handlers = console
 [logger_routes]
 level = DEBUG
 handlers =
 qualname = routes.middleware
 # "level = DEBUG" logs the route matched and routing variables.
+## "level = DEBUG" logs the route matched and routing variables.
 propagate = 1
 [logger_beaker]
 level = DEBUG
 handlers =
 qualname = beaker.container

docs/api/api.rst

➞

Show inline comments

@@ @@ -10,26 +10,26 @@ There's a single schema for calling all @@
 with JSON protocol both ways. An url to send API request to RhodeCode is
 <your_server>/_admin/api
 API ACCESS FOR WEB VIEWS
 ++++++++++++++++++++++++
 API access can also be turned on for each web view in RhodeCode that is
 decorated with `@LoginRequired` decorator. To enable API access simple change
 the standard login decorator to `@LoginRequired(api_access=True)`.
 After this change, a rhodecode view can be accessed without login by adding a
 API access can also be turned on for each web view in RhodeCode that is
 decorated with `@LoginRequired` decorator. To enable API access simple change
 the standard login decorator to `@LoginRequired(api_access=True)`.
 After this change, a rhodecode view can be accessed without login by adding a
 GET parameter `?api_key=<api_key>` to url. By default this is only
 enabled on RSS/ATOM feed views.
 API ACCESS
 ++++++++++
 All clients are required to send JSON-RPC spec JSON data::
+    {
+    {
         "id:"<id>",
         "api_key":"<api_key>",
         "method":"<method_name>",
         "args":{"<arg_key>":"<arg_val>"}
+    }
@@ @@ -46,13 +46,13 @@ Simply provide @@
     api_key can be found in your user account page
 RhodeCode API will return always a JSON-RPC response::
+    {
+    {
         "id":<id>, # matching id sent by request
         "result": "<result>"|null, # JSON formatted result, null if any errors
         "error": "null"|<error_message> # JSON formatted error (if any)
+    }
 All responses from API will be `HTTP/1.0 200 OK`, if there's an error while
@@ @@ -67,34 +67,34 @@ From version 1.4 RhodeCode adds a script @@
 communicate with API. After installing RhodeCode a `rhodecode-api` script
 will be available.
 To get started quickly simply run::
   rhodecode-api _create_config --apikey=<youapikey> --apihost=<rhodecode host>
 This will create a file named .config in the directory you executed it storing
 json config file with credentials. You can skip this step and always provide
 both of the arguments to be able to communicate with server
 after that simply run any api command for example get_repo::
  rhodecode-api get_repo
  calling {"api_key": "<apikey>", "id": 75, "args": {}, "method": "get_repo"} to http://127.0.0.1:5000
  rhodecode said:
  {'error': 'Missing non optional `repoid` arg in JSON DATA',
   'id': 75,
   'result': None}
 Ups looks like we forgot to add an argument
 Let's try again now giving the repoid as parameters::
     rhodecode-api get_repo repoid:rhodecode
     rhodecode-api get_repo repoid:rhodecode
     calling {"api_key": "<apikey>", "id": 39, "args": {"repoid": "rhodecode"}, "method": "get_repo"} to http://127.0.0.1:5000
     rhodecode said:
     {'error': None,
      'id': 39,
      'result': <json data...>}
@@ @@ -129,13 +129,13 @@ OUTPUT:: @@
 rescan_repos
 ------------
 Dispatch rescan repositories action. If remove_obsolete is set
 RhodeCode will delete repos that are in database but not in the filesystem.
-This command can be executed only using api_key belonging to user with admin
 This command can be executed only using api_key belonging to user with admin
 rights.
 INPUT::
     id : <id_for_response>
     api_key : "<api_key>"
@@ @@ -144,34 +144,57 @@ INPUT:: @@
                 "remove_obsolete" : "<boolean = Optional(False)>"
+              }
 OUTPUT::
     id : <id_given_in_input>
-    result : "{'added': [<list of names of added repos>],
     result : "{'added': [<list of names of added repos>],
                'removed': [<list of names of removed repos>]}"
     error :  null
 invalidate_cache
 ----------------
 Invalidate cache for repository.
 This command can be executed only using api_key belonging to user with admin
 rights or regular user that have write or admin or write access to repository.
 INPUT::
     id : <id_for_response>
     api_key : "<api_key>"
     method :  "invalidate_cache"
     args :    {
                 "repoid" : "<reponame or repo_id>"
+              }
 OUTPUT::
     id : <id_given_in_input>
     result : "Cache for repository `<reponame>` was invalidated: invalidated cache keys: <list_of_cache_keys>"
     error :  null
 lock
 ----
 Set locking state on given repository by given user. If userid param is skipped
 , then it is set to id of user whos calling this method.
 This command can be executed only using api_key belonging to user with admin
 , then it is set to id of user whos calling this method. If locked param is skipped
 then function shows current lock state of given repo.
 This command can be executed only using api_key belonging to user with admin
 rights or regular user that have admin or write access to repository.
 INPUT::
     id : <id_for_response>
     api_key : "<api_key>"
     method :  "lock"
     args :    {
                 "repoid" : "<reponame or repo_id>"
                 "userid" : "<user_id or username = Optional(=apiuser)>",
                 "locked" : "<bool true|false>"
+                "locked" : "<bool true|false = Optional(=None)>"
+              }
 OUTPUT::
     id : <id_given_in_input>
     result : "User `<username>` set lock state for repo `<reponame>` to `true|false`"
@@ @@ -180,13 +203,13 @@ OUTPUT:: @@
 show_ip
 -------
 Shows IP address as seen from RhodeCode server, together with all
 defined IP addresses for given user.
-This command can be executed only using api_key belonging to user with admin
 This command can be executed only using api_key belonging to user with admin
 rights.
 INPUT::
     id : <id_for_response>
     api_key : "<api_key>"
@@ @@ -205,40 +228,41 @@ OUTPUT:: @@
                                    "ip_addr": "<ip_with_mask>",
                                    "ip_range": ["<start_ip>", "<end_ip>"],
                                 },
                                 ...
+                             ]
+             }
     error :  null
 get_user
 --------
 Get's an user by username or user_id, Returns empty result if user is not found.
 If userid param is skipped it is set to id of user who is calling this method.
-This command can be executed only using api_key belonging to user with admin
 This command can be executed only using api_key belonging to user with admin
 rights, or regular users that cannot specify different userid than theirs
 INPUT::
     id : <id_for_response>
     api_key : "<api_key>"
     method :  "get_user"
-    args :    {
     args :    {
                 "userid" : "<username or user_id Optional(=apiuser)>"
+              }
 OUTPUT::
     id : <id_given_in_input>
-    result: None if user does not exist or
     result: None if user does not exist or
+            {
                 "user_id" :     "<user_id>",
                 "api_key" :     "<api_key>",
                 "username" :    "<username>",
                 "firstname":    "<firstname>",
                 "lastname" :    "<lastname>",
                 "email" :       "<email>",
                 "emails":       "<list_of_all_additional_emails>",
                 "ip_addresses": "<list_of_ip_addresses_for_user>",
@@ @@ -286,21 +310,21 @@ OUTPUT:: @@
                 "ip_addresses": "<list_of_ip_addresses_for_user>",
                 "active" :      "<bool>",
                 "admin" :       "<bool>",
                 "ldap_dn" :     "<ldap_dn>",
                 "last_login":   "<last_login>",
               },
-    	      …
+              …
+            ]
     error:  null
 create_user
 -----------
-Creates new user. This command can
 Creates new user. This command can
 be executed only using api_key belonging to user with admin rights.
 INPUT::
     id : <id_for_response>
@@ @@ -338,13 +362,13 @@ OUTPUT:: @@
     error:  null
 update_user
 -----------
-updates given user if such user exists. This command can
 updates given user if such user exists. This command can
 be executed only using api_key belonging to user with admin rights.
 INPUT::
     id : <id_for_response>
@@ @@ -375,22 +399,22 @@ OUTPUT:: @@
                 "email" :    "<email>",
                 "emails":    "<list_of_all_additional_emails>",
                 "active" :   "<bool>",
                 "admin" :    "<bool>",
                 "ldap_dn" :  "<ldap_dn>",
                 "last_login": "<last_login>",
-              },
               },
+            }
     error:  null
 delete_user
 -----------
-deletes givenuser if such user exists. This command can
 deletes givenuser if such user exists. This command can
 be executed only using api_key belonging to user with admin rights.
 INPUT::
     id : <id_for_response>
@@ @@ -410,35 +434,35 @@ OUTPUT:: @@
     error:  null
 get_users_group
 ---------------
-Gets an existing users group. This command can be executed only using api_key
+Gets an existing user group. This command can be executed only using api_key
 belonging to user with admin rights.
 INPUT::
     id : <id_for_response>
     api_key : "<api_key>"
     method :  "get_users_group"
     args :    {
-                "usersgroupid" : "<users group id or name>"
+                "usersgroupid" : "<user group id or name>"
+              }
 OUTPUT::
     id : <id_given_in_input>
     result : None if group not exist
+             {
                "users_group_id" : "<id>",
                "group_name" :     "<groupname>",
                "active":          "<bool>",
                "members" :  [
+                              {
+                              {
                                 "user_id" :  "<user_id>",
                                 "username" : "<username>",
                                 "firstname": "<firstname>",
                                 "lastname" : "<lastname>",
                                 "email" :    "<email>",
                                 "emails":    "<list_of_all_additional_emails>",
@@ @@ -453,13 +477,13 @@ OUTPUT:: @@
     error : null
 get_users_groups
 ----------------
-Lists all existing users groups. This command can be executed only using
+Lists all existing user groups. This command can be executed only using
 api_key belonging to user with admin rights.
 INPUT::
     id : <id_for_response>
@@ @@ -481,13 +505,13 @@ OUTPUT:: @@
     error : null
 create_users_group
 ------------------
-Creates new users group. This command can be executed only using api_key
+Creates new user group. This command can be executed only using api_key
 belonging to user with admin rights
 INPUT::
     id : <id_for_response>
@@ @@ -499,86 +523,86 @@ INPUT:: @@
+              }
 OUTPUT::
     id : <id_given_in_input>
     result: {
-              "msg": "created new users group `<groupname>`",
+              "msg": "created new user group `<groupname>`",
               "users_group": {
                      "users_group_id" : "<id>",
                      "group_name" :     "<groupname>",
                      "active":          "<bool>",
                },
+            }
     error:  null
 add_user_to_users_group
 -----------------------
-Adds a user to a users group. If user exists in that group success will be
+Adds a user to a user group. If user exists in that group success will be
 `false`. This command can be executed only using api_key
 belonging to user with admin rights
 INPUT::
     id : <id_for_response>
     api_key : "<api_key>"
     method :  "add_user_users_group"
     args:     {
-                "usersgroupid" : "<users group id or name>",
+                "usersgroupid" : "<user group id or name>",
                 "userid" : "<user_id or username>",
+              }
 OUTPUT::
     id : <id_given_in_input>
     result: {
               "success": True|False # depends on if member is in group
-              "msg": "added member `<username>` to users group `<groupname>` |
+              "msg": "added member `<username>` to user group `<groupname>` |
                       User is already in that group"
+            }
     error:  null
 remove_user_from_users_group
 ----------------------------
 Removes a user from a users group. If user is not in given group success will
 be `false`. This command can be executed only
 Removes a user from a user group. If user is not in given group success will
 be `false`. This command can be executed only
 using api_key belonging to user with admin rights
 INPUT::
     id : <id_for_response>
     api_key : "<api_key>"
     method :  "remove_user_from_users_group"
     args:     {
-                "usersgroupid" : "<users group id or name>",
+                "usersgroupid" : "<user group id or name>",
                 "userid" : "<user_id or username>",
+              }
 OUTPUT::
     id : <id_given_in_input>
     result: {
               "success":  True|False,  # depends on if member is in group
-              "msg": "removed member <username> from users group <groupname> |
+              "msg": "removed member <username> from user group <groupname> |
                       User wasn't in group"
+            }
     error:  null
 get_repo
 --------
 Gets an existing repository by it's name or repository_id. Members will return
 either users_group or user associated to that repository. This command can be
 executed only using api_key belonging to user with admin
 either users_group or user associated to that repository. This command can be
 executed only using api_key belonging to user with admin
 rights or regular user that have at least read access to repository.
 INPUT::
     id : <id_for_response>
@@ @@ -596,15 +620,15 @@ OUTPUT:: @@
                 "repo_id" :          "<repo_id>",
                 "repo_name" :        "<reponame>"
                 "repo_type" :        "<repo_type>",
                 "clone_uri" :        "<clone_uri>",
                 "enable_downloads":  "<bool>",
                 "enable_locking":    "<bool>",
-                "enable_statistics": "<bool>",
                 "enable_statistics": "<bool>",
                 "private":           "<bool>",
-                "created_on" :       "<date_time_created>",
                 "created_on" :       "<date_time_created>",
                 "description" :      "<description>",
                 "landing_rev":       "<landing_rev>",
                 "last_changeset":    {
                                        "author":   "<full_author>",
                                        "date":     "<date_time_of_commit>",
                                        "message":  "<commit_message>",
@@ @@ -612,14 +636,14 @@ OUTPUT:: @@
                                        "revision": "<numeric_revision>",
                                        "short_id": "<short_id>"
+                                     }
                 "owner":             "<repo_owner>",
                 "fork_of":           "<name_of_fork_parent>",
                 "members" :     [
+                                  {
                                     "type": "user",
+                                  {
                                     "type":        "user",
                                     "user_id" :    "<user_id>",
                                     "username" :   "<username>",
                                     "firstname":   "<firstname>",
                                     "lastname" :   "<lastname>",
                                     "email" :      "<email>",
                                     "emails":      "<list_of_all_additional_emails>",
@@ @@ -627,30 +651,46 @@ OUTPUT:: @@
                                     "admin" :      "<bool>",
                                     "ldap_dn" :    "<ldap_dn>",
                                     "last_login":  "<last_login>",
                                     "permission" : "repository.(read|write|admin)"
                                   },
                                   …
+                                  {
                                     "type": "users_group",
+                                  {
                                     "type":      "users_group",
                                     "id" :       "<usersgroupid>",
                                     "name" :     "<usersgroupname>",
                                     "active":    "<bool>",
                                     "permission" : "repository.(read|write|admin)"
                                   },
                                   …
+                                ]
                  "followers":   [
+                                  {
                                     "user_id" :     "<user_id>",
                                     "username" :    "<username>",
                                     "firstname":    "<firstname>",
                                     "lastname" :    "<lastname>",
                                     "email" :       "<email>",
                                     "emails":       "<list_of_all_additional_emails>",
                                     "ip_addresses": "<list_of_ip_addresses_for_user>",
                                     "active" :      "<bool>",
                                     "admin" :       "<bool>",
                                     "ldap_dn" :     "<ldap_dn>",
                                     "last_login":   "<last_login>",
                                   },
                                   …
+                 ]
+            }
     error:  null
 get_repos
 ---------
 Lists all existing repositories. This command can be executed only using
 api_key belonging to user with admin rights or regular user that have
 Lists all existing repositories. This command can be executed only using
 api_key belonging to user with admin rights or regular user that have
 admin, write or read access to repository.
 INPUT::
     id : <id_for_response>
@@ @@ -665,32 +705,32 @@ OUTPUT:: @@
+              {
                 "repo_id" :          "<repo_id>",
                 "repo_name" :        "<reponame>"
                 "repo_type" :        "<repo_type>",
                 "clone_uri" :        "<clone_uri>",
                 "private": :         "<bool>",
-                "created_on" :       "<datetimecreated>",
                 "created_on" :       "<datetimecreated>",
                 "description" :      "<description>",
                 "landing_rev":       "<landing_rev>",
                 "owner":             "<repo_owner>",
                 "fork_of":           "<name_of_fork_parent>",
                 "enable_downloads":  "<bool>",
                 "enable_locking":    "<bool>",
-                "enable_statistics": "<bool>",
                 "enable_statistics": "<bool>",
               },
               …
+            ]
     error:  null
 get_repo_nodes
 --------------
 returns a list of nodes and it's children in a flat list for a given path
 at given revision. It's possible to specify ret_type to show only `files` or
 `dirs`. This command can be executed only using api_key belonging to user
 returns a list of nodes and it's children in a flat list for a given path
 at given revision. It's possible to specify ret_type to show only `files` or
 `dirs`. This command can be executed only using api_key belonging to user
 with admin rights
 INPUT::
     id : <id_for_response>
@@ @@ -717,15 +757,15 @@ OUTPUT:: @@
 create_repo
 -----------
 Creates a repository. If repository name contains "/", all needed repository
 groups will be created. For example "foo/bar/baz" will create groups
 "foo", "bar" (with "foo" as parent), and create "baz" repository with
 "bar" as group. This command can be executed only using api_key belonging to user with admin
 groups will be created. For example "foo/bar/baz" will create groups
 "foo", "bar" (with "foo" as parent), and create "baz" repository with
 "bar" as group. This command can be executed only using api_key belonging to user with admin
 rights or regular user that have create repository permission. Regular users
 cannot specify owner parameter
 INPUT::
@@ @@ -753,20 +793,20 @@ OUTPUT:: @@
               "repo": {
                 "repo_id" :          "<repo_id>",
                 "repo_name" :        "<reponame>"
                 "repo_type" :        "<repo_type>",
                 "clone_uri" :        "<clone_uri>",
                 "private": :         "<bool>",
-                "created_on" :       "<datetimecreated>",
                 "created_on" :       "<datetimecreated>",
                 "description" :      "<description>",
                 "landing_rev":       "<landing_rev>",
                 "owner":             "<username or user_id>",
                 "fork_of":           "<name_of_fork_parent>",
                 "enable_downloads":  "<bool>",
                 "enable_locking":    "<bool>",
-                "enable_statistics": "<bool>",
                 "enable_statistics": "<bool>",
               },
+            }
     error:  null
 fork_repo
@@ @@ -789,13 +829,13 @@ INPUT:: @@
                 "fork_name":        "<forkname>",
                 "owner":            "<username or user_id = Optional(=apiuser)>",
                 "description":      "<description>",
                 "copy_permissions": "<bool>",
                 "private":          "<bool>",
                 "landing_rev":      "<landing_rev>"
+              }
 OUTPUT::
     id : <id_given_in_input>
     result: {
@@ @@ -805,23 +845,26 @@ OUTPUT:: @@
     error:  null
 delete_repo
 -----------
 Deletes a repository. This command can be executed only using api_key belonging to user with admin
 rights or regular user that have admin access to repository.
 Deletes a repository. This command can be executed only using api_key belonging
 to user with admin rights or regular user that have admin access to repository.
 When `forks` param is set it's possible to detach or delete forks of deleting
 repository
 INPUT::
     id : <id_for_response>
     api_key : "<api_key>"
     method :  "delete_repo"
     args:     {
                 "repoid" : "<reponame or repo_id>"
                 "repoid" : "<reponame or repo_id>",
                 "forks"  : "`delete` or `detach` = Optional(None)"
+              }
 OUTPUT::
     id : <id_given_in_input>
     result: {
@@ @@ -832,13 +875,13 @@ OUTPUT:: @@
 grant_user_permission
 ---------------------
 Grant permission for user on given repository, or update existing one
-if found. This command can be executed only using api_key belonging to user
 if found. This command can be executed only using api_key belonging to user
 with admin rights.
 INPUT::
     id : <id_for_response>
@@ @@ -860,13 +903,13 @@ OUTPUT:: @@
     error:  null
 revoke_user_permission
 ----------------------
-Revoke permission for user on given repository. This command can be executed
 Revoke permission for user on given repository. This command can be executed
 only using api_key belonging to user with admin rights.
 INPUT::
     id : <id_for_response>
@@ @@ -887,56 +930,56 @@ OUTPUT:: @@
     error:  null
 grant_users_group_permission
 ----------------------------
 Grant permission for users group on given repository, or update
 existing one if found. This command can be executed only using
 Grant permission for user group on given repository, or update
 existing one if found. This command can be executed only using
 api_key belonging to user with admin rights.
 INPUT::
     id : <id_for_response>
     api_key : "<api_key>"
     method :  "grant_users_group_permission"
     args:     {
                 "repoid" : "<reponame or repo_id>"
-                "usersgroupid" : "<users group id or name>"
+                "usersgroupid" : "<user group id or name>"
                 "perm" : "(repository.(none|read|write|admin))",
+              }
 OUTPUT::
     id : <id_given_in_input>
     result: {
               "msg" : "Granted perm: `<perm>` for group: `<usersgroupname>` in repo: `<reponame>`",
               "success": true
+            }
     error:  null
 revoke_users_group_permission
 -----------------------------
-Revoke permission for users group on given repository.This command can be
+Revoke permission for user group on given repository.This command can be
 executed only using api_key belonging to user with admin rights.
 INPUT::
     id : <id_for_response>
     api_key : "<api_key>"
     method  : "revoke_users_group_permission"
     args:     {
                 "repoid" : "<reponame or repo_id>"
-                "usersgroupid" : "<users group id or name>"
+                "usersgroupid" : "<user group id or name>"
+              }
 OUTPUT::
     id : <id_given_in_input>
     result: {
               "msg" : "Revoked perm for group: `<usersgroupname>` in repo: `<reponame>`",
               "success": true
+            }
     error:  null
@@ \ No newline at end of file @@
     error:  null

docs/api/models.rst

➞

Show inline comments

@@ @@ -3,33 +3,33 @@ @@
 ========================
 The :mod:`models` Module
 ========================
 .. automodule:: rhodecode.model
    :members:
 .. automodule:: rhodecode.model.comment
    :members:
 .. automodule:: rhodecode.model.notification
-   :members:
    :members:
 .. automodule:: rhodecode.model.permission
    :members:
 .. automodule:: rhodecode.model.repo_permission
-   :members:
    :members:
 .. automodule:: rhodecode.model.repo
-   :members:
    :members:
 .. automodule:: rhodecode.model.repos_group
    :members:
 .. automodule:: rhodecode.model.scm
    :members:
 .. automodule:: rhodecode.model.user
    :members:
    :members:
 .. automodule:: rhodecode.model.users_group
    :members:
@@ \ No newline at end of file @@
    :members:

docs/changelog.rst

➞

Show inline comments

 .. _changelog:
 =========
 Changelog
 =========
 .6.0rc1 (**2013-04-07**)
 -------------------------
 news
 ++++
  - Redesign UI, with lots of small improvements.
  - Group management delegation. Group admin can manage a group, and repos
    under it, admin can create child groups inside group he manages.
  - Repository extra fields. Optional unlimited extra fields can be defined for
    each repository to store custom data.
  - API get_repo call includes repo followers now.
  - Large amounts of improvements in pull requests.
  - #734 repo switcher is available in all pages.
  - #733 API invalidate_cache function.
  - Added option to turn on HSTS headers when using SSL.
  - #83 show repo size on summary page.
  - #745 added show full diff link into to big diff message.
  - Deprecated RSS links - ATOM is the present and the future.
  - Add option to define custom lexers for custom extensions for code highlight
    in rcextension module.
  - Git executable is now configurable via .ini files.
  - #689 repositories now has optional detach/delete option for connected forks.
  - Obfuscate password when cloning a remote repo with credentials.
  - #788 tarball cache. zip or compressed tarballs can be optionally cached for
    faster serving.
  - Speed up of last_changeset extraction in VCS.
  - API get_locks function.
  - Configurable HTTP codes for repository locking.
  - Possible to use closed branches in ?branch= in changelog.
  - Linaro's ldap sync scripts.
  - #797 git refs filter is now configurable via .ini file.
  - New ishell paster command for easier administrative tasks.
 fixes
 +++++
  - #654 switch to handles `/` in branch/tag/bookmark names.
  - #572 moved out password reset tasks from celery.
  - #730 filter out repo groups choices to only ones that you have write+ access.
  - #462 disable file editing when not on branch head.
  - #731 update-repoinfo sometimes failed to update data when changesets were
    initial commits.
  - #749,#805 and #516 Removed duplication of repo settings for rhodecode admins
    and repo admins.
  - Global permission update with "overwrite existing settings" shouldn't
    override private repositories.
  - #642 added recursion limit for stats gathering.
  - #739 Delete/Edit repositories should only point to admin links if the user
    is an super admin.
  - Fixed escaping of html in "patch" view for GIT repos.
  - #747 load changeset cache after forking to refresh lightweight dashboard caches.
  - Quick repo list: public/private icon control should only control icons,
    not repo visibility.
  - #746 UnicodeDedode errors on feed controllers.
  - #756 cleanup repos didn't properly compose paths of repos to be cleaned up.
  - #763 gravatar helper function should fallback into default image if somehow
    email provided is empty.
  - Fixes #762, LDAP and container created users are now activated based on
    the registration settings in permissions.
  - Cleanup would recurse into every leaf and could thus not be used on lots of
    large repositories.
  - Better detection of deleting groups with subgroups inside.
  - Fixed issue with renaming repos group together with changing parents with
    multiple nested trees.
  - #594 web interface file committing executes push hooks.
  - Disallow cloning from different URI's that http[s]/svn/git/hg.
  - Handling of RhodeCode extra params in consistent way.
  - Don't normalize path if it's empty on adding a file through web interface.
  - #808 missing changesets and files should return 404 not redirect
  - #809 added url quote in clone url.
  - Fixed issues with importing non-ascii repo names.
  - Automatically assign instance_id for host and process if it has been set to *
  - Fixed multiple IP addresses in each of extracted IP.
  - Lot of other small bug fixes and improvements.
 .5.4 (**2013-03-13**)
 ----------------------
 news
 ++++
@@ @@ -17,14 +93,14 @@ fixes @@
 - fixed webtest dependency issues
 - fixed issues with celery tasks for password reset
 - fixed #763 gravatar helper function should fallback into default image
   if email is empty
 - fixes #762 user global activation flag is also respected for LDAP created
   accounts
 - use password obfuscate when clonning a remote repo with credentials inside
 - fixed issue with renaming repos group together with changing parents
 - use password obfuscate when clonning a remote repo with credentials inside
 - fixed issue with renaming repository group together with changing parents
 - disallow cloning from file:/// URIs
 - handle all cases with multiple IP addresses in proxy headers
 .5.3 (**2013-02-12**)
 ----------------------
@@ @@ -81,23 +157,24 @@ fixes @@
 .5.1 (**2012-12-13**)
 ----------------------
 news
 ++++
-- implements #677: Don't allow to close pull requests when they are
 - implements #677: Don't allow to close pull requests when they are
   under-review status
 - implemented #670 Implementation of Roles in Pull Request
 fixes
 +++++
 - default permissions can get duplicated after migration
 - fixed changeset status labels, they now select radio buttons
 - #682 translation difficult for multi-line text
 - #683 fixed difference between messages about not mapped repositories
 - email: fail nicely when no SMTP server has been configured
 .5.0 (**2012-12-12**)
 ----------------------
 news
 ++++
@@ @@ -117,13 +194,13 @@ news @@
   pages. This can significantly improve speed of rendering the page
 - implements #632,added branch/tag/bookmarks info into feeds
   added changeset link to body of message
 - implemented #638 permissions overview to groups
 - implements #636, lazy loading of history and authors to speed up source
   pages rendering
-- implemented #647, option to pass list of default encoding used to
 - implemented #647, option to pass list of default encoding used to
   encode to/decode from unicode
 - added caching layer into RSS/ATOM feeds.
 - basic implementation of cherry picking changesets for pull request, ref #575
 - implemented #661 Add option to include diff in RSS feed
 - implemented file history page for showing detailed changelog for a given file
 - implemented #663 Admin/permission: specify default repogroup perms
@@ @@ -140,23 +217,23 @@ fixes @@
 - #589 search urlgenerator didn't properly escape special characters
 - fixed issue #614 Include repo name in delete confirmation dialog
 - fixed #623: Lang meta-tag doesn't work with C#/C++
 - fixes #612 Double quotes to Single quotes result in bad html in diff
 - fixes #630 git statistics do too much work making them slow.
 - fixes #625 Git-Tags are not displayed in Shortlog
-- fix for issue #602, enforce str when setting mercurial UI object.
 - fix for issue #602, enforce str when setting mercurial UI object.
   When this is used together with mercurial internal translation system
   it can lead to UnicodeDecodeErrors
 - fixes #645 Fix git handler when doing delete remote branch
 - implements #649 added two seperate method for author and commiter to VCS
   changeset class switch author for git backed to be the real author not commiter
 - implements #649 added two seperate method for author and committer to VCS
   changeset class switch author for git backed to be the real author not committer
 - fix issue #504 RhodeCode is showing different versions of README on
   different summary page loads
 - implemented #658 Changing username in LDAP-Mode should not be allowed.
 - fixes #652 switch to generator approach when doing file annotation to prevent
-  huge memory consumption
   huge memory consumption
 - fixes #666 move lockkey path location to cache_dir to ensure this path is
   always writable for rhodecode server
 - many more small fixes and improvements
 - fixed issues with recursive scans on removed repositories that could take
   long time on instance start
@@ @@ -201,15 +278,15 @@ news @@
 - #518 added possibility of specifying multiple patterns for issues
 - update codemirror to latest version
 fixes
 +++++
-- fixed #570 explicit users group permissions can overwrite owner permissions
+- fixed #570 explicit user group permissions can overwrite owner permissions
 - fixed #578 set proper PATH with current Python for Git
-  hooks to execute within same Python as RhodeCode
   hooks to execute within same Python as RhodeCode
 - fixed issue with Git bare repos that ends with .git in name
 .4.2 (**2012-09-12**)
 ----------------------
 news
@@ @@ -218,18 +295,18 @@ news @@
 - added option to menu to quick lock/unlock repository for users that have
   write access to
 - Implemented permissions for writing to repo
   groups. Now only write access to group allows to create a repostiory
   within that group
 - #565 Add support for {netloc} and {scheme} to alternative_gravatar_url
-- updated translation for zh_CN
 - updated translation for zh_CN
 fixes
 +++++
-- fixed visual permissions check on repos groups inside groups
+- fixed visual permissions check on repository groups inside groups
 - fixed issues with non-ascii search terms in search, and indexers
 - fixed parsing of page number in GET parameters
 - fixed issues with generating pull-request overview for repos with
   bookmarks and tags, also preview doesn't loose chosen revision from
   select dropdown
@@ @@ -237,27 +314,27 @@ fixes @@
 ----------------------
 news
 ++++
 - always put a comment about code-review status change even if user send
-  empty data
   empty data
 - modified_on column saves repository update and it's going to be used
   later for light version of main page ref #500
 - pull request notifications send much nicer emails with details about pull
   request
 - #551 show breadcrumbs in summary view for repositories inside a group
 fixes
 +++++
 - fixed migrations of permissions that can lead to inconsistency.
-  Some users sent feedback that after upgrading from older versions issues
   Some users sent feedback that after upgrading from older versions issues
   with updating default permissions occurred. RhodeCode detects that now and
   resets default user permission to initial state if there is a need for that.
-  Also forces users to set the default value for new forking permission.
   Also forces users to set the default value for new forking permission.
 - #535 improved apache wsgi example configuration in docs
 - fixes #550 mercurial repositories comparision failed when origin repo had
   additional not-common changesets
 - fixed status of code-review in preview windows of pull request
 - git forks were not initialized at bare repos
 - fixes #555 fixes issues with comparing non-related repositories
@@ @@ -270,76 +347,76 @@ fixes @@
 .4.0 (**2012-09-03**)
 ----------------------
 news
 ++++
 - new codereview system
 - email map, allowing users to have multiple email addresses mapped into
   their accounts
 - improved git-hook system. Now all actions for git are logged into journal
   including pushed revisions, user and IP address
 - changed setup-app into setup-rhodecode and added default options to it.
 - new git repos are created as bare now by default
 - #464 added links to groups in permission box
 - #465 mentions autocomplete inside comments boxes
 - #469 added --update-only option to whoosh to re-index only given list
-  of repos in index
   of repos in index
 - rhodecode-api CLI client
 - new git http protocol replaced buggy dulwich implementation.
   Now based on pygrack & gitweb
-- Improved RSS/ATOM feeds. Discoverable by browsers using proper headers, and
 - Improved RSS/ATOM feeds. Discoverable by browsers using proper headers, and
   reformated based on user suggestions. Additional rss/atom feeds for user
   journal
 - various i18n improvements
 - #478 permissions overview for admin in user edit view
 - File view now displays small gravatars off all authors of given file
 - Implemented landing revisions. Each repository will get landing_rev attribute
   that defines 'default' revision/branch for generating readme files
-- Implemented #509, RhodeCode enforces SSL for push/pulling if requested at
 - Implemented #509, RhodeCode enforces SSL for push/pulling if requested at
   earliest possible call.
 - Import remote svn repositories to mercurial using hgsubversion.
 - Fixed #508 RhodeCode now has a option to explicitly set forking permissions
 - RhodeCode can use alternative server for generating avatar icons
 - implemented repositories locking. Pull locks, push unlocks. Also can be done
   via API calls
-- #538 form for permissions can handle multiple users at once
 - #538 form for permissions can handle multiple users at once
 fixes
 +++++
 - improved translations
 - fixes issue #455 Creating an archive generates an exception on Windows
-- fixes #448 Download ZIP archive keeps file in /tmp open and results
 - fixes #448 Download ZIP archive keeps file in /tmp open and results
   in out of disk space
 - fixes issue #454 Search results under Windows include proceeding
   backslash
 - fixed issue #450. Rhodecode no longer will crash when bad revision is
   present in journal data.
 - fix for issue #417, git execution was broken on windows for certain
   commands.
 - fixed #413. Don't disable .git directory for bare repos on deleting
 - fixed issue #459. Changed the way of obtaining logger in reindex task.
 - fixed #453 added ID field in whoosh SCHEMA that solves the issue of
   reindexing modified files
-- fixed #481 rhodecode emails are sent without Date header
 - fixed #481 rhodecode emails are sent without Date header
 - fixed #458 wrong count when no repos are present
-- fixed issue #492 missing `\ No newline at end of file` test at the end of
 - fixed issue #492 missing `\ No newline at end of file` test at the end of
   new chunk in html diff
 - full text search now works also for commit messages
 .3.6 (**2012-05-17**)
 ----------------------
 news
 ++++
 - chinese traditional translation
 - changed setup-app into setup-rhodecode and added arguments for auto-setup
   mode that doesn't need user interaction
 - changed setup-app into setup-rhodecode and added arguments for auto-setup
   mode that doesn't need user interaction
 fixes
 +++++
 - fixed no scm found warning
 - fixed __future__ import error on rcextensions
@@ @@ -353,17 +430,17 @@ fixes @@
 news
 ++++
 - use ext_json for json module
 - unified annotation view with file source view
 - notification improvements, better inbox + css
-- #419 don't strip passwords for login forms, make rhodecode
 - #419 don't strip passwords for login forms, make rhodecode
   more compatible with LDAP servers
 - Added HTTP_X_FORWARDED_FOR as another method of extracting
   IP for pull/push logs. - moved all to base controller
 - #415: Adding comment to changeset causes reload.
 - Added HTTP_X_FORWARDED_FOR as another method of extracting
   IP for pull/push logs. - moved all to base controller
 - #415: Adding comment to changeset causes reload.
   Comments are now added via ajax and doesn't reload the page
 - #374 LDAP config is discarded when LDAP can't be activated
 - limited push/pull operations are now logged for git in the journal
 - bumped mercurial to 2.2.X series
 - added support for displaying submodules in file-browser
 - #421 added bookmarks in changelog view
@@ @@ -373,13 +450,13 @@ fixes @@
 - fixed dev-version marker for stable when served from source codes
 - fixed missing permission checks on show forks page
 - #418 cast to unicode fixes in notification objects
 - #426 fixed mention extracting regex
 - fixed remote-pulling for git remotes remopositories
-- fixed #434: Error when accessing files or changesets of a git repository
 - fixed #434: Error when accessing files or changesets of a git repository
   with submodules
 - fixed issue with empty APIKEYS for users after registration ref. #438
 - fixed issue with getting README files from git repositories
 .3.4 (**2012-03-28**)
 ----------------------
@@ @@ -390,62 +467,62 @@ news @@
 - Whoosh logging is now controlled by the .ini files logging setup
 - added clone-url into edit form on /settings page
 - added help text into repo add/edit forms
 - created rcextensions module with additional mappings (ref #322) and
   post push/pull/create repo hooks callbacks
 - implemented #377 Users view for his own permissions on account page
 - #399 added inheritance of permissions for users group on repos groups
 - #401 repository group is automatically pre-selected when adding repos
 - #399 added inheritance of permissions for user group on repository groups
 - #401 repository group is automatically pre-selected when adding repos
   inside a repository group
-- added alternative HTTP 403 response when client failed to authenticate. Helps
 - added alternative HTTP 403 response when client failed to authenticate. Helps
   solving issues with Mercurial and LDAP
-- #402 removed group prefix from repository name when listing repositories
 - #402 removed group prefix from repository name when listing repositories
   inside a group
 - added gravatars into permission view and permissions autocomplete
-- #347 when running multiple RhodeCode instances, properly invalidates cache
 - #347 when running multiple RhodeCode instances, properly invalidates cache
   for all registered servers
 fixes
 +++++
 - fixed #390 cache invalidation problems on repos inside group
 - fixed #385 clone by ID url was loosing proxy prefix in URL
 - fixed some unicode problems with waitress
 - fixed issue with escaping < and > in changeset commits
-- fixed error occurring during recursive group creation in API
 - fixed error occurring during recursive group creation in API
   create_repo function
 - fixed #393 py2.5 fixes for routes url generator
 - fixed #397 Private repository groups shows up before login
 - fixed #396 fixed problems with revoking users in nested groups
-- fixed mysql unicode issues + specified InnoDB as default engine with
 - fixed mysql unicode issues + specified InnoDB as default engine with
   utf8 charset
 - #406 trim long branch/tag names in changelog to not break UI
 .3.3 (**2012-03-02**)
 ----------------------
 news
 ++++
 fixes
 +++++
-- fixed some python2.5 compatibility issues
 - fixed some python2.5 compatibility issues
 - fixed issues with removed repos was accidentally added as groups, after
   full rescan of paths
 - fixes #376 Cannot edit user (using container auth)
-- fixes #378 Invalid image urls on changeset screen with proxy-prefix
 - fixes #378 Invalid image urls on changeset screen with proxy-prefix
   configuration
 - fixed initial sorting of repos inside repo group
 - fixes issue when user tried to resubmit same permission into user/user_groups
 - bumped beaker version that fixes #375 leap error bug
 - fixed raw_changeset for git. It was generated with hg patch headers
 - fixed vcs issue with last_changeset for filenodes
 - fixed missing commit after hook delete
-- fixed #372 issues with git operation detection that caused a security issue
 - fixed #372 issues with git operation detection that caused a security issue
   for git repos
 .3.2 (**2012-02-28**)
 ----------------------
 news
@@ @@ -456,15 +533,15 @@ fixes @@
 +++++
 - fixed git protocol issues with repos-groups
 - fixed git remote repos validator that prevented from cloning remote git repos
 - fixes #370 ending slashes fixes for repo and groups
 - fixes #368 improved git-protocol detection to handle other clients
-- fixes #366 When Setting Repository Group To Blank Repo Group Wont Be
 - fixes #366 When Setting Repository Group To Blank Repo Group Wont Be
   Moved To Root
-- fixes #371 fixed issues with beaker/sqlalchemy and non-ascii cache keys
 - fixes #371 fixed issues with beaker/sqlalchemy and non-ascii cache keys
 - fixed #373 missing cascade drop on user_group_to_perm table
 .3.1 (**2012-02-27**)
 ----------------------
 news
@@ @@ -472,68 +549,68 @@ news @@
 fixes
 +++++
 - redirection loop occurs when remember-me wasn't checked during login
-- fixes issues with git blob history generation
 - fixes issues with git blob history generation
 - don't fetch branch for git in file history dropdown. Causes unneeded slowness
 .3.0 (**2012-02-26**)
 ----------------------
 news
 ++++
-- code review, inspired by github code-comments
 - code review, inspired by github code-comments
 - #215 rst and markdown README files support
 - #252 Container-based and proxy pass-through authentication support
 - #44 branch browser. Filtering of changelog by branches
 - mercurial bookmarks support
 - new hover top menu, optimized to add maximum size for important views
-- configurable clone url template with possibility to specify  protocol like
 - configurable clone url template with possibility to specify  protocol like
   ssh:// or http:// and also manually alter other parts of clone_url.
 - enabled largefiles extension by default
 - optimized summary file pages and saved a lot of unused space in them
 - #239 option to manually mark repository as fork
 - #320 mapping of commit authors to RhodeCode users
-- #304 hashes are displayed using monospace font
 - #304 hashes are displayed using monospace font
 - diff configuration, toggle white lines and context lines
 - #307 configurable diffs, whitespace toggle, increasing context lines
 - sorting on branches, tags and bookmarks using YUI datatable
 - improved file filter on files page
 - implements #330 api method for listing nodes ar particular revision
 - #73 added linking issues in commit messages to chosen issue tracker url
   based on user defined regular expression
-- added linking of changesets in commit messages
 - added linking of changesets in commit messages
 - new compact changelog with expandable commit messages
 - firstname and lastname are optional in user creation
 - #348 added post-create repository hook
-- #212 global encoding settings is now configurable from .ini files
 - #212 global encoding settings is now configurable from .ini files
 - #227 added repository groups permissions
 - markdown gets codehilite extensions
-- new API methods, delete_repositories, grante/revoke permissions for groups
 - new API methods, delete_repositories, grante/revoke permissions for groups
   and repos
 fixes
 +++++
 - rewrote dbsession management for atomic operations, and better error handling
 - fixed sorting of repo tables
 - #326 escape of special html entities in diffs
 - normalized user_name => username in api attributes
-- fixes #298 ldap created users with mixed case emails created conflicts
 - fixes #298 ldap created users with mixed case emails created conflicts
   on saving a form
-- fixes issue when owner of a repo couldn't revoke permissions for users
 - fixes issue when owner of a repo couldn't revoke permissions for users
   and groups
 - fixes #271 rare JSON serialization problem with statistics
 - fixes #337 missing validation check for conflicting names of a group with a
-  repositories group
+  repository group
 - #340 fixed session problem for mysql and celery tasks
-- fixed #331 RhodeCode mangles repository names if the a repository group
 - fixed #331 RhodeCode mangles repository names if the a repository group
   contains the "full path" to the repositories
 - #355 RhodeCode doesn't store encrypted LDAP passwords
 .2.5 (**2012-01-28**)
 ----------------------
@@ @@ -548,83 +625,83 @@ fixes @@
 - #341 "scanning for repositories in None" log message during Rescan was missing
   a parameter
 - fixed creating archives with subrepos. Some hooks were triggered during that
   operation leading to crash.
 - fixed missing email in account page.
 - Reverted Mercurial to 2.0.1 for windows due to bug in Mercurial that makes
-  forking on windows impossible
   forking on windows impossible
 .2.4 (**2012-01-19**)
 ----------------------
 news
 ++++
 - RhodeCode is bundled with mercurial series 2.0.X by default, with
   full support to largefiles extension. Enabled by default in new installations
 - #329 Ability to Add/Remove Groups to/from a Repository via AP
 - added requires.txt file with requirements
 fixes
 +++++
 - fixes db session issues with celery when emailing admins
-- #331 RhodeCode mangles repository names if the a repository group
 - #331 RhodeCode mangles repository names if the a repository group
   contains the "full path" to the repositories
 - #298 Conflicting e-mail addresses for LDAP and RhodeCode users
 - DB session cleanup after hg protocol operations, fixes issues with
   `mysql has gone away` errors
 - #333 doc fixes for get_repo api function
 - #271 rare JSON serialization problem with statistics enabled
-- #337 Fixes issues with validation of repository name conflicting with
 - #337 Fixes issues with validation of repository name conflicting with
   a group name. A proper message is now displayed.
 - #292 made ldap_dn in user edit readonly, to get rid of confusion that field
   doesn't work
 - #316 fixes issues with web description in hgrc files
   doesn't work
 - #316 fixes issues with web description in hgrc files
 .2.3 (**2011-11-02**)
 ----------------------
 news
 ++++
 - added option to manage repos group for non admin users
 - added following API methods for get_users, create_user, get_users_groups,
   get_users_group, create_users_group, add_user_to_users_groups, get_repos,
 - added option to manage repository group for non admin users
 - added following API methods for get_users, create_user, get_users_groups,
   get_users_group, create_users_group, add_user_to_users_groups, get_repos,
   get_repo, create_repo, add_user_to_repo
-- implements #237 added password confirmation for my account
 - implements #237 added password confirmation for my account
   and admin edit user.
 - implements #291 email notification for global events are now sent to all
   administrator users, and global config email.
 fixes
 +++++
 - added option for passing auth method for smtp mailer
 - #276 issue with adding a single user with id>10 to usergroups
-- #277 fixes windows LDAP settings in which missing values breaks the ldap auth
 - #277 fixes windows LDAP settings in which missing values breaks the ldap auth
 - #288 fixes managing of repos in a group for non admin user
 .2.2 (**2011-10-17**)
 ----------------------
 news
 ++++
 - #226 repo groups are available by path instead of numerical id
 fixes
 +++++
 - #259 Groups with the same name but with different parent group
 - #260 Put repo in group, then move group to another group -> repo becomes unavailable
 - #258 RhodeCode 1.2 assumes egg folder is writable (lockfiles problems)
-- #265 ldap save fails sometimes on converting attributes to booleans,
 - #265 ldap save fails sometimes on converting attributes to booleans,
   added getter and setter into model that will prevent from this on db model level
 - fixed problems with timestamps issues #251 and #213
-- fixes #266 RhodeCode allows to create repo with the same name and in
 - fixes #266 RhodeCode allows to create repo with the same name and in
   the same parent as group
 - fixes #245 Rescan of the repositories on Windows
 - fixes #248 cannot edit repos inside a group on windows
 - fixes #219 forking problems on windows
 .2.1 (**2011-10-08**)
@@ @@ -634,13 +711,13 @@ news @@
 ++++
 fixes
 +++++
-- fixed problems with basic auth and push problems
 - fixed problems with basic auth and push problems
 - gui fixes
 - fixed logger
 .2.0 (**2011-10-07**)
 ----------------------
@@ @@ -652,70 +729,70 @@ news @@
 - 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
 - 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 #93 customizable changelog on combined revision ranges -
   equivalent of githubs compare view
 - implemented #108 extended and more powerful LDAP configuration
-- implemented #56 users groups
+- implemented #56 user 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
 - #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
 - 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
 - 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
 - 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
 - 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
 - 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
 - improved rendering of dag (they are not trimmed anymore when number of
   heads exceeds 5)
 .1.8 (**2011-04-12**)
 ----------------------
 news
 ++++
@@ @@ -736,13 +813,13 @@ fixes @@
 - windows fixes for os.kill issue #133
 - fixes path splitting for windows issues #148
 - fixed issue #143 wrong import on migration to 1.1.X
 - fixed problems with displaying binary files, thanks to Thomas Waldmann
 - removed name from archive files since it's breaking ui for long repo names
 - fixed issue with archive headers sent to browser, thanks to Thomas Waldmann
-- fixed compatibility for 1024px displays, and larger dpi settings, thanks to
 - fixed compatibility for 1024px displays, and larger dpi settings, thanks to
   Thomas Waldmann
 - fixed issue #166 summary pager was skipping 10 revisions on second page
 .1.7 (**2011-03-23**)
 ----------------------
@@ @@ -780,14 +857,14 @@ news @@
 fixes
 +++++
 - fixed sorting by author in main page
 - fixed crashes with diffs on binary files
 - fixed #131 problem with boolean values for LDAP
 - fixed #122 mysql problems thanks to striker69
 - fixed problem with errors on calling raw/raw_files/annotate functions
 - fixed #122 mysql problems thanks to striker69
 - fixed problem with errors on calling raw/raw_files/annotate functions
   with unknown revisions
 - fixed returned rawfiles attachment names with international character
 - cleaned out docs, big thanks to Jason Harris
 .1.4 (**2011-02-19**)
 ----------------------
@@ @@ -798,13 +875,13 @@ news @@
 fixes
 +++++
 - fixed formencode import problem on settings page, that caused server crash
   when that page was accessed as first after server start
 - journal fixes
-- fixed option to access repository just by entering http://server/<repo_name>
 - fixed option to access repository just by entering http://server/<repo_name>
 .1.3 (**2011-02-16**)
 ----------------------
 news
 ++++
@@ @@ -813,17 +890,17 @@ news @@
 - added option to access repository just by entering http://server/<repo_name>
 - celery task ignores result for better performance
 fixes
 +++++
-- fixed ehlo command and non auth mail servers on smtp_lib. Thanks to
 - fixed ehlo command and non auth mail servers on smtp_lib. Thanks to
   apollo13 and Johan Walles
 - small fixes in journal
 - fixed problems with getting setting for celery from .ini files
-- registration, password reset and login boxes share the same title as main
 - registration, password reset and login boxes share the same title as main
   application now
 - fixed #113: to high permissions to fork repository
 - fixed problem with '[' chars in commit messages in journal
 - removed issue with space inside renamed repository after deletion
 - db transaction fixes when filesystem repository creation failed
 - fixed #106 relation issues on databases different than sqlite
@@ @@ -838,17 +915,17 @@ news @@
 fixes
 +++++
 - fixes #98 protection against float division of percentage stats
 - fixed graph bug
-- forced webhelpers version since it was making troubles during installation
 - forced webhelpers version since it was making troubles during installation
 .1.1 (**2011-01-06**)
 ----------------------
 news
 ++++
 - added force https option into ini files for easier https usage (no need to
   set server headers with this options)
 - small css updates
@@ @@ -866,26 +943,26 @@ fixes @@
 ----------------------
 news
 ++++
 - rewrite of internals for vcs >=0.1.10
-- uses mercurial 1.7 with dotencode disabled for maintaining compatibility
 - uses mercurial 1.7 with dotencode disabled for maintaining compatibility
   with older clients
 - anonymous access, authentication via ldap
-- performance upgrade for cached repos list - each repository has its own
 - performance upgrade for cached repos list - each repository has its own
   cache that's invalidated when needed.
 - performance upgrades on repositories with large amount of commits (20K+)
 - main page quick filter for filtering repositories
 - user dashboards with ability to follow chosen repositories actions
 - sends email to admin on new user registration
 - added cache/statistics reset options into repository settings
 - more detailed action logger (based on hooks) with pushed changesets lists
   and options to disable those hooks from admin panel
 - introduced new enhanced changelog for merges that shows more accurate results
-- new improved and faster code stats (based on pygments lexers mapping tables,
 - new improved and faster code stats (based on pygments lexers mapping tables,
   showing up to 10 trending sources for each repository. Additionally stats
   can be disabled in repository settings.
 - gui optimizations, fixed application width to 1024px
 - added cut off (for large files/changesets) limit into config files
 - whoosh, celeryd, upgrade moved to paster command
 - other than sqlite database backends can be used
@@ @@ -900,16 +977,16 @@ fixes @@
 - fixes #69 added password confirmation fields
 - fixes #87 RhodeCode crashes occasionally on updating repository owner
 - fixes #82 broken annotations on files with more than 1 blank line at the end
 - a lot of fixes and tweaks for file browser
 - fixed detached session issues
 - fixed when user had no repos he would see all repos listed in my account
-- fixed ui() instance bug when global hgrc settings was loaded for server
 - fixed ui() instance bug when global hgrc settings was loaded for server
   instance and all hgrc options were merged with our db ui() object
 - numerous small bugfixes
 (special thanks for TkSoh for detailed feedback)
 .0.2 (**2010-11-12**)
 ----------------------
@@ @@ -968,9 +1045,9 @@ fixes @@
 - fixed i18n during installation.
 .0.0rc2 (**2010-10-11**)
 -------------------------
-- Disabled dirsize in file browser, it's causing nasty bug when dir renames
 - Disabled dirsize in file browser, it's causing nasty bug when dir renames
   occure. After vcs is fixed it'll be put back again.
 - templating/css rewrites, optimized css.

docs/contributing.rst

➞

Show inline comments

@@ @@ -7,25 +7,25 @@ Contributing to RhodeCode @@
 If you would like to contribute to RhodeCode, please contact me, any help is
 greatly appreciated!
 Could I request that you make your source contributions by first forking the
 RhodeCode repository on bitbucket_
 https://bitbucket.org/marcinkuzminski/rhodecode and then make your changes to
-your forked repository. Please post all fixes into **BETA** branch since your
 your forked repository. Please post all fixes into **BETA** branch since your
 fix might be already fixed there and i try to merge all fixes from beta into
-stable, and not the other way. Finally, when you are finished making a change,
 stable, and not the other way. Finally, when you are finished making a change,
 please send me a pull request.
 To run RhodeCode in a development version you always need to install the latest
 required libs from `requires.txt` file.
 after downloading/pulling RhodeCode make sure you run::
     python setup.py develop
-command to install/verify all required packages, and prepare development
 command to install/verify all required packages, and prepare development
 enviroment.
 After finishing your changes make sure all tests passes ok. You can run
 the testsuite running ``nosetest`` from the project root, or if you use tox
 run tox for python2.5-2.7 with multiple database test.

docs/index.rst

➞

Show inline comments

@@ @@ -10,13 +10,13 @@ Users Guide @@
 .. toctree::
    :maxdepth: 1
    installation
    setup
    upgrade
 **Usage**
 .. toctree::
    :maxdepth: 1
    usage/general
@@ @@ -30,24 +30,24 @@ Users Guide @@
    usage/troubleshooting
 **Develop**
 .. toctree::
    :maxdepth: 1
    contributing
    changelog
 **API**
 .. toctree::
    :maxdepth: 1
    api/api
    api/models
 Other topics
 ------------
 * :ref:`genindex`
 * :ref:`search`
@@ @@ -58,7 +58,7 @@ Other topics @@
 .. _mercurial: http://mercurial.selenic.com/
 .. _bitbucket: http://bitbucket.org/
 .. _subversion: http://subversion.tigris.org/
 .. _git: http://git-scm.com/
 .. _celery: http://celeryproject.org/
 .. _Sphinx: http://sphinx.pocoo.org/
 .. _vcs: http://pypi.python.org/pypi/vcs
@@ \ No newline at end of file @@
 .. _vcs: http://pypi.python.org/pypi/vcs

docs/installation.rst

➞

Show inline comments

 .. _installation:
 ============
 Installation
 ============
 ``RhodeCode`` is written entirely in Python. Before posting any issues make
 sure, your not missing any system libraries and using right version of
 ``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.
 Installing RhodeCode from PyPI (aka "Cheeseshop")
@@ @@ -38,20 +38,20 @@ Step by step installation example for Wi @@
 Step by step installation example for Linux
 -------------------------------------------
 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.
 python and making things less problematic when doing system python updates.
 Alternative very detailed installation instructions for Ubuntu Server with
 celery, indexer and daemon scripts: https://gist.github.com/4546398
 - Assuming you have installed virtualenv_ create a new virtual environment
   using virtualenv command::
 - Assuming you have installed virtualenv_ create a new virtual environment
   using virtualenv command::
     virtualenv --no-site-packages /opt/rhodecode-venv
 .. note:: Using ``--no-site-packages`` when generating your
    virtualenv is **very important**. This flag provides the necessary
@@ @@ -60,74 +60,74 @@ celery, indexer and daemon scripts: http @@
    it's possible that RhodeCode will not install properly into
    the virtualenv, or, even if it does, may not run properly,
    depending on the packages you've already got installed into your
    Python's "main" site-packages dir.
-- this will install new virtualenv_ into `/opt/rhodecode-venv`.
 - this will install new virtualenv_ into `/opt/rhodecode-venv`.
 - Activate the virtualenv_ by running::
     source /opt/rhodecode-venv/bin/activate
 .. note:: If you're using UNIX, *do not* use ``sudo`` to run the
    ``virtualenv`` script.  It's perfectly acceptable (and desirable)
    to create a virtualenv as a normal user.
 - Make a folder for rhodecode data files, and configuration somewhere on the
 - Make a folder for rhodecode data files, and configuration somewhere on the
   filesystem. For example::
     mkdir /opt/rhodecode
 - Go into the created directory run this command to install rhodecode::
     easy_install rhodecode
   or::
     pip install rhodecode
 - This will install rhodecode together with pylons and all other required
     pip install rhodecode
 - 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
 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
 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.
 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.
-**Message Broker**
 **Message Broker**
 - preferred is `RabbitMq <http://www.rabbitmq.com/>`_
 - A possible alternative is `Redis <http://code.google.com/p/redis/>`_
-For installation instructions you can visit:
 For installation instructions you can visit:
 http://ask.github.com/celery/getting-started/index.html.
 This is a very nice tutorial on how to start using celery_ with rabbitmq_
 You can now proceed to :ref:`setup`
 -----------------------------------
-.. _virtualenv: http://pypi.python.org/pypi/virtualenv
 .. _virtualenv: http://pypi.python.org/pypi/virtualenv
 .. _python: http://www.python.org/
 .. _mercurial: http://mercurial.selenic.com/
 .. _celery: http://celeryproject.org/
 .. _rabbitmq: http://www.rabbitmq.com/

docs/installation_win.rst

➞

Show inline comments

@@ @@ -44,13 +44,13 @@ choose "Visual C++ 2008 Express" when in @@
 .. note::
    Silverlight Runtime and SQL Server 2008 Express Edition are not
    required, you can uncheck them
 .. note::
 bit: You also need to install the Microsoft Windows SDK for .NET 3.5 SP1 (.NET 4.0 won't work).
    Download from: http://www.microsoft.com/en-us/download/details.aspx?id=3138
 .. note::
 bit: You also need to copy and rename a .bat file to make the Visual C++ compiler work.
@@ @@ -87,13 +87,13 @@ http://sourceforge.net/projects/pywin32/ @@
   When writing this guide, the file was:
   http://sourceforge.net/projects/pywin32/files/pywin32/Build%20217/pywin32-217.win32-py2.7.exe/download
   .. note::
 bit: Download and install the 64bit version.
-     At the time of writing you can find this at:
      At the time of writing you can find this at:
      http://sourceforge.net/projects/pywin32/files/pywin32/Build%20218/pywin32-218.win-amd64-py2.7.exe/download
 Step4 - Python BIN
 ------------------
 Add Python BIN folder to the path

docs/setup.rst

➞

Show inline comments

@@ @@ -475,13 +475,13 @@ can be found at *rhodecode.lib.hooks*. @@
 Changing default encoding
 -------------------------
 By default RhodeCode uses utf8 encoding, starting from 1.3 series this
 can be changed, simply edit default_encoding in .ini file to desired one.
-This affects many parts in rhodecode including commiters names, filenames,
+This affects many parts in rhodecode including committers names, filenames,
 encoding of commit messages. In addition RhodeCode can detect if `chardet`
 library is installed. If `chardet` is detected RhodeCode will fallback to it
 when there are encode/decode errors.
 Setting Up Celery
@@ @@ -649,13 +649,13 @@ Add the following at the end of the .ini @@
     [filter:proxy-prefix]
     use = egg:PasteDeploy#prefix
     prefix = /<someprefix>
-then change <someprefix> into your choosen prefix
+then change <someprefix> into your chosen prefix
 Apache's WSGI config
 --------------------
 Alternatively, RhodeCode can be set up with Apache under mod_wsgi. For
 that, you'll need to:

docs/theme/nature/layout.html

➞

Show inline comments

 {% extends "basic/layout.html" %}
 {% block sidebarlogo %}
 <h3>Support RhodeCode development.</h3>
 <div style="text-align:center">
 	<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
 	<input type="hidden" name="cmd" value="_s-xclick">
 	<input type="hidden" name="hosted_button_id" value="8U2LLRPLBKWDU">
 	<input style="border:0px !important" type="image" src="https://www.paypal.com/en_US/i/btn/btn_donate_SM.gif"
 	border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
 	<img alt="" border="0" src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1">
 	</form>
     <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
         <input type="hidden" name="cmd" value="_s-xclick">
         <input type="hidden" name="hosted_button_id" value="8U2LLRPLBKWDU">
         <input style="border:0px !important" type="image" src="https://www.paypal.com/en_US/i/btn/btn_donate_SM.gif"
         border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
         <img alt="" border="0" src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1">
     </form>
     <div style="padding:5px">
      <a href="http://flattr.com/thing/167489/RhodeCode" target="_blank">
      <img src="http://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" border="0" /></a>
    </div>
+    </div>
 </div>
 {% endblock %}}

docs/theme/nature/static/pygments.css

➞

Show inline comments

@@ @@ -48,7 +48,7 @@ @@
 .s1 { color: #bb8844 } /* Literal.String.Single */
 .ss { color: #bb8844 } /* Literal.String.Symbol */
 .bp { color: #999999 } /* Name.Builtin.Pseudo */
 .vc { color: #ff99ff } /* Name.Variable.Class */
 .vg { color: #ff99ff } /* Name.Variable.Global */
 .vi { color: #ff99ff } /* Name.Variable.Instance */
 .il { color: #009999 } /* Literal.Number.Integer.Long */
@@ \ No newline at end of file @@
 .il { color: #009999 } /* Literal.Number.Integer.Long */

docs/usage/backup.rst

➞

Show inline comments

@@ @@ -20,7 +20,7 @@ RhodeCode ie. the same place where the i @@
 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 @@
 Database backup will contain all gathered statistics

docs/usage/debugging.rst

➞

Show inline comments

@@ @@ -11,13 +11,13 @@ possibly debug them. @@
 enable detailed debug
 ---------------------
 RhodeCode uses standard python logging modules to log it's output.
 By default only loggers with INFO level are displayed. To enable full output
-change `level = DEBUG` for all logging handlers in currently used .ini file.
 change `level = DEBUG` for all logging handlers in currently used .ini file.
 This change will allow to see much more detailed output in the logfile or
 console. This generally helps a lot to track issues.
 enable interactive debug mode
 -----------------------------

docs/usage/general.rst

➞

Show inline comments

@@ @@ -35,13 +35,13 @@ checkbox the << and >> buttons will only @@
 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
+`Show selected changesets <from-rev> -> <to-rev>` clicking this will bring
 compare view. In this view also it's possible to switch to combined compare.
 Compare view is also available from the journal on pushes having more than
 one changeset
@@ @@ -102,13 +102,13 @@ Currently it support following options: @@
 - svn -> hg clone
 - git -> git clone
 .. note::
-    * `svn -> hg` cloning requires `hgsubversion` library to be installed.*
+    - *`svn -> hg` cloning requires `hgsubversion` library to be installed.*
 If you need to clone repositories that are protected via basic auth, you
 might pass the url with stored credentials inside eg.
 `http://user:passw@remote.server/repo`, RhodeCode will try to login and clone
 using given credentials. Please take a note that they will be stored as
 plaintext inside the database. RhodeCode will remove auth info when showing the

docs/usage/git_support.rst

➞

Show inline comments

@@ @@ -8,48 +8,48 @@ GIT support @@
 Git support in RhodeCode 1.3 was enabled by default. You need to have a git
 client installed on the machine to make git fully work.
 Although There is one limitation on git usage.
 - large pushes requires a http server with chunked encoding support.
 if you plan to use git you need to run RhodeCode with some
 http server that supports chunked encoding which git http protocol uses,
 i recommend using waitress_ or gunicorn_ (linux only) for `paste` wsgi app
 http server that supports chunked encoding which git http protocol uses,
 i recommend using waitress_ or gunicorn_ (linux only) for `paste` wsgi app
 replacement. Starting from version 1.4 waitress_ is the default wsgi server
 used in RhodeCode.
 To use, simply change change the following in the .ini file::
     use = egg:Paste#http
 to::
     use = egg:waitress#main
 or::
     use = egg:gunicorn#main
 And comment out bellow options::
     threadpool_workers =
     threadpool_max_requests =
     use_threadpool =
     threadpool_workers =
     threadpool_max_requests =
     use_threadpool =
 You can simply run `paster serve` as usual.
 You can always disable git/hg support by editing a
 You can always disable git/hg support by editing a
 file **rhodecode/__init__.py** and commenting out backends
 .. code-block:: python
    BACKENDS = {
        'hg': 'Mercurial repository',
        #'git': 'Git repository',
+   }
 .. _waitress: http://pypi.python.org/pypi/waitress
 .. _gunicorn: http://pypi.python.org/pypi/gunicorn
@@ \ No newline at end of file @@
 .. _gunicorn: http://pypi.python.org/pypi/gunicorn

docs/usage/locking.rst

➞

Show inline comments

@@ @@ -2,40 +2,40 @@ @@
 ===================================
 RhodeCode repository locking system
 ===================================
-| Repos with **locking function=disabled** is the default, that's how repos work
 | Repos with **locking function=disabled** is the default, that's how repos work
   today.
 | Repos with **locking function=enabled** behaves like follows:
 Repos have a state called `locked` that can be true or false.
-The hg/git commands `hg/git clone`, `hg/git pull`, and `hg/git push`
 The hg/git commands `hg/git clone`, `hg/git pull`, and `hg/git push`
 influence this state:
-- The command `hg/git pull <repo>` will lock that repo (locked=true)
 - The command `hg/git pull <repo>` will lock that repo (locked=true)
   if the user has write/admin permissions on this repo
-- The command `hg/git clone <repo>` will lock that repo (locked=true) if the
 - The command `hg/git clone <repo>` will lock that repo (locked=true) if the
   user has write/admin permissions on this repo
 RhodeCode will remember the user id who locked the repo
-only this specific user can unlock the repo (locked=false) by calling
 only this specific user can unlock the repo (locked=false) by calling
-- `hg/git push <repo>`
 - `hg/git push <repo>`
-every other command on that repo from this user and
 every other command on that repo from this user and
 every command from any other user will result in http return code 423 (locked)
-additionally the http error includes the <user> that locked the repo
 additionally the http error includes the <user> that locked the repo
 (e.g. “repository <repo> locked by user <user>”)
-So the scenario of use for repos with `locking function` enabled is that
 So the scenario of use for repos with `locking function` enabled is that
 every initial clone and every pull gives users (with write permission)
 the exclusive right to do a push.
 Each repo can be manually unlocked by admin from the repo settings menu.
@@ \ No newline at end of file @@
 Each repo can be manually unlocked by admin from the repo settings menu.

docs/usage/performance.rst

➞

Show inline comments

@@ @@ -10,41 +10,53 @@ amount of data from version control syst @@
 the best performance.
 * RhodeCode will perform better on machines with faster disks (SSD/SAN). It's
   more important to have faster disk than faster CPU.
 * Slowness on initial page can be easily fixed by grouping repositories, and/or
   increasing cache size (see below)
   increasing cache size (see below), that includes using lightweight dashboard
   option and vcs_full_cache setting in .ini file
 Follow these few steps to improve performance of RhodeCode system.
 . Increase cache
     in the .ini file::
      beaker.cache.sql_cache_long.expire=3600 <-- set this to higher number
     This option affects the cache expiration time for main page. Having
     few hundreds of repositories on main page can sometimes make the system
     to behave slow when cache expires for all of them. Increasing `expire`
     option to day (86400) or a week (604800) will improve general response
     times for the main page. RhodeCode has an intelligent cache expiration
     system and it will expire cache for repositories that had been changed.
 . Switch from sqlite to postgres or mysql
     sqlite is a good option when having small load on the system. But due to
     locking issues with sqlite, it's not recommended to use it for larger
     setup. Switching to mysql or postgres will result in a immediate
     performance increase.
 . Scale RhodeCode horizontally
     - running two or more instances on the same server can speed up things a lot
     - load balance using round robin or ip hash
     - you need to handle consistent user session storage by switching to
       db sessions, client side sessions or sharing session data folder across
       instances. See http://beaker.readthedocs.org/ docs for details.
     - remember that each instance needs it's own .ini file and unique
       `instance_id` set in them
@@ \ No newline at end of file @@
     Scaling horizontally can give huge performance increase when dealing with
     large traffic (large amount of users, CI servers etc). RhodeCode can be
     scaled horizontally on one (recommended) or multiple machines. In order
     to scale horizontally you need to do the following:
     - each instance needs it's own .ini file and unique `instance_id` set in them
     - each instance `data` storage needs to be configured to be stored on a
       shared disk storage, preferably together with repositories. This `data`
       dir contains template caches, sessions, whoosh index and it's used for
       tasks locking (so it's safe across multiple instances). Set the
       `cache_dir`, `index_dir`, `beaker.cache.data_dir`, `beaker.cache.lock_dir`
       variables in each .ini file to shared location across RhodeCode instances
     - if celery is used each instance should run separate celery instance, but
       the message broken should be common to all of them (ex one rabbitmq
       shared server)
     - load balance using round robin or ip hash, recommended is writing LB rules
       that will separate regular user traffic from automated processes like CI
       servers or build bots.

docs/usage/subrepos.rst

➞

Show inline comments

@@ @@ -2,36 +2,36 @@ @@
 =============================================
 working with RhodeCode and mercurial subrepos
 =============================================
 example usage of Subrepos with RhodeCode::
     ## init a simple repo
-    hg init repo1
     hg init repo1
     cd repo1
     echo "file1" > file1
-    hg add file1
     hg add file1
     hg ci --message "initial file 1"
     #clone subrepo we want to add
     hg clone http://rc.local/subrepo
     ## use path like url to existing repo in RhodeCode
     echo "subrepo = http://rc.local/subrepo" > .hgsub
     hg add .hgsub
     hg ci --message "added remote subrepo"
 In file list of repo1 you will see a connected subrepo at revision it was
 during cloning.
 Clicking in subrepos link should send you to proper repository in RhodeCode
 cloning repo1 will also clone attached subrepository.
 Next we can edit the subrepo data, and push back to RhodeCode. This will update
 both of repositories.
 see http://mercurial.aragost.com/kick-start/en/subrepositories/ for more
 information about subrepositories
@@ \ No newline at end of file @@
 information about subrepositories

init.d/rhodecode-daemon2

➞

Show inline comments

 #!/bin/sh -e
 ########################################
 #### THIS IS A DEBIAN INIT.D SCRIPT ####
 ########################################
 ### BEGIN INIT INFO
 # Provides:          rhodecode
 # Required-Start:    $all
 # Required-Stop:     $all
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: starts instance of rhodecode
 # Description:       starts instance of rhodecode using start-stop-daemon
 ### END INIT INFO
 APP_NAME="rhodecode"
 APP_HOMEDIR="marcink/python_workspace"
 APP_PATH="/home/$APP_HOMEDIR/$APP_NAME"
 APP_HOMEDIR="opt"
 APP_PATH="/$APP_HOMEDIR/$APP_NAME"
 CONF_NAME="production.ini"
 PID_PATH="$APP_PATH/$APP_NAME.pid"
 LOG_PATH="$APP_PATH/$APP_NAME.log"
 PYTHON_PATH="/home/$APP_HOMEDIR/v-env"
 RUN_AS="marcink"
 PYTHON_PATH="/$APP_HOMEDIR/$APP_NAME-venv"
 RUN_AS="root"
 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
+}
 status() {
   echo -n "Checking status of $APP_NAME ... "
   pid=`cat $PID_PATH`
   status=`ps ax | grep $pid | grep -ve grep`
   if [ "$?" -eq 0 ]; then
     echo "running"
   else
     echo "NOT running"
   fi
+}
 case "$1" in
   status)
    status
     ;;
   start)
     start
     ;;
   stop)
     stop
     ;;
@@ @@ -70,7 +84,7 @@ case "$1" in @@
     ### start ###
     start
     ;;
   *)
     echo "Usage: $0 {start|stop|restart}"
     exit 1
 esac
 esac
@@ \ No newline at end of file @@

production.ini

➞

Show inline comments

@@ @@ -22,78 +22,114 @@ pdebug = false @@
 #smtp_server = mail.server.com
 #smtp_username =
 #smtp_password =
 #smtp_port =
 #smtp_use_tls = false
 #smtp_use_ssl = true
 # Specify available auth parameters here (e.g. LOGIN PLAIN CRAM-MD5, etc.)
+## Specify available auth parameters here (e.g. LOGIN PLAIN CRAM-MD5, etc.)
 #smtp_auth =
 [server:main]
 ## PASTE
 ##nr of threads to spawn
+## nr of threads to spawn
 #threadpool_workers = 5
 ##max request before thread respawn
+## max request before thread respawn
 #threadpool_max_requests = 10
 ##option to use threads of process
+## option to use threads of process
 #use_threadpool = true
 #use = egg:Paste#http
 #WAITRESS
+## WAITRESS
 threads = 5
 ## 100GB
 max_request_body_size = 107374182400
 use = egg:waitress#main
 host = 127.0.0.1
 port = 8001
 [filter:proxy-prefix]
 # prefix middleware for rc
 use = egg:PasteDeploy#prefix
 prefix = /<your-prefix>
 ## prefix middleware for rc
 #[filter:proxy-prefix]
 #use = egg:PasteDeploy#prefix
 #prefix = /<your-prefix>
 [app:main]
 use = egg:rhodecode
 ## enable proxy prefix middleware
 #filter-with = proxy-prefix
 full_stack = true
 static_files = true
 # Optional Languages
 # en, fr, ja, pt_BR, zh_CN, zh_TW, pl
 ## Optional Languages
 ## en, fr, ja, pt_BR, zh_CN, zh_TW, pl
 lang = en
 cache_dir = %(here)s/data
 index_dir = %(here)s/data/index
 ## uncomment and set this path to use archive download cache
 #archive_cache_dir = /tmp/tarballcache
 ## change this to unique ID for security
 app_instance_uuid = rc-production
 ## cut off limit for large diffs (size in bytes)
 cut_off_limit = 256000
 vcs_full_cache = True
 ## use cache version of scm repo everywhere
 vcs_full_cache = true
 ## force https in RhodeCode, fixes https redirects, assumes it's always https
 force_https = false
 commit_parse_limit = 50
 # number of items displayed in lightweight dashboard before paginating
 ## use Strict-Transport-Security headers
 use_htsts = false
 ## number of commits stats will parse on each iteration
 commit_parse_limit = 25
 ## number of items displayed in lightweight dashboard before paginating is shown
 dashboard_items = 100
 ## use gravatar service to display avatars
 use_gravatar = true
 ## path to git executable
 git_path = git
 ## git rev filter option, --all is the default filter, if you need to
 ## hide all refs in changelog switch this to --branches --tags
 git_rev_filter=--all
 ## RSS feed options
 rss_cut_off_limit = 256000
 rss_items_per_page = 10
 rss_include_diff = false
 ## options for showing and identifying changesets
 show_sha_length = 12
 show_revision_number = true
 ## alternative_gravatar_url allows you to use your own avatar server application
 ## the following parts of the URL will be replaced
 ## {email}        user email
 ## {md5email}     md5 hash of the user email (like at gravatar.com)
 ## {size}         size of the image that is expected from the server application
 ## {scheme}       http/https from RhodeCode server
 ## {netloc}       network location from RhodeCode server
 #alternative_gravatar_url = http://myavatarserver.com/getbyemail/{email}/{size}
 #alternative_gravatar_url = http://myavatarserver.com/getbymd5/{md5email}?s={size}
 ## container auth options
 container_auth_enabled = false
 proxypass_auth_enabled = false
 ## default encoding used to convert from and to unicode
 ## can be also a comma seperated list of encoding in case of mixed encodings
 default_encoding = utf8
 ## overwrite schema of clone url
 ## available vars:
@@ @@ -143,12 +179,17 @@ instance_id = @@
 ## alternative return HTTP header for failed authentication. Default HTTP
 ## response is 401 HTTPUnauthorized. Currently HG clients have troubles with
 ## handling that. Set this variable to 403 to return HTTPForbidden
 auth_ret_code =
 ## locking return code. When repository is locked return this HTTP code. 2XX
 ## codes don't break the transactions while 4XX codes do
 lock_ret_code = 423
 ####################################
 ###        CELERY CONFIG        ####
 ####################################
 use_celery = false
 broker.host = localhost
 broker.vhost = rabbitmqhost
@@ @@ -167,13 +208,13 @@ celery.result.serialier = json @@
 celeryd.concurrency = 2
 #celeryd.log.file = celeryd.log
 celeryd.log.level = debug
 celeryd.max.tasks.per.child = 1
 #tasks will never be sent to the queue, but executed locally instead.
+## tasks will never be sent to the queue, but executed locally instead.
 celery.always.eager = false
 ####################################
 ###         BEAKER CACHE        ####
 ####################################
 beaker.cache.data_dir=%(here)s/data/cache/data
@@ @@ -223,24 +264,25 @@ beaker.cache.sql_cache_long.key_length = @@
 ## file based cookies (default) ##
 #beaker.session.type = file
 beaker.session.key = rhodecode
 ## secure cookie requires AES python libraries ##
 #beaker.session.encrypt_key = g654dcno0-9873jhgfreyu
 #beaker.session.validate_key = 9712sds2212c--zxc123
 ## secure cookie requires AES python libraries
 #beaker.session.encrypt_key = <key_for_encryption>
 #beaker.session.validate_key = <validation_key>
 ## sets session as invalid if it haven't been accessed for given amount of time
 beaker.session.timeout = 2592000
 beaker.session.httponly = true
 #beaker.session.cookie_path = /<your-prefix>
-## uncomment for https secure cookie ##
 ## uncomment for https secure cookie
 beaker.session.secure = false
-## auto save the session to not to use .save() ##
 ## auto save the session to not to use .save()
 beaker.session.auto = False
 ## default cookie expiration time in seconds `true` expire at browser close ##
 #beaker.session.cookie_expires = 3600
@@ @@ -249,72 +291,72 @@ beaker.session.auto = False @@
 ############################
 ####################
 ### [errormator] ###
 ####################
 # Errormator is tailored to work with RhodeCode, see
 # http://errormator.com for details how to obtain an account
 # you must install python package `errormator_client` to make it work
 ## Errormator is tailored to work with RhodeCode, see
 ## http://errormator.com for details how to obtain an account
 ## you must install python package `errormator_client` to make it work
 # errormator enabled
 errormator = true
 ## errormator enabled
 errormator = false
 errormator.server_url = https://api.errormator.com
 errormator.api_key = YOUR_API_KEY
 # TWEAK AMOUNT OF INFO SENT HERE
+## TWEAK AMOUNT OF INFO SENT HERE
 # enables 404 error logging (default False)
+## enables 404 error logging (default False)
 errormator.report_404 = false
 # time in seconds after request is considered being slow (default 1)
+## time in seconds after request is considered being slow (default 1)
 errormator.slow_request_time = 1
 # record slow requests in application
 # (needs to be enabled for slow datastore recording and time tracking)
 ## record slow requests in application
 ## (needs to be enabled for slow datastore recording and time tracking)
 errormator.slow_requests = true
 # enable hooking to application loggers
+## enable hooking to application loggers
 # errormator.logging = true
 # minimum log level for log capture
+## minimum log level for log capture
 # errormator.logging.level = WARNING
 # send logs only from erroneous/slow requests
 # (saves API quota for intensive logging)
 ## send logs only from erroneous/slow requests
 ## (saves API quota for intensive logging)
 errormator.logging_on_error = false
 # list of additonal keywords that should be grabbed from environ object
 # can be string with comma separated list of words in lowercase
 # (by default client will always send following info:
 # 'REMOTE_USER', 'REMOTE_ADDR', 'SERVER_NAME', 'CONTENT_TYPE' + all keys that
 # start with HTTP* this list be extended with additional keywords here
 ## list of additonal keywords that should be grabbed from environ object
 ## can be string with comma separated list of words in lowercase
 ## (by default client will always send following info:
 ## 'REMOTE_USER', 'REMOTE_ADDR', 'SERVER_NAME', 'CONTENT_TYPE' + all keys that
 ## start with HTTP* this list be extended with additional keywords here
 errormator.environ_keys_whitelist =
 # list of keywords that should be blanked from request object
 # can be string with comma separated list of words in lowercase
 # (by default client will always blank keys that contain following words
 # 'password', 'passwd', 'pwd', 'auth_tkt', 'secret', 'csrf'
 # this list be extended with additional keywords set here
 ## list of keywords that should be blanked from request object
 ## can be string with comma separated list of words in lowercase
 ## (by default client will always blank keys that contain following words
 ## 'password', 'passwd', 'pwd', 'auth_tkt', 'secret', 'csrf'
 ## this list be extended with additional keywords set here
 errormator.request_keys_blacklist =
 # list of namespaces that should be ignores when gathering log entries
 # can be string with comma separated list of namespaces
 # (by default the client ignores own entries: errormator_client.client)
 ## list of namespaces that should be ignores when gathering log entries
 ## can be string with comma separated list of namespaces
 ## (by default the client ignores own entries: errormator_client.client)
 errormator.log_namespace_blacklist =
 ################
 ### [sentry] ###
 ################
 # sentry is a alternative open source error aggregator
 # you must install python packages `sentry` and `raven` to enable
 ## sentry is a alternative open source error aggregator
 ## you must install python packages `sentry` and `raven` to enable
 sentry.dsn = YOUR_DNS
 sentry.servers =
 sentry.name =
 sentry.key =
 sentry.public_key =
@@ @@ -368,13 +410,13 @@ level = NOTSET @@
 handlers = console
 [logger_routes]
 level = DEBUG
 handlers =
 qualname = routes.middleware
 # "level = DEBUG" logs the route matched and routing variables.
+## "level = DEBUG" logs the route matched and routing variables.
 propagate = 1
 [logger_beaker]
 level = DEBUG
 handlers =
 qualname = beaker.container

requires.txt

➞

Show inline comments

deleted file

rhodecode/__init__.py

➞

Show inline comments

@@ @@ -23,25 +23,25 @@ @@
+#
 # 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 sys
 import platform
-VERSION = (1, 5, 4)
+VERSION = (1, 6, 0, 'rc1')
 try:
     from rhodecode.lib import get_current_revision
     _rev = get_current_revision(quiet=True)
     if _rev and len(VERSION) > 3:
         VERSION += ('dev%s' % _rev[0],)
 except ImportError:
     pass
 __version__ = ('.'.join((str(each) for each in VERSION[:3])) +
                '.'.join(VERSION[3:]))
-__dbversion__ = 10  # defines current db version for migrations
+__dbversion__ = 11  # defines current db version for migrations
 __platform__ = platform.system()
 __license__ = 'GPLv3'
 __py_version__ = sys.version_info
 __author__ = 'Marcin Kuzminski'
 __url__ = 'http://rhodecode.org'

rhodecode/bin/ldap_sync.conf

➞

Show inline comments

@@ new file 100644 @@
 [default]
 api_url = http://your.rhodecode.server:5000/_admin/api
 api_user = admin
 api_key = XXXXXXXXXXXX
 ldap_uri = ldap://your.ldap.server:389
 ldap_user = cn=rhodecode,ou=binders,dc=linaro,dc=org
 ldap_key = XXXXXXXXX
 base_dn = dc=linaro,dc=org
 sync_users = True
@@ \ No newline at end of file @@

rhodecode/bin/ldap_sync.py

➞

Show inline comments

@@ new file 100644 @@
 # 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 ldap
 import urllib2
 import uuid
 import json
 from ConfigParser import ConfigParser
 config = ConfigParser()
 config.read('ldap_sync.conf')
 class InvalidResponseIDError(Exception):
     """ Request and response don't have the same UUID. """
 class RhodecodeResponseError(Exception):
     """ Response has an error, something went wrong with request execution. """
 class UserAlreadyInGroupError(Exception):
     """ User is already a member of the target group. """
 class UserNotInGroupError(Exception):
     """ User is not a member of the target group. """
 class RhodecodeAPI():
     def __init__(self, url, key):
         self.url = url
         self.key = key
     def get_api_data(self, uid, method, args):
         """Prepare dict for API post."""
         return {
             "id": uid,
             "api_key": self.key,
             "method": method,
             "args": args
+        }
     def rhodecode_api_post(self, method, args):
         """Send a generic API post to Rhodecode.
         This will generate the UUID for validation check after the
         response is returned. Handle errors and get the result back.
         """
         uid = str(uuid.uuid1())
         data = self.get_api_data(uid, method, args)
         data = json.dumps(data)
         headers = {'content-type': 'text/plain'}
         req = urllib2.Request(self.url, data, headers)
         response = urllib2.urlopen(req)
         response = json.load(response)
         if uid != response["id"]:
             raise InvalidResponseIDError("UUID does not match.")
         if response["error"] != None:
             raise RhodecodeResponseError(response["error"])
         return response["result"]
     def create_group(self, name, active=True):
         """Create the Rhodecode user group."""
         args = {
             "group_name": name,
             "active": str(active)
+        }
         self.rhodecode_api_post("create_users_group", args)
     def add_membership(self, group, username):
         """Add specific user to a group."""
         args = {
             "usersgroupid": group,
             "userid": username
+        }
         result = self.rhodecode_api_post("add_user_to_users_group", args)
         if not result["success"]:
             raise UserAlreadyInGroupError("User %s already in group %s." %
                                           (username, group))
     def remove_membership(self, group, username):
         """Remove specific user from a group."""
         args = {
             "usersgroupid": group,
             "userid": username
+        }
         result = self.rhodecode_api_post("remove_user_from_users_group", args)
         if not result["success"]:
             raise UserNotInGroupError("User %s not in group %s." %
                                       (username, group))
     def get_group_members(self, name):
         """Get the list of member usernames from a user group."""
         args = {"usersgroupid": name}
         members = self.rhodecode_api_post("get_users_group", args)['members']
         member_list = []
         for member in members:
             member_list.append(member["username"])
         return member_list
     def get_group(self, name):
         """Return group info."""
         args = {"usersgroupid": name}
         return self.rhodecode_api_post("get_users_group", args)
     def get_user(self, username):
         """Return user info."""
         args = {"userid": username}
         return self.rhodecode_api_post("get_user", args)
 class LdapClient():
     def __init__(self, uri, user, key, base_dn):
         self.client = ldap.initialize(uri, trace_level=0)
         self.client.set_option(ldap.OPT_REFERRALS, 0)
         self.client.simple_bind(user, key)
         self.base_dn = base_dn
     def __del__(self):
         self.client.unbind()
     def get_groups(self):
         """Get all the groups in form of dict {group_name: group_info,...}."""
         searchFilter = "objectClass=groupOfUniqueNames"
         result = self.client.search_s(self.base_dn, ldap.SCOPE_SUBTREE,
                                       searchFilter)
         groups = {}
         for group in result:
             groups[group[1]['cn'][0]] = group[1]
         return groups
     def get_group_users(self, groups, group):
         """Returns all the users belonging to a single group.
         Based on the list of groups and memberships, returns all the
         users belonging to a single group, searching recursively.
         """
         users = []
         for member in groups[group]["uniqueMember"]:
             member = self.parse_member_string(member)
             if member[0] == "uid":
                 users.append(member[1])
             elif member[0] == "cn":
                 users += self.get_group_users(groups, member[1])
         return users
     def parse_member_string(self, member):
         """Parses the member string and returns a touple of type and name.
         Unique member can be either user or group. Users will have 'uid' as
         prefix while groups will have 'cn'.
         """
         member = member.split(",")[0]
         return member.split('=')
 class LdapSync(object):
     def __init__(self):
         self.ldap_client = LdapClient(config.get("default", "ldap_uri"),
                                       config.get("default", "ldap_user"),
                                       config.get("default", "ldap_key"),
                                       config.get("default", "base_dn"))
         self.rhodocode_api = RhodecodeAPI(config.get("default", "api_url"),
                                           config.get("default", "api_key"))
     def update_groups_from_ldap(self):
         """Add all the groups from LDAP to Rhodecode."""
         added = existing = 0
         groups = self.ldap_client.get_groups()
         for group in groups:
             try:
                 self.rhodecode_api.create_group(group)
                 added += 1
             except Exception:
                 existing += 1
         return added, existing
     def update_memberships_from_ldap(self, group):
         """Update memberships in rhodecode based on the LDAP groups."""
         groups = self.ldap_client.get_groups()
         group_users = self.ldap_client.get_group_users(groups, group)
         # Delete memberships first from each group which are not part
         # of the group any more.
         rhodecode_members = self.rhodecode_api.get_group_members(group)
         for rhodecode_member in rhodecode_members:
             if rhodecode_member not in group_users:
                 try:
                     self.rhodocode_api.remove_membership(group,
                                                          rhodecode_member)
                 except UserNotInGroupError:
                     pass
         # Add memberships.
         for member in group_users:
             try:
                 self.rhodecode_api.add_membership(group, member)
             except UserAlreadyInGroupError:
                 # TODO: handle somehow maybe..
                 pass
 if __name__ == '__main__':
     sync = LdapSync()
     print sync.update_groups_from_ldap()
     for gr in sync.ldap_client.get_groups():
         # TODO: exception when user does not exist during add membership...
         # How should we handle this.. Either sync users as well at this step,
         # or just ignore those who don't exist. If we want the second case,
         # we need to find a way to recognize the right exception (we always get
         # RhodecodeResponseError with no error code so maybe by return msg (?)
         sync.update_memberships_from_ldap(gr)

rhodecode/bin/rhodecode_api.py

➞

Show inline comments

@@ @@ -235,13 +235,13 @@ def main(argv=None): @@
     method = args.method
     if method == '_create_config':
         sys.exit()
     try:
         margs = dict(map(lambda s: s.split(':', 1), other))
     except:
+    except Exception:
         sys.stderr.write('Error parsing arguments \n')
         sys.exit()
     api_call(apikey, host, args.format, method, **margs)
     return 0

rhodecode/config/deployment.ini_tmpl

➞

Show inline comments

@@ @@ -22,78 +22,114 @@ pdebug = false @@
 #smtp_server = mail.server.com
 #smtp_username =
 #smtp_password =
 #smtp_port =
 #smtp_use_tls = false
 #smtp_use_ssl = true
 # Specify available auth parameters here (e.g. LOGIN PLAIN CRAM-MD5, etc.)
+## Specify available auth parameters here (e.g. LOGIN PLAIN CRAM-MD5, etc.)
 #smtp_auth =
 [server:main]
 ## PASTE
 ##nr of threads to spawn
+## nr of threads to spawn
 #threadpool_workers = 5
 ##max request before thread respawn
+## max request before thread respawn
 #threadpool_max_requests = 10
 ##option to use threads of process
+## option to use threads of process
 #use_threadpool = true
 #use = egg:Paste#http
 #WAITRESS
+## WAITRESS
 threads = 5
 ## 100GB
 max_request_body_size = 107374182400
 use = egg:waitress#main
 host = 127.0.0.1
 port = 5000
 [filter:proxy-prefix]
 # prefix middleware for rc
 use = egg:PasteDeploy#prefix
 prefix = /<your-prefix>
 ## prefix middleware for rc
 #[filter:proxy-prefix]
 #use = egg:PasteDeploy#prefix
 #prefix = /<your-prefix>
 [app:main]
 use = egg:rhodecode
 ## enable proxy prefix middleware
 #filter-with = proxy-prefix
 full_stack = true
 static_files = true
 # Optional Languages
 # en, fr, ja, pt_BR, zh_CN, zh_TW, pl
 ## Optional Languages
 ## en, fr, ja, pt_BR, zh_CN, zh_TW, pl
 lang = en
 cache_dir = %(here)s/data
 index_dir = %(here)s/data/index
 ## uncomment and set this path to use archive download cache
 #archive_cache_dir = /tmp/tarballcache
 ## change this to unique ID for security
 app_instance_uuid = ${app_instance_uuid}
 ## cut off limit for large diffs (size in bytes)
 cut_off_limit = 256000
 vcs_full_cache = True
 ## use cache version of scm repo everywhere
 vcs_full_cache = true
 ## force https in RhodeCode, fixes https redirects, assumes it's always https
 force_https = false
 commit_parse_limit = 50
 # number of items displayed in lightweight dashboard before paginating
 ## use Strict-Transport-Security headers
 use_htsts = false
 ## number of commits stats will parse on each iteration
 commit_parse_limit = 25
 ## number of items displayed in lightweight dashboard before paginating is shown
 dashboard_items = 100
 ## use gravatar service to display avatars
 use_gravatar = true
 ## path to git executable
 git_path = git
 ## git rev filter option, --all is the default filter, if you need to
 ## hide all refs in changelog switch this to --branches --tags
 git_rev_filter=--all
 ## RSS feed options
 rss_cut_off_limit = 256000
 rss_items_per_page = 10
 rss_include_diff = false
 ## options for showing and identifying changesets
 show_sha_length = 12
 show_revision_number = true
 ## alternative_gravatar_url allows you to use your own avatar server application
 ## the following parts of the URL will be replaced
 ## {email}        user email
 ## {md5email}     md5 hash of the user email (like at gravatar.com)
 ## {size}         size of the image that is expected from the server application
 ## {scheme}       http/https from RhodeCode server
 ## {netloc}       network location from RhodeCode server
 #alternative_gravatar_url = http://myavatarserver.com/getbyemail/{email}/{size}
 #alternative_gravatar_url = http://myavatarserver.com/getbymd5/{md5email}?s={size}
 ## container auth options
 container_auth_enabled = false
 proxypass_auth_enabled = false
 ## default encoding used to convert from and to unicode
 ## can be also a comma seperated list of encoding in case of mixed encodings
 default_encoding = utf8
 ## overwrite schema of clone url
 ## available vars:
@@ @@ -143,12 +179,17 @@ instance_id = @@
 ## alternative return HTTP header for failed authentication. Default HTTP
 ## response is 401 HTTPUnauthorized. Currently HG clients have troubles with
 ## handling that. Set this variable to 403 to return HTTPForbidden
 auth_ret_code =
 ## locking return code. When repository is locked return this HTTP code. 2XX
 ## codes don't break the transactions while 4XX codes do
 lock_ret_code = 423
 ####################################
 ###        CELERY CONFIG        ####
 ####################################
 use_celery = false
 broker.host = localhost
 broker.vhost = rabbitmqhost
@@ @@ -167,13 +208,13 @@ celery.result.serialier = json @@
 celeryd.concurrency = 2
 #celeryd.log.file = celeryd.log
 celeryd.log.level = debug
 celeryd.max.tasks.per.child = 1
 #tasks will never be sent to the queue, but executed locally instead.
+## tasks will never be sent to the queue, but executed locally instead.
 celery.always.eager = false
 ####################################
 ###         BEAKER CACHE        ####
 ####################################
 beaker.cache.data_dir=%(here)s/data/cache/data
@@ @@ -223,24 +264,25 @@ beaker.cache.sql_cache_long.key_length = @@
 ## file based cookies (default) ##
 #beaker.session.type = file
 beaker.session.key = rhodecode
 ## secure cookie requires AES python libraries ##
 #beaker.session.encrypt_key = g654dcno0-9873jhgfreyu
 #beaker.session.validate_key = 9712sds2212c--zxc123
 ## secure cookie requires AES python libraries
 #beaker.session.encrypt_key = <key_for_encryption>
 #beaker.session.validate_key = <validation_key>
 ## sets session as invalid if it haven't been accessed for given amount of time
 beaker.session.timeout = 2592000
 beaker.session.httponly = true
 #beaker.session.cookie_path = /<your-prefix>
-## uncomment for https secure cookie ##
 ## uncomment for https secure cookie
 beaker.session.secure = false
-## auto save the session to not to use .save() ##
 ## auto save the session to not to use .save()
 beaker.session.auto = False
 ## default cookie expiration time in seconds `true` expire at browser close ##
 #beaker.session.cookie_expires = 3600
@@ @@ -249,72 +291,72 @@ beaker.session.auto = False @@
 ############################
 ####################
 ### [errormator] ###
 ####################
 # Errormator is tailored to work with RhodeCode, see
 # http://errormator.com for details how to obtain an account
 # you must install python package `errormator_client` to make it work
 ## Errormator is tailored to work with RhodeCode, see
 ## http://errormator.com for details how to obtain an account
 ## you must install python package `errormator_client` to make it work
 # errormator enabled
 errormator = true
 ## errormator enabled
 errormator = false
 errormator.server_url = https://api.errormator.com
 errormator.api_key = YOUR_API_KEY
 # TWEAK AMOUNT OF INFO SENT HERE
+## TWEAK AMOUNT OF INFO SENT HERE
 # enables 404 error logging (default False)
+## enables 404 error logging (default False)
 errormator.report_404 = false
 # time in seconds after request is considered being slow (default 1)
+## time in seconds after request is considered being slow (default 1)
 errormator.slow_request_time = 1
 # record slow requests in application
 # (needs to be enabled for slow datastore recording and time tracking)
 ## record slow requests in application
 ## (needs to be enabled for slow datastore recording and time tracking)
 errormator.slow_requests = true
 # enable hooking to application loggers
+## enable hooking to application loggers
 # errormator.logging = true
 # minimum log level for log capture
+## minimum log level for log capture
 # errormator.logging.level = WARNING
 # send logs only from erroneous/slow requests
 # (saves API quota for intensive logging)
 ## send logs only from erroneous/slow requests
 ## (saves API quota for intensive logging)
 errormator.logging_on_error = false
 # list of additonal keywords that should be grabbed from environ object
 # can be string with comma separated list of words in lowercase
 # (by default client will always send following info:
 # 'REMOTE_USER', 'REMOTE_ADDR', 'SERVER_NAME', 'CONTENT_TYPE' + all keys that
 # start with HTTP* this list be extended with additional keywords here
 ## list of additonal keywords that should be grabbed from environ object
 ## can be string with comma separated list of words in lowercase
 ## (by default client will always send following info:
 ## 'REMOTE_USER', 'REMOTE_ADDR', 'SERVER_NAME', 'CONTENT_TYPE' + all keys that
 ## start with HTTP* this list be extended with additional keywords here
 errormator.environ_keys_whitelist =
 # list of keywords that should be blanked from request object
 # can be string with comma separated list of words in lowercase
 # (by default client will always blank keys that contain following words
 # 'password', 'passwd', 'pwd', 'auth_tkt', 'secret', 'csrf'
 # this list be extended with additional keywords set here
 ## list of keywords that should be blanked from request object
 ## can be string with comma separated list of words in lowercase
 ## (by default client will always blank keys that contain following words
 ## 'password', 'passwd', 'pwd', 'auth_tkt', 'secret', 'csrf'
 ## this list be extended with additional keywords set here
 errormator.request_keys_blacklist =
 # list of namespaces that should be ignores when gathering log entries
 # can be string with comma separated list of namespaces
 # (by default the client ignores own entries: errormator_client.client)
 ## list of namespaces that should be ignores when gathering log entries
 ## can be string with comma separated list of namespaces
 ## (by default the client ignores own entries: errormator_client.client)
 errormator.log_namespace_blacklist =
 ################
 ### [sentry] ###
 ################
 # sentry is a alternative open source error aggregator
 # you must install python packages `sentry` and `raven` to enable
 ## sentry is a alternative open source error aggregator
 ## you must install python packages `sentry` and `raven` to enable
 sentry.dsn = YOUR_DNS
 sentry.servers =
 sentry.name =
 sentry.key =
 sentry.public_key =
@@ @@ -378,13 +420,13 @@ level = NOTSET @@
 handlers = console
 [logger_routes]
 level = DEBUG
 handlers =
 qualname = routes.middleware
 # "level = DEBUG" logs the route matched and routing variables.
+## "level = DEBUG" logs the route matched and routing variables.
 propagate = 1
 [logger_beaker]
 level = DEBUG
 handlers =
 qualname = beaker.container

rhodecode/config/environment.py

➞

Show inline comments

@@ @@ -17,12 +17,13 @@ from rhodecode.config.routing import mak @@
 from rhodecode.lib import helpers
 from rhodecode.lib.auth import set_available_permissions
 from rhodecode.lib.utils import repo2db_mapper, make_ui, set_rhodecode_config,\
     load_rcextensions, check_git_version
 from rhodecode.lib.utils2 import engine_from_config, str2bool
 from rhodecode.lib.db_manage import DbManage
 from rhodecode.model import init_model
 from rhodecode.model.scm import ScmModel
 log = logging.getLogger(__name__)
@@ @@ -85,24 +86,30 @@ def load_environment(global_conf, app_co @@
         # set RC_WHOOSH_TEST_DISABLE=1 to disable whoosh index during tests
         if not int(os.environ.get('RC_WHOOSH_TEST_DISABLE', 0)):
             create_test_index(TESTS_TMP_PATH, config, True)
     #check git version
     check_git_version()
+    DbManage.check_waitress()
     # MULTIPLE DB configs
     # Setup the SQLAlchemy database engine
     sa_engine_db1 = engine_from_config(config, 'sqlalchemy.db1.')
     init_model(sa_engine_db1)
     repos_path = make_ui('db').configitems('paths')[0][1]
     repo2db_mapper(ScmModel().repo_scan(repos_path),
                    remove_obsolete=False, install_git_hook=False)
     set_available_permissions(config)
     config['base_path'] = repos_path
     set_rhodecode_config(config)
     instance_id = rhodecode.CONFIG.get('instance_id')
     if instance_id == '*':
         instance_id = '%s-%s' % (os.uname()[1], os.getpid())
         rhodecode.CONFIG['instance_id'] = instance_id
     # CONFIGURATION OPTIONS HERE (note: all config options will override
     # any Pylons config options)
     # store config reference into our module to skip import magic of
     # pylons
     rhodecode.CONFIG.update(config)

rhodecode/config/middleware.py

➞

Show inline comments

@@ @@ -12,12 +12,13 @@ from pylons.middleware import ErrorHandl @@
 from pylons.wsgiapp import PylonsApp
 from rhodecode.lib.middleware.simplehg import SimpleHg
 from rhodecode.lib.middleware.simplegit import SimpleGit
 from rhodecode.lib.middleware.https_fixup import HttpsFixup
 from rhodecode.config.environment import load_environment
 from rhodecode.lib.middleware.wrapper import RequestWrapper
 def make_app(global_conf, full_stack=True, static_files=True, **app_conf):
     """Create a Pylons WSGI application and return it
     ``global_conf``
@@ @@ -52,25 +53,25 @@ def make_app(global_conf, full_stack=Tru @@
         app = ProfilingMiddleware(app)
     if asbool(full_stack):
         from rhodecode.lib.middleware.sentry import Sentry
         from rhodecode.lib.middleware.errormator import Errormator
         if Errormator:
+        if Errormator and asbool(config['app_conf'].get('errormator')):
             app = Errormator(app, config)
         elif Sentry:
             app = Sentry(app, config)
         # Handle Python exceptions
         app = ErrorHandler(app, global_conf, **config['pylons.errorware'])
         # 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 = RequestWrapper(app, config)
         # Display error documents for 401, 403, 404 status codes (and
         # 500 when debug is disabled)
         if asbool(config['debug']):
             app = StatusCodeRedirect(app)
         else:
             app = StatusCodeRedirect(app, [400, 401, 403, 404, 500])

rhodecode/config/rcextensions/__init__.py

➞

Show inline comments

@@ @@ -3,12 +3,20 @@ @@
 # format is {'ext':['Names']} eg. {'py':['Python']} note: there can be
 # more than one name for extension
 # NOTE: that this will overide any mappings in LANGUAGES_EXTENSIONS_MAP
 # build by pygments
 EXTRA_MAPPINGS = {}
 # additional lexer definitions for custom files
 # it's overrides pygments lexers, and uses defined name of lexer to colorize the
 # files. Format is {'ext': 'lexer_name'}
 # List of lexers can be printed running:
 # python -c "import pprint;from pygments import lexers;pprint.pprint([(x[0], x[1]) for x in lexers.get_all_lexers()]);"
 EXTRA_LEXERS = {}
 #==============================================================================
 # WHOOSH INDEX EXTENSIONS
 #==============================================================================
 # if INDEX_EXTENSIONS is [] it'll use pygments lexers extensions by default.
 # To set your own just add to this list extensions to index with content
 INDEX_EXTENSIONS = []

rhodecode/config/routing.py

➞

Show inline comments

@@ @@ -38,27 +38,38 @@ def make_map(config): @@
         try:
             by_id = repo_name.split('_')
             if len(by_id) == 2 and by_id[1].isdigit() and by_id[0] == '':
                 repo_name = Repository.get(by_id[1]).repo_name
                 match_dict['repo_name'] = repo_name
         except:
+        except Exception:
             pass
         return is_valid_repo(repo_name, config['base_path'])
     def check_group(environ, match_dict):
         """
-        check for valid repositories group for proper 404 handling
+        check for valid repository 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'])
         return is_valid_repos_group(repos_group_name, config['base_path'])
     def check_group_skip_path(environ, match_dict):
         """
         check for valid repository group for proper 404 handling, but skips
         verification of existing path
         :param environ:
         :param match_dict:
         """
         repos_group_name = match_dict.get('group_name')
         return is_valid_repos_group(repos_group_name, config['base_path'],
                                     skip_path_check=True)
     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
@@ @@ -90,34 +101,34 @@ def make_map(config): @@
              action="create", conditions=dict(method=["POST"]))
         m.connect("repos", "/repos",
              action="index", conditions=dict(method=["GET"]))
         m.connect("formatted_repos", "/repos.{format}",
              action="index",
             conditions=dict(method=["GET"]))
         m.connect("new_repo", "/repos/new",
              action="new", conditions=dict(method=["GET"]))
         m.connect("formatted_new_repo", "/repos/new.{format}",
              action="new", conditions=dict(method=["GET"]))
         m.connect("new_repo", "/create_repository",
                   action="create_repository", conditions=dict(method=["GET"]))
         m.connect("/repos/{repo_name:.*?}",
              action="update", conditions=dict(method=["PUT"],
                                               function=check_repo))
         m.connect("/repos/{repo_name:.*?}",
              action="delete", conditions=dict(method=["DELETE"],
                                               function=check_repo))
         m.connect("edit_repo", "/repos/{repo_name:.*?}/edit",
              action="edit", conditions=dict(method=["GET"],
                                             function=check_repo))
         m.connect("formatted_edit_repo", "/repos/{repo_name:.*?}.{format}/edit",
              action="edit", conditions=dict(method=["GET"],
                                             function=check_repo))
         m.connect("repo", "/repos/{repo_name:.*?}",
              action="show", conditions=dict(method=["GET"],
                                             function=check_repo))
         m.connect("formatted_repo", "/repos/{repo_name:.*?}.{format}",
              action="show", conditions=dict(method=["GET"],
                                             function=check_repo))
         #add repo perm member
         m.connect('set_repo_perm_member', "/set_repo_perm_member/{repo_name:.*?}",
              action="set_repo_perm_member",
              conditions=dict(method=["POST"], function=check_repo))
         #ajax delete repo perm user
         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
@@ @@ -142,12 +153,24 @@ def make_map(config): @@
         m.connect('repo_as_fork', "/repo_as_fork/{repo_name:.*?}",
                   action="repo_as_fork", conditions=dict(method=["PUT"],
                                                       function=check_repo))
         m.connect('repo_locking', "/repo_locking/{repo_name:.*?}",
                   action="repo_locking", conditions=dict(method=["PUT"],
                                                       function=check_repo))
         m.connect('toggle_locking', "/locking_toggle/{repo_name:.*?}",
                   action="toggle_locking", conditions=dict(method=["GET"],
                                                       function=check_repo))
         #repo fields
         m.connect('create_repo_fields', "/repo_fields/{repo_name:.*?}/new",
                   action="create_repo_field", conditions=dict(method=["PUT"],
                                                       function=check_repo))
         m.connect('delete_repo_fields', "/repo_fields/{repo_name:.*?}/{field_id}",
                   action="delete_repo_field", conditions=dict(method=["DELETE"],
                                                       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",
@@ @@ -155,39 +178,40 @@ def make_map(config): @@
         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}",
+        m.connect("update_repos_group", "/repos_groups/{group_name:.*?}",
                   action="update", conditions=dict(method=["PUT"],
                                                    function=check_int))
         m.connect("delete_repos_group", "/repos_groups/{id}",
                                                    function=check_group))
         m.connect("delete_repos_group", "/repos_groups/{group_name:.*?}",
                   action="delete", conditions=dict(method=["DELETE"],
                                                    function=check_int))
         m.connect("edit_repos_group", "/repos_groups/{id:.*?}/edit",
                   action="edit", conditions=dict(method=["GET"],))
         m.connect("formatted_edit_repos_group",
                   "/repos_groups/{id}.{format}/edit",
                                                    function=check_group_skip_path))
         m.connect("edit_repos_group", "/repos_groups/{group_name:.*?}/edit",
                   action="edit", conditions=dict(method=["GET"],
                                                  function=check_int))
         m.connect("repos_group", "/repos_groups/{id}",
                                                  function=check_group))
         m.connect("formatted_edit_repos_group",
                   "/repos_groups/{group_name:.*?}.{format}/edit",
                   action="edit", conditions=dict(method=["GET"],
                                                  function=check_group))
         m.connect("repos_group", "/repos_groups/{group_name:.*?}",
                   action="show", conditions=dict(method=["GET"],
                                                  function=check_int))
         m.connect("formatted_repos_group", "/repos_groups/{id}.{format}",
                                                  function=check_group))
         m.connect("formatted_repos_group", "/repos_groups/{group_name:.*?}.{format}",
                   action="show", conditions=dict(method=["GET"],
                                                  function=check_int))
         # ajax delete repos group perm user
                                                  function=check_group))
         # ajax delete repository group perm user
         m.connect('delete_repos_group_user_perm',
                   "/delete_repos_group_user_perm/{group_name:.*}",
+                  "/delete_repos_group_user_perm/{group_name:.*?}",
              action="delete_repos_group_user_perm",
              conditions=dict(method=["DELETE"], function=check_group))
-        # ajax delete repos group perm users_group
+        # ajax delete repository group perm users_group
         m.connect('delete_repos_group_users_group_perm',
                   "/delete_repos_group_users_group_perm/{group_name:.*}",
+                  "/delete_repos_group_users_group_perm/{group_name:.*?}",
                   action="delete_repos_group_users_group_perm",
                   conditions=dict(method=["DELETE"], function=check_group))
     #ADMIN USER REST ROUTES
     with rmap.submapper(path_prefix=ADMIN_PREFIX,
                         controller='admin/users') as m:
@@ @@ -224,13 +248,13 @@ def make_map(config): @@
                   action="delete_email", conditions=dict(method=["DELETE"]))
         m.connect("user_ips", "/users_ips/{id}",
                   action="add_ip", conditions=dict(method=["PUT"]))
         m.connect("user_ips_delete", "/users_ips/{id}",
                   action="delete_ip", conditions=dict(method=["DELETE"]))
-    #ADMIN USERS GROUPS REST ROUTES
+    #ADMIN USER GROUPS 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"]))
@@ @@ -305,14 +329,12 @@ def make_map(config): @@
         m.connect("formatted_admin_setting", "/settings/{setting_id}.{format}",
                   action="show", conditions=dict(method=["GET"]))
         m.connect("admin_settings_my_account", "/my_account",
                   action="my_account", conditions=dict(method=["GET"]))
         m.connect("admin_settings_my_account_update", "/my_account_update",
                   action="my_account_update", conditions=dict(method=["PUT"]))
         m.connect("admin_settings_create_repository", "/create_repository",
                   action="create_repository", conditions=dict(method=["GET"]))
         m.connect("admin_settings_my_repos", "/my_account/repos",
                   action="my_account_my_repos", conditions=dict(method=["GET"]))
         m.connect("admin_settings_my_pullrequests", "/my_account/pull_requests",
                   action="my_account_my_pullrequests", conditions=dict(method=["GET"]))
     #NOTIFICATION REST ROUTES
@@ @@ -386,14 +408,19 @@ def make_map(config): @@
     rmap.connect('toggle_following', '%s/toggle_following' % ADMIN_PREFIX,
                  controller='journal', action='toggle_following',
                  conditions=dict(method=["POST"]))
     #SEARCH
     rmap.connect('search', '%s/search' % ADMIN_PREFIX, controller='search',)
     rmap.connect('search_repo', '%s/search/{search_repo:.*}' % ADMIN_PREFIX,
                   controller='search')
     rmap.connect('search_repo_admin', '%s/search/{repo_name:.*}' % ADMIN_PREFIX,
                  controller='search',
                  conditions=dict(function=check_repo))
     rmap.connect('search_repo', '/{repo_name:.*?}/search',
                  controller='search',
                  conditions=dict(function=check_repo),
+                 )
     #LOGIN/LOGOUT/REGISTER/SIGN IN
     rmap.connect('login_home', '%s/login' % ADMIN_PREFIX, controller='login')
     rmap.connect('logout_home', '%s/logout' % ADMIN_PREFIX, controller='login',
                  action='logout')
@@ @@ -420,20 +447,35 @@ def make_map(config): @@
     # REPOSITORY ROUTES
     #==========================================================================
     rmap.connect('summary_home', '/{repo_name:.*?}',
                 controller='summary',
                 conditions=dict(function=check_repo))
     rmap.connect('repo_size', '/{repo_name:.*?}/repo_size',
                 controller='summary', action='repo_size',
                 conditions=dict(function=check_repo))
     rmap.connect('repos_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))
     # no longer user, but kept for routes to work
     rmap.connect("_edit_repo", "/{repo_name:.*?}/edit",
                  controller='admin/repos', action="edit",
                  conditions=dict(method=["GET"], function=check_repo)
+                 )
     rmap.connect("edit_repo", "/{repo_name:.*?}/settings",
                  controller='admin/repos', action="edit",
                  conditions=dict(method=["GET"], function=check_repo)
+                 )
     #still working url for backward compat.
     rmap.connect('raw_changeset_home_depraced',
                  '/{repo_name:.*?}/raw-changeset/{revision}',
                  controller='changeset', action='changeset_raw',
                  revision='tip', conditions=dict(function=check_repo))
@@ @@ -468,14 +510,14 @@ def make_map(config): @@
     rmap.connect('compare_url',
                  '/{repo_name:.*?}/compare/{org_ref_type}@{org_ref:.*?}...{other_ref_type}@{other_ref:.*?}',
                  controller='compare', action='index',
                  conditions=dict(function=check_repo),
                  requirements=dict(
                             org_ref_type='(branch|book|tag|rev|org_ref_type)',
                             other_ref_type='(branch|book|tag|rev|other_ref_type)')
                             org_ref_type='(branch|book|tag|rev|__other_ref_type__)',
                             other_ref_type='(branch|book|tag|rev|__org_ref_type__)')
+                 )
     rmap.connect('pullrequest_home',
                  '/{repo_name:.*?}/pull-request/new', controller='pullrequests',
                  action='index', conditions=dict(function=check_repo,
                                                  method=["GET"]))
@@ @@ -515,13 +557,13 @@ def make_map(config): @@
     rmap.connect('pullrequest_comment_delete',
                  '/{repo_name:.*?}/pull-request-comment/{comment_id}/delete',
                 controller='pullrequests', action='delete_comment',
                 conditions=dict(function=check_repo, method=["DELETE"]))
-    rmap.connect('summary_home', '/{repo_name:.*?}/summary',
+    rmap.connect('summary_home_summary', '/{repo_name:.*?}/summary',
                 controller='summary', conditions=dict(function=check_repo))
     rmap.connect('shortlog_home', '/{repo_name:.*?}/shortlog',
                 controller='shortlog', conditions=dict(function=check_repo))
     rmap.connect('shortlog_file_home', '/{repo_name:.*?}/shortlog/{revision}/{f_path:.*}',
@@ @@ -545,12 +587,16 @@ def make_map(config): @@
                 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))
     rmap.connect('files_home_nopath', '/{repo_name:.*?}/files/{revision}',
                 controller='files', revision='tip', f_path='',
                 conditions=dict(function=check_repo))
     rmap.connect('files_history_home',
                  '/{repo_name:.*?}/history/{revision}/{f_path:.*}',
                  controller='files', action='history', revision='tip', f_path='',
                  conditions=dict(function=check_repo))
     rmap.connect('files_diff_home', '/{repo_name:.*?}/diff/{f_path:.*}',
@@ @@ -588,28 +634,12 @@ def make_map(config): @@
     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))
     rmap.connect('repo_settings_update', '/{repo_name:.*?}/settings',
                 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))
     rmap.connect('toggle_locking', "/{repo_name:.*?}/locking_toggle",
                  controller='settings', action="toggle_locking",
                  conditions=dict(method=["GET"], function=check_repo))
     rmap.connect('repo_fork_create_home', '/{repo_name:.*?}/fork',
                 controller='forks', action='fork_create',
                 conditions=dict(function=check_repo, method=["POST"]))
     rmap.connect('repo_fork_home', '/{repo_name:.*?}/fork',
                 controller='forks', action='fork',

rhodecode/controllers/admin/admin.py

➞

Show inline comments

@@ @@ -127,13 +127,13 @@ class AdminController(BaseController): @@
                 .options(joinedload(UserLog.repository))
         #FILTERING
         c.search_term = request.GET.get('filter')
         try:
             users_log = _journal_filter(users_log, c.search_term)
         except:
+        except Exception:
             # we want this to crash for now
             raise
         users_log = users_log.order_by(UserLog.action_date.desc())
         p = safe_int(request.params.get('page', 1), 1)

rhodecode/controllers/admin/defaults.py

➞

Show inline comments

@@ @@ -104,13 +104,13 @@ class DefaultsController(BaseController) @@
                 defaults=defaults,
                 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 defaults'),
+            h.flash(_('Error occurred during update of defaults'),
                     category='error')
         return redirect(url('defaults'))
     def delete(self, id):
         """DELETE /defaults/id: Delete an existing item"""

rhodecode/controllers/admin/ldap_settings.py

➞

Show inline comments

@@ @@ -120,13 +120,13 @@ class LdapSettingsController(BaseControl @@
                             v = ldap_active
                         setting = RhodeCodeSetting.get_by_name(k)
                         setting.app_settings_value = v
                         Session().add(setting)
                 Session().commit()
-                h.flash(_('Ldap settings updated successfully'),
+                h.flash(_('LDAP settings updated successfully'),
                         category='success')
                 if not ldap_active:
                     #if ldap is missing send an info to user
                     h.flash(_('Unable to activate ldap. The "python-ldap" library '
                               'is missing.'), category='warning')
@@ @@ -141,10 +141,10 @@ class LdapSettingsController(BaseControl @@
                 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 ldap settings'),
+            h.flash(_('Error occurred during update of ldap settings'),
                     category='error')
         return redirect(url('ldap_home'))

rhodecode/controllers/admin/notifications.py

➞

Show inline comments

@@ @@ -25,13 +25,13 @@ @@
 import logging
 import traceback
 from pylons import request
 from pylons import tmpl_context as c, url
 from pylons.controllers.util import redirect
+from pylons.controllers.util import redirect, abort
 from webhelpers.paginate import Page
 from rhodecode.lib.base import BaseController, render
 from rhodecode.model.db import Notification
@@ @@ -114,13 +114,13 @@ class NotificationsController(BaseContro @@
                         for un in no.notifications_to_users)
             if h.HasPermissionAny('hg.admin')() or owner:
                     NotificationModel().mark_read(c.rhodecode_user.user_id, no)
                     Session().commit()
                     return 'ok'
         except Exception:
             Session.rollback()
+            Session().rollback()
             log.error(traceback.format_exc())
         return 'fail'
     def delete(self, notification_id):
         """DELETE /_admin/notifications/id: Delete an existing item"""
         # Forms posted to this method should contain a hidden field:
@@ @@ -136,37 +136,38 @@ class NotificationsController(BaseContro @@
                         for un in no.notifications_to_users)
             if h.HasPermissionAny('hg.admin')() or owner:
                     NotificationModel().delete(c.rhodecode_user.user_id, no)
                     Session().commit()
                     return 'ok'
         except Exception:
             Session.rollback()
+            Session().rollback()
             log.error(traceback.format_exc())
         return 'fail'
     def show(self, notification_id, format='html'):
         """GET /_admin/notifications/id: Show a specific item"""
         # url('notification', notification_id=ID)
         c.user = self.rhodecode_user
         no = Notification.get(notification_id)
-        owner = all(un.user.user_id == c.rhodecode_user.user_id
+        owner = any(un.user.user_id == c.rhodecode_user.user_id
                     for un in no.notifications_to_users)
         if no and (h.HasPermissionAny('hg.admin', 'repository.admin')() or owner):
             unotification = NotificationModel()\
                             .get_user_notification(c.user.user_id, no)
             # if this association to user is not valid, we don't want to show
             # this message
             if unotification:
-                if unotification.read is False:
+                if not unotification.read:
                     unotification.mark_as_read()
                     Session().commit()
                 c.notification = no
                 return render('admin/notifications/show_notification.html')
-        return redirect(url('notifications'))
+        return abort(403)
     def edit(self, notification_id, format='html'):
         """GET /_admin/notifications/id/edit: Form to edit an existing item"""
         # url('edit_notification', notification_id=ID)

rhodecode/controllers/admin/permissions.py

➞

Show inline comments

@@ @@ -64,17 +64,17 @@ class PermissionsController(BaseControll @@
         self.group_perms_choices = [('group.none', _('None'),),
                                     ('group.read', _('Read'),),
                                     ('group.write', _('Write'),),
                                     ('group.admin', _('Admin'),)]
         self.register_choices = [
             ('hg.register.none',
-                _('disabled')),
+                _('Disabled')),
             ('hg.register.manual_activate',
-                _('allowed with manual account activation')),
+                _('Allowed with manual account activation')),
             ('hg.register.auto_activate',
-                _('allowed with automatic account activation')), ]
+                _('Allowed with automatic account activation')), ]
         self.create_choices = [('hg.create.none', _('Disabled')),
                                ('hg.create.repository', _('Enabled'))]
         self.fork_choices = [('hg.fork.none', _('Disabled')),
                              ('hg.fork.repository', _('Enabled'))]
@@ @@ -136,13 +136,13 @@ class PermissionsController(BaseControll @@
                     defaults=defaults,
                     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 permissions'),
+                h.flash(_('Error occurred during update of permissions'),
                         category='error')
         return redirect(url('edit_permission', id=id))
     def delete(self, id):
         """DELETE /permissions/id: Delete an existing item"""

rhodecode/controllers/admin/repos.py

➞

Show inline comments

@@ @@ -25,53 +25,56 @@ @@
 import logging
 import traceback
 import formencode
 from formencode import htmlfill
 from webob.exc import HTTPInternalServerError
+from webob.exc import HTTPInternalServerError, HTTPForbidden
 from pylons import request, session, tmpl_context as c, url
 from pylons.controllers.util import redirect
 from pylons.i18n.translation import _
 from sqlalchemy.exc import IntegrityError
 import rhodecode
 from rhodecode.lib import helpers as h
 from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator, \
     HasPermissionAnyDecorator, HasRepoPermissionAllDecorator
 from rhodecode.lib.base import BaseController, render
     HasPermissionAnyDecorator, HasRepoPermissionAllDecorator, NotAnonymous,\
     HasPermissionAny, HasReposGroupPermissionAny, HasRepoPermissionAnyDecorator
 from rhodecode.lib.base import BaseRepoController, render
 from rhodecode.lib.utils import invalidate_cache, action_logger, repo_name_slug
 from rhodecode.lib.helpers import get_token
 from rhodecode.model.meta import Session
 from rhodecode.model.db import User, Repository, UserFollowing, RepoGroup,\
     RhodeCodeSetting
 from rhodecode.model.forms import RepoForm
 from rhodecode.model.scm import ScmModel
     RhodeCodeSetting, RepositoryField
 from rhodecode.model.forms import RepoForm, RepoFieldForm, RepoPermsForm
 from rhodecode.model.scm import ScmModel, GroupList
 from rhodecode.model.repo import RepoModel
 from rhodecode.lib.compat import json
 from sqlalchemy.sql.expression import func
 from rhodecode.lib.exceptions import AttachedForksError
 log = logging.getLogger(__name__)
-class ReposController(BaseController):
+class ReposController(BaseRepoController):
     """
     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')
     @LoginRequired()
     @HasPermissionAnyDecorator('hg.admin', 'hg.create.repository')
     def __before__(self):
         c.admin_user = session.get('admin_user')
         c.admin_username = session.get('admin_username')
         super(ReposController, self).__before__()
     def __load_defaults(self):
         c.repo_groups = RepoGroup.groups_choices(check_perms=True)
         acl_groups = GroupList(RepoGroup.query().all(),
                                perm_set=['group.write', 'group.admin'])
         c.repo_groups = RepoGroup.groups_choices(groups=acl_groups)
         c.repo_groups_choices = map(lambda k: unicode(k[0]), c.repo_groups)
         repo_model = RepoModel()
         c.users_array = repo_model.get_users_js()
         c.users_groups_array = repo_model.get_users_groups_js()
         choices, c.landing_revs = ScmModel().get_repo_landing_revs()
@@ @@ -113,12 +116,15 @@ class ReposController(BaseController): @@
         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)
         c.repo_fields = RepositoryField.query()\
             .filter(RepositoryField.repository == db_repo).all()
         defaults = RepoModel()._get_defaults(repo_name)
         c.repos_list = [('', _('--REMOVE FORK--'))]
         c.repos_list += [(x.repo_id, x.repo_name) for x in
                     Repository.query().order_by(Repository.repo_name).all()
                     if x.repo_id != c.repo_info.repo_id]
@@ @@ -133,92 +139,108 @@ class ReposController(BaseController): @@
         c.repos_list = Repository.query()\
                         .order_by(func.lower(Repository.repo_name))\
                         .all()
         repos_data = RepoModel().get_repos_as_dict(repos_list=c.repos_list,
                                                    admin=True)
                                                    admin=True,
                                                    super_user_actions=True)
         #json used to render the grid
         c.data = json.dumps(repos_data)
         return render('admin/repos/repos.html')
-    @HasPermissionAnyDecorator('hg.admin', 'hg.create.repository')
+    @NotAnonymous()
     def create(self):
         """
         POST /repos: Create a new item"""
         # url('repos')
         self.__load_defaults()
         form_result = {}
         try:
             form_result = RepoForm(repo_groups=c.repo_groups_choices,
                                    landing_revs=c.landing_revs_choices)()\
                             .to_python(dict(request.POST))
             new_repo = RepoModel().create(form_result,
                                           self.rhodecode_user.user_id)
             if form_result['clone_uri']:
-                h.flash(_('created repository %s from %s') \
+                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')
                 repo_url = h.link_to(form_result['repo_name'],
                     h.url('summary_home', repo_name=form_result['repo_name_full']))
                 h.flash(h.literal(_('Created repository %s') % repo_url),
                         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_full'], self.ip_addr,
                               self.sa)
             else:
                 action_logger(self.rhodecode_user, 'admin_created_repo',
                               form_result['repo_name_full'], self.ip_addr,
                               self.sa)
             Session().commit()
         except formencode.Invalid, errors:
             c.new_repo = errors.value['repo_name']
             if request.POST.get('user_created'):
                 r = render('admin/repos/repo_add_create_repository.html')
             else:
                 r = render('admin/repos/repo_add.html')
             return htmlfill.render(
-                r,
+                render('admin/repos/repo_add.html'),
                 defaults=errors.value,
                 errors=errors.error_dict or {},
                 prefix_error=False,
                 encoding="UTF-8")
         except Exception:
             log.error(traceback.format_exc())
-            msg = _('error occurred during creation of repository %s') \
+            msg = _('Error creating repository %s') \
                     % form_result.get('repo_name')
             h.flash(msg, category='error')
             return redirect(url('repos'))
             if c.rhodecode_user.is_admin:
                 return redirect(url('repos'))
             return redirect(url('home'))
         #redirect to our new repo !
         return redirect(url('summary_home', repo_name=new_repo.repo_name))
     @HasPermissionAllDecorator('hg.admin')
     def new(self, format='html'):
         """GET /repos/new: Form to create a new item"""
     @NotAnonymous()
     def create_repository(self):
         """GET /_admin/create_repository: Form to create a new item"""
         new_repo = request.GET.get('repo', '')
         parent_group = request.GET.get('parent_group')
         if not HasPermissionAny('hg.admin', 'hg.create.repository')():
             #you're not super admin nor have global create permissions,
             #but maybe you have at least write permission to a parent group ?
             _gr = RepoGroup.get(parent_group)
             gr_name = _gr.group_name if _gr else None
             if not HasReposGroupPermissionAny('group.admin', 'group.write')(group_name=gr_name):
                 raise HTTPForbidden
         acl_groups = GroupList(RepoGroup.query().all(),
                                perm_set=['group.write', 'group.admin'])
         c.repo_groups = RepoGroup.groups_choices(groups=acl_groups)
         c.repo_groups_choices = map(lambda k: unicode(k[0]), c.repo_groups)
         choices, c.landing_revs = ScmModel().get_repo_landing_revs()
         c.new_repo = repo_name_slug(new_repo)
-        self.__load_defaults()
         ## apply the defaults from defaults page
         defaults = RhodeCodeSetting.get_default_repo_settings(strip_prefix=True)
         if parent_group:
             defaults.update({'repo_group': parent_group})
         return htmlfill.render(
             render('admin/repos/repo_add.html'),
             defaults=defaults,
             errors={},
             prefix_error=False,
             encoding="UTF-8"
+        )
-    @HasPermissionAllDecorator('hg.admin')
+    @HasRepoPermissionAllDecorator('repository.admin')
     def update(self, repo_name):
         """
         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:
@@ @@ -256,17 +278,17 @@ class ReposController(BaseController): @@
                 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 repository %s') \
+            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')
+    @HasRepoPermissionAllDecorator('repository.admin')
     def delete(self, repo_name):
         """
         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:
@@ @@ -277,75 +299,116 @@ class ReposController(BaseController): @@
         repo_model = RepoModel()
         repo = repo_model.get_by_repo_name(repo_name)
         if not repo:
             h.not_mapped_error(repo_name)
             return redirect(url('repos'))
         try:
             _forks = repo.forks.count()
             handle_forks = None
             if _forks and request.POST.get('forks'):
                 do = request.POST['forks']
                 if do == 'detach_forks':
                     handle_forks = 'detach'
                     h.flash(_('Detached %s forks') % _forks, category='success')
                 elif do == 'delete_forks':
                     handle_forks = 'delete'
                     h.flash(_('Deleted %s forks') % _forks, category='success')
             repo_model.delete(repo, forks=handle_forks)
             action_logger(self.rhodecode_user, 'admin_deleted_repo',
                               repo_name, self.ip_addr, self.sa)
             repo_model.delete(repo)
                   repo_name, self.ip_addr, self.sa)
             invalidate_cache('get_repo_cached_%s' % repo_name)
-            h.flash(_('deleted repository %s') % repo_name, category='success')
+            h.flash(_('Deleted repository %s') % repo_name, category='success')
             Session().commit()
         except IntegrityError, e:
             if e.message.find('repositories_fork_id_fkey') != -1:
                 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 AttachedForksError:
             h.flash(_('Cannot delete %s it still contains attached forks')
                         % repo_name, category='warning')
-        except Exception, e:
         except Exception:
             log.error(traceback.format_exc())
             h.flash(_('An error occurred during deletion of %s') % repo_name,
                     category='error')
         return redirect(url('repos'))
     @HasRepoPermissionAllDecorator('repository.admin')
     def set_repo_perm_member(self, repo_name):
         form = RepoPermsForm()().to_python(request.POST)
         perms_new = form['perms_new']
         perms_updates = form['perms_updates']
         cur_repo = repo_name
         # update permissions
         for member, perm, member_type in perms_updates:
             if member_type == 'user':
                 # this updates existing one
                 RepoModel().grant_user_permission(
                     repo=cur_repo, user=member, perm=perm
+                )
             else:
                 RepoModel().grant_users_group_permission(
                     repo=cur_repo, group_name=member, perm=perm
+                )
         # set new permissions
         for member, perm, member_type in perms_new:
             if member_type == 'user':
                 RepoModel().grant_user_permission(
                     repo=cur_repo, user=member, perm=perm
+                )
             else:
                 RepoModel().grant_users_group_permission(
                     repo=cur_repo, group_name=member, perm=perm
+                )
         #TODO: implement this
         #action_logger(self.rhodecode_user, 'admin_changed_repo_permissions',
         #              repo_name, self.ip_addr, self.sa)
         Session().commit()
         h.flash(_('Repository permissions updated'), category='success')
         return redirect(url('edit_repo', repo_name=repo_name))
     @HasRepoPermissionAllDecorator('repository.admin')
     def delete_perm_user(self, repo_name):
         """
         DELETE an existing repository permission user
         :param repo_name:
         """
         try:
             RepoModel().revoke_user_permission(repo=repo_name,
                                                user=request.POST['user_id'])
             #TODO: implement this
             #action_logger(self.rhodecode_user, 'admin_revoked_repo_permissions',
             #              repo_name, self.ip_addr, self.sa)
             Session().commit()
         except Exception:
             log.error(traceback.format_exc())
             h.flash(_('An error occurred during deletion of repository user'),
                     category='error')
             raise HTTPInternalServerError()
     @HasRepoPermissionAllDecorator('repository.admin')
     def delete_perm_users_group(self, repo_name):
         """
-        DELETE an existing repository permission users group
+        DELETE an existing repository permission user group
         :param repo_name:
         """
         try:
             RepoModel().revoke_users_group_permission(
                 repo=repo_name, group_name=request.POST['users_group_id']
+            )
             Session().commit()
         except Exception:
             log.error(traceback.format_exc())
             h.flash(_('An error occurred during deletion of repository'
-                      ' users groups'),
+                      ' user groups'),
                     category='error')
             raise HTTPInternalServerError()
-    @HasPermissionAllDecorator('hg.admin')
+    @HasRepoPermissionAllDecorator('repository.admin')
     def repo_stats(self, repo_name):
         """
         DELETE an existing repository statistics
         :param repo_name:
         """
@@ @@ -356,13 +419,13 @@ class ReposController(BaseController): @@
         except Exception, e:
             log.error(traceback.format_exc())
             h.flash(_('An error occurred during deletion of repository stats'),
                     category='error')
         return redirect(url('edit_repo', repo_name=repo_name))
-    @HasPermissionAllDecorator('hg.admin')
+    @HasRepoPermissionAllDecorator('repository.admin')
     def repo_cache(self, repo_name):
         """
         INVALIDATE existing repository cache
         :param repo_name:
         """
@@ @@ -373,13 +436,13 @@ class ReposController(BaseController): @@
         except Exception, e:
             log.error(traceback.format_exc())
             h.flash(_('An error occurred during cache invalidation'),
                     category='error')
         return redirect(url('edit_repo', repo_name=repo_name))
-    @HasPermissionAllDecorator('hg.admin')
+    @HasRepoPermissionAllDecorator('repository.admin')
     def repo_locking(self, repo_name):
         """
         Unlock repository when it is locked !
         :param repo_name:
         """
@@ @@ -393,13 +456,40 @@ class ReposController(BaseController): @@
         except Exception, e:
             log.error(traceback.format_exc())
             h.flash(_('An error occurred during unlocking'),
                     category='error')
         return redirect(url('edit_repo', repo_name=repo_name))
     @HasPermissionAllDecorator('hg.admin')
     @HasRepoPermissionAnyDecorator('repository.write', 'repository.admin')
     def toggle_locking(self, repo_name):
         """
         Toggle locking of repository by simple GET call to url
         :param repo_name:
         """
         try:
             repo = Repository.get_by_repo_name(repo_name)
             if repo.enable_locking:
                 if repo.locked[0]:
                     Repository.unlock(repo)
                     action = _('Unlocked')
                 else:
                     Repository.lock(repo, c.rhodecode_user.user_id)
                     action = _('Locked')
                 h.flash(_('Repository has been %s') % action,
                         category='success')
         except Exception, e:
             log.error(traceback.format_exc())
             h.flash(_('An error occurred during unlocking'),
                     category='error')
         return redirect(url('summary_home', repo_name=repo_name))
     @HasRepoPermissionAllDecorator('repository.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:
@@ @@ -412,22 +502,22 @@ class ReposController(BaseController): @@
                 repo_id = Repository.get_by_repo_name(repo_name).repo_id
                 user_id = User.get_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')
                 Session().commit()
             except:
+            except Exception:
                 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')
+    @HasRepoPermissionAllDecorator('repository.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:
@@ @@ -438,13 +528,13 @@ class ReposController(BaseController): @@
         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')
+    @HasRepoPermissionAllDecorator('repository.admin')
     def repo_as_fork(self, repo_name):
         """
         Mark given repository as a fork of another
         :param repo_name:
         """
@@ @@ -465,18 +555,52 @@ class ReposController(BaseController): @@
     @HasPermissionAllDecorator('hg.admin')
     def show(self, repo_name, format='html'):
         """GET /repos/repo_name: Show a specific item"""
         # url('repo', repo_name=ID)
-    @HasPermissionAllDecorator('hg.admin')
+    @HasRepoPermissionAllDecorator('repository.admin')
     def edit(self, repo_name, format='html'):
         """GET /repos/repo_name/edit: Form to edit an existing item"""
         # url('edit_repo', repo_name=ID)
         defaults = self.__load_data(repo_name)
         return htmlfill.render(
             render('admin/repos/repo_edit.html'),
             defaults=defaults,
             encoding="UTF-8",
             force_defaults=False
+        )
     @HasPermissionAllDecorator('hg.admin')
     def create_repo_field(self, repo_name):
         try:
             form_result = RepoFieldForm()().to_python(dict(request.POST))
             new_field = RepositoryField()
             new_field.repository = Repository.get_by_repo_name(repo_name)
             new_field.field_key = form_result['new_field_key']
             new_field.field_type = form_result['new_field_type']  # python type
             new_field.field_value = form_result['new_field_value']  # set initial blank value
             new_field.field_desc = form_result['new_field_desc']
             new_field.field_label = form_result['new_field_label']
             Session().add(new_field)
             Session().commit()
         except Exception, e:
             log.error(traceback.format_exc())
             msg = _('An error occurred during creation of field')
             if isinstance(e, formencode.Invalid):
                 msg += ". " + e.msg
             h.flash(msg, category='error')
         return redirect(url('edit_repo', repo_name=repo_name))
     @HasPermissionAllDecorator('hg.admin')
     def delete_repo_field(self, repo_name, field_id):
         field = RepositoryField.get_or_404(field_id)
         try:
             Session().delete(field)
             Session().commit()
         except Exception, e:
             log.error(traceback.format_exc())
             msg = _('An error occurred during removal of field')
             h.flash(msg, category='error')
         return redirect(url('edit_repo', repo_name=repo_name))

rhodecode/controllers/admin/repos_groups.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 """
     rhodecode.controllers.admin.repos_groups
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    Repositories groups controller for RhodeCode
+    Repository groups controller for RhodeCode
     :created_on: Mar 23, 2010
     :author: marcink
     :copyright: (C) 2010-2012 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
@@ @@ -27,31 +27,33 @@ import logging @@
 import traceback
 import formencode
 from formencode import htmlfill
 from pylons import request, tmpl_context as c, url
 from pylons.controllers.util import redirect
+from pylons.controllers.util import abort, redirect
 from pylons.i18n.translation import _
 from sqlalchemy.exc import IntegrityError
 import rhodecode
 from rhodecode.lib import helpers as h
 from rhodecode.lib.ext_json import json
 from rhodecode.lib.auth import LoginRequired, HasPermissionAnyDecorator,\
     HasReposGroupPermissionAnyDecorator
     HasReposGroupPermissionAnyDecorator, HasReposGroupPermissionAll,\
     HasPermissionAll
 from rhodecode.lib.base import BaseController, render
 from rhodecode.model.db import RepoGroup, Repository
 from rhodecode.model.repos_group import ReposGroupModel
 from rhodecode.model.forms import ReposGroupForm
 from rhodecode.model.meta import Session
 from rhodecode.model.repo import RepoModel
 from webob.exc import HTTPInternalServerError, HTTPNotFound
 from rhodecode.lib.utils2 import str2bool
+from rhodecode.lib.utils2 import str2bool, safe_int
 from sqlalchemy.sql.expression import func
 from rhodecode.model.scm import GroupList
 log = logging.getLogger(__name__)
 class ReposGroupsController(BaseController):
     """REST Controller styled on the Atom Publishing Protocol"""
@@ @@ -60,27 +62,37 @@ class ReposGroupsController(BaseControll @@
     #     map.resource('repos_group', 'repos_groups')
     @LoginRequired()
     def __before__(self):
         super(ReposGroupsController, self).__before__()
     def __load_defaults(self):
         c.repo_groups = RepoGroup.groups_choices()
     def __load_defaults(self, allow_empty_group=False, exclude_group_ids=[]):
         if HasPermissionAll('hg.admin')('group edit'):
             #we're global admin, we're ok and we can create TOP level groups
             allow_empty_group = True
         #override the choices for this form, we need to filter choices
         #and display only those we have ADMIN right
         groups_with_admin_rights = GroupList(RepoGroup.query().all(),
                                              perm_set=['group.admin'])
         c.repo_groups = RepoGroup.groups_choices(groups=groups_with_admin_rights,
                                                  show_empty_group=allow_empty_group)
         # exclude filtered ids
         c.repo_groups = filter(lambda x: x[0] not in exclude_group_ids,
                                c.repo_groups)
         c.repo_groups_choices = map(lambda k: unicode(k[0]), c.repo_groups)
         repo_model = RepoModel()
         c.users_array = repo_model.get_users_js()
         c.users_groups_array = repo_model.get_users_groups_js()
     def __load_data(self, group_id):
         """
         Load defaults settings for edit, and update
         :param group_id:
         """
         self.__load_defaults()
         repo_group = RepoGroup.get_or_404(group_id)
         data = repo_group.get_dict()
         data['group_name'] = repo_group.name
         # fill repository users
         for p in repo_group.repo_group_to_perm:
@@ @@ -91,150 +103,192 @@ class ReposGroupsController(BaseControll @@
         for p in repo_group.users_group_to_perm:
             data.update({'g_perm_%s' % p.users_group.users_group_name:
                              p.permission.permission_name})
         return data
     @HasPermissionAnyDecorator('hg.admin')
     def _revoke_perms_on_yourself(self, form_result):
         _up = filter(lambda u: c.rhodecode_user.username == u[0],
                      form_result['perms_updates'])
         _new = filter(lambda u: c.rhodecode_user.username == u[0],
                       form_result['perms_new'])
         if _new and _new[0][1] != 'group.admin' or _up and _up[0][1] != 'group.admin':
             return True
         return False
     def index(self, format='html'):
         """GET /repos_groups: All items in the collection"""
         # url('repos_groups')
         group_iter = GroupList(RepoGroup.query().all(), perm_set=['group.admin'])
         sk = lambda g: g.parents[0].group_name if g.parents else g.group_name
-        c.groups = sorted(RepoGroup.query().all(), key=sk)
+        c.groups = sorted(group_iter, 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_form = ReposGroupForm(available_groups =
                                           c.repo_groups_choices)()
         # permissions for can create group based on parent_id are checked
         # here in the Form
         repos_group_form = ReposGroupForm(available_groups=
                                 map(lambda k: unicode(k[0]), c.repo_groups))()
         try:
             form_result = repos_group_form.to_python(dict(request.POST))
             ReposGroupModel().create(
                     group_name=form_result['group_name'],
                     group_description=form_result['group_description'],
                     parent=form_result['group_parent_id']
                     parent=form_result['group_parent_id'],
                     owner=self.rhodecode_user.user_id
+            )
             Session().commit()
-            h.flash(_('created repos group %s') \
+            h.flash(_('Created repository 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') \
+            h.flash(_('Error occurred during creation of repository group %s') \
                     % request.POST.get('group_name'), category='error')
         parent_group_id = form_result['group_parent_id']
         #TODO: maybe we should get back to the main view, not the admin one
         return redirect(url('repos_groups', parent_group=parent_group_id))
         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')
         if HasPermissionAll('hg.admin')('group create'):
             #we're global admin, we're ok and we can create TOP level groups
             pass
         else:
             # we pass in parent group into creation form, thus we know
             # what would be the group, we can check perms here !
             group_id = safe_int(request.GET.get('parent_group'))
             group = RepoGroup.get(group_id) if group_id else None
             group_name = group.group_name if group else None
             if HasReposGroupPermissionAll('group.admin')(group_name, 'group create'):
                 pass
             else:
                 return abort(403)
         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"""
     @HasReposGroupPermissionAnyDecorator('group.admin')
     def update(self, group_name):
         """PUT /repos_groups/group_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('repos_group', id=ID),
+        #    h.form(url('repos_group', group_name=GROUP_NAME),
         #           method='put')
-        # url('repos_group', id=ID)
+        # url('repos_group', group_name=GROUP_NAME)
         self.__load_defaults()
         c.repos_group = RepoGroup.get(id)
         c.repos_group = ReposGroupModel()._get_repos_group(group_name)
         if HasPermissionAll('hg.admin')('group edit'):
             #we're global admin, we're ok and we can create TOP level groups
             allow_empty_group = True
         elif not c.repos_group.parent_group:
             allow_empty_group = True
         else:
             allow_empty_group = False
         self.__load_defaults(allow_empty_group=allow_empty_group,
                              exclude_group_ids=[c.repos_group.group_id])
         repos_group_form = ReposGroupForm(
             edit=True,
             old_data=c.repos_group.get_dict(),
             available_groups=c.repo_groups_choices
             available_groups=c.repo_groups_choices,
             can_create_in_root=allow_empty_group,
         )()
         try:
             form_result = repos_group_form.to_python(dict(request.POST))
             ReposGroupModel().update(id, form_result)
             if not c.rhodecode_user.is_admin:
                 if self._revoke_perms_on_yourself(form_result):
                     msg = _('Cannot revoke permission for yourself as admin')
                     h.flash(msg, category='warning')
                     raise Exception('revoke admin permission on self')
             new_gr = ReposGroupModel().update(group_name, form_result)
             Session().commit()
-            h.flash(_('updated repos group %s') \
+            h.flash(_('Updated repository group %s') \
                     % form_result['group_name'], category='success')
             # we now have new name !
             group_name = new_gr.group_name
             #TODO: in future action_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') \
+            h.flash(_('Error occurred during update of repository group %s') \
                     % request.POST.get('group_name'), category='error')
-        return redirect(url('edit_repos_group', id=id))
+        return redirect(url('edit_repos_group', group_name=group_name))
     @HasPermissionAnyDecorator('hg.admin')
     def delete(self, id):
         """DELETE /repos_groups/id: Delete an existing item"""
     @HasReposGroupPermissionAnyDecorator('group.admin')
     def delete(self, group_name):
         """DELETE /repos_groups/group_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:
-        #    h.form(url('repos_group', id=ID),
+        #    h.form(url('repos_group', group_name=GROUP_NAME),
         #           method='delete')
-        # url('repos_group', id=ID)
+        # url('repos_group', group_name=GROUP_NAME)
-        gr = RepoGroup.get(id)
+        gr = c.repos_group = ReposGroupModel()._get_repos_group(group_name)
         repos = gr.repositories.all()
         if repos:
             h.flash(_('This group contains %s repositores and cannot be '
                       'deleted') % len(repos),
                     category='error')
                       'deleted') % len(repos), category='warning')
             return redirect(url('repos_groups'))
         children = gr.children.all()
         if children:
             h.flash(_('This group contains %s subgroups and cannot be deleted'
                       % (len(children))), category='warning')
             return redirect(url('repos_groups'))
         try:
-            ReposGroupModel().delete(id)
+            ReposGroupModel().delete(group_name)
             Session().commit()
-            h.flash(_('removed repos group %s') % gr.group_name,
+            h.flash(_('Removed repository group %s') % group_name,
                     category='success')
             #TODO: in future action_logger(, '', '', '', self.sa)
         except IntegrityError, e:
             if str(e.message).find('groups_group_parent_id_fkey') != -1:
                 log.error(traceback.format_exc())
                 h.flash(_('Cannot delete this group it still contains '
                           'subgroups'),
                         category='warning')
             else:
                 log.error(traceback.format_exc())
                 h.flash(_('error occurred during deletion of repos '
                           'group %s') % gr.group_name, category='error')
         except Exception:
             log.error(traceback.format_exc())
             h.flash(_('error occurred during deletion of repos '
                       'group %s') % gr.group_name, category='error')
             h.flash(_('Error occurred during deletion of repos '
                       'group %s') % group_name, category='error')
         return redirect(url('repos_groups'))
     @HasReposGroupPermissionAnyDecorator('group.admin')
     def delete_repos_group_user_perm(self, group_name):
         """
-        DELETE an existing repositories group permission user
+        DELETE an existing repository group permission user
         :param group_name:
         """
         try:
             if not c.rhodecode_user.is_admin:
                 if c.rhodecode_user.user_id == safe_int(request.POST['user_id']):
                     msg = _('Cannot revoke permission for yourself as admin')
                     h.flash(msg, category='warning')
                     raise Exception('revoke admin permission on self')
             recursive = str2bool(request.POST.get('recursive', False))
             ReposGroupModel().delete_permission(
                 repos_group=group_name, obj=request.POST['user_id'],
                 obj_type='user', recursive=recursive
+            )
             Session().commit()
@@ @@ -244,13 +298,13 @@ class ReposGroupsController(BaseControll @@
                     category='error')
             raise HTTPInternalServerError()
     @HasReposGroupPermissionAnyDecorator('group.admin')
     def delete_repos_group_users_group_perm(self, group_name):
         """
-        DELETE an existing repositories group permission users group
+        DELETE an existing repository group permission user group
         :param group_name:
         """
         try:
             recursive = str2bool(request.POST.get('recursive', False))
@@ @@ -259,13 +313,13 @@ class ReposGroupsController(BaseControll @@
                 obj_type='users_group', recursive=recursive
+            )
             Session().commit()
         except Exception:
             log.error(traceback.format_exc())
             h.flash(_('An error occurred during deletion of group'
-                      ' users groups'),
+                      ' user groups'),
                     category='error')
             raise HTTPInternalServerError()
     def show_by_name(self, group_name):
         """
         This is a proxy that does a lookup group_name -> id, and shows
@@ @@ -276,54 +330,62 @@ class ReposGroupsController(BaseControll @@
         if id_:
             return self.show(id_.group_id)
         raise HTTPNotFound
     @HasReposGroupPermissionAnyDecorator('group.read', 'group.write',
                                          'group.admin')
     def show(self, id, format='html'):
         """GET /repos_groups/id: Show a specific item"""
         # url('repos_group', id=ID)
     def show(self, group_name, format='html'):
         """GET /repos_groups/group_name: Show a specific item"""
         # url('repos_group', group_name=GROUP_NAME)
-        c.group = RepoGroup.get_or_404(id)
+        c.group = c.repos_group = ReposGroupModel()._get_repos_group(group_name)
         c.group_repos = c.group.repositories.all()
         #overwrite our cached list with current filter
         gr_filter = c.group_repos
         c.repo_cnt = 0
         groups = RepoGroup.query().order_by(RepoGroup.group_name)\
-            .filter(RepoGroup.group_parent_id == id).all()
+            .filter(RepoGroup.group_parent_id == c.group.group_id).all()
         c.groups = self.scm_model.get_repos_groups(groups)
-        if c.visual.lightweight_dashboard is False:
+        if not c.visual.lightweight_dashboard:
             c.repos_list = self.scm_model.get_repos(all_repos=gr_filter)
         ## lightweight version of dashboard
         else:
             c.repos_list = Repository.query()\
-                            .filter(Repository.group_id == id)\
+                            .filter(Repository.group_id == c.group.group_id)\
                             .order_by(func.lower(Repository.repo_name))\
                             .all()
             repos_data = RepoModel().get_repos_as_dict(repos_list=c.repos_list,
                                                        admin=False)
             #json used to render the grid
             c.data = json.dumps(repos_data)
         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)
     @HasReposGroupPermissionAnyDecorator('group.admin')
     def edit(self, group_name, format='html'):
         """GET /repos_groups/group_name/edit: Form to edit an existing item"""
         # url('edit_repos_group', group_name=GROUP_NAME)
         c.repos_group = ReposGroupModel()._get_repos_group(id)
         defaults = self.__load_data(c.repos_group.group_id)
         c.repos_group = ReposGroupModel()._get_repos_group(group_name)
         #we can only allow moving empty group if it's already a top-level
         #group, ie has no parents, or we're admin
         if HasPermissionAll('hg.admin')('group edit'):
             #we're global admin, we're ok and we can create TOP level groups
             allow_empty_group = True
         elif not c.repos_group.parent_group:
             allow_empty_group = True
         else:
             allow_empty_group = False
         # we need to exclude this group from the group list for editing
         c.repo_groups = filter(lambda x: x[0] != c.repos_group.group_id,
                                c.repo_groups)
         self.__load_defaults(allow_empty_group=allow_empty_group,
                              exclude_group_ids=[c.repos_group.group_id])
         defaults = self.__load_data(c.repos_group.group_id)
         return htmlfill.render(
             render('admin/repos_groups/repos_groups_edit.html'),
             defaults=defaults,
             encoding="UTF-8",
             force_defaults=False

rhodecode/controllers/admin/settings.py

➞

Show inline comments

@@ @@ -34,29 +34,31 @@ 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 import helpers as h
 from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator, \
     HasPermissionAnyDecorator, NotAnonymous
     HasPermissionAnyDecorator, NotAnonymous, HasPermissionAny,\
     HasReposGroupPermissionAll, HasReposGroupPermissionAny, AuthUser
 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, repo_name_slug, check_git_version
 from rhodecode.model.db import RhodeCodeUi, Repository, RepoGroup, \
     RhodeCodeSetting, PullRequest, PullRequestReviewers
 from rhodecode.model.forms import UserForm, ApplicationSettingsForm, \
     ApplicationUiSettingsForm, ApplicationVisualisationForm
 from rhodecode.model.scm import ScmModel
+from rhodecode.model.scm import ScmModel, GroupList
 from rhodecode.model.user import UserModel
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.db import User
 from rhodecode.model.notification import EmailNotificationModel
 from rhodecode.model.meta import Session
 from rhodecode.lib.utils2 import str2bool, safe_unicode
 from rhodecode.lib.compat import json
 from webob.exc import HTTPForbidden
 log = logging.getLogger(__name__)
 class SettingsController(BaseController):
     """REST Controller styled on the Atom Publishing Protocol"""
     # To properly map this controller, ensure your config/routing.py
@@ @@ -162,13 +164,13 @@ class SettingsController(BaseController) @@
                 Session().commit()
                 set_rhodecode_config(config)
                 h.flash(_('Updated application settings'), category='success')
             except Exception:
                 log.error(traceback.format_exc())
-                h.flash(_('error occurred during updating '
+                h.flash(_('Error occurred during updating '
                           'application settings'),
                           category='error')
         if setting_id == 'visual':
             application_form = ApplicationVisualisationForm()()
@@ @@ -201,20 +203,25 @@ class SettingsController(BaseController) @@
                 sett4 = RhodeCodeSetting.get_by_name_or_create('lightweight_dashboard')
                 sett4.app_settings_value = \
                     form_result['rhodecode_lightweight_dashboard']
                 Session().add(sett4)
                 sett4 = RhodeCodeSetting.get_by_name_or_create('repository_fields')
                 sett4.app_settings_value = \
                     form_result['rhodecode_repository_fields']
                 Session().add(sett4)
                 Session().commit()
                 set_rhodecode_config(config)
                 h.flash(_('Updated visualisation settings'),
                         category='success')
             except Exception:
                 log.error(traceback.format_exc())
-                h.flash(_('error occurred during updating '
+                h.flash(_('Error occurred during updating '
                           'visualisation settings'),
                         category='error')
         if setting_id == 'vcs':
             application_form = ApplicationUiSettingsForm()()
             try:
@@ @@ -226,82 +233,75 @@ class SettingsController(BaseController) @@
                      errors=errors.error_dict or {},
                      prefix_error=False,
                      encoding="UTF-8"
+                )
             try:
                 # fix namespaces for hooks and extensions
                 _f = lambda s: s.replace('.', '_')
                 sett = RhodeCodeUi.get_by_key('push_ssl')
                 sett.ui_value = form_result['web_push_ssl']
                 Session().add(sett)
                 sett = RhodeCodeUi.get_by_key('/')
                 sett.ui_value = form_result['paths_root_path']
                 Session().add(sett)
                 #HOOKS
                 sett = RhodeCodeUi.get_by_key(RhodeCodeUi.HOOK_UPDATE)
                 sett.ui_active = form_result[_f('hooks_%s' %
                                                 RhodeCodeUi.HOOK_UPDATE)]
                 sett.ui_active = form_result['hooks_changegroup_update']
                 Session().add(sett)
                 sett = RhodeCodeUi.get_by_key(RhodeCodeUi.HOOK_REPO_SIZE)
                 sett.ui_active = form_result[_f('hooks_%s' %
                                                 RhodeCodeUi.HOOK_REPO_SIZE)]
                 sett.ui_active = form_result['hooks_changegroup_repo_size']
                 Session().add(sett)
                 sett = RhodeCodeUi.get_by_key(RhodeCodeUi.HOOK_PUSH)
                 sett.ui_active = form_result[_f('hooks_%s' %
                                                 RhodeCodeUi.HOOK_PUSH)]
                 sett.ui_active = form_result['hooks_changegroup_push_logger']
                 Session().add(sett)
                 sett = RhodeCodeUi.get_by_key(RhodeCodeUi.HOOK_PULL)
                 sett.ui_active = form_result[_f('hooks_%s' %
                                                  RhodeCodeUi.HOOK_PULL)]
                 sett.ui_active = form_result['hooks_outgoing_pull_logger']
                 Session().add(sett)
                 ## EXTENSIONS
                 sett = RhodeCodeUi.get_by_key('largefiles')
                 if not sett:
                     #make one if it's not there !
                     sett = RhodeCodeUi()
                     sett.ui_key = 'largefiles'
                     sett.ui_section = 'extensions'
-                sett.ui_active = form_result[_f('extensions_largefiles')]
                 sett.ui_active = form_result['extensions_largefiles']
                 Session().add(sett)
                 sett = RhodeCodeUi.get_by_key('hgsubversion')
                 if not sett:
                     #make one if it's not there !
                     sett = RhodeCodeUi()
                     sett.ui_key = 'hgsubversion'
                     sett.ui_section = 'extensions'
-                sett.ui_active = form_result[_f('extensions_hgsubversion')]
                 sett.ui_active = form_result['extensions_hgsubversion']
                 Session().add(sett)
 #                sett = RhodeCodeUi.get_by_key('hggit')
 #                if not sett:
 #                    #make one if it's not there !
 #                    sett = RhodeCodeUi()
 #                    sett.ui_key = 'hggit'
 #                    sett.ui_section = 'extensions'
+#
-#                sett.ui_active = form_result[_f('extensions_hggit')]
 #                sett.ui_active = form_result['extensions_hggit']
 #                Session().add(sett)
                 Session().commit()
                 h.flash(_('Updated VCS settings'), category='success')
             except Exception:
                 log.error(traceback.format_exc())
-                h.flash(_('error occurred during updating '
+                h.flash(_('Error occurred during updating '
                           'application settings'), category='error')
         if setting_id == 'hooks':
             ui_key = request.POST.get('new_hook_ui_key')
             ui_value = request.POST.get('new_hook_ui_value')
             try:
@@ @@ -321,13 +321,13 @@ class SettingsController(BaseController) @@
                 if update:
                     h.flash(_('Updated hooks'), category='success')
                 Session().commit()
             except Exception:
                 log.error(traceback.format_exc())
-                h.flash(_('error occurred during hook creation'),
+                h.flash(_('Error occurred during hook creation'),
                         category='error')
             return redirect(url('admin_edit_setting', setting_id='hooks'))
         if setting_id == 'email':
             test_email = request.POST.get('test_email')
@@ @@ -399,12 +399,14 @@ class SettingsController(BaseController) @@
         """
         GET /_admin/my_account Displays info about my account
         """
         # url('admin_settings_my_account')
         c.user = User.get(self.rhodecode_user.user_id)
         c.perm_user = AuthUser(user_id=self.rhodecode_user.user_id,
                                ip_addr=self.ip_addr)
         c.ldap_dn = c.user.ldap_dn
         if c.user.username == 'default':
             h.flash(_("You can't edit this user since it's"
               " crucial for entire application"), category='warning')
             return redirect(url('users'))
@@ @@ -430,12 +432,14 @@ class SettingsController(BaseController) @@
         # Or using helpers:
         #    h.form(url('admin_settings_my_account_update'),
         #           method='put')
         # url('admin_settings_my_account_update', id=ID)
         uid = self.rhodecode_user.user_id
         c.user = User.get(self.rhodecode_user.user_id)
         c.perm_user = AuthUser(user_id=self.rhodecode_user.user_id,
                                ip_addr=self.ip_addr)
         c.ldap_dn = c.user.ldap_dn
         email = self.rhodecode_user.email
         _form = UserForm(edit=True,
                          old_data={'user_id': uid, 'email': email})()
         form_result = {}
         try:
@@ @@ -457,51 +461,38 @@ class SettingsController(BaseController) @@
                 errors=errors.error_dict or {},
                 prefix_error=False,
                 encoding="UTF-8")
             return render('admin/users/user_edit_my_account.html')
         except Exception:
             log.error(traceback.format_exc())
-            h.flash(_('error occurred during update of user %s') \
+            h.flash(_('Error occurred during update of user %s') \
                     % form_result.get('username'), category='error')
         return redirect(url('my_account'))
     @NotAnonymous()
     def my_account_my_pullrequests(self):
         c.my_pull_requests = PullRequest.query()\
         c.show_closed = request.GET.get('pr_show_closed')
         def _filter(pr):
             s = sorted(pr, key=lambda o: o.created_on, reverse=True)
             if not c.show_closed:
                 s = filter(lambda p: p.status != PullRequest.STATUS_CLOSED, s)
             return s
         c.my_pull_requests = _filter(PullRequest.query()\
                                 .filter(PullRequest.user_id ==
                                         self.rhodecode_user.user_id)\
                                 .all()
         c.participate_in_pull_requests = \
             [x.pull_request for x in PullRequestReviewers.query()\
                                     .filter(PullRequestReviewers.user_id ==
                                             self.rhodecode_user.user_id)\
                                     .all()]
         return render('admin/users/user_edit_my_account_pullrequests.html')
     @NotAnonymous()
     @HasPermissionAnyDecorator('hg.admin', 'hg.create.repository')
     def create_repository(self):
         """GET /_admin/create_repository: Form to create a new item"""
                                 .all())
         c.repo_groups = RepoGroup.groups_choices(check_perms=True)
         c.repo_groups_choices = map(lambda k: unicode(k[0]), c.repo_groups)
         choices, c.landing_revs = ScmModel().get_repo_landing_revs()
         new_repo = request.GET.get('repo', '')
         c.new_repo = repo_name_slug(new_repo)
         c.participate_in_pull_requests = _filter([
                     x.pull_request for x in PullRequestReviewers.query()\
                     .filter(PullRequestReviewers.user_id ==
                             self.rhodecode_user.user_id).all()])
         ## apply the defaults from defaults page
         defaults = RhodeCodeSetting.get_default_repo_settings(strip_prefix=True)
         return htmlfill.render(
             render('admin/repos/repo_add_create_repository.html'),
             defaults=defaults,
             errors={},
             prefix_error=False,
             encoding="UTF-8"
+        )
         return render('admin/users/user_edit_my_account_pullrequests.html')
     def _get_hg_ui_settings(self):
         ret = RhodeCodeUi.query().all()
         if not ret:
             raise Exception('Could not get application ui settings !')

rhodecode/controllers/admin/users.py

➞

Show inline comments

@@ @@ -96,15 +96,15 @@ class UsersController(BaseController): @@
                 "raw_username": user.username,
                 "username": user_lnk(user.user_id, user.username),
                 "firstname": user.name,
                 "lastname": user.lastname,
                 "last_login": h.fmt_date(user.last_login),
                 "last_login_raw": datetime_to_time(user.last_login),
                 "active": h.bool2icon(user.active),
                 "admin": h.bool2icon(user.admin),
                 "ldap": h.bool2icon(bool(user.ldap_dn)),
                 "active": h.boolicon(user.active),
                 "admin": h.boolicon(user.admin),
                 "ldap": h.boolicon(bool(user.ldap_dn)),
                 "action": user_actions(user.user_id, user.username),
             })
         c.data = json.dumps({
             "totalRecords": total_records,
             "startIndex": 0,
@@ @@ -124,25 +124,25 @@ class UsersController(BaseController): @@
         try:
             form_result = user_form.to_python(dict(request.POST))
             user_model.create(form_result)
             usr = form_result['username']
             action_logger(self.rhodecode_user, 'admin_created_user:%s' % usr,
                           None, self.ip_addr, self.sa)
-            h.flash(_('created user %s') % usr,
+            h.flash(_('Created user %s') % usr,
                     category='success')
             Session().commit()
         except formencode.Invalid, errors:
             return htmlfill.render(
                 render('admin/users/user_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 user %s') \
+            h.flash(_('Error occurred during creation of user %s') \
                     % request.POST.get('username'), category='error')
         return redirect(url('users'))
     def new(self, format='html'):
         """GET /users/new: Form to create a new item"""
         # url('new_user')
@@ @@ -192,13 +192,13 @@ class UsersController(BaseController): @@
                 defaults=defaults,
                 errors=e,
                 prefix_error=False,
                 encoding="UTF-8")
         except Exception:
             log.error(traceback.format_exc())
-            h.flash(_('error occurred during update of user %s') \
+            h.flash(_('Error occurred during update of user %s') \
                     % form_result.get('username'), category='error')
         return redirect(url('edit_user', id=id))
     def delete(self, id):
         """DELETE /users/id: Delete an existing item"""
         # Forms posted to this method should contain a hidden field:
@@ @@ -208,13 +208,13 @@ class UsersController(BaseController): @@
         #           method='delete')
         # url('user', id=ID)
         usr = User.get_or_404(id)
         try:
             UserModel().delete(usr)
             Session().commit()
-            h.flash(_('successfully deleted user'), category='success')
+            h.flash(_('Successfully deleted user'), category='success')
         except (UserOwnsReposException, DefaultUserException), e:
             h.flash(e, category='warning')
         except Exception:
             log.error(traceback.format_exc())
             h.flash(_('An error occurred during deletion of user'),
                     category='error')

rhodecode/controllers/admin/users_groups.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 """
     rhodecode.controllers.admin.users_groups
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    Users Groups crud controller for pylons
+    User Groups crud controller for pylons
     :created_on: Jan 25, 2011
     :author: marcink
     :copyright: (C) 2010-2012 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
@@ @@ -30,22 +30,22 @@ 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 import helpers as h
-from rhodecode.lib.exceptions import UsersGroupsAssignedException
+from rhodecode.lib.exceptions import UserGroupsAssignedException
 from rhodecode.lib.utils2 import safe_unicode, str2bool
 from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator
 from rhodecode.lib.base import BaseController, render
-from rhodecode.model.users_group import UsersGroupModel
+from rhodecode.model.users_group import UserGroupModel
 from rhodecode.model.db import User, UsersGroup, UsersGroupToPerm,\
     UsersGroupRepoToPerm, UsersGroupRepoGroupToPerm
 from rhodecode.model.forms import UsersGroupForm
 from rhodecode.model.db import User, UserGroup, UserGroupToPerm,\
     UserGroupRepoToPerm, UserGroupRepoGroupToPerm
 from rhodecode.model.forms import UserGroupForm
 from rhodecode.model.meta import Session
 from rhodecode.lib.utils import action_logger
 from sqlalchemy.orm import joinedload
 log = logging.getLogger(__name__)
@@ @@ -64,40 +64,40 @@ class UsersGroupsController(BaseControll @@
         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 = UsersGroup().query().all()
+        c.users_groups_list = UserGroup().query().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()()
+        users_group_form = UserGroupForm()()
         try:
             form_result = users_group_form.to_python(dict(request.POST))
-            UsersGroupModel().create(name=form_result['users_group_name'],
+            UserGroupModel().create(name=form_result['users_group_name'],
                                      active=form_result['users_group_active'])
             gr = form_result['users_group_name']
             action_logger(self.rhodecode_user,
                           'admin_created_users_group:%s' % gr,
                           None, self.ip_addr, self.sa)
-            h.flash(_('created users group %s') % gr, category='success')
+            h.flash(_('Created user group %s') % gr, category='success')
             Session().commit()
         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') \
+            h.flash(_('Error occurred during creation of user 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"""
@@ @@ -107,67 +107,69 @@ class UsersGroupsController(BaseControll @@
     def _load_data(self, id):
         c.users_group.permissions = {
             'repositories': {},
             'repositories_groups': {}
+        }
         ugroup_repo_perms = UsersGroupRepoToPerm.query()\
             .options(joinedload(UsersGroupRepoToPerm.permission))\
             .options(joinedload(UsersGroupRepoToPerm.repository))\
             .filter(UsersGroupRepoToPerm.users_group_id == id)\
         ugroup_repo_perms = UserGroupRepoToPerm.query()\
             .options(joinedload(UserGroupRepoToPerm.permission))\
             .options(joinedload(UserGroupRepoToPerm.repository))\
             .filter(UserGroupRepoToPerm.users_group_id == id)\
             .all()
         for gr in ugroup_repo_perms:
             c.users_group.permissions['repositories'][gr.repository.repo_name]  \
                 = gr.permission.permission_name
         ugroup_group_perms = UsersGroupRepoGroupToPerm.query()\
             .options(joinedload(UsersGroupRepoGroupToPerm.permission))\
             .options(joinedload(UsersGroupRepoGroupToPerm.group))\
             .filter(UsersGroupRepoGroupToPerm.users_group_id == id)\
         ugroup_group_perms = UserGroupRepoGroupToPerm.query()\
             .options(joinedload(UserGroupRepoGroupToPerm.permission))\
             .options(joinedload(UserGroupRepoGroupToPerm.group))\
             .filter(UserGroupRepoGroupToPerm.users_group_id == id)\
             .all()
         for gr in ugroup_group_perms:
             c.users_group.permissions['repositories_groups'][gr.group.group_name] \
                 = gr.permission.permission_name
         c.group_members_obj = [x.user for x in c.users_group.members]
         c.group_members_obj = sorted((x.user for x in c.users_group.members),
                                      key=lambda u: u.username.lower())
         c.group_members = [(x.user_id, x.username) for x in
                            c.group_members_obj]
         c.available_members = [(x.user_id, x.username) for x in
                                User.query().all()]
         c.available_members = sorted(((x.user_id, x.username) for x in
                                       User.query().all()),
                                      key=lambda u: u[1].lower())
     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_or_404(id)
+        c.users_group = UserGroup.get_or_404(id)
         self._load_data(id)
         available_members = [safe_unicode(x[0]) for x in c.available_members]
-        users_group_form = UsersGroupForm(edit=True,
+        users_group_form = UserGroupForm(edit=True,
                                           old_data=c.users_group.get_dict(),
                                           available_members=available_members)()
         try:
             form_result = users_group_form.to_python(request.POST)
-            UsersGroupModel().update(c.users_group, form_result)
+            UserGroupModel().update(c.users_group, form_result)
             gr = form_result['users_group_name']
             action_logger(self.rhodecode_user,
                           'admin_updated_users_group:%s' % gr,
                           None, self.ip_addr, self.sa)
-            h.flash(_('updated users group %s') % gr, category='success')
+            h.flash(_('Updated user group %s') % gr, category='success')
             Session().commit()
         except formencode.Invalid, errors:
-            ug_model = UsersGroupModel()
+            ug_model = UserGroupModel()
             defaults = errors.value
             e = errors.error_dict or {}
             defaults.update({
                 'create_repo_perm': ug_model.has_perm(id,
                                                       'hg.create.repository'),
                 'fork_repo_perm': ug_model.has_perm(id,
@@ @@ -180,50 +182,50 @@ class UsersGroupsController(BaseControll @@
                 defaults=defaults,
                 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') \
+            h.flash(_('Error occurred during update of user group %s') \
                     % request.POST.get('users_group_name'), category='error')
         return redirect(url('edit_users_group', id=id))
     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)
-        usr_gr = UsersGroup.get_or_404(id)
+        usr_gr = UserGroup.get_or_404(id)
         try:
-            UsersGroupModel().delete(usr_gr)
+            UserGroupModel().delete(usr_gr)
             Session().commit()
             h.flash(_('successfully deleted users group'), category='success')
         except UsersGroupsAssignedException, e:
             h.flash(_('Successfully deleted user group'), category='success')
         except UserGroupsAssignedException, e:
             h.flash(e, category='error')
         except Exception:
             log.error(traceback.format_exc())
-            h.flash(_('An error occurred during deletion of users group'),
+            h.flash(_('An error occurred during deletion of user 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 = UsersGroup.get_or_404(id)
+        c.users_group = UserGroup.get_or_404(id)
         self._load_data(id)
-        ug_model = UsersGroupModel()
+        ug_model = UserGroupModel()
         defaults = c.users_group.get_dict()
         defaults.update({
             'create_repo_perm': ug_model.has_perm(c.users_group,
                                                   'hg.create.repository'),
             'fork_repo_perm': ug_model.has_perm(c.users_group,
                                                 'hg.fork.repository'),
@@ @@ -237,43 +239,43 @@ class UsersGroupsController(BaseControll @@
+        )
     def update_perm(self, id):
         """PUT /users_perm/id: Update an existing item"""
         # url('users_group_perm', id=ID, method='put')
-        users_group = UsersGroup.get_or_404(id)
+        users_group = UserGroup.get_or_404(id)
         grant_create_perm = str2bool(request.POST.get('create_repo_perm'))
         grant_fork_perm = str2bool(request.POST.get('fork_repo_perm'))
         inherit_perms = str2bool(request.POST.get('inherit_default_permissions'))
-        usersgroup_model = UsersGroupModel()
+        usergroup_model = UserGroupModel()
         try:
             users_group.inherit_default_permissions = inherit_perms
             Session().add(users_group)
             if grant_create_perm:
                 usersgroup_model.revoke_perm(id, 'hg.create.none')
                 usersgroup_model.grant_perm(id, 'hg.create.repository')
                 h.flash(_("Granted 'repository create' permission to users group"),
                 usergroup_model.revoke_perm(id, 'hg.create.none')
                 usergroup_model.grant_perm(id, 'hg.create.repository')
                 h.flash(_("Granted 'repository create' permission to user group"),
                         category='success')
             else:
                 usersgroup_model.revoke_perm(id, 'hg.create.repository')
                 usersgroup_model.grant_perm(id, 'hg.create.none')
                 h.flash(_("Revoked 'repository create' permission to users group"),
                 usergroup_model.revoke_perm(id, 'hg.create.repository')
                 usergroup_model.grant_perm(id, 'hg.create.none')
                 h.flash(_("Revoked 'repository create' permission to user group"),
                         category='success')
             if grant_fork_perm:
                 usersgroup_model.revoke_perm(id, 'hg.fork.none')
                 usersgroup_model.grant_perm(id, 'hg.fork.repository')
                 h.flash(_("Granted 'repository fork' permission to users group"),
                 usergroup_model.revoke_perm(id, 'hg.fork.none')
                 usergroup_model.grant_perm(id, 'hg.fork.repository')
                 h.flash(_("Granted 'repository fork' permission to user group"),
                         category='success')
             else:
                 usersgroup_model.revoke_perm(id, 'hg.fork.repository')
                 usersgroup_model.grant_perm(id, 'hg.fork.none')
                 h.flash(_("Revoked 'repository fork' permission to users group"),
                 usergroup_model.revoke_perm(id, 'hg.fork.repository')
                 usergroup_model.grant_perm(id, 'hg.fork.none')
                 h.flash(_("Revoked 'repository fork' permission to user group"),
                         category='success')
             Session().commit()
         except Exception:
             log.error(traceback.format_exc())
             h.flash(_('An error occurred during permissions saving'),

rhodecode/controllers/api/api.py

➞

Show inline comments

@@ @@ -24,26 +24,28 @@ @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 import traceback
 import logging
 from pylons.controllers.util import abort
 from rhodecode.controllers.api import JSONRPCController, JSONRPCError
 from rhodecode.lib.auth import PasswordGenerator, AuthUser, \
     HasPermissionAllDecorator, HasPermissionAnyDecorator, \
     HasPermissionAnyApi, HasRepoPermissionAnyApi
 from rhodecode.lib.utils import map_groups, repo2db_mapper
 from rhodecode.lib.utils2 import str2bool, time_to_datetime, safe_int
 from rhodecode.lib import helpers as h
 from rhodecode.model.meta import Session
 from rhodecode.model.scm import ScmModel
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.user import UserModel
-from rhodecode.model.users_group import UsersGroupModel
+from rhodecode.model.users_group import UserGroupModel
 from rhodecode.model.permission import PermissionModel
 from rhodecode.model.db import Repository, RhodeCodeSetting, UserIpMap
 from rhodecode.lib.compat import json
 log = logging.getLogger(__name__)
 class OptionalAttr(object):
     """
@@ @@ -118,19 +120,19 @@ def get_repo_or_error(repoid): @@
         raise JSONRPCError('repository `%s` does not exist' % (repoid))
     return repo
 def get_users_group_or_error(usersgroupid):
     """
-    Get users group by id or name or return JsonRPCError if not found
+    Get user group by id or name or return JsonRPCError if not found
     :param userid:
     """
-    users_group = UsersGroupModel().get_group(usersgroupid)
+    users_group = UserGroupModel().get_group(usersgroupid)
     if users_group is None:
-        raise JSONRPCError('users group `%s` does not exist' % usersgroupid)
+        raise JSONRPCError('user group `%s` does not exist' % usersgroupid)
     return users_group
 def get_perm_or_error(permid):
     """
     Get permission by id or name or return JsonRPCError if not found
@@ @@ -199,13 +201,40 @@ class ApiController(JSONRPCController): @@
         except Exception:
             log.error(traceback.format_exc())
             raise JSONRPCError(
                 'Error occurred during rescan repositories action'
+            )
     def lock(self, apiuser, repoid, locked, userid=Optional(OAttr('apiuser'))):
     def invalidate_cache(self, apiuser, repoid):
         """
         Dispatch cache invalidation action on given repo
         :param apiuser:
         :param repoid:
         """
         repo = get_repo_or_error(repoid)
         if HasPermissionAnyApi('hg.admin')(user=apiuser) is False:
             # check if we have admin permission for this repo !
             if HasRepoPermissionAnyApi('repository.admin',
                                        'repository.write')(user=apiuser,
                                             repo_name=repo.repo_name) is False:
                 raise JSONRPCError('repository `%s` does not exist' % (repoid))
         try:
             invalidated_keys = ScmModel().mark_for_invalidation(repo.repo_name)
             Session().commit()
             return ('Cache for repository `%s` was invalidated: '
                     'invalidated cache keys: %s' % (repoid, invalidated_keys))
         except Exception:
             log.error(traceback.format_exc())
             raise JSONRPCError(
                 'Error occurred during cache invalidation action'
+            )
     def lock(self, apiuser, repoid, locked=Optional(None),
              userid=Optional(OAttr('apiuser'))):
         """
         Set locking state on particular repository by given user, if
         this command is runned by non-admin account userid is set to user
         who is calling this method
         :param apiuser:
@@ @@ -227,27 +256,83 @@ class ApiController(JSONRPCController): @@
+                )
         else:
             raise JSONRPCError('repository `%s` does not exist' % (repoid))
         if isinstance(userid, Optional):
             userid = apiuser.user_id
         user = get_user_or_error(userid)
         locked = bool(locked)
         try:
             if locked:
                 Repository.lock(repo, user.user_id)
         if isinstance(locked, Optional):
             lockobj = Repository.getlock(repo)
             if lockobj[0] is None:
                 return ('Repo `%s` not locked. Locked=`False`.'
                         % (repo.repo_name))
             else:
                 Repository.unlock(repo)
                 userid, time_ = lockobj
                 user = get_user_or_error(userid)
                 return ('Repo `%s` locked by `%s`. Locked=`True`. '
                         'Locked since: `%s`'
                     % (repo.repo_name, user.username,
                        json.dumps(time_to_datetime(time_))))
         else:
             locked = str2bool(locked)
             try:
                 if locked:
                     Repository.lock(repo, user.user_id)
                 else:
                     Repository.unlock(repo)
                 return ('User `%s` set lock state for repo `%s` to `%s`'
                         % (user.username, repo.repo_name, locked))
             except Exception:
                 log.error(traceback.format_exc())
                 raise JSONRPCError(
                     'Error occurred locking repository `%s`' % repo.repo_name
+                )
             return ('User `%s` set lock state for repo `%s` to `%s`'
                     % (user.username, repo.repo_name, locked))
         except Exception:
             log.error(traceback.format_exc())
             raise JSONRPCError(
                 'Error occurred locking repository `%s`' % repo.repo_name
+            )
     def get_locks(self, apiuser, userid=Optional(OAttr('apiuser'))):
         """
         Get all locks for given userid, if
         this command is runned by non-admin account userid is set to user
         who is calling this method, thus returning locks for himself
         :param apiuser:
         :param userid:
         """
         if HasPermissionAnyApi('hg.admin')(user=apiuser):
             pass
         else:
             #make sure normal user does not pass someone else userid,
             #he is not allowed to do that
             if not isinstance(userid, Optional) and userid != apiuser.user_id:
                 raise JSONRPCError(
                     'userid is not the same as your user'
+                )
         ret = []
         if isinstance(userid, Optional):
             user = None
         else:
             user = get_user_or_error(userid)
         #show all locks
         for r in Repository.getAll():
             userid, time_ = r.locked
             if time_:
                 _api_data = r.get_api_data()
                 # if we use userfilter just show the locks for this user
                 if user:
                     if safe_int(userid) == user.user_id:
                         ret.append(_api_data)
                 else:
                     ret.append(_api_data)
         return ret
     @HasPermissionAllDecorator('hg.admin')
     def show_ip(self, apiuser, userid):
         """
         Shows IP address as seen from RhodeCode server, together with all
         defined IP addresses for given user
@@ @@ -420,13 +505,13 @@ class ApiController(JSONRPCController): @@
             raise JSONRPCError('failed to delete ID:%s %s' % (user.user_id,
                                                               user.username))
     @HasPermissionAllDecorator('hg.admin')
     def get_users_group(self, apiuser, usersgroupid):
         """"
-        Get users group by name or id
+        Get user group by name or id
         :param apiuser:
         :param usersgroupid:
         """
         users_group = get_users_group_or_error(usersgroupid)
@@ @@ -439,19 +524,19 @@ class ApiController(JSONRPCController): @@
         data['members'] = members
         return data
     @HasPermissionAllDecorator('hg.admin')
     def get_users_groups(self, apiuser):
         """"
-        Get all users groups
+        Get all user groups
         :param apiuser:
         """
         result = []
-        for users_group in UsersGroupModel().get_all():
+        for users_group in UserGroupModel().get_all():
             result.append(users_group.get_api_data())
         return result
     @HasPermissionAllDecorator('hg.admin')
     def create_users_group(self, apiuser, group_name, active=Optional(True)):
         """
@@ @@ -459,56 +544,56 @@ class ApiController(JSONRPCController): @@
         :param apiuser:
         :param group_name:
         :param active:
         """
         if UsersGroupModel().get_by_name(group_name):
             raise JSONRPCError("users group `%s` already exist" % group_name)
         if UserGroupModel().get_by_name(group_name):
             raise JSONRPCError("user group `%s` already exist" % group_name)
         try:
             active = Optional.extract(active)
-            ug = UsersGroupModel().create(name=group_name, active=active)
+            ug = UserGroupModel().create(name=group_name, active=active)
             Session().commit()
             return dict(
-                msg='created new users group `%s`' % group_name,
+                msg='created new user group `%s`' % group_name,
                 users_group=ug.get_api_data()
+            )
         except Exception:
             log.error(traceback.format_exc())
             raise JSONRPCError('failed to create group `%s`' % group_name)
     @HasPermissionAllDecorator('hg.admin')
     def add_user_to_users_group(self, apiuser, usersgroupid, userid):
         """"
-        Add a user to a users group
+        Add a user to a user group
         :param apiuser:
         :param usersgroupid:
         :param userid:
         """
         user = get_user_or_error(userid)
         users_group = get_users_group_or_error(usersgroupid)
         try:
-            ugm = UsersGroupModel().add_user_to_group(users_group, user)
+            ugm = UserGroupModel().add_user_to_group(users_group, user)
             success = True if ugm != True else False
-            msg = 'added member `%s` to users group `%s`' % (
+            msg = 'added member `%s` to user group `%s`' % (
                         user.username, users_group.users_group_name
+                    )
             msg = msg if success else 'User is already in that group'
             Session().commit()
             return dict(
                 success=success,
                 msg=msg
+            )
         except Exception:
             log.error(traceback.format_exc())
             raise JSONRPCError(
-                'failed to add member to users group `%s`' % (
+                'failed to add member to user group `%s`' % (
                     users_group.users_group_name
+                )
+            )
     @HasPermissionAllDecorator('hg.admin')
     def remove_user_from_users_group(self, apiuser, usersgroupid, userid):
@@ @@ -520,24 +605,24 @@ class ApiController(JSONRPCController): @@
         :param userid:
         """
         user = get_user_or_error(userid)
         users_group = get_users_group_or_error(usersgroupid)
         try:
-            success = UsersGroupModel().remove_user_from_group(users_group,
+            success = UserGroupModel().remove_user_from_group(users_group,
                                                                user)
-            msg = 'removed member `%s` from users group `%s`' % (
+            msg = 'removed member `%s` from user group `%s`' % (
                         user.username, users_group.users_group_name
+                    )
             msg = msg if success else "User wasn't in group"
             Session().commit()
             return dict(success=success, msg=msg)
         except Exception:
             log.error(traceback.format_exc())
             raise JSONRPCError(
-                'failed to remove member from users group `%s`' % (
+                'failed to remove member from user group `%s`' % (
                         users_group.users_group_name
+                    )
+            )
     def get_repo(self, apiuser, repoid):
         """"
@@ @@ -552,12 +637,13 @@ class ApiController(JSONRPCController): @@
             # check if we have admin permission for this repo !
             if HasRepoPermissionAnyApi('repository.admin')(user=apiuser,
                                             repo_name=repo.repo_name) is False:
                 raise JSONRPCError('repository `%s` does not exist' % (repoid))
         members = []
         followers = []
         for user in repo.repo_to_perm:
             perm = user.permission.permission_name
             user = user.user
             user_data = user.get_api_data()
             user_data['type'] = "user"
             user_data['permission'] = perm
@@ @@ -568,14 +654,18 @@ class ApiController(JSONRPCController): @@
             users_group = users_group.users_group
             users_group_data = users_group.get_api_data()
             users_group_data['type'] = "users_group"
             users_group_data['permission'] = perm
             members.append(users_group_data)
         for user in repo.followers:
             followers.append(user.user.get_api_data())
         data = repo.get_api_data()
         data['members'] = members
         data['followers'] = followers
         return data
     def get_repos(self, apiuser):
         """"
         Get all repositories
@@ @@ -760,32 +850,46 @@ class ApiController(JSONRPCController): @@
             log.error(traceback.format_exc())
             raise JSONRPCError(
                 'failed to fork repository `%s` as `%s`' % (repo_name,
                                                             fork_name)
+            )
     def delete_repo(self, apiuser, repoid):
+    def delete_repo(self, apiuser, repoid, forks=Optional(None)):
         """
         Deletes a given repository
         :param apiuser:
         :param repoid:
         :param forks: detach or delete, what do do with attached forks for repo
         """
         repo = get_repo_or_error(repoid)
         if HasPermissionAnyApi('hg.admin')(user=apiuser) is False:
             # check if we have admin permission for this repo !
             if HasRepoPermissionAnyApi('repository.admin')(user=apiuser,
                                             repo_name=repo.repo_name) is False:
-                 raise JSONRPCError('repository `%s` does not exist' % (repoid))
                 raise JSONRPCError('repository `%s` does not exist' % (repoid))
         try:
             RepoModel().delete(repo)
             handle_forks = Optional.extract(forks)
             _forks_msg = ''
             _forks = [f for f in repo.forks]
             if handle_forks == 'detach':
                 _forks_msg = ' ' + _('Detached %s forks') % len(_forks)
             elif handle_forks == 'delete':
                 _forks_msg = ' ' + _('Deleted %s forks') % len(_forks)
             elif _forks:
                 raise JSONRPCError(
                     'Cannot delete `%s` it still contains attached forks'
                     % repo.repo_name
+                )
             RepoModel().delete(repo, forks=forks)
             Session().commit()
             return dict(
                 msg='Deleted repository `%s`' % repo.repo_name,
+                msg='Deleted repository `%s`%s' % (repo.repo_name, _forks_msg),
                 success=True
+            )
         except Exception:
             log.error(traceback.format_exc())
             raise JSONRPCError(
                 'failed to delete repository `%s`' % repo.repo_name
@@ @@ -856,13 +960,13 @@ class ApiController(JSONRPCController): @@
+            )
     @HasPermissionAllDecorator('hg.admin')
     def grant_users_group_permission(self, apiuser, repoid, usersgroupid,
                                      perm):
         """
-        Grant permission for users group on given repository, or update
+        Grant permission for user group on given repository, or update
         existing one if found
         :param apiuser:
         :param repoid:
         :param usersgroupid:
         :param perm:
@@ @@ -875,32 +979,32 @@ class ApiController(JSONRPCController): @@
             RepoModel().grant_users_group_permission(repo=repo,
                                                      group_name=users_group,
                                                      perm=perm)
             Session().commit()
             return dict(
-                msg='Granted perm: `%s` for users group: `%s` in '
+                msg='Granted perm: `%s` for user group: `%s` in '
                     'repo: `%s`' % (
                     perm.permission_name, users_group.users_group_name,
                     repo.repo_name
                 ),
                 success=True
+            )
         except Exception:
             log.error(traceback.format_exc())
             raise JSONRPCError(
-                'failed to edit permission for users group: `%s` in '
+                'failed to edit permission for user group: `%s` in '
                 'repo: `%s`' % (
                     usersgroupid, repo.repo_name
+                )
+            )
     @HasPermissionAllDecorator('hg.admin')
     def revoke_users_group_permission(self, apiuser, repoid, usersgroupid):
         """
-        Revoke permission for users group on given repository
+        Revoke permission for user group on given repository
         :param apiuser:
         :param repoid:
         :param usersgroupid:
         """
         repo = get_repo_or_error(repoid)
@@ @@ -909,19 +1013,19 @@ class ApiController(JSONRPCController): @@
         try:
             RepoModel().revoke_users_group_permission(repo=repo,
                                                       group_name=users_group)
             Session().commit()
             return dict(
-                msg='Revoked perm for users group: `%s` in repo: `%s`' % (
+                msg='Revoked perm for user group: `%s` in repo: `%s`' % (
                     users_group.users_group_name, repo.repo_name
                 ),
                 success=True
+            )
         except Exception:
             log.error(traceback.format_exc())
             raise JSONRPCError(
-                'failed to edit permission for users group: `%s` in '
+                'failed to edit permission for user group: `%s` in '
                 'repo: `%s`' % (
                     users_group.users_group_name, repo.repo_name
+                )
+            )

Changeset was too big and was cut off... Show full diff anyway

0 comments (0 inline, 0 general)