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] inline collectMetadata

Browse Source
This commit is contained in:
Julia Beliaeva
2019-03-25 21:33:08 +03:00
parent 855d8fd801
commit 7751454c62
1 changed files with 10 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/history/GitLogUtil.java
+10 -21
View File
@@ -156,10 +156,15 @@ public class GitLogUtil {
if (factory == null) {
return LogDataImpl.empty();
}
Set<VcsRef> refs = new OpenTHashSet<>(GitLogProvider.DONT_CONSIDER_SHA);
List<VcsCommitMetadata> commits =
collectMetadata(project, root, lowPriorityProcess, record -> {
List<VcsCommitMetadata> commits = ContainerUtil.newArrayList();
try {
GitLineHandler handler = createGitHandler(project, root, Collections.emptyList(), lowPriorityProcess);
readRecordsFromHandler(project, root, true, false, false, false, record -> {
GitCommit commit = createCommit(project, root, Collections.singletonList(record), factory);
commits.add(commit);
Collection<VcsRef> refsInRecord = parseRefs(record.getRefs(), commit.getId(), factory, root);
for (VcsRef ref : refsInRecord) {
if (!refs.add(ref)) {
@@ -167,23 +172,7 @@ public class GitLogUtil {
LOG.error("Adding duplicate element " + ref + " to the set containing " + otherRef);
}
}
return commit;
}, params);
return new LogDataImpl(refs, commits);
}
@NotNull
private static List<VcsCommitMetadata> collectMetadata(@NotNull Project project,
@NotNull VirtualFile root,
boolean lowPriorityProcess,
@NotNull NullableFunction<GitLogRecord, VcsCommitMetadata> converter,
String... parameters) throws VcsException {
List<VcsCommitMetadata> commits = ContainerUtil.newArrayList();
try {
GitLineHandler handler = createGitHandler(project, root, Collections.emptyList(), lowPriorityProcess);
readRecordsFromHandler(project, root, true, false, false, false, record -> commits.add(converter.fun(record)), handler, parameters);
}, handler, params);
}
catch (VcsException e) {
if (commits.isEmpty()) {
@@ -192,9 +181,9 @@ public class GitLogUtil {
LOG.warn("Error during loading details, returning partially loaded commits\n", e);
}
return commits;
return new LogDataImpl(refs, commits);
}
@Nullable
public static VcsLogObjectsFactory getObjectsFactoryWithDisposeCheck(@NotNull Project project) {
return ReadAction.compute(() -> {