diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/history/FileHistoryPanel.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/history/FileHistoryPanel.java index e993d6d7ea7e..d8fef3183674 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/history/FileHistoryPanel.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/history/FileHistoryPanel.java @@ -141,7 +141,7 @@ public class FileHistoryPanel extends JPanel implements DataProvider, Disposable if (VcsDataKeys.CHANGES.is(dataId) || VcsDataKeys.SELECTED_CHANGES.is(dataId)) { List details = myUi.getVcsLog().getSelectedDetails(); if (details.isEmpty() || details.size() > VcsLogUtil.MAX_SELECTED_COMMITS) return null; - return ArrayUtil.toObjectArray(myUi.collectChanges(details, true), Change.class); + return ArrayUtil.toObjectArray(VcsLogUtil.collectChanges(details, detail -> myUi.collectRelevantChanges(detail)), Change.class); } else if (VcsLogInternalDataKeys.LOG_UI_PROPERTIES.is(dataId)) { return myUi.getProperties(); diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/history/FileHistoryUi.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/history/FileHistoryUi.java index 2c041e1b5f23..5962ce931cd9 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/history/FileHistoryUi.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/history/FileHistoryUi.java @@ -43,7 +43,6 @@ import com.intellij.vcs.log.ui.highlighters.MyCommitsHighlighter; import com.intellij.vcs.log.ui.highlighters.VcsLogHighlighterFactory; import com.intellij.vcs.log.ui.table.GraphTableModel; import com.intellij.vcs.log.ui.table.VcsLogGraphTable; -import com.intellij.vcs.log.util.VcsLogUtil; import com.intellij.vcs.log.visible.VisiblePack; import com.intellij.vcs.log.visible.VisiblePackRefresher; import com.intellij.vcsUtil.VcsUtil; @@ -163,11 +162,6 @@ public class FileHistoryUi extends AbstractVcsLogUi { return names; } - @NotNull - public List collectChanges(@NotNull List detailsList, boolean onlyRelevant) { - return VcsLogUtil.collectChanges(detailsList, details -> onlyRelevant ? collectRelevantChanges(details) : details.getChanges()); - } - @Override protected void handleCommitNotFound(@NotNull T commitId, boolean commitExists, diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/history/CreatePatchFromHistoryActionProvider.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/history/CreatePatchFromHistoryActionProvider.java index dfc28b3c3b64..2d053ed46c1e 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/history/CreatePatchFromHistoryActionProvider.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/history/CreatePatchFromHistoryActionProvider.java @@ -23,6 +23,7 @@ import com.intellij.openapi.vcs.VcsDataKeys; import com.intellij.openapi.vcs.changes.Change; import com.intellij.openapi.vcs.changes.actions.CreatePatchFromChangesAction; import com.intellij.vcs.log.CommitId; +import com.intellij.vcs.log.VcsFullCommitDetails; import com.intellij.vcs.log.history.FileHistoryUi; import com.intellij.vcs.log.ui.VcsLogInternalDataKeys; import com.intellij.vcs.log.util.VcsLogUtil; @@ -78,7 +79,7 @@ public class CreatePatchFromHistoryActionProvider implements AnActionExtensionPr String commitMessage = e.getRequiredData(VcsDataKeys.PRESET_COMMIT_MESSAGE); ui.getVcsLog().requestSelectedDetails(detailsList -> { - List changes = ui.collectChanges(detailsList, false); + List changes = VcsLogUtil.collectChanges(detailsList, VcsFullCommitDetails::getChanges); CreatePatchFromChangesAction.createPatch(project, commitMessage, changes, mySilentClipboard); }); }