mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
refactoring [git]: Delete redundant registry "git.status.no.lock"
After changes in the previous commit status command doesn't acquire any locks by default GitOrigin-RevId: c154a77a5e424174e4b2bd71e6c36ee4c90e98bb
This commit is contained in:
committed by
intellij-monorepo-bot
parent
882942ed7b
commit
d7842d780c
@@ -1296,7 +1296,6 @@ f:git4idea.commands.GitCommand
|
||||
- sf:SSH_ASKPASS_REQUIRE_ENV:java.lang.String
|
||||
- sf:STASH:git4idea.commands.GitCommand
|
||||
- sf:STATUS:git4idea.commands.GitCommand
|
||||
- sf:STATUS_NO_LOCK:git4idea.commands.GitCommand
|
||||
- sf:SUBMODULE:git4idea.commands.GitCommand
|
||||
- sf:TAG:git4idea.commands.GitCommand
|
||||
- sf:UPDATE_INDEX:git4idea.commands.GitCommand
|
||||
@@ -2596,9 +2595,8 @@ f:git4idea.index.GitFileStatusNodeProducerBase$Companion
|
||||
f:git4idea.index.GitIndexStatusUtilKt
|
||||
- sf:NUL:java.lang.String
|
||||
- sf:getFilePath(com.intellij.openapi.vfs.VirtualFile,com.intellij.openapi.vcs.FilePath,git4idea.config.GitExecutable):java.lang.String
|
||||
- sf:getFileStatus(com.intellij.openapi.project.Project,com.intellij.openapi.vfs.VirtualFile,java.util.List,Z,Z,Z,git4idea.commands.GitCommand):java.util.List
|
||||
- sf:getFileStatus(com.intellij.openapi.project.Project,com.intellij.openapi.vfs.VirtualFile,java.util.List,Z,Z,Z):java.util.List
|
||||
- sf:getFileStatus(com.intellij.openapi.vfs.VirtualFile,com.intellij.openapi.vcs.FilePath,git4idea.config.GitExecutable):git4idea.index.LightFileStatus
|
||||
- bs:getFileStatus$default(com.intellij.openapi.project.Project,com.intellij.openapi.vfs.VirtualFile,java.util.List,Z,Z,Z,git4idea.commands.GitCommand,I,java.lang.Object):java.util.List
|
||||
- sf:getRepositoryPath(git4idea.index.LightFileStatus):java.lang.String
|
||||
- sf:getStatus(com.intellij.openapi.project.Project,com.intellij.openapi.vfs.VirtualFile,java.util.List,Z,Z,Z):java.util.List
|
||||
- bs:getStatus$default(com.intellij.openapi.project.Project,com.intellij.openapi.vfs.VirtualFile,java.util.List,Z,Z,Z,I,java.lang.Object):java.util.List
|
||||
|
||||
@@ -699,9 +699,6 @@
|
||||
description="If enabled, Git will use a sequencer to cherry-pick multiple commits as a range (e.g., 'git cherry-pick A^..C') instead of applying each commit individually."/>
|
||||
<registryKey key="git.commit.staged.saver.use.index.info" defaultValue="true"
|
||||
description="Uses an optimized approach to save and restore the index during changelist commits, improving performance"/>
|
||||
<registryKey defaultValue="false"
|
||||
description="Use 'git status' without lock. Disabling may speed up commit but could result in stale data."
|
||||
key="git.status.no.lock"/>
|
||||
|
||||
<search.projectOptionsTopHitProvider implementation="git4idea.config.GitOptionsTopHitProvider"/>
|
||||
<vcs name="Git" vcsClass="git4idea.GitVcs" displayName="Git" administrativeAreaName=".git"/>
|
||||
|
||||
@@ -62,7 +62,6 @@ public final class GitCommand {
|
||||
public static final GitCommand SHOW = read("show");
|
||||
public static final GitCommand STASH = write("stash");
|
||||
public static final GitCommand STATUS = readOptional("status");
|
||||
public static final GitCommand STATUS_NO_LOCK = read("status");
|
||||
public static final GitCommand SUBMODULE = write("submodule"); // NB: it is write command in the submodule, not in the current root which is the submodule's parent
|
||||
public static final GitCommand TAG = read("tag");
|
||||
public static final GitCommand UPDATE_INDEX = write("update-index");
|
||||
|
||||
@@ -74,10 +74,9 @@ fun getFileStatus(
|
||||
withRenames: Boolean,
|
||||
withUntracked: Boolean,
|
||||
withIgnored: Boolean,
|
||||
statusCommand: GitCommand = GitCommand.STATUS,
|
||||
): List<LightFileStatus.StatusRecord> {
|
||||
val h = GitUtil.createHandlerWithPaths(files) {
|
||||
val h = GitLineHandler(project, root, statusCommand)
|
||||
val h = GitLineHandler(project, root, GitCommand.STATUS)
|
||||
h.setSilent(true)
|
||||
h.appendParameters(GitExecutableManager.getInstance().tryGetVersion(project) ?: GitVersion.NULL,
|
||||
withRenames = withRenames, withUntracked = withUntracked, withIgnored = withIgnored)
|
||||
|
||||
@@ -12,7 +12,6 @@ import com.intellij.openapi.progress.runBlockingMaybeCancellable
|
||||
import com.intellij.openapi.progress.util.BackgroundTaskUtil
|
||||
import com.intellij.openapi.project.InitialVfsRefreshService
|
||||
import com.intellij.openapi.project.Project
|
||||
import com.intellij.openapi.util.registry.Registry
|
||||
import com.intellij.openapi.vcs.FilePath
|
||||
import com.intellij.openapi.vcs.ProjectLevelVcsManager
|
||||
import com.intellij.openapi.vcs.VcsException
|
||||
@@ -340,10 +339,7 @@ class GitUntrackedFilesHolder internal constructor(
|
||||
is DirtyScope.Files -> dirtyScope.files
|
||||
}
|
||||
coroutineToIndicator {
|
||||
val statusCommand =
|
||||
if (Registry.`is`("git.status.no.lock")) GitCommand.STATUS_NO_LOCK else GitCommand.STATUS
|
||||
|
||||
getFileStatus(project, repoRoot, dirtyFiles, false, true, withIgnored, statusCommand)
|
||||
getFileStatus(project, repoRoot, dirtyFiles, false, true, withIgnored)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user