MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Revert "git: optimize checking if a directory is a Git or Hg root"

Browse Source 
Appeared to refresh more than expected. Reverting during investigation.

This reverts commit 86df77cf40.
This commit is contained in:
Kirill Likhodedov
2018-12-13 16:24:30 +03:00
parent 0a7db7eaf0
commit bcfe6c79d1
4 changed files with 2 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-api/src/com/intellij/openapi/vcs/VcsRootChecker.java
-7
View File
@@ -36,13 +36,6 @@ public abstract class VcsRootChecker {
return false;
}
/**
* Checks if the given directory is a root of the supported VCS.
*/
public boolean isRoot(@NotNull VirtualFile maybeRoot) {
return isRoot(maybeRoot.getPath());
}
/**
* Returns the VCS supported by this checker.
*/
platform/vcs-impl/src/com/intellij/openapi/vcs/roots/VcsRootDetectorImpl.java
+2 -1
View File
@@ -143,8 +143,9 @@ public class VcsRootDetectorImpl implements VcsRootDetector {
@Nullable
private AbstractVcs getVcsFor(@NotNull VirtualFile maybeRoot, @Nullable VirtualFile dirToCheckForIgnore) {
String path = maybeRoot.getPath();
for (VcsRootChecker checker : myCheckers) {
if (checker.isRoot(maybeRoot) && (dirToCheckForIgnore == null || !checker.isIgnored(maybeRoot, dirToCheckForIgnore))) {
if (checker.isRoot(path) && (dirToCheckForIgnore == null || !checker.isIgnored(maybeRoot, dirToCheckForIgnore))) {
return myVcsManager.findVcsByName(checker.getSupportedVcs().getName());
}
}
plugins/git4idea/src/git4idea/roots/GitRootChecker.java
-5
View File
@@ -39,11 +39,6 @@ public class GitRootChecker extends VcsRootChecker {
return GitUtil.isGitRoot(path);
}
@Override
public boolean isRoot(@NotNull VirtualFile maybeRoot) {
return GitUtil.findGitDir(maybeRoot) != null;
}
@Override
@NotNull
public VcsKey getSupportedVcs() {
plugins/hg4idea/src/org/zmlx/hg4idea/roots/HgRootChecker.java
-7
View File
@@ -17,8 +17,6 @@ package org.zmlx.hg4idea.roots;
import com.intellij.openapi.vcs.VcsKey;
import com.intellij.openapi.vcs.VcsRootChecker;
import com.intellij.openapi.vfs.VfsUtil;
import com.intellij.openapi.vfs.VirtualFile;
import org.jetbrains.annotations.NotNull;
import org.zmlx.hg4idea.HgVcs;
import org.zmlx.hg4idea.util.HgUtil;
@@ -35,11 +33,6 @@ public class HgRootChecker extends VcsRootChecker {
return new File(path, HgUtil.DOT_HG).exists();
}
@Override
public boolean isRoot(@NotNull VirtualFile maybeRoot) {
return VfsUtil.refreshAndFindChild(maybeRoot, HgUtil.DOT_HG) != null;
}
@NotNull
@Override
public VcsKey getSupportedVcs() {