diff --git a/docs/api/api.rst b/docs/api/api.rst --- a/docs/api/api.rst +++ b/docs/api/api.rst @@ -575,16 +575,16 @@ OUTPUT:: "description" : "", "landing_rev": "", "last_changeset": { - "author": "", - "date": "", - "message": "", - "raw_id": "", - "revision": "", - "short_id": "" + "author": "", + "date": "", + "message": "", + "raw_id": "", + "revision": "", + "short_id": "" }, "owner": "", "fork_of": "", - "members" : [ + "members" : [ { "type": "user", "user_id" : "", @@ -609,8 +609,8 @@ OUTPUT:: "permission" : "repository.(read|write|admin)" }, … - ], - "followers": [ + ], + "followers": [ { "user_id" : "", "username" : "", @@ -626,20 +626,20 @@ OUTPUT:: "last_login": "", }, … - ], - - "tags": { + ], + + "tags": { "": "", ... - }, - "branches": { + }, + "branches": { "": "", ... - }, - "bookmarks": { + }, + "bookmarks": { "": "", ... - }, + }, "pull_requests": [ { diff --git a/kallithea/controllers/api/api.py b/kallithea/controllers/api/api.py --- a/kallithea/controllers/api/api.py +++ b/kallithea/controllers/api/api.py @@ -172,20 +172,20 @@ class ApiController(JSONRPCController): OUTPUT:: - id : - result : { - "msg": "Pulled from ``" - "repository": "" - } - error : null + id : + result : { + "msg": "Pulled from ``" + "repository": "" + } + error : null ERROR OUTPUT:: - id : - result : null - error : { - "Unable to pull changes from ``" - } + id : + result : null + error : { + "Unable to pull changes from ``" + } """ repo = get_repo_or_error(repoid) @@ -218,20 +218,20 @@ class ApiController(JSONRPCController): OUTPUT:: - id : - result : { - 'added': [,...] - 'removed': [,...] - } - error : null + id : + result : { + 'added': [,...] + 'removed': [,...] + } + error : null ERROR OUTPUT:: - id : - result : null - error : { - 'Error occurred during rescan repositories action' - } + id : + result : null + error : { + 'Error occurred during rescan repositories action' + } """ try: rm_obsolete = remove_obsolete @@ -255,20 +255,20 @@ class ApiController(JSONRPCController): OUTPUT:: - id : - result : { - 'msg': Cache for repository `` was invalidated, - 'repository': - } - error : null + id : + result : { + 'msg': Cache for repository `` was invalidated, + 'repository': + } + error : null ERROR OUTPUT:: - id : - result : null - error : { - 'Error occurred during cache invalidation action' - } + id : + result : null + error : { + 'Error occurred during cache invalidation action' + } """ repo = get_repo_or_error(repoid) if not HasPermissionAny('hg.admin')(): @@ -333,16 +333,16 @@ class ApiController(JSONRPCController): OUTPUT:: - id : - result : { - 'modules': [ [, ], ...] - 'py_version': , - 'platform': , - 'kallithea_version': , - 'git_version': '', - 'git_path': '' - } - error : null + id : + result : { + 'modules': [ [, ], ...] + 'py_version': , + 'platform': , + 'kallithea_version': , + 'git_version': '', + 'git_path': '' + } + error : null """ return db.Setting.get_server_info() @@ -456,15 +456,15 @@ class ApiController(JSONRPCController): ERROR OUTPUT:: - id : - result : null - error : { - "user `` already exist" - or - "email `` already exist" - or - "failed to create user ``" - } + id : + result : null + error : { + "user `` already exist" + or + "email `` already exist" + or + "failed to create user ``" + } """ if db.User.get_by_username(username): raise JSONRPCError("user `%s` already exist" % (username,)) @@ -535,11 +535,11 @@ class ApiController(JSONRPCController): ERROR OUTPUT:: - id : - result : null - error : { - "failed to update user ``" - } + id : + result : null + error : { + "failed to update user ``" + } """ user = get_user_or_error(userid) @@ -591,11 +591,11 @@ class ApiController(JSONRPCController): ERROR OUTPUT:: - id : - result : null - error : { - "failed to delete user ID: " - } + id : + result : null + error : { + "failed to delete user ID: " + } """ user = get_user_or_error(userid) @@ -690,13 +690,13 @@ class ApiController(JSONRPCController): ERROR OUTPUT:: - id : - result : null - error : { - "user group `` already exist" - or - "failed to create group ``" - } + id : + result : null + error : { + "user group `` already exist" + or + "failed to create group ``" + } """ if UserGroupModel().get_by_name(group_name): raise JSONRPCError("user group `%s` already exist" % (group_name,)) @@ -843,21 +843,21 @@ class ApiController(JSONRPCController): OUTPUT:: - id : - result : { - "success": True|False # depends on if member is in group - "msg": "added member `` to a user group `` | - User is already in that group" - } - error : null + id : + result : { + "success": True|False # depends on if member is in group + "msg": "added member `` to a user group `` | + User is already in that group" + } + error : null ERROR OUTPUT:: - id : - result : null - error : { - "failed to add member to user group ``" - } + id : + result : null + error : { + "failed to add member to user group ``" + } """ user = get_user_or_error(userid) user_group = get_user_group_or_error(usergroupid) @@ -943,58 +943,58 @@ class ApiController(JSONRPCController): OUTPUT:: - id : - result : { - "repo_id" : "", - "repo_name" : "" - "repo_type" : "", - "clone_uri" : "", - "enable_downloads": "", - "enable_statistics": "", - "private": "", - "created_on" : "", - "description" : "", - "landing_rev": "", - "last_changeset": { - "author": "", - "date": "", - "message": "", - "raw_id": "", - "revision": "", - "short_id": "" - } - "owner": "", - "fork_of": "", - "members" : [ - { - "name": "", - "type" : "user", - "permission" : "repository.(read|write|admin)" - }, - … - { - "name": "", - "type" : "user_group", - "permission" : "usergroup.(read|write|admin)" - }, - … - ] - "followers": [, ...], - - "tags": { - "": "", - ... - }, - "branches": { - "": "", - ... - }, - "bookmarks": { - "": "", - ... - }, - } - error : null + id : + result : { + "repo_id" : "", + "repo_name" : "" + "repo_type" : "", + "clone_uri" : "", + "enable_downloads": "", + "enable_statistics": "", + "private": "", + "created_on" : "", + "description" : "", + "landing_rev": "", + "last_changeset": { + "author": "", + "date": "", + "message": "", + "raw_id": "", + "revision": "", + "short_id": "" + } + "owner": "", + "fork_of": "", + "members" : [ + { + "name": "", + "type" : "user", + "permission" : "repository.(read|write|admin)" + }, + … + { + "name": "", + "type" : "user_group", + "permission" : "usergroup.(read|write|admin)" + }, + … + ] + "followers": [, ...], + + "tags": { + "": "", + ... + }, + "branches": { + "": "", + ... + }, + "bookmarks": { + "": "", + ... + }, + } + error : null """ repo = get_repo_or_error(repoid) @@ -1177,11 +1177,11 @@ class ApiController(JSONRPCController): ERROR OUTPUT:: - id : - result : null - error : { - 'failed to create repository `` - } + id : + result : null + error : { + 'failed to create repository `` + } """ group_name = None repo_name_parts = repo_name.split('/') @@ -1579,20 +1579,20 @@ class ApiController(JSONRPCController): OUTPUT:: - id : - result : { - "msg" : "Granted perm: `` for group: `` in repo: ``", - "success": true - } - error : null + id : + result : { + "msg" : "Granted perm: `` for group: `` in repo: ``", + "success": true + } + error : null ERROR OUTPUT:: - id : - result : null - error : { - "failed to edit permission for user group: `` in repo ``' - } + id : + result : null + error : { + "failed to edit permission for user group: `` in repo ``' + } """ repo = get_repo_or_error(repoid) perm = get_perm_or_error(perm)