Nelze vybrat více než 25 témat Téma musí začínat písmenem nebo číslem, může obsahovat pomlčky („-“) a může být dlouhé až 35 znaků.

CherryPickResult.java 4.8KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166
  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. @Override
  68. public String toString() {
  69. return "Failed";
  70. }
  71. },
  72. /** */
  73. CONFLICTING {
  74. @Override
  75. public String toString() {
  76. return "Conflicting";
  77. }
  78. }
  79. }
  80. private final CherryPickStatus status;
  81. private final RevCommit newHead;
  82. private final List<Ref> cherryPickedRefs;
  83. private final Map<String, MergeFailureReason> failingPaths;
  84. /**
  85. * @param newHead
  86. * commit the head points at after this cherry-pick
  87. * @param cherryPickedRefs
  88. * list of successfully cherry-picked <code>Ref</code>'s
  89. */
  90. public CherryPickResult(RevCommit newHead, List<Ref> cherryPickedRefs) {
  91. this.status = CherryPickStatus.OK;
  92. this.newHead = newHead;
  93. this.cherryPickedRefs = cherryPickedRefs;
  94. this.failingPaths = null;
  95. }
  96. /**
  97. * @param failingPaths
  98. * list of paths causing this cherry-pick to fail (see
  99. * {@link ResolveMerger#getFailingPaths()} for details)
  100. */
  101. public CherryPickResult(Map<String, MergeFailureReason> failingPaths) {
  102. this.status = CherryPickStatus.FAILED;
  103. this.newHead = null;
  104. this.cherryPickedRefs = null;
  105. this.failingPaths = failingPaths;
  106. }
  107. private CherryPickResult(CherryPickStatus status) {
  108. this.status = status;
  109. this.newHead = null;
  110. this.cherryPickedRefs = null;
  111. this.failingPaths = null;
  112. }
  113. /**
  114. * A <code>CherryPickResult</code> with status
  115. * {@link CherryPickStatus#CONFLICTING}
  116. */
  117. public static final CherryPickResult CONFLICT = new CherryPickResult(
  118. CherryPickStatus.CONFLICTING);
  119. /**
  120. * @return the status this cherry-pick resulted in
  121. */
  122. public CherryPickStatus getStatus() {
  123. return status;
  124. }
  125. /**
  126. * @return the commit the head points at after this cherry-pick,
  127. * <code>null</code> if {@link #getStatus} is not
  128. * {@link CherryPickStatus#OK}
  129. */
  130. public RevCommit getNewHead() {
  131. return newHead;
  132. }
  133. /**
  134. * @return the list of successfully cherry-picked <code>Ref</code>'s,
  135. * <code>null</code> if {@link #getStatus} is not
  136. * {@link CherryPickStatus#OK}
  137. */
  138. public List<Ref> getCherryPickedRefs() {
  139. return cherryPickedRefs;
  140. }
  141. /**
  142. * @return the list of paths causing this cherry-pick to fail (see
  143. * {@link ResolveMerger#getFailingPaths()} for details),
  144. * <code>null</code> if {@link #getStatus} is not
  145. * {@link CherryPickStatus#FAILED}
  146. */
  147. public Map<String, MergeFailureReason> getFailingPaths() {
  148. return failingPaths;
  149. }
  150. }