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

[git] IDEA-89452 "File" or "Folder"

Browse Source
This commit is contained in:
Kirill Likhodedov
2012-07-30 17:32:12 +04:00
parent 1b575436db
commit 3b42ba22e7
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/GitUtil.java
+10
View File
@@ -855,4 +855,14 @@ public class GitUtil {
}
return hash;
}
@NotNull
public static String fileOrFolder(@NotNull VirtualFile file) {
if (file.isDirectory()) {
return "Folder";
}
else {
return "File";
}
}
}
plugins/git4idea/src/git4idea/actions/GitCompareWithBranchAction.java
+4 -3
View File
@@ -209,9 +209,10 @@ public class GitCompareWithBranchAction extends DumbAwareAction {
new GitDiffFromHistoryHandler(project).showDiffForTwo(new FilePathImpl(file), compareRevision, currentRevision);
}
private static void fileDoesntExistInBranchError(Project project, VirtualFile file, String branchToCompare) {
GitUIUtil.notifyMessage(project, "File doesn't exist in branch",
String.format("File <code>%s</code> doesn't exist in branch <code>%s</code>", file.getPresentableUrl(), branchToCompare),
private static void fileDoesntExistInBranchError(@NotNull Project project, @NotNull VirtualFile file, @NotNull String branchToCompare) {
GitUIUtil.notifyMessage(project, GitUtil.fileOrFolder(file) + " doesn't exist in branch",
String.format("%s <code>%s</code> doesn't exist in branch <code>%s</code>",
GitUtil.fileOrFolder(file), file.getPresentableUrl(), branchToCompare),
NotificationType.WARNING, true, null);
}
}