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-92750 handle exceptions in case of incorrect git output

Browse Source
This commit is contained in:
Kirill Likhodedov
2015-03-05 14:02:58 +03:00
parent f44477b7a6
commit 410a8e15e0
1 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/merge/GitPullDialog.java
+21 -8
View File
@@ -140,14 +140,15 @@ public class GitPullDialog extends DialogWrapper {
});
if (!result.isNull() && result.get().success()) {
return ContainerUtil.mapNotNull(result.get().getOutput(), new Function<String, String>() {
@Override
public String fun(@NotNull String line) {
if (StringUtil.isEmptyOrSpaces(line)) return null;
String shortRemoteName = line.trim().substring(line.indexOf(GitBranch.REFS_HEADS_PREFIX) + GitBranch.REFS_HEADS_PREFIX.length());
return remote.getName() + "/" + shortRemoteName;
}
});
try {
return parseRemoteBranches(remote, result.get().getOutput());
}
catch (Exception e) {
LOG.error("Couldn't parse ls-remote output: [" + result.get().getOutput() + "]", e);
Messages.showErrorDialog(this.getRootPane(), "Couldn't parse ls-remote output",
"Couldn't get the remote branches list from " + remote.getName());
return null;
}
}
else {
String message = result.isNull() ? "" : result.get().getErrorOutputAsJoinedString();
@@ -156,6 +157,18 @@ public class GitPullDialog extends DialogWrapper {
}
}
@NotNull
private static List<String> parseRemoteBranches(@NotNull final GitRemote remote, @NotNull List<String> lsRemoteOutputLines) {
return ContainerUtil.mapNotNull(lsRemoteOutputLines, new Function<String, String>() {
@Override
public String fun(@NotNull String line) {
if (StringUtil.isEmptyOrSpaces(line)) return null;
String shortRemoteName = line.trim().substring(line.indexOf(GitBranch.REFS_HEADS_PREFIX) + GitBranch.REFS_HEADS_PREFIX.length());
return remote.getName() + "/" + shortRemoteName;
}
});
}
private void validateDialog() {
String selectedRemote = getRemote();
if (StringUtil.isEmptyOrSpaces(selectedRemote)) {