public static ArrayMemory valueOf(MergeResult call) { ArrayMemory memory = new ArrayMemory(); memory.refOfIndex("base").assign(valueOf(call.getBase())); memory.refOfIndex("newHead").assign(valueOf(call.getNewHead())); memory.refOfIndex("status").assign(call.getMergeStatus().name()); memory.refOfIndex("success").assign(call.getMergeStatus().isSuccessful()); memory.refOfIndex("checkoutConflicts").assign(ArrayMemory.ofStringCollection(call.getCheckoutConflicts())); return memory; }
false)); Text newHeadText = new Text(composite, SWT.READ_ONLY); ObjectId newHead = mergeResult.getNewHead(); if (newHead != null) newHeadText.setText(getCommitMessage(newHead) + SPACE + abbreviate(mergeResult.getNewHead(), true)); newHeadText .setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
"Merge was made after diverted branch with auto commit"); ret = new Pair<>(true, ""); new RestClientImpl().post(CollectorApi.getPostVerigreenNeededRequest(mergeResult.getNewHead().getName().substring(0, 7)));
ObjectId oldHeadId = oldHead.getObjectId(); outw.println(MessageFormat.format(CLIText.get().updating, oldHeadId .abbreviate(7).name(), result.getNewHead().abbreviate(7) .name())); outw.println(result.getMergeStatus().toString());