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

[refactoring] GitUtil.findGitDir: extract parsing .git file content

Browse Source
This commit is contained in:
Kirill Likhodedov
2015-11-27 16:23:59 +03:00
parent a0256c33ff
commit 351bca9316
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/GitUtil.java
+8 -8
View File
@@ -82,6 +82,7 @@ public class GitUtil {
}
};
private static final String SUBMODULE_REPO_PATH_PREFIX = "gitdir:";
private final static Logger LOG = Logger.getInstance(GitUtil.class);
/**
@@ -105,14 +106,7 @@ public class GitUtil {
// if .git is a file with some specific content, it indicates a submodule with a link to the real repository path
String content = readContent(child);
if (content == null) return null;
String pathToDir;
String prefix = "gitdir:";
if (content.startsWith(prefix)) {
pathToDir = content.substring(prefix.length()).trim();
}
else {
pathToDir = content;
}
String pathToDir = parsePathToRepository(content);
if (!FileUtil.isAbsolute(pathToDir)) {
String canonicalPath = FileUtil.toCanonicalPath(FileUtil.join(rootDir.getPath(), pathToDir));
@@ -124,6 +118,12 @@ public class GitUtil {
return VcsUtil.getVirtualFileWithRefresh(new File(pathToDir));
}
@NotNull
private static String parsePathToRepository(@NotNull String content) {
content = content.trim();
return content.startsWith(SUBMODULE_REPO_PATH_PREFIX) ? content.substring(SUBMODULE_REPO_PATH_PREFIX.length()).trim() : content;
}
@Nullable
private static String readContent(@NotNull VirtualFile child) {
String content;