return baseCommits.get(0); if (baseCommits.size() >= MAX_BASES) throw new NoMergeBaseException(NoMergeBaseException.MergeBaseFailureReason.TOO_MANY_MERGE_BASES, MessageFormat.format( JGitText.get().mergeRecursiveTooManyMergeBasesFor, Integer.valueOf(MAX_BASES), a.name(), b.name(), RevCommit nextBase = baseCommits.get(commitIdx); if (commitIdx >= MAX_BASES) throw new NoMergeBaseException( NoMergeBaseException.MergeBaseFailureReason.TOO_MANY_MERGE_BASES, MessageFormat.format( currentBase = createCommitForTree(resultTree, parents); else throw new NoMergeBaseException( NoMergeBaseException.MergeBaseFailureReason.CONFLICTS_DURING_MERGE_BASE_CALCULATION, MessageFormat.format(
/** * Construct a NoMergeBase exception * * @param reason * the reason why no merge base could be found * @param message * a text describing the problem * @param why * an exception causing this error */ public NoMergeBaseException(MergeBaseFailureReason reason, String message, Throwable why) { super(MessageFormat.format(JGitText.get().noMergeBase, reason.toString(), message)); this.reason = reason; initCause(why); }
final RevCommit base2 = walk.next(); if (base2 != null) { throw new NoMergeBaseException( MergeBaseFailureReason.MULTIPLE_MERGE_BASES_NOT_SUPPORTED, MessageFormat.format(
/** * Construct a NoMergeBase exception * * @param reason * the reason why no merge base could be found * @param message * a text describing the problem * @param why * an exception causing this error */ public NoMergeBaseException(MergeBaseFailureReason reason, String message, Throwable why) { super(MessageFormat.format(JGitText.get().noMergeBase, reason.toString(), message)); this.reason = reason; initCause(why); }
return baseCommits.get(0); if (baseCommits.size() >= MAX_BASES) throw new NoMergeBaseException(NoMergeBaseException.MergeBaseFailureReason.TOO_MANY_MERGE_BASES, MessageFormat.format( JGitText.get().mergeRecursiveTooManyMergeBasesFor, Integer.valueOf(MAX_BASES), a.name(), b.name(), RevCommit nextBase = baseCommits.get(commitIdx); if (commitIdx >= MAX_BASES) throw new NoMergeBaseException( NoMergeBaseException.MergeBaseFailureReason.TOO_MANY_MERGE_BASES, MessageFormat.format( currentBase = createCommitForTree(resultTree, parents); else throw new NoMergeBaseException( NoMergeBaseException.MergeBaseFailureReason.CONFLICTS_DURING_MERGE_BASE_CALCULATION, MessageFormat.format(
/** * Construct a NoMergeBase exception * * @param reason * the reason why no merge base could be found * @param message * a text describing the problem * @param why * an exception causing this error */ public NoMergeBaseException(MergeBaseFailureReason reason, String message, Throwable why) { super(MessageFormat.format(JGitText.get().noMergeBase, reason.toString(), message)); this.reason = reason; initCause(why); }
return baseCommits.get(0); if (baseCommits.size() >= MAX_BASES) throw new NoMergeBaseException(NoMergeBaseException.MergeBaseFailureReason.TOO_MANY_MERGE_BASES, MessageFormat.format( JGitText.get().mergeRecursiveTooManyMergeBasesFor, Integer.valueOf(MAX_BASES), a.name(), b.name(), RevCommit nextBase = baseCommits.get(commitIdx); if (commitIdx >= MAX_BASES) throw new NoMergeBaseException( NoMergeBaseException.MergeBaseFailureReason.TOO_MANY_MERGE_BASES, MessageFormat.format( currentBase = createCommitForTree(resultTree, parents); else throw new NoMergeBaseException( NoMergeBaseException.MergeBaseFailureReason.CONFLICTS_DURING_MERGE_BASE_CALCULATION, MessageFormat.format(
private static RevCommit getMergeBaseCommit(RevWalk walk, RevCommit a, RevCommit b) throws IncorrectObjectTypeException, IOException { walk.reset(); walk.setRevFilter(RevFilter.MERGE_BASE); walk.markStart(a); walk.markStart(b); final RevCommit base = walk.next(); if (base == null) return null; final RevCommit base2 = walk.next(); if (base2 != null) { throw new NoMergeBaseException( MergeBaseFailureReason.MULTIPLE_MERGE_BASES_NOT_SUPPORTED, MessageFormat.format( JGitText.get().multipleMergeBasesFor, a.name(), b.name(), base.name(), base2.name())); } return base; }
final RevCommit base2 = walk.next(); if (base2 != null) { throw new NoMergeBaseException( MergeBaseFailureReason.MULTIPLE_MERGE_BASES_NOT_SUPPORTED, MessageFormat.format(
final RevCommit base2 = walk.next(); if (base2 != null) { throw new NoMergeBaseException( MergeBaseFailureReason.MULTIPLE_MERGE_BASES_NOT_SUPPORTED, MessageFormat.format(