@ -50,6 +50,10 @@ import java.io.File;
import java.io.IOException ; import java.io.IOException ;
import java.net.InetAddress ; import java.net.InetAddress ;
import java.net.UnknownHostException ; import java.net.UnknownHostException ;
import java.nio.file.Files ;
import java.nio.file.InvalidPathException ;
import java.nio.file.Path ;
import java.nio.file.Paths ;
import java.security.AccessController ; import java.security.AccessController ;
import java.security.PrivilegedAction ; import java.security.PrivilegedAction ;
import java.text.DateFormat ; import java.text.DateFormat ;
@ -60,6 +64,7 @@ import java.util.concurrent.atomic.AtomicReference;
import org.eclipse.jgit.errors.ConfigInvalidException ; import org.eclipse.jgit.errors.ConfigInvalidException ;
import org.eclipse.jgit.errors.CorruptObjectException ; import org.eclipse.jgit.errors.CorruptObjectException ;
import org.eclipse.jgit.internal.JGitText ;
import org.eclipse.jgit.lib.Config ; import org.eclipse.jgit.lib.Config ;
import org.eclipse.jgit.lib.Constants ; import org.eclipse.jgit.lib.Constants ;
import org.eclipse.jgit.lib.ObjectChecker ; import org.eclipse.jgit.lib.ObjectChecker ;
@ -137,6 +142,42 @@ public abstract class SystemReader {
fs ) ; fs ) ;
} }
private Path getXDGConfigHome ( FS fs ) {
String configHomePath = getenv ( Constants . XDG_CONFIG_HOME ) ;
if ( StringUtils . isEmptyOrNull ( configHomePath ) ) {
configHomePath = new File ( fs . userHome ( ) , ".config" ) //$NON-NLS-1$
. getAbsolutePath ( ) ;
}
try {
Path xdgHomePath = Paths . get ( configHomePath ) ;
Files . createDirectories ( xdgHomePath ) ;
return xdgHomePath ;
} catch ( IOException | InvalidPathException e ) {
LOG . error ( JGitText . get ( ) . createXDGConfigHomeFailed ,
configHomePath , e ) ;
}
return null ;
}
@Override
public FileBasedConfig openJGitConfig ( Config parent , FS fs ) {
Path xdgPath = getXDGConfigHome ( fs ) ;
if ( xdgPath ! = null ) {
Path configPath = null ;
try {
configPath = xdgPath . resolve ( "jgit" ) ; //$NON-NLS-1$
Files . createDirectories ( configPath ) ;
configPath = configPath . resolve ( Constants . CONFIG ) ;
return new FileBasedConfig ( parent , configPath . toFile ( ) , fs ) ;
} catch ( IOException e ) {
LOG . error ( JGitText . get ( ) . createJGitConfigFailed , configPath ,
e ) ;
}
}
return new FileBasedConfig ( parent ,
new File ( fs . userHome ( ) , ".jgitconfig" ) , fs ) ; //$NON-NLS-1$
}
@Override @Override
public String getHostname ( ) { public String getHostname ( ) {
if ( hostname = = null ) { if ( hostname = = null ) {
@ -198,6 +239,8 @@ public abstract class SystemReader {
private AtomicReference < FileBasedConfig > userConfig = new AtomicReference < > ( ) ; private AtomicReference < FileBasedConfig > userConfig = new AtomicReference < > ( ) ;
private AtomicReference < FileBasedConfig > jgitConfig = new AtomicReference < > ( ) ;
private void init ( ) { private void init ( ) {
// Creating ObjectChecker must be deferred. Unit tests change
// Creating ObjectChecker must be deferred. Unit tests change
// behavior of is{Windows,MacOS} in constructor of subclass.
// behavior of is{Windows,MacOS} in constructor of subclass.
@ -274,6 +317,22 @@ public abstract class SystemReader {
* / * /
public abstract FileBasedConfig openSystemConfig ( Config parent , FS fs ) ; public abstract FileBasedConfig openSystemConfig ( Config parent , FS fs ) ;
/ * *
* Open the jgit configuration located at $XDG_CONFIG_HOME / jgit / config . Use
* { @link # getJGitConfig ( ) } to get the current jgit configuration in the
* user home since it manages automatic reloading when the jgit config file
* was modified and avoids unnecessary reloads .
*
* @param parent
* a config with values not found directly in the returned config
* @param fs
* the file system abstraction which will be necessary to perform
* certain file system operations .
* @return the jgit configuration located at $XDG_CONFIG_HOME / jgit / config
* @since 5 . 5 . 2
* /
public abstract FileBasedConfig openJGitConfig ( Config parent , FS fs ) ;
/ * * / * *
* Get the git configuration found in the user home . The configuration will * Get the git configuration found in the user home . The configuration will
* be reloaded automatically if the configuration file was modified . Also * be reloaded automatically if the configuration file was modified . Also
@ -301,6 +360,31 @@ public abstract class SystemReader {
return c ; return c ;
} }
/ * *
* Get the jgit configuration located at $XDG_CONFIG_HOME / jgit / config . The
* configuration will be reloaded automatically if the configuration file
* was modified . If the configuration file wasn ' t modified returns the
* cached configuration .
*
* @return the jgit configuration located at $XDG_CONFIG_HOME / jgit / config
* @throws ConfigInvalidException
* if configuration is invalid
* @throws IOException
* if something went wrong when reading files
* @since 5 . 5 . 2
* /
public StoredConfig getJGitConfig ( )
throws ConfigInvalidException , IOException {
FileBasedConfig c = jgitConfig . get ( ) ;
if ( c = = null ) {
jgitConfig . compareAndSet ( null ,
openJGitConfig ( null , FS . DETECTED ) ) ;
c = jgitConfig . get ( ) ;
}
updateAll ( c ) ;
return c ;
}
/ * * / * *
* Get the gitconfig configuration found in the system - wide "etc" directory . * Get the gitconfig configuration found in the system - wide "etc" directory .
* The configuration will be reloaded automatically if the configuration * The configuration will be reloaded automatically if the configuration
@ -319,7 +403,7 @@ public abstract class SystemReader {
FileBasedConfig c = systemConfig . get ( ) ; FileBasedConfig c = systemConfig . get ( ) ;
if ( c = = null ) { if ( c = = null ) {
systemConfig . compareAndSet ( null , systemConfig . compareAndSet ( null ,
openSystemConfig ( null , FS . DETECTED ) ) ; openSystemConfig ( getJGitConfig ( ) , FS . DETECTED ) ) ;
c = systemConfig . get ( ) ; c = systemConfig . get ( ) ;
} }
updateAll ( c ) ; updateAll ( c ) ;
Matthias Sohn
5 years ago