private void checkReintegrateIsAllowedAndMergeAll(
@Nullable WrapperInvertor copyPoint, boolean supportsMergeInfo) {
boolean reintegrate = copyPoint != null && copyPoint.isInvertedSense();
if (!reintegrate || myInteraction.shouldReintegrate(copyPoint.inverted().getTarget())) {
MergerFactory mergerFactory =
createMergeAllFactory(reintegrate, copyPoint, supportsMergeInfo);
String title =
"Merging all from "
+ myMergeContext.getBranchName()
+ (reintegrate ? " (reintegrate)" : "");
merge(title, mergerFactory, null);
}
}
@NotNull
private MergerFactory createMergeAllFactory(
boolean reintegrate, @Nullable WrapperInvertor copyPoint, boolean supportsMergeInfo) {
long revision =
copyPoint != null
? reintegrate
? copyPoint.getWrapped().getTargetRevision()
: copyPoint.getWrapped().getSourceRevision()
: -1;
return (vcs, target, handler, currentBranchUrl, branchName) ->
new BranchMerger(
vcs,
currentBranchUrl,
myMergeContext.getWcInfo().getPath(),
handler,
reintegrate,
myMergeContext.getBranchName(),
revision,
supportsMergeInfo);
}
