motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge "Cache gitPrefix in FS_Win32"

This commit is contained in:
Shawn Pearce 2011-03-10 13:02:24 -05:00 committed by Code Review
parent 561aa98041 6f066dec02
commit 09d2b9f0ed
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
org.eclipse.jgit/src/org/eclipse/jgit/util/FS_Win32.java
View File

@ -64,6 +64,9 @@ public String run() {
&& StringUtils.toLowerCase(osDotName).indexOf("windows") != -1;
}
private File gitPrefix;
private boolean gitPrefixEvaluated;
public boolean supportsExecute() {
return false;
}
@ -83,21 +86,26 @@ public boolean retryFailedLockFileCommit() {
@Override
public File gitPrefix() {
if (gitPrefixEvaluated)
return gitPrefix;
String path = SystemReader.getInstance().getenv("PATH");
File gitExe = searchPath(path, "git.exe", "git.cmd");
if (gitExe != null)
return gitExe.getParentFile().getParentFile();
gitPrefix = gitExe.getParentFile().getParentFile();
else {
// This isn't likely to work, if bash is in $PATH, git should
// also be in $PATH. But its worth trying.
//
String w = readPipe(userHome(), //
new String[] { "bash", "--login", "-c", "which git" }, //
Charset.defaultCharset().name());
if (w != null)
gitPrefix = new File(w).getParentFile().getParentFile();
}
// This isn't likely to work, if bash is in $PATH, git should
// also be in $PATH. But its worth trying.
//
String w = readPipe(userHome(), //
new String[] { "bash", "--login", "-c", "which git" }, //
Charset.defaultCharset().name());
if (w != null)
return new File(w).getParentFile().getParentFile();
return null;
gitPrefixEvaluated = true;
return gitPrefix;
}
@Override