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

vcs: cleanup

Browse Source 
GitOrigin-RevId: 633a37e3b102186c4fcf4b622113974846ceb666
This commit is contained in:
Aleksey Pivovarov
2020-03-10 12:33:08 +00:00
committed by intellij-monorepo-bot
parent 5e21bb53d5
commit 5d39a0ebfc
1 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/roots/VcsRootDetectorImpl.java
+21 -13
View File
@@ -102,11 +102,11 @@ public class VcsRootDetectorImpl implements VcsRootDetector {
private Set<VcsRoot> scanForRootsInsideDir(@NotNull VirtualFile root) {
Set<VcsRoot> roots = new HashSet<>();
VcsRootScanner.visitDirsRecursivelyWithoutExcluded(myProject, ProjectRootManager.getInstance(myProject), root, dir -> {
if (Registry.is("vcs.root.detector.skip.vendor") && dir.getName().equalsIgnoreCase("vendor")) return SKIP_CHILDREN;
AbstractVcs vcs = getVcsFor(dir);
if (vcs != null) {
LOG.debug("Found VCS " + vcs + " in " + dir);
roots.add(new VcsRoot(vcs, dir));
if (isIgnoredDirectory(dir)) return SKIP_CHILDREN;
VcsRoot vcsRoot = getVcsRootFor(dir);
if (vcsRoot != null) {
LOG.debug("Found VCS " + vcsRoot.getVcs() + " in " + vcsRoot.getPath());
roots.add(vcsRoot);
}
return CONTINUE;
});
@@ -117,33 +117,41 @@ public class VcsRootDetectorImpl implements VcsRootDetector {
return rootsInsideDir.stream().noneMatch(it -> startDir.equals(it.getPath()));
}
private boolean isIgnoredDirectory(@NotNull VirtualFile dir) {
return Registry.is("vcs.root.detector.skip.vendor") && dir.getName().equalsIgnoreCase("vendor");
}
@Nullable
private VcsRoot scanForSingleRootAboveDir(@NotNull final VirtualFile dir) {
if (myProject.isDisposed()) {
return null;
}
ProgressManager.checkCanceled();
VirtualFile userHomeDir = VfsUtil.getUserHomeDir();
VirtualFile par = dir.getParent();
while (par != null && !par.equals(VfsUtil.getUserHomeDir())) {
AbstractVcs vcs = getVcsFor(par, dir);
if (vcs != null) return new VcsRoot(vcs, par);
while (par != null) {
if (par.equals(userHomeDir)) break; // ignore mappings in ~/ and above
VcsRoot vcsRoot = getVcsRootFor(par, dir);
if (vcsRoot != null) return vcsRoot;
par = par.getParent();
}
return null;
}
@Nullable
private AbstractVcs getVcsFor(@NotNull VirtualFile dir) {
return getVcsFor(dir, null);
private VcsRoot getVcsRootFor(@NotNull VirtualFile dir) {
return getVcsRootFor(dir, null);
}
@Nullable
private AbstractVcs getVcsFor(@NotNull VirtualFile maybeRoot, @Nullable VirtualFile dirToCheckForIgnore) {
private VcsRoot getVcsRootFor(@NotNull VirtualFile maybeRoot, @Nullable VirtualFile dirToCheckForIgnore) {
ProgressManager.checkCanceled();
String path = maybeRoot.getPath();
return VcsRootChecker.EXTENSION_POINT_NAME.computeSafeIfAny(checker -> {
if (checker.isRoot(path) && (dirToCheckForIgnore == null || !checker.isIgnored(maybeRoot, dirToCheckForIgnore))) {
return myVcsManager.findVcsByName(checker.getSupportedVcs().getName());
AbstractVcs vcs = myVcsManager.findVcsByName(checker.getSupportedVcs().getName());
if (vcs != null) return new VcsRoot(vcs, maybeRoot);
return null;
}
return null;
});