From 2694cc3beb29d0c337fd16f3f40de1bdd431b052 Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Wed, 25 Sep 2024 12:00:57 +0200 Subject: [PATCH] IJPL-158857 vcs: do not use Registry in static initializer GitOrigin-RevId: 64582b4418af0de43614b605564eeed9d2686051 --- platform/vcs-log/impl/api-dump.txt | 2 +- .../src/com/intellij/vcs/log/data/TopCommitsCache.java | 2 +- .../impl/src/com/intellij/vcs/log/data/VcsLogData.java | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/platform/vcs-log/impl/api-dump.txt b/platform/vcs-log/impl/api-dump.txt index 03b5e971cd67..eef96c6c3f71 100644 --- a/platform/vcs-log/impl/api-dump.txt +++ b/platform/vcs-log/impl/api-dump.txt @@ -209,7 +209,6 @@ f:com.intellij.vcs.log.data.VcsLogData - com.intellij.openapi.Disposable - com.intellij.vcs.log.VcsLogDataProvider - sf:DATA_PACK_REFRESH:com.intellij.vcs.log.data.VcsLogProgress$ProgressKey -- sf:RECENT_COMMITS_COUNT:I - (com.intellij.openapi.project.Project,java.util.Map,com.intellij.vcs.log.impl.VcsLogErrorHandler,Z,com.intellij.openapi.Disposable):V - addDataPackChangeListener(com.intellij.vcs.log.data.DataPackChangeListener):V - dispose():V @@ -229,6 +228,7 @@ f:com.intellij.vcs.log.data.VcsLogData - getMiniDetailsGetter():com.intellij.vcs.log.data.MiniDetailsGetter - getProgress():com.intellij.vcs.log.data.VcsLogProgress - getProject():com.intellij.openapi.project.Project +- s:getRecentCommitsCount():I - getRoots():java.util.Collection - getStorage():com.intellij.vcs.log.data.VcsLogStorage - getTopCommitsCache():com.intellij.vcs.log.data.TopCommitsCache diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/TopCommitsCache.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/TopCommitsCache.java index 90f7e03a7a21..e97b60114715 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/TopCommitsCache.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/TopCommitsCache.java @@ -44,7 +44,7 @@ public class TopCommitsCache { isBroken = true; continue; // means some error happened (and reported) earlier, nothing we can do here } - if (result.size() < VcsLogData.RECENT_COMMITS_COUNT * 2) { + if (result.size() < VcsLogData.getRecentCommitsCount() * 2) { result.add(detail); myCache.put(index, detail); } diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogData.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogData.java index 8e1fe6c6fe43..7066dbe95e35 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogData.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogData.java @@ -41,7 +41,6 @@ import static com.intellij.openapi.vcs.VcsScopeKt.VcsScope; public final class VcsLogData implements Disposable, VcsLogDataProvider { private static final Logger LOG = Logger.getInstance(VcsLogData.class); - public static final int RECENT_COMMITS_COUNT = Registry.intValue("vcs.log.recent.commits.count"); public static final VcsLogProgress.ProgressKey DATA_PACK_REFRESH = new VcsLogProgress.ProgressKey("data pack"); @@ -99,7 +98,7 @@ public final class VcsLogData implements Disposable, VcsLogDataProvider { myDetailsGetter = new CommitDetailsGetter(myStorage, logProviders, this); myRefresher = new VcsLogRefresherImpl(myProject, myStorage, myLogProviders, myUserRegistry, myIndex, progress, myTopCommitsDetailsCache, - this::fireDataPackChangeEvent, RECENT_COMMITS_COUNT); + this::fireDataPackChangeEvent, getRecentCommitsCount()); Disposer.register(this, myRefresher); myContainingBranchesGetter = new ContainingBranchesGetter(this, this); @@ -447,4 +446,8 @@ public final class VcsLogData implements Disposable, VcsLogDataProvider { public static @NotNull RegistryValue getIndexingRegistryValue() { return Registry.get("vcs.log.index.enable"); } + + public static int getRecentCommitsCount() { + return Registry.intValue("vcs.log.recent.commits.count"); + } }