From d97bf8a17e03dd8c256dddc6677400c762781bd6 Mon Sep 17 00:00:00 2001 From: Julia Beliaeva Date: Mon, 25 Mar 2019 20:53:43 +0300 Subject: [PATCH] [git] rename collectShortDetails to collectMetadata --- plugins/git4idea/src/git4idea/history/GitHistoryUtils.java | 4 ++-- plugins/git4idea/src/git4idea/history/GitLogUtil.java | 6 ++---- plugins/git4idea/src/git4idea/log/GitLogProvider.java | 2 +- .../src/git4idea/merge/GitDefaultMergeDialogCustomizer.kt | 4 ++-- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/plugins/git4idea/src/git4idea/history/GitHistoryUtils.java b/plugins/git4idea/src/git4idea/history/GitHistoryUtils.java index 63c333e941b5..e8e6c4d8cb2c 100644 --- a/plugins/git4idea/src/git4idea/history/GitHistoryUtils.java +++ b/plugins/git4idea/src/git4idea/history/GitHistoryUtils.java @@ -112,8 +112,8 @@ public class GitHistoryUtils { @NotNull VirtualFile root, @NotNull String... hashes) throws VcsException { - List result = GitLogUtil.collectShortDetails(project, GitVcs.getInstance(project), root, - Arrays.asList(hashes)); + List result = GitLogUtil.collectMetadata(project, GitVcs.getInstance(project), root, + Arrays.asList(hashes)); if (result.size() != hashes.length) return null; return result; } diff --git a/plugins/git4idea/src/git4idea/history/GitLogUtil.java b/plugins/git4idea/src/git4idea/history/GitLogUtil.java index 59bf7cb90a40..4dc48334eef4 100644 --- a/plugins/git4idea/src/git4idea/history/GitLogUtil.java +++ b/plugins/git4idea/src/git4idea/history/GitLogUtil.java @@ -49,10 +49,8 @@ public class GitLogUtil { public static final String STDIN = "--stdin"; @NotNull - public static List collectShortDetails(@NotNull Project project, - @NotNull GitVcs vcs, - @NotNull VirtualFile root, - @NotNull List hashes) + public static List collectMetadata(@NotNull Project project, @NotNull GitVcs vcs, @NotNull VirtualFile root, + @NotNull List hashes) throws VcsException { VcsLogObjectsFactory factory = getObjectsFactoryWithDisposeCheck(project); if (factory == null) { diff --git a/plugins/git4idea/src/git4idea/log/GitLogProvider.java b/plugins/git4idea/src/git4idea/log/GitLogProvider.java index b811b6bb2da6..4d00d5f37193 100644 --- a/plugins/git4idea/src/git4idea/log/GitLogProvider.java +++ b/plugins/git4idea/src/git4idea/log/GitLogProvider.java @@ -355,7 +355,7 @@ public class GitLogProvider implements VcsLogProvider { @Override public List readMetadata(@NotNull final VirtualFile root, @NotNull List hashes) throws VcsException { - return GitLogUtil.collectShortDetails(myProject, myVcs, root, hashes); + return GitLogUtil.collectMetadata(myProject, myVcs, root, hashes); } @NotNull diff --git a/plugins/git4idea/src/git4idea/merge/GitDefaultMergeDialogCustomizer.kt b/plugins/git4idea/src/git4idea/merge/GitDefaultMergeDialogCustomizer.kt index 4ab1de3c1987..52fbdc9ec030 100644 --- a/plugins/git4idea/src/git4idea/merge/GitDefaultMergeDialogCustomizer.kt +++ b/plugins/git4idea/src/git4idea/merge/GitDefaultMergeDialogCustomizer.kt @@ -105,8 +105,8 @@ open class GitDefaultMergeDialogCustomizer( private fun loadCherryPickCommitDetails(repository: GitRepository): CherryPickDetails? { val cherryPickHead = tryResolveRef(repository, CHERRY_PICK_HEAD) ?: return null - val shortDetails = GitLogUtil.collectShortDetails(project, GitVcs.getInstance(project), repository.root, - listOf(cherryPickHead.asString())) + val shortDetails = GitLogUtil.collectMetadata(project, GitVcs.getInstance(project), repository.root, + listOf(cherryPickHead.asString())) val result = shortDetails.singleOrNull() ?: return null return CherryPickDetails(cherryPickHead.toShortString(), result.author.name, result.subject)