MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-19 21:11:28 +07:00
Code Issues Packages Projects Releases Wiki Activity

vcs-log: do not ignore refresh errors

Browse Source 
GitOrigin-RevId: e097d1d54f067ee0301e16ead81d332ebae03b40
This commit is contained in:
Aleksey Pivovarov
2024-01-02 15:31:46 +01:00
committed by intellij-monorepo-bot
parent 0788a3381b
commit b776b4ba64
4 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/git4idea/src/git4idea/history/GitFileHistory.kt
View File

@@ -101,7 +101,7 @@ class GitFileHistory internal constructor(private val project: Project,
val revision = createGitFileRevision(project, root, record, startPath)
consumer(revision)
}
Git.getInstance().runCommandWithoutCollectingOutput(handler)
Git.getInstance().runCommandWithoutCollectingOutput(handler).throwOnError()
splitter.reportErrors()
return lastCommits
}

2
plugins/git4idea/src/git4idea/history/GitLogHistoryHandler.kt
View File

@@ -45,7 +45,7 @@ open class GitLogHistoryHandler(private val project: Project) : VcsLogFileHistor
val splitter = GitLogOutputSplitter(handler, parser) { record ->
result.add(GitFileHistory.createGitFileRevision(project, root, record, filePath))
}
Git.getInstance().runCommandWithoutCollectingOutput(handler)
Git.getInstance().runCommandWithoutCollectingOutput(handler).throwOnError()
splitter.reportErrors()
return result
}

2
plugins/git4idea/src/git4idea/history/GitLogUtil.java
View File

@@ -123,7 +123,7 @@ public final class GitLogUtil {
if (userConsumer != null) userConsumer.accept(factory.createUser(record.getAuthorName(), record.getAuthorEmail()));
});
Git.getInstance().runCommandWithoutCollectingOutput(handler);
Git.getInstance().runCommandWithoutCollectingOutput(handler).throwOnError();
handlerListener.reportErrors();
}

8
plugins/git4idea/src/git4idea/merge/GitMergeUtil.java
View File

@@ -21,10 +21,7 @@ import com.intellij.util.ArrayUtilRt;
import com.intellij.vcsUtil.VcsFileUtil;
import git4idea.GitRevisionNumber;
import git4idea.GitUtil;
import git4idea.commands.Git;
import git4idea.commands.GitCommand;
import git4idea.commands.GitLineHandler;
import git4idea.commands.GitLineHandlerListener;
import git4idea.commands.*;
import git4idea.config.GitVersionSpecialty;
import git4idea.history.GitHistoryUtils;
import git4idea.index.GitIndexUtil;
@@ -368,7 +365,8 @@ public final class GitMergeUtil {
}
}
});
Git.getInstance().runCommandWithoutCollectingOutput(h);
GitCommandResult commandResult = Git.getInstance().runCommandWithoutCollectingOutput(h);
if (!commandResult.success()) return null;
if (pathAmbiguous[0]) return null;
return result[0];