From 166fa5d3119ad9908bcacc3c41c47fcee2cdb761 Mon Sep 17 00:00:00 2001 From: Julia Beliaeva Date: Mon, 25 Mar 2019 19:55:57 +0300 Subject: [PATCH] [git] inline createParentHashes --- plugins/git4idea/src/git4idea/history/GitLogUtil.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/plugins/git4idea/src/git4idea/history/GitLogUtil.java b/plugins/git4idea/src/git4idea/history/GitLogUtil.java index a4f06d1671d4..cf539d197bc2 100644 --- a/plugins/git4idea/src/git4idea/history/GitLogUtil.java +++ b/plugins/git4idea/src/git4idea/history/GitLogUtil.java @@ -119,7 +119,7 @@ public class GitLogUtil { GitLogOutputSplitter handlerListener = new GitLogOutputSplitter(handler, parser, record -> { Hash hash = HashImpl.build(record.getHash()); - List parents = getParentHashes(factory, record); + List parents = ContainerUtil.map(record.getParentsHashes(), factory::createHash); commitConsumer.consume(factory.createTimedCommit(hash, parents, record.getCommitTime())); if (refConsumer != null) { @@ -203,7 +203,7 @@ public class GitLogUtil { private static GitCommit createCommit(@NotNull Project project, @NotNull VirtualFile root, @NotNull List records, @NotNull VcsLogObjectsFactory factory, @NotNull DiffRenameLimit renameLimit) { GitLogRecord record = notNull(ContainerUtil.getLastItem(records)); - List parents = getParentHashes(factory, record); + List parents = ContainerUtil.map(record.getParentsHashes(), factory::createHash); return new GitCommit(project, HashImpl.build(record.getHash()), parents, record.getCommitTime(), root, record.getSubject(), factory.createUser(record.getAuthorName(), record.getAuthorEmail()), record.getFullMessage(), @@ -211,11 +211,6 @@ public class GitLogUtil { ContainerUtil.map(records, GitLogRecord::getStatusInfos), renameLimit); } - @NotNull - public static List getParentHashes(@NotNull VcsLogObjectsFactory factory, @NotNull GitLogRecord record) { - return ContainerUtil.map(record.getParentsHashes(), factory::createHash); - } - /** * @deprecated use {@link GitHistoryUtils#history(Project, VirtualFile, String...)} instead. */