| /* |
| * Copyright 2000-2012 JetBrains s.r.o. |
| * |
| * Licensed under the Apache License, Version 2.0 (the "License"); |
| * you may not use this file except in compliance with the License. |
| * You may obtain a copy of the License at |
| * |
| * http://www.apache.org/licenses/LICENSE-2.0 |
| * |
| * Unless required by applicable law or agreed to in writing, software |
| * distributed under the License is distributed on an "AS IS" BASIS, |
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| * See the License for the specific language governing permissions and |
| * limitations under the License. |
| */ |
| package git4idea.branch; |
| |
| import com.intellij.notification.Notification; |
| import com.intellij.notification.NotificationListener; |
| import com.intellij.notification.NotificationType; |
| import com.intellij.openapi.components.ServiceManager; |
| import com.intellij.openapi.progress.ProgressIndicator; |
| import com.intellij.openapi.project.Project; |
| import com.intellij.openapi.ui.Messages; |
| import com.intellij.openapi.ui.VerticalFlowLayout; |
| import com.intellij.openapi.util.text.StringUtil; |
| import com.intellij.openapi.vcs.changes.Change; |
| import com.intellij.openapi.vcs.changes.ui.SelectFilesDialog; |
| import com.intellij.openapi.vfs.VirtualFile; |
| import com.intellij.ui.components.JBLabel; |
| import com.intellij.util.ui.UIUtil; |
| import com.intellij.xml.util.XmlStringUtil; |
| import git4idea.*; |
| import git4idea.commands.Git; |
| import git4idea.merge.GitConflictResolver; |
| import git4idea.repo.GitRepository; |
| import git4idea.util.UntrackedFilesNotifier; |
| import org.jetbrains.annotations.NotNull; |
| import org.jetbrains.annotations.Nullable; |
| |
| import javax.swing.*; |
| import javax.swing.event.HyperlinkEvent; |
| import java.util.ArrayList; |
| import java.util.Collection; |
| import java.util.List; |
| import java.util.Map; |
| import java.util.concurrent.atomic.AtomicBoolean; |
| |
| /** |
| * @author Kirill Likhodedov |
| */ |
| public class GitBranchUiHandlerImpl implements GitBranchUiHandler { |
| |
| @NotNull private final Project myProject; |
| @NotNull private final Git myGit; |
| @NotNull private final GitPlatformFacade myFacade; |
| @NotNull private final ProgressIndicator myProgressIndicator; |
| |
| public GitBranchUiHandlerImpl(@NotNull Project project, @NotNull GitPlatformFacade facade, @NotNull Git git, @NotNull ProgressIndicator indicator) { |
| myProject = project; |
| myGit = git; |
| myFacade = facade; |
| myProgressIndicator = indicator; |
| } |
| |
| @Override |
| public void notifySuccess(@NotNull String message) { |
| notifySuccess("", message); |
| } |
| |
| @Override |
| public void notifySuccess(@NotNull String title, @NotNull String message) { |
| notifySuccess(title, message, null); |
| } |
| |
| @Override |
| public void notifySuccess(@NotNull String title, @NotNull String description, @Nullable NotificationListener listener) { |
| Notificator.getInstance(myProject).notify(GitVcs.NOTIFICATION_GROUP_ID, title, description, NotificationType.INFORMATION, listener); |
| } |
| |
| @Override |
| public void notifyError(@NotNull String title, @NotNull String message) { |
| Notificator.getInstance(myProject).notify(GitVcs.IMPORTANT_ERROR_NOTIFICATION, title, message, NotificationType.ERROR); |
| } |
| |
| @Override |
| public boolean notifyErrorWithRollbackProposal(@NotNull final String title, @NotNull final String message, |
| @NotNull final String rollbackProposal) { |
| final AtomicBoolean ok = new AtomicBoolean(); |
| UIUtil.invokeAndWaitIfNeeded(new Runnable() { |
| @Override |
| public void run() { |
| StringBuilder description = new StringBuilder(); |
| if (!StringUtil.isEmptyOrSpaces(message)) { |
| description.append(message).append("<br/>"); |
| } |
| description.append(rollbackProposal); |
| ok.set(Messages.OK == MessageManager.showYesNoDialog(myProject, XmlStringUtil.wrapInHtml(description), title, |
| "Rollback", "Don't rollback", Messages.getErrorIcon())); |
| } |
| }); |
| return ok.get(); |
| } |
| |
| @Override |
| public void showUnmergedFilesNotification(@NotNull final String operationName, @NotNull final Collection<GitRepository> repositories) { |
| String title = unmergedFilesErrorTitle(operationName); |
| String description = unmergedFilesErrorNotificationDescription(operationName); |
| Notificator.getInstance(myProject).notify(GitVcs.IMPORTANT_ERROR_NOTIFICATION, title, description, NotificationType.ERROR, |
| new NotificationListener() { |
| @Override |
| public void hyperlinkUpdate(@NotNull Notification notification, |
| @NotNull HyperlinkEvent event) { |
| if (event.getEventType() == HyperlinkEvent.EventType.ACTIVATED && event.getDescription().equals("resolve")) { |
| GitConflictResolver.Params params = new GitConflictResolver.Params(). |
| setMergeDescription(String.format("The following files have unresolved conflicts. You need to resolve them before %s.", |
| operationName)). |
| setErrorNotificationTitle("Unresolved files remain."); |
| new GitConflictResolver(myProject, myGit, myFacade, GitUtil.getRootsFromRepositories(repositories), params).merge(); |
| } |
| } |
| } |
| ); |
| } |
| |
| @Override |
| public boolean showUnmergedFilesMessageWithRollback(@NotNull final String operationName, @NotNull final String rollbackProposal) { |
| final AtomicBoolean ok = new AtomicBoolean(); |
| UIUtil.invokeAndWaitIfNeeded(new Runnable() { |
| @Override |
| public void run() { |
| String description = String.format("<html>You have to resolve all merge conflicts before %s.<br/>%s</html>", |
| operationName, rollbackProposal); |
| // suppressing: this message looks ugly if capitalized by words |
| //noinspection DialogTitleCapitalization |
| ok.set(Messages.OK == MessageManager.showYesNoDialog(myProject, description, unmergedFilesErrorTitle(operationName), |
| "Rollback", "Don't rollback", Messages.getErrorIcon())); |
| } |
| }); |
| return ok.get(); |
| } |
| |
| @Override |
| public void showUntrackedFilesNotification(@NotNull String operationName, @NotNull Collection<VirtualFile> untrackedFiles) { |
| UntrackedFilesNotifier.notifyUntrackedFilesOverwrittenBy(myProject, ServiceManager.getService(myProject, GitPlatformFacade.class), |
| untrackedFiles, operationName, null); |
| } |
| |
| @Override |
| public boolean showUntrackedFilesDialogWithRollback(@NotNull String operationName, @NotNull String rollbackProposal, |
| @NotNull Collection<VirtualFile> untrackedFiles) { |
| String title = "Could not " + StringUtil.capitalize(operationName); |
| String description = UntrackedFilesNotifier.createUntrackedFilesOverwrittenDescription(operationName, false); |
| |
| final SelectFilesDialog dialog = new UntrackedFilesDialog(myProject, untrackedFiles, StringUtil.stripHtml(description, true), rollbackProposal); |
| dialog.setTitle(title); |
| UIUtil.invokeAndWaitIfNeeded(new Runnable() { |
| @Override |
| public void run() { |
| myFacade.showDialog(dialog); |
| } |
| }); |
| return dialog.isOK(); |
| } |
| |
| @NotNull |
| @Override |
| public ProgressIndicator getProgressIndicator() { |
| return myProgressIndicator; |
| } |
| |
| @Override |
| public int showSmartOperationDialog(@NotNull Project project, @NotNull List<Change> changes, @NotNull String operation, boolean force) { |
| return GitSmartOperationDialog.showAndGetAnswer(myProject, changes, operation, true); |
| } |
| |
| @Override |
| public boolean showBranchIsNotFullyMergedDialog(@NotNull Project project, @NotNull final Map<GitRepository, List<GitCommit>> history, |
| @NotNull final String unmergedBranch, @NotNull final List<String> mergedToBranches, |
| @NotNull final String baseBranch) { |
| final AtomicBoolean forceDelete = new AtomicBoolean(); |
| UIUtil.invokeAndWaitIfNeeded(new Runnable() { |
| @Override |
| public void run() { |
| forceDelete.set(GitBranchIsNotFullyMergedDialog.showAndGetAnswer(myProject, history, unmergedBranch, mergedToBranches, baseBranch)); |
| } |
| }); |
| return forceDelete.get(); |
| } |
| |
| @NotNull |
| private static String unmergedFilesErrorTitle(@NotNull String operationName) { |
| return "Can't " + operationName + " because of unmerged files"; |
| } |
| |
| @NotNull |
| private static String unmergedFilesErrorNotificationDescription(String operationName) { |
| return "You have to <a href='resolve'>resolve</a> all merge conflicts before " + operationName + ".<br/>" + |
| "After resolving conflicts you also probably would want to commit your files to the current branch."; |
| } |
| |
| private static class UntrackedFilesDialog extends SelectFilesDialog { |
| |
| @NotNull private final String myRollbackProposal; |
| |
| public UntrackedFilesDialog(@NotNull Project project, @NotNull Collection<VirtualFile> originalFiles, @NotNull String prompt, |
| @NotNull String rollbackProposal) { |
| super(project, new ArrayList<VirtualFile>(originalFiles), prompt, null, false, false, false); |
| myRollbackProposal = rollbackProposal; |
| setOKButtonText("Rollback"); |
| setCancelButtonText("Don't rollback"); |
| init(); |
| } |
| |
| @Override |
| protected JComponent createSouthPanel() { |
| JComponent buttons = super.createSouthPanel(); |
| JPanel panel = new JPanel(new VerticalFlowLayout()); |
| panel.add(new JBLabel(XmlStringUtil.wrapInHtml(myRollbackProposal))); |
| panel.add(buttons); |
| return panel; |
| } |
| } |
| } |