You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

CherryPickResult.java 4.8KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164
  1. /*
  2. * Copyright (C) 2011, Philipp Thun <philipp.thun@sap.com>
  3. * and other copyright owners as documented in the project's IP log.
  4. *
  5. * This program and the accompanying materials are made available
  6. * under the terms of the Eclipse Distribution License v1.0 which
  7. * accompanies this distribution, is reproduced below, and is
  8. * available at http://www.eclipse.org/org/documents/edl-v10.php
  9. *
  10. * All rights reserved.
  11. *
  12. * Redistribution and use in source and binary forms, with or
  13. * without modification, are permitted provided that the following
  14. * conditions are met:
  15. *
  16. * - Redistributions of source code must retain the above copyright
  17. * notice, this list of conditions and the following disclaimer.
  18. *
  19. * - Redistributions in binary form must reproduce the above
  20. * copyright notice, this list of conditions and the following
  21. * disclaimer in the documentation and/or other materials provided
  22. * with the distribution.
  23. *
  24. * - Neither the name of the Eclipse Foundation, Inc. nor the
  25. * names of its contributors may be used to endorse or promote
  26. * products derived from this software without specific prior
  27. * written permission.
  28. *
  29. * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
  30. * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
  31. * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  32. * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  33. * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
  34. * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  35. * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  36. * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  37. * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
  38. * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  39. * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  40. * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  41. * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  42. */
  43. package org.eclipse.jgit.api;
  44. import java.util.List;
  45. import java.util.Map;
  46. import org.eclipse.jgit.lib.Ref;
  47. import org.eclipse.jgit.merge.ResolveMerger;
  48. import org.eclipse.jgit.merge.ResolveMerger.MergeFailureReason;
  49. import org.eclipse.jgit.revwalk.RevCommit;
  50. /**
  51. * Encapsulates the result of a {@link CherryPickCommand}.
  52. */
  53. public class CherryPickResult {
  54. /**
  55. * The cherry-pick status
  56. */
  57. public enum CherryPickStatus {
  58. /** */
  59. OK {
  60. @Override
  61. public String toString() {
  62. return "Ok";
  63. }
  64. },
  65. /** */
  66. FAILED {
  67. public String toString() {
  68. return "Failed";
  69. }
  70. },
  71. /** */
  72. CONFLICTING {
  73. public String toString() {
  74. return "Conflicting";
  75. }
  76. }
  77. }
  78. private final CherryPickStatus status;
  79. private final RevCommit newHead;
  80. private final List<Ref> cherryPickedRefs;
  81. private final Map<String, MergeFailureReason> failingPaths;
  82. /**
  83. * @param newHead
  84. * commit the head points at after this cherry-pick
  85. * @param cherryPickedRefs
  86. * list of successfully cherry-picked <code>Ref</code>'s
  87. */
  88. public CherryPickResult(RevCommit newHead, List<Ref> cherryPickedRefs) {
  89. this.status = CherryPickStatus.OK;
  90. this.newHead = newHead;
  91. this.cherryPickedRefs = cherryPickedRefs;
  92. this.failingPaths = null;
  93. }
  94. /**
  95. * @param failingPaths
  96. * list of paths causing this cherry-pick to fail (see
  97. * {@link ResolveMerger#getFailingPaths()} for details)
  98. */
  99. public CherryPickResult(Map<String, MergeFailureReason> failingPaths) {
  100. this.status = CherryPickStatus.FAILED;
  101. this.newHead = null;
  102. this.cherryPickedRefs = null;
  103. this.failingPaths = failingPaths;
  104. }
  105. private CherryPickResult(CherryPickStatus status) {
  106. this.status = status;
  107. this.newHead = null;
  108. this.cherryPickedRefs = null;
  109. this.failingPaths = null;
  110. }
  111. /**
  112. * A <code>CherryPickResult</code> with status
  113. * {@link CherryPickStatus#CONFLICTING}
  114. */
  115. public static final CherryPickResult CONFLICT = new CherryPickResult(
  116. CherryPickStatus.CONFLICTING);
  117. /**
  118. * @return the status this cherry-pick resulted in
  119. */
  120. public CherryPickStatus getStatus() {
  121. return status;
  122. }
  123. /**
  124. * @return the commit the head points at after this cherry-pick,
  125. * <code>null</code> if {@link #getStatus} is not
  126. * {@link CherryPickStatus#OK}
  127. */
  128. public RevCommit getNewHead() {
  129. return newHead;
  130. }
  131. /**
  132. * @return the list of successfully cherry-picked <code>Ref</code>'s,
  133. * <code>null</code> if {@link #getStatus} is not
  134. * {@link CherryPickStatus#OK}
  135. */
  136. public List<Ref> getCherryPickedRefs() {
  137. return cherryPickedRefs;
  138. }
  139. /**
  140. * @return the list of paths causing this cherry-pick to fail (see
  141. * {@link ResolveMerger#getFailingPaths()} for details),
  142. * <code>null</code> if {@link #getStatus} is not
  143. * {@link CherryPickStatus#FAILED}
  144. */
  145. public Map<String, MergeFailureReason> getFailingPaths() {
  146. return failingPaths;
  147. }
  148. }