public MergeResultImpl(org.eclipse.che.api.git.shared.MergeResult origin) { this.newHead = origin.getNewHead(); java.util.List<java.lang.String> mergedCommitsIn = origin.getMergedCommits(); if (mergedCommitsIn != null) { java.util.List<java.lang.String> mergedCommitsOut = new java.util.ArrayList<java.lang.String>(); for (java.lang.String mergedCommitsIn_ : mergedCommitsIn) { mergedCommitsOut.add(mergedCommitsIn_); } this.mergedCommits = mergedCommitsOut; } this.mergeStatus = origin.getMergeStatus(); java.util.List<java.lang.String> failedIn = origin.getFailed(); if (failedIn != null) { java.util.List<java.lang.String> failedOut = new java.util.ArrayList<java.lang.String>(); for (java.lang.String failedIn_ : failedIn) { failedOut.add(failedIn_); } this.failed = failedOut; } java.util.List<java.lang.String> conflictsIn = origin.getConflicts(); if (conflictsIn != null) { java.util.List<java.lang.String> conflictsOut = new java.util.ArrayList<java.lang.String>(); for (java.lang.String conflictsIn_ : conflictsIn) { conflictsOut.add(conflictsIn_); } this.conflicts = conflictsOut; } }
throws IOException, WebApplicationException { Writer writer = new OutputStreamWriter(entityStream); MergeResult.MergeStatus status = mergeResult.getMergeStatus(); switch (mergeResult.getMergeStatus()) { case FAST_FORWARD: case ALREADY_UP_TO_DATE: case FAILED: writer.write("error: Failed to merge:"); for (String failed : mergeResult.getFailed()) { writer.write(" "); writer.write(failed); for (String conflict : mergeResult.getConflicts()) { writer.write("CONFLICT(content): Merge conflict in: " + conflict); writer.write('\n');
if (mergeResult.getMergeStatus().equals(ALREADY_UP_TO_DATE)) { return mergeResult.getMergeStatus().getValue(); List<String> conflicts = mergeResult.getConflicts(); if (conflicts != null && conflicts.size() > 0) { for (String conflict : conflicts) { List<String> commits = mergeResult.getMergedCommits(); if (commits != null && commits.size() > 0) { for (String commit : commits) { String message = mergeResult.getMergeStatus().getValue(); String conflictText = conflictMessage.toString(); message += (!conflictText.isEmpty()) ? constant.mergedConflicts() : ""; message += (!commitText.isEmpty()) ? " " + constant.mergedCommits(commitText) : ""; message += (mergeResult.getNewHead() != null) ? " " + constant.mergedNewHead(mergeResult.getNewHead()) : ""; return message;