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

Reuse more correct method to find the Git root directory

Browse Source 
This fixes IDEA-159506
This commit is contained in:
Kirill Likhodedov
2017-05-12 19:49:38 +03:00
parent 5191477600
commit e6c8b18c25
1 changed files with 8 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/GitUtil.java
+8 -22
View File
@@ -35,7 +35,6 @@ import com.intellij.openapi.vcs.changes.ChangeListManager;
import com.intellij.openapi.vcs.changes.ChangeListManagerEx; import com.intellij.openapi.vcs.changes.ChangeListManagerEx;
import com.intellij.openapi.vcs.changes.ContentRevision; import com.intellij.openapi.vcs.changes.ContentRevision;
import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList; import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList;
import com.intellij.openapi.vcs.vfs.AbstractVcsVirtualFile;
import com.intellij.openapi.vfs.CharsetToolkit; import com.intellij.openapi.vfs.CharsetToolkit;
import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.VirtualFile;
@@ -328,15 +327,10 @@ public class GitUtil {
public static Set<VirtualFile> gitRootsForPaths(final Collection<VirtualFile> roots) { public static Set<VirtualFile> gitRootsForPaths(final Collection<VirtualFile> roots) {
HashSet<VirtualFile> rc = new HashSet<>(); HashSet<VirtualFile> rc = new HashSet<>();
for (VirtualFile root : roots) { for (VirtualFile root : roots) {
VirtualFile f = root; VirtualFile gitRoot = getGitRootOrNull(VcsUtil.getFilePath(root));
do { if (gitRoot != null) {
if (f.findFileByRelativePath(DOT_GIT) != null) { rc.add(gitRoot);
rc.add(f);
break;
}
f = f.getParent();
} }
while (f != null);
} }
return rc; return rc;
} }
@@ -373,10 +367,12 @@ public class GitUtil {
@Nullable @Nullable
public static VirtualFile getGitRootOrNull(@NotNull final FilePath filePath) { public static VirtualFile getGitRootOrNull(@NotNull final FilePath filePath) {
File root = filePath.getIOFile(); File root = filePath.getIOFile();
while (root != null && (!root.exists() || !root.isDirectory() || !new File(root, DOT_GIT).exists())) { while (root != null) {
File gitDir = findGitDir(root);
if (gitDir != null) return LocalFileSystem.getInstance().findFileByIoFile(root);
root = root.getParentFile(); root = root.getParentFile();
} }
return root == null ? null : LocalFileSystem.getInstance().findFileByIoFile(root); return null;
} }
public static boolean isGitRoot(@NotNull File folder) { public static boolean isGitRoot(@NotNull File folder) {
@@ -414,17 +410,7 @@ public class GitUtil {
*/ */
@Nullable @Nullable
public static VirtualFile gitRootOrNull(final VirtualFile file) { public static VirtualFile gitRootOrNull(final VirtualFile file) {
if (file instanceof AbstractVcsVirtualFile) { return getGitRootOrNull(VcsUtil.getFilePath(file.getPath()));
return getGitRootOrNull(VcsUtil.getFilePath(file.getPath()));
}
VirtualFile root = file;
while (root != null) {
if (root.findFileByRelativePath(DOT_GIT) != null) {
return root;
}
root = root.getParent();
}
return root;
} }
/** /**