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

[vcs-log] restore map from head to root IDEA-159468

Browse Source 
In case of fake VP, not every head has a reference on it. So keep roots in a special map for that case.
This commit is contained in:
Julia Beliaeva
2016-08-05 20:59:54 +03:00
parent 3471946e57
commit 31b3ea0650
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-log/impl/src/com/intellij/vcs/log/data/RefsModel.java
+4 -1
View File
@@ -18,6 +18,7 @@ public class RefsModel implements VcsLogRefs {
@NotNull private final VcsLogStorage myHashMap;
@NotNull private final Map<VirtualFile, CompressedRefs> myRefs;
@NotNull private final TIntObjectHashMap<VcsRef> myBestRefForHead;
@NotNull private final TIntObjectHashMap<VirtualFile> myRootForHead;
public RefsModel(@NotNull Map<VirtualFile, CompressedRefs> refs,
@NotNull Set<Integer> heads,
@@ -27,10 +28,12 @@ public class RefsModel implements VcsLogRefs {
myHashMap = hashMap;
myBestRefForHead = new TIntObjectHashMap<>();
myRootForHead = new TIntObjectHashMap<>();
for (int head : heads) {
CommitId commitId = myHashMap.getCommitId(head);
if (commitId != null) {
VirtualFile root = commitId.getRoot();
myRootForHead.put(head, root);
Optional<VcsRef> bestRef =
myRefs.get(root).refsToCommit(head).stream().min(providers.get(root).getReferenceManager().getBranchLayoutComparator());
if (bestRef.isPresent()) {
@@ -50,7 +53,7 @@ public class RefsModel implements VcsLogRefs {
@NotNull
public VirtualFile rootAtHead(int headIndex) {
return myBestRefForHead.get(headIndex).getRoot();
return myRootForHead.get(headIndex);
}
@NotNull