From ebab794941b04b95cc8fc734d496ec640680f789 Mon Sep 17 00:00:00 2001 From: Julia Beliaeva Date: Wed, 8 May 2019 22:02:36 +0300 Subject: [PATCH] [hg] limit the number of commits during filtering in order to show first results faster In 20aeb1ad47824505c6234449addcd1dbd78ee48d due to a mistake parameter maxCount stopped being used. GitOrigin-RevId: d16c643b55627893c21ba51e9228ca74c1e8dbeb --- .../src/org/zmlx/hg4idea/log/HgHistoryUtil.java | 10 ++++++++-- .../src/org/zmlx/hg4idea/log/HgLogProvider.java | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/log/HgHistoryUtil.java b/plugins/hg4idea/src/org/zmlx/hg4idea/log/HgHistoryUtil.java index bf1ccd41afde..3f0003941ff5 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/log/HgHistoryUtil.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/log/HgHistoryUtil.java @@ -392,8 +392,14 @@ public class HgHistoryUtil { @NotNull public static List readAllHashes(@NotNull Project project, @NotNull VirtualFile root, - @NotNull final Consumer userRegistry, @NotNull List params) { + @NotNull Consumer userRegistry, @NotNull List params) { + return readHashes(project, root, userRegistry, -1, params); + } + @NotNull + public static List readHashes(@NotNull Project project, @NotNull VirtualFile root, + @NotNull Consumer userRegistry, int limit, + @NotNull List params) { final VcsLogObjectsFactory factory = getObjectsFactoryWithDisposeCheck(project); if (factory == null) { return Collections.emptyList(); @@ -402,7 +408,7 @@ public class HgHistoryUtil { assert hgvcs != null; HgVersion version = hgvcs.getVersion(); String[] templates = ArrayUtil.toStringArray(HgBaseLogParser.constructDefaultTemplate(version)); - HgCommandResult result = getLogResult(project, root, version, -1, params, HgChangesetUtil.makeTemplate(templates)); + HgCommandResult result = getLogResult(project, root, version, limit, params, HgChangesetUtil.makeTemplate(templates)); return getCommitRecords(project, result, new HgBaseLogParser() { @Override diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/log/HgLogProvider.java b/plugins/hg4idea/src/org/zmlx/hg4idea/log/HgLogProvider.java index b686fcf5f4b1..0c720c339873 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/log/HgLogProvider.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/log/HgLogProvider.java @@ -282,7 +282,7 @@ public final class HgLogProvider implements VcsLogProvider { } } - return HgHistoryUtil.readAllHashes(myProject, root, Consumer.EMPTY_CONSUMER, filterParameters); + return HgHistoryUtil.readHashes(myProject, root, Consumer.EMPTY_CONSUMER, maxCount, filterParameters); } @Nullable