Restore tabbed formatting to make diffs to develop useful

James Moger

2014-05-08 311ae949236e19894c575f619dc45f82d979424f

Restore tabbed formatting to make diffs to develop useful

 src/main/java/com/gitblit/servlet/RpcServlet.java

@@ -79,12 +79,11 @@
     * @throws java.io.IOException

     */

    @Override

    protected void processRequest(HttpServletRequest request, HttpServletResponse response)

            throws ServletException, IOException {

    protected void processRequest(HttpServletRequest request, HttpServletResponse response) throws ServletException,

            IOException {

        RpcRequest reqType = RpcRequest.fromName(request.getParameter("req"));

        String objectName = request.getParameter("name");

        logger.info(MessageFormat.format("Rpc {0} request from {1}", reqType,

                request.getRemoteAddr()));

        logger.info(MessageFormat.format("Rpc {0} request from {1}", reqType, request.getRemoteAddr()));



        UserModel user = (UserModel) request.getUserPrincipal();



@@ -129,7 +128,8 @@
                }

                if (model.isCollectingGarbage) {

                    // skip garbage collecting repository

                    logger.warn(MessageFormat.format("Temporarily excluding {0} from RPC, busy collecting garbage", model.name));

                    logger.warn(MessageFormat.format("Temporarily excluding {0} from RPC, busy collecting garbage",

                            model.name));

                    continue;

                }

                // get local branches

@@ -199,12 +199,13 @@
            // fork repository

            RepositoryModel origin = gitblit.getRepositoryModel(objectName);

            if (origin == null) {

                // failed to find repository, error is logged by the repository manager

                // failed to find repository, error is logged by the repository

                // manager

                response.setStatus(failureCode);

            } else {

                if (user == null || !user.canFork(origin)) {

                    logger.error("User {} is not permitted to fork '{}'!",

                            user == null ? "anonymous" : user.username, objectName);

                    logger.error("User {} is not permitted to fork '{}'!", user == null ? "anonymous" : user.username,

                            objectName);

                    response.setStatus(failureCode);

                } else {

                    try {

@@ -306,7 +307,8 @@
        } else if (RpcRequest.SET_REPOSITORY_MEMBER_PERMISSIONS.equals(reqType)) {

            // set the repository permissions for the specified users

            RepositoryModel model = gitblit.getRepositoryModel(objectName);

            Collection<RegistrantAccessPermission> permissions = deserialize(request, response, RpcUtils.REGISTRANT_PERMISSIONS_TYPE);

            Collection<RegistrantAccessPermission> permissions = deserialize(request, response,

                    RpcUtils.REGISTRANT_PERMISSIONS_TYPE);

            result = gitblit.setUserAccessPermissions(model, permissions);

        } else if (RpcRequest.LIST_REPOSITORY_TEAMS.equals(reqType)) {

            // get repository teams

@@ -322,7 +324,8 @@
        } else if (RpcRequest.SET_REPOSITORY_TEAM_PERMISSIONS.equals(reqType)) {

            // set the repository permissions for the specified teams

            RepositoryModel model = gitblit.getRepositoryModel(objectName);

            Collection<RegistrantAccessPermission> permissions = deserialize(request, response, RpcUtils.REGISTRANT_PERMISSIONS_TYPE);

            Collection<RegistrantAccessPermission> permissions = deserialize(request, response,

                    RpcUtils.REGISTRANT_PERMISSIONS_TYPE);

            result = gitblit.setTeamAccessPermissions(model, permissions);

        } else if (RpcRequest.LIST_FEDERATION_REGISTRATIONS.equals(reqType)) {

            // return the list of federation registrations

@@ -388,8 +391,7 @@
        } else if (RpcRequest.EDIT_SETTINGS.equals(reqType)) {

            // update settings on the server

            if (allowAdmin) {

                Map<String, String> map = deserialize(request, response,

                        RpcUtils.SETTINGS_TYPE);

                Map<String, String> map = deserialize(request, response, RpcUtils.SETTINGS_TYPE);

                gitblit.updateSettings(map);

            } else {

                response.sendError(notAllowedCode);