@NotNull
private Task newIntegrateTask(@NotNull String title, @NotNull MergerFactory mergerFactory) {
return new SvnIntegrateChangesTask(
myMergeContext.getVcs(),
new WorkingCopyInfo(myMergeContext.getWcInfo().getPath(), true),
mergerFactory,
parseUrl(myMergeContext.getSourceUrl()),
title,
false,
myMergeContext.getBranchName()) {
@Override
public void onFinished() {
super.onFinished();
mySemaphore.up();
}
};
}
@CalledInAwt
public void execute() {
FileDocumentManager.getInstance().saveAllDocuments();
mySemaphore.down();
runInEdt(
() -> {
if (areInSameHierarchy(
createUrl(myMergeContext.getSourceUrl()), myMergeContext.getWcInfo().getUrl())) {
end("Cannot merge from self", true);
} else if (!hasSwitchedRoots() || myInteraction.shouldContinueSwitchedRootFound()) {
runInBackground(
"Checking repository capabilities",
indicator -> {
if (supportsMergeInfo()) {
runInEdt(this::selectMergeVariant);
} else {
mergeAll(false);
}
});
}
});
}
private boolean supportsMergeInfo() {
return myMergeContext.getWcInfo().getFormat().supportsMergeInfo()
&& checkRepositoryVersion15(myMergeContext.getVcs(), myMergeContext.getSourceUrl());
}
