[vcs] API cleanup: remove unused deprecated API (IJPL-156972)

GitOrigin-RevId: 4b604f64669c0b9df8baf6fd0250c99f04350997

platform/vcs-api/api-dump.txt

@@ -1319,13 +1319,6 @@ f:com.intellij.openapi.vcs.changes.LogicalLock
 - getExpirationDate():java.util.Date
 - getOwner():java.lang.String
 - isIsLocal():Z
-f:com.intellij.openapi.vcs.changes.PseudoMap
-- com.intellij.util.NullableFunction
-- com.intellij.util.PairConsumer
-- <init>():V
-- consume(java.lang.Object,java.lang.Object):V
-- fun(java.lang.Object):java.lang.Object
-- f:getCommitContext():com.intellij.openapi.vcs.changes.CommitContext
 f:com.intellij.openapi.vcs.changes.TextRevisionNumber
 - com.intellij.openapi.vcs.history.ShortVcsRevisionNumber
 - <init>(java.lang.String):V

platform/vcs-api/src/com/intellij/openapi/vcs/changes/PseudoMap.kt

@@ -1,18 +0,0 @@
-// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.openapi.vcs.changes
-
-import com.intellij.util.NullableFunction
-import com.intellij.util.PairConsumer
-import org.jetbrains.annotations.ApiStatus
-
-@Suppress("DEPRECATION")
-@ApiStatus.ScheduledForRemoval
-@Deprecated("Use CommitContext")
-class PseudoMap<Key, Value> : PairConsumer<Key, Value>, NullableFunction<Key, Value> {
-  val commitContext: CommitContext = CommitContext()
-
-  @Suppress("UNCHECKED_CAST")
-  override fun `fun`(key: Key): Value? = commitContext.additionalData.`fun`(key) as? Value
-
-  override fun consume(key: Key, value: Value): Unit = commitContext.additionalDataConsumer.consume(key, value)
-}

platform/vcs-api/src/com/intellij/openapi/vcs/checkin/CheckinEnvironment.java

@@ -9,7 +9,6 @@ import com.intellij.openapi.vcs.VcsException;
 import com.intellij.openapi.vcs.changes.Change;
 import com.intellij.openapi.vcs.changes.ChangeList;
 import com.intellij.openapi.vcs.changes.CommitContext;
-import com.intellij.openapi.vcs.changes.PseudoMap;
 import com.intellij.openapi.vcs.ui.RefreshableOnComponent;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.NullableFunction;
@@ -44,10 +43,6 @@ public interface CheckinEnvironment {
   @Nullable
   default RefreshableOnComponent createAdditionalOptionsPanel(@NotNull CheckinProjectPanel panel,
                                                               @NotNull PairConsumer<Object, Object> additionalDataConsumer) {
-    // for compatibility with external plugins
-    if (additionalDataConsumer instanceof PseudoMap) {
-      return createCommitOptions(panel, ((PseudoMap<?, ?>)additionalDataConsumer).getCommitContext());
-    }
     return null;
   }
 

platform/vcs-impl/api-dump.txt

@@ -2945,7 +2945,6 @@ a:com.intellij.openapi.vcs.changes.ui.CommitChangeListDialog
 - addStateListener(com.intellij.vcs.commit.CommitWorkflowUiStateListener,com.intellij.openapi.Disposable):V
 - p:afterInit():V
 - s:commitChanges(com.intellij.openapi.project.Project,java.util.Collection,com.intellij.openapi.vcs.changes.LocalChangeList,com.intellij.openapi.vcs.changes.CommitExecutor,java.lang.String):Z
-- s:commitChanges(com.intellij.openapi.project.Project,java.util.Collection,java.util.Collection,com.intellij.openapi.vcs.changes.LocalChangeList,com.intellij.openapi.vcs.changes.CommitExecutor,java.lang.String):Z
 - s:commitVcsChanges(com.intellij.openapi.project.Project,java.util.Collection,com.intellij.openapi.vcs.changes.LocalChangeList,java.lang.String,com.intellij.openapi.vcs.changes.CommitResultHandler):Z
 - s:commitWithExecutor(com.intellij.openapi.project.Project,java.util.Collection,com.intellij.openapi.vcs.changes.LocalChangeList,com.intellij.openapi.vcs.changes.CommitExecutor,java.lang.String,com.intellij.openapi.vcs.changes.CommitResultHandler):Z
 - confirmCommitWithEmptyMessage():Z
@@ -5433,7 +5432,6 @@ f:com.intellij.vcsUtil.RollbackUtil
 - s:getRollbackOperationName(com.intellij.openapi.project.Project):java.lang.String
 - s:getRollbackOperationName(java.util.Collection):java.lang.String
 f:com.intellij.vcsUtil.VcsFileUtil
-- sf:CASE_SENSITIVE_FILE_PATH_HASHING_STRATEGY:com.intellij.util.containers.HashingStrategy
 - sf:FILE_PATH_LIMIT:I
 - <init>():V
 - s:addFilesToVcsWithConfirmation(com.intellij.openapi.project.Project,java.util.Collection):V

platform/vcs-impl/src/com/intellij/openapi/vcs/VcsShowConfirmationOptionImpl.java

@@ -1,49 +0,0 @@
-/*
- * Copyright 2000-2016 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.intellij.openapi.vcs;
-
-import org.jetbrains.annotations.ApiStatus;
-
-/**
- * @deprecated Use {@link VcsShowConfirmationOption#STATIC_SHOW_CONFIRMATION}
- */
-@ApiStatus.Internal
-@Deprecated(forRemoval = true)
-public class VcsShowConfirmationOptionImpl implements VcsShowConfirmationOption {
-  private Value myValue = Value.SHOW_CONFIRMATION;
-
-  public VcsShowConfirmationOptionImpl(final String displayName,
-                                       final String caption,
-                                       final String doNothingCaption,
-                                       final String showConfirmationCaption,
-                                       final String doActionSilentlyCaption) {
-  }
-
-  @Override
-  public Value getValue() {
-    return myValue;
-  }
-
-  @Override
-  public void setValue(Value value) {
-    myValue = value;
-  }
-
-  @Override
-  public boolean isPersistent() {
-    return true;
-  }
-}

platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java

@@ -134,19 +134,6 @@ public abstract class CommitChangeListDialog extends DialogWrapper implements Si
                                       @Nullable LocalChangeList initialChangeList,
                                       @Nullable CommitExecutor executor,
                                       @Nullable String comment) {
-    return commitChanges(project, null, included, initialChangeList, executor, comment);
-  }
-
-  /**
-   * @deprecated Prefer using {@link #commitWithExecutor} or {@link #commitVcsChanges}.
-   */
-  @Deprecated(forRemoval = true)
-  public static boolean commitChanges(@NotNull Project project,
-                                      @SuppressWarnings("unused") @Nullable Collection<? extends Change> ignored_parameter,
-                                      @NotNull Collection<?> included,
-                                      @Nullable LocalChangeList initialChangeList,
-                                      @Nullable CommitExecutor executor,
-                                      @Nullable String comment) {
     if (executor != null) {
       return commitWithExecutor(project, included, initialChangeList, executor, comment, null);
     }

platform/vcs-impl/src/com/intellij/openapi/vcs/impl/projectlevelman/MappingsToRoots.java

@@ -5,17 +5,13 @@ import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diff.impl.patch.formove.FilePathComparator;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.FileIndexFacade;
-import com.intellij.openapi.util.Computable;
 import com.intellij.openapi.vcs.AbstractVcs;
-import com.intellij.openapi.vcs.impl.DefaultVcsRootPolicy;
 import com.intellij.openapi.vfs.VfsUtilCore;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 
 @ApiStatus.Internal
@@ -57,33 +53,4 @@ public final class MappingsToRoots {
     });
     return VfsUtilCore.toVirtualFileArray(result);
   }
-
-  /**
-   * @return mapped roots and all modules inside: modules might have different settings
-   * @see com.intellij.openapi.vcs.VcsRootSettings
-   * @deprecated To be removed
-   */
-  @NotNull
-  @Deprecated(forRemoval = true)
-  public static List<VirtualFile> getDetailedVcsMappings(@NotNull Project project,
-                                                         @NotNull NewMappings newMappings,
-                                                         @NotNull AbstractVcs vcs) {
-    // same as above, but no compression
-    List<VirtualFile> roots = new ArrayList<>(newMappings.getMappingsAsFilesUnderVcs(vcs));
-
-    Collection<VirtualFile> modules = DefaultVcsRootPolicy.getInstance(project).getDefaultVcsRoots();
-    Collection<VirtualFile> modulesUnderVcs = ContainerUtil.filter(modules, file -> {
-      if (!file.isDirectory()) return false;
-      NewMappings.MappedRoot root = newMappings.getMappedRootFor(file);
-      return root != null && vcs.equals(root.vcs);
-    });
-
-    List<VirtualFile> modulesToAdd = ApplicationManager.getApplication().runReadAction((Computable<List<VirtualFile>>)() -> {
-      final FileIndexFacade facade = FileIndexFacade.getInstance(project);
-      return ContainerUtil.filter(modulesUnderVcs,
-                                  module -> ContainerUtil.or(roots, root -> facade.isValidAncestor(root, module)));
-    });
-
-    return new ArrayList<>(ContainerUtil.union(roots, modulesToAdd));
-  }
 }

platform/vcs-impl/src/com/intellij/vcsUtil/VcsFileUtil.java

@@ -11,14 +11,12 @@ import com.intellij.openapi.util.Ref;
 import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vcs.*;
-import com.intellij.openapi.vcs.changes.ChangesUtil;
 import com.intellij.openapi.vcs.changes.VcsDirtyScopeManager;
 import com.intellij.openapi.vcs.checkin.CheckinEnvironment;
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VfsUtilCore;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.ThrowableConsumer;
-import com.intellij.util.containers.HashingStrategy;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.SystemIndependent;
 
@@ -489,11 +487,4 @@ public final class VcsFileUtil {
     }
     return rc.toString();
   }
-
-  /**
-   * @deprecated Use {@link ChangesUtil#CASE_SENSITIVE_FILE_PATH_HASHING_STRATEGY}
-   */
-  @Deprecated(forRemoval = true)
-  public static final HashingStrategy<FilePath> CASE_SENSITIVE_FILE_PATH_HASHING_STRATEGY =
-    ChangesUtil.CASE_SENSITIVE_FILE_PATH_HASHING_STRATEGY;
 }

platform/vcs-log/impl/api-dump.txt

@@ -399,14 +399,12 @@ f:com.intellij.vcs.log.impl.SimpleRefGroup
 - <init>(java.lang.String,java.util.List):V
 - <init>(java.lang.String,java.util.List,Z):V
 - b:<init>(java.lang.String,java.util.List,Z,I,kotlin.jvm.internal.DefaultConstructorMarker):V
-- sf:buildGroups(com.intellij.util.containers.MultiMap,Z,Z,java.util.List):V
 - sf:buildGroups(java.util.List,com.intellij.util.containers.MultiMap,Z,Z):java.util.List
 - getColors():java.util.List
 - getName():java.lang.String
 - getRefs():java.util.List
 - isExpanded():Z
 f:com.intellij.vcs.log.impl.SimpleRefGroup$Companion
-- f:buildGroups(com.intellij.util.containers.MultiMap,Z,Z,java.util.List):V
 - f:buildGroups(java.util.List,com.intellij.util.containers.MultiMap,Z,Z):java.util.List
 c:com.intellij.vcs.log.impl.SimpleRefType
 - com.intellij.vcs.log.VcsRefType

platform/vcs-log/impl/src/com/intellij/vcs/log/impl/SimpleRefGroup.kt

@@ -51,17 +51,5 @@ class SimpleRefGroup @JvmOverloads constructor(private val name: @Nls String,
       }
       return result
     }
-
-    @ApiStatus.ScheduledForRemoval
-    @Deprecated("Use buildGroups(List<? extends RefGroup>, MultiMap<VcsRefType, VcsRef>, boolean, boolean) function instead")
-    @JvmStatic
-    fun buildGroups(groupedRefs: MultiMap<VcsRefType, VcsRef>,
-                    compact: Boolean,
-                    showTagNames: Boolean,
-                    result: MutableList<RefGroup>) {
-      val groups = buildGroups(result, groupedRefs, compact, showTagNames)
-      result.clear()
-      result.addAll(groups)
-    }
   }
 }