@Override
public void run(ContinuationContext context) {
final StringBuilder message =
new StringBuilder().append("Theirs changes merged for ").append(myOldPresentation);
VcsBalloonProblemNotifier.showOverChangesView(
myVcs.getProject(), message.toString(), MessageType.INFO);
if (!myWarnings.isEmpty()) {
AbstractVcsHelper.getInstance(myVcs.getProject())
.showErrors(myWarnings, TreeConflictRefreshablePanel.TITLE);
}
}
private static String toString(@Nullable VcsFileRevision value) {
if (!(value instanceof SvnFileRevision)) return "";
final SvnFileRevision revision = (SvnFileRevision) value;
final List<SvnFileRevision> mergeSources = revision.getMergeSources();
if (mergeSources.isEmpty()) {
return "";
}
final StringBuilder sb = new StringBuilder();
for (SvnFileRevision source : mergeSources) {
if (sb.length() != 0) {
sb.append(", ");
}
sb.append(source.getRevisionNumber().asString());
if (!source.getMergeSources().isEmpty()) {
sb.append("*");
}
}
return sb.toString();
}
@SuppressWarnings("MethodMayBeStatic")
private String formatWc(
@NotNull WCInfo info, @NotNull Collection<WorkingCopyFormat> upgradeFormats) {
final StringBuilder sb =
new StringBuilder()
.append("<html><head>")
.append(UIUtil.getCssFontDeclaration(UIUtil.getLabelFont()))
.append("</head><body><table bgColor=\"")
.append(ColorUtil.toHex(UIUtil.getPanelBackground()))
.append("\">");
sb.append("<tr valign=\"top\"><td colspan=\"3\"><b>")
.append(info.getPath())
.append("</b></td></tr>");
if (info.hasError()) {
sb.append("<tr valign=\"top\"><td>URL:</td><td colspan=\"2\" color=\"")
.append(ColorUtil.toHex(JBColor.red))
.append("\">")
.append(info.getErrorMessage())
.append("</td></tr>");
} else {
sb.append("<tr valign=\"top\"><td>URL:</td><td colspan=\"2\">")
.append(info.getRootUrl())
.append("</td></tr>");
}
if (upgradeFormats.size() > 1) {
sb.append("<tr valign=\"top\"><td>Format:</td><td>")
.append(info.getFormat().getName())
.append("</td><td><a href=\"")
.append(CHANGE_FORMAT)
.append("\">Change</a></td></tr>");
} else {
sb.append("<tr valign=\"top\"><td>Format:</td><td colspan=\"2\">")
.append(info.getFormat().getName())
.append("</td></tr>");
}
if (!Depth.INFINITY.equals(info.getStickyDepth()) && !info.hasError()) {
// can fix
sb.append("<tr valign=\"top\"><td>Depth:</td><td>")
.append(info.getStickyDepth().getName())
.append("</td><td><a href=\"")
.append(FIX_DEPTH)
.append("\">Fix</a></td></tr>");
} else {
sb.append("<tr valign=\"top\"><td>Depth:</td><td colspan=\"2\">")
.append(info.getStickyDepth().getName())
.append("</td></tr>");
}
final NestedCopyType type = info.getType();
if (NestedCopyType.external.equals(type) || NestedCopyType.switched.equals(type)) {
sb.append("<tr valign=\"top\"><td colspan=\"3\"><i>")
.append(type.getName())
.append("</i></td></tr>");
}
if (info.isIsWcRoot()) {
sb.append("<tr valign=\"top\"><td colspan=\"3\"><i>")
.append("Working copy root</i></td></tr>");
}
if (!info.hasError()) {
if (info.getFormat().isOrGreater(WorkingCopyFormat.ONE_DOT_SEVEN)) {
sb.append("<tr valign=\"top\"><td colspan=\"3\"><a href=\"")
.append(CLEANUP)
.append("\">Cleanup</a></td></tr>");
}
sb.append("<tr valign=\"top\"><td colspan=\"3\"><a href=\"")
.append(CONFIGURE_BRANCHES)
.append("\">Configure Branches</a></td></tr>");
sb.append("<tr valign=\"top\"><td colspan=\"3\"><a href=\"")
.append(MERGE_FROM)
.append("\"><b>Merge From...</b></a></i></td></tr>");
sb.append("</table></body></html>");
}
return sb.toString();
}
