123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187 |
- /*
- * Copyright (C) 2010, Mathias Kinzler <mathias.kinzler@sap.com>
- * and other copyright owners as documented in the project's IP log.
- *
- * This program and the accompanying materials are made available
- * under the terms of the Eclipse Distribution License v1.0 which
- * accompanies this distribution, is reproduced below, and is
- * available at http://www.eclipse.org/org/documents/edl-v10.php
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or
- * without modification, are permitted provided that the following
- * conditions are met:
- *
- * - Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * - Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided
- * with the distribution.
- *
- * - Neither the name of the Eclipse Foundation, Inc. nor the
- * names of its contributors may be used to endorse or promote
- * products derived from this software without specific prior
- * written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
- * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
- package org.eclipse.jgit.api;
-
- import java.util.Map;
-
- import org.eclipse.jgit.merge.ResolveMerger;
- import org.eclipse.jgit.merge.ResolveMerger.MergeFailureReason;
- import org.eclipse.jgit.revwalk.RevCommit;
-
- /**
- * The result of a {@link RebaseCommand} execution
- */
- public class RebaseResult {
- /**
- * The overall status
- */
- public enum Status {
- /**
- * Rebase was successful, HEAD points to the new commit
- */
- OK {
- @Override
- public boolean isSuccessful() {
- return true;
- }
- },
- /**
- * Aborted; the original HEAD was restored
- */
- ABORTED {
- @Override
- public boolean isSuccessful() {
- return false;
- }
- },
- /**
- * Stopped due to a conflict; must either abort or resolve or skip
- */
- STOPPED {
- @Override
- public boolean isSuccessful() {
- return false;
- }
- },
- /**
- * Failed; the original HEAD was restored
- */
- FAILED {
- @Override
- public boolean isSuccessful() {
- return false;
- }
- },
- /**
- * Already up-to-date
- */
- UP_TO_DATE {
- @Override
- public boolean isSuccessful() {
- return true;
- }
- },
- /**
- * Fast-forward, HEAD points to the new commit
- */
- FAST_FORWARD {
- @Override
- public boolean isSuccessful() {
- return true;
- }
- };
-
- /**
- * @return whether the status indicates a successful result
- */
- public abstract boolean isSuccessful();
- }
-
- static final RebaseResult OK_RESULT = new RebaseResult(Status.OK);
-
- static final RebaseResult ABORTED_RESULT = new RebaseResult(Status.ABORTED);
-
- static final RebaseResult UP_TO_DATE_RESULT = new RebaseResult(
- Status.UP_TO_DATE);
-
- static final RebaseResult FAST_FORWARD_RESULT = new RebaseResult(
- Status.FAST_FORWARD);
-
- private final Status mySatus;
-
- private final RevCommit currentCommit;
-
- private Map<String, MergeFailureReason> failingPaths;
-
- private RebaseResult(Status status) {
- this.mySatus = status;
- currentCommit = null;
- }
-
- /**
- * Create <code>RebaseResult</code> with status {@link Status#STOPPED}
- *
- * @param commit
- * current commit
- */
- RebaseResult(RevCommit commit) {
- mySatus = Status.STOPPED;
- currentCommit = commit;
- }
-
- /**
- * Create <code>RebaseResult</code> with status {@link Status#FAILED}
- *
- * @param failingPaths
- * list of paths causing this rebase to fail
- */
- RebaseResult(Map<String, MergeFailureReason> failingPaths) {
- mySatus = Status.FAILED;
- currentCommit = null;
- this.failingPaths = failingPaths;
- }
-
- /**
- * @return the overall status
- */
- public Status getStatus() {
- return mySatus;
- }
-
- /**
- * @return the current commit if status is {@link Status#STOPPED}, otherwise
- * <code>null</code>
- */
- public RevCommit getCurrentCommit() {
- return currentCommit;
- }
-
- /**
- * @return the list of paths causing this rebase to fail (see
- * {@link ResolveMerger#getFailingPaths()} for details) if status is
- * {@link Status#FAILED}, otherwise <code>null</code>
- */
- public Map<String, MergeFailureReason> getFailingPaths() {
- return failingPaths;
- }
- }
|