| // Copyright (C) 2009 The Android Open Source Project |
| // |
| // Licensed under the Apache License, Version 2.0 (the "License"); |
| // you may not use this file except in compliance with the License. |
| // You may obtain a copy of the License at |
| // |
| // http://www.apache.org/licenses/LICENSE-2.0 |
| // |
| // Unless required by applicable law or agreed to in writing, software |
| // distributed under the License is distributed on an "AS IS" BASIS, |
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| // See the License for the specific language governing permissions and |
| // limitations under the License. |
| |
| package com.google.gerrit.server.git; |
| |
| public enum CommitMergeStatus { |
| /** */ |
| CLEAN_MERGE("Change has been successfully merged into the git repository."), |
| |
| /** */ |
| CLEAN_PICK("Change has been successfully cherry-picked"), |
| |
| /** */ |
| CLEAN_REBASE("Change has been successfully rebased"), |
| |
| /** */ |
| ALREADY_MERGED(""), |
| |
| /** */ |
| PATH_CONFLICT("The change could not be merged due to a path conflict.\n" |
| + "\n" |
| + "Please rebase the change locally and upload the rebased commit for review."), |
| |
| /** */ |
| MISSING_DEPENDENCY(""), |
| |
| /** */ |
| NO_PATCH_SET(""), |
| |
| /** */ |
| REVISION_GONE(""), |
| |
| /** */ |
| NO_SUBMIT_TYPE(""), |
| |
| /** */ |
| MANUAL_RECURSIVE_MERGE("The change requires a local merge to resolve.\n" |
| + "\n" |
| + "Please merge (or rebase) the change locally and upload the resolution for review."), |
| |
| /** */ |
| CANNOT_CHERRY_PICK_ROOT("Cannot cherry-pick an initial commit onto an existing branch.\n" |
| + "\n" |
| + "Please merge the change locally and upload the merge commit for review."), |
| |
| /** */ |
| CANNOT_REBASE_ROOT("Cannot rebase an initial commit onto an existing branch.\n" |
| + "\n" |
| + "Please merge the change locally and upload the merge commit for review."), |
| |
| /** */ |
| NOT_FAST_FORWARD("Project policy requires all submissions to be a fast-forward.\n" |
| + "\n" |
| + "Please rebase the change locally and upload again for review."), |
| |
| /** */ |
| INVALID_PROJECT_CONFIGURATION("Change contains an invalid project configuration."), |
| |
| /** */ |
| INVALID_PROJECT_CONFIGURATION_PARENT_PROJECT_NOT_FOUND( |
| "Change contains an invalid project configuration:\n" |
| + "Parent project does not exist."), |
| |
| /** */ |
| INVALID_PROJECT_CONFIGURATION_ROOT_PROJECT_CANNOT_HAVE_PARENT( |
| "Change contains an invalid project configuration:\n" |
| + "The root project cannot have a parent."), |
| |
| /** */ |
| SETTING_PARENT_PROJECT_ONLY_ALLOWED_BY_ADMIN( |
| "Change contains a project configuration that changes the parent project.\n" |
| + "The change must be submitted by a Gerrit administrator."); |
| |
| |
| private String message; |
| |
| CommitMergeStatus(String message){ |
| this.message = message; |
| } |
| |
| public String getMessage(){ |
| return message; |
| } |
| } |