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

[vcs][git] override method, to allow get git repository structure without Project instance

Browse Source 
GitOrigin-RevId: b4b9b75ea50d584390ce2e8c930be384fb2e4eaf
This commit is contained in:
Alexander Bubenchikov
2024-05-16 10:56:27 +02:00
committed by intellij-monorepo-bot
parent 0839636890
commit 43c39b29af
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/git4idea/src/git4idea/index/GitIndexUtil.java
View File

@@ -95,10 +95,16 @@ public final class GitIndexUtil {
public static @NotNull List<StagedFileOrDirectory> listTreeForRawPaths(@NotNull GitRepository repository,
@NotNull List<String> filePaths,
@NotNull VcsRevisionNumber revision) throws VcsException {
List<StagedFileOrDirectory> result = new ArrayList<>();
VirtualFile root = repository.getRoot();
return listTreeForRawPaths(repository.getProject(), repository.getRoot(), filePaths, revision);
}
GitLineHandler h = new GitLineHandler(repository.getProject(), root, GitCommand.LS_TREE);
public static @NotNull List<StagedFileOrDirectory> listTreeForRawPaths(@Nullable Project project,
@NotNull VirtualFile repositoryRoot,
@NotNull List<String> filePaths,
@NotNull VcsRevisionNumber revision) throws VcsException {
List<StagedFileOrDirectory> result = new ArrayList<>();
GitLineHandler h = new GitLineHandler(project, repositoryRoot, GitCommand.LS_TREE);
h.addParameters(revision.asString());
h.endOptions();
h.addParameters(filePaths);
@@ -107,7 +113,7 @@ public final class GitIndexUtil {
@Override
public void onLineAvailable(String line, Key outputType) {
if (outputType != ProcessOutputTypes.STDOUT) return;
ContainerUtil.addIfNotNull(result, parseListTreeRecord(root, line));
ContainerUtil.addIfNotNull(result, parseListTreeRecord(repositoryRoot, line));
}
});
Git.getInstance().runCommandWithoutCollectingOutput(h).throwOnError();
@@ -115,6 +121,7 @@ public final class GitIndexUtil {
return result;
}
private static @Nullable StagedFile parseListFilesStagedRecord(@NotNull VirtualFile root, @NotNull String line) {
try {
StringScanner s = new StringScanner(line);