MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[vcs-log] also log message when commit can not be cherry-picked

Browse Source
This commit is contained in:
Julia Beliaeva
2016-01-14 19:25:55 +03:00
parent 4332ef2ee9
commit 09f371f912
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/dvcs-impl/src/com/intellij/dvcs/cherrypick/VcsCherryPickAction.java
+6 -2
View File
@@ -18,6 +18,7 @@ package com.intellij.dvcs.cherrypick;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.CommonDataKeys;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.extensions.Extensions;
import com.intellij.openapi.fileEditor.FileDocumentManager;
import com.intellij.openapi.progress.ProgressIndicator;
@@ -46,6 +47,7 @@ import org.jetbrains.annotations.Nullable;
import java.util.*;
public class VcsCherryPickAction extends DumbAwareAction {
private static final Logger LOG = Logger.getInstance(VcsCherryPickAction.class);
private static final String NAME = "Cherry-Pick";
@NotNull private final Set<Hash> myIdsInProgress;
@@ -184,8 +186,10 @@ public class VcsCherryPickAction extends DumbAwareAction {
VcsCherryPicker cherryPicker = getCherryPickerForCommit(myProject, myProjectLevelVcsManager, details);
if (cherryPicker == null) {
VcsNotifier.getInstance(myProject).notifyWeakError(
"Cherry pick is not supported for commit " + details.getId().toShortString() + " from root " + details.getRoot().getName());
String message =
"Cherry pick is not supported for commit " + details.getId().toShortString() + " from root " + details.getRoot().getName();
VcsNotifier.getInstance(myProject).notifyWeakError(message);
LOG.warn(message);
return false;
}
List<VcsFullCommitDetails> list = myGroupedCommits.get(cherryPicker);