MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-10-01 19:02:13 +07:00
Code Issues Packages Projects Releases Wiki Activity

[refactoring] GitUtil.findGitDir: extract searching for file

Browse Source
This commit is contained in:
Kirill Likhodedov
2015-11-27 16:24:00 +03:00
parent 351bca9316
commit 2782b3aebc
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/GitUtil.java
+11 -4
View File
@@ -107,15 +107,22 @@ public class GitUtil {
String content = readContent(child);
if (content == null) return null;
String pathToDir = parsePathToRepository(content);
File file = findSubmoduleRepositoryDir(rootDir, pathToDir);
if (file == null) return null;
return VcsUtil.getVirtualFileWithRefresh(file);
}
if (!FileUtil.isAbsolute(pathToDir)) {
String canonicalPath = FileUtil.toCanonicalPath(FileUtil.join(rootDir.getPath(), pathToDir));
@Nullable
private static File findSubmoduleRepositoryDir(@NotNull VirtualFile rootDir, @NotNull String path) {
if (!FileUtil.isAbsolute(path)) {
String canonicalPath = FileUtil.toCanonicalPath(FileUtil.join(rootDir.getPath(), path));
if (canonicalPath == null) {
return null;
}
pathToDir = FileUtil.toSystemIndependentName(canonicalPath);
path = FileUtil.toSystemIndependentName(canonicalPath);
}
return VcsUtil.getVirtualFileWithRefresh(new File(pathToDir));
File file = new File(path);
return file.isDirectory() ? file : null;
}
@NotNull