From 54bff064d758978ae0c7f88bcfd366d62e161806 Mon Sep 17 00:00:00 2001 From: Julia Beliaeva Date: Wed, 12 Jul 2017 17:12:27 +0300 Subject: [PATCH] [git] no need to convert string to hash and back --- .../git4idea/history/GitChangesParser.java | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/plugins/git4idea/src/git4idea/history/GitChangesParser.java b/plugins/git4idea/src/git4idea/history/GitChangesParser.java index 224246004a44..30870414402e 100644 --- a/plugins/git4idea/src/git4idea/history/GitChangesParser.java +++ b/plugins/git4idea/src/git4idea/history/GitChangesParser.java @@ -23,8 +23,7 @@ import com.intellij.openapi.vcs.changes.Change; import com.intellij.openapi.vcs.changes.ContentRevision; import com.intellij.openapi.vcs.history.VcsRevisionNumber; import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.vcs.log.Hash; -import com.intellij.vcs.log.impl.HashImpl; +import com.intellij.util.containers.ContainerUtil; import git4idea.GitContentRevision; import git4idea.GitRevisionNumber; import org.jetbrains.annotations.NotNull; @@ -44,7 +43,7 @@ public class GitChangesParser { @NotNull Date date, @NotNull List parentsHashes) throws VcsException { GitRevisionNumber thisRevision = new GitRevisionNumber(hash, date); - List parentRevisions = prepareParentRevisions(parentsHashes); + List parentRevisions = ContainerUtil.map(parentsHashes, GitRevisionNumber::new); List result = new ArrayList<>(); for (GitLogStatusInfo statusInfo : statusInfos) { @@ -53,19 +52,6 @@ public class GitChangesParser { return result; } - private static List prepareParentRevisions(List parentsHashes) { - final List parents = new ArrayList<>(parentsHashes.size()); - for (String parentsShortHash : parentsHashes) { - parents.add(HashImpl.build(parentsShortHash)); - } - - final List parentRevisions = new ArrayList<>(parents.size()); - for (Hash parent : parents) { - parentRevisions.add(new GitRevisionNumber(parent.asString())); - } - return parentRevisions; - } - private static Change parseChange(final Project project, final VirtualFile vcsRoot, final List parentRevisions, final GitLogStatusInfo statusInfo, final VcsRevisionNumber thisRevision) throws VcsException { final ContentRevision before; @@ -116,5 +102,4 @@ public class GitChangesParser { } return new Change(before, after, status); } - }