Browse Source

Config: extract method to read included config

Change-Id: I2c55af3e5fe29e0ce8e3d05e4b54ec961d3f863a
Signed-off-by: Marc Strapetz <marc.strapetz@syntevo.com>
stable-4.10
Marc Strapetz 7 years ago committed by Matthias Sohn
parent
commit
b8f2577472
  1. 57
      org.eclipse.jgit/src/org/eclipse/jgit/lib/Config.java

57
org.eclipse.jgit/src/org/eclipse/jgit/lib/Config.java

@ -63,6 +63,7 @@ import java.util.Set;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
import org.eclipse.jgit.annotations.Nullable;
import org.eclipse.jgit.errors.ConfigInvalidException; import org.eclipse.jgit.errors.ConfigInvalidException;
import org.eclipse.jgit.events.ConfigChangedEvent; import org.eclipse.jgit.events.ConfigChangedEvent;
import org.eclipse.jgit.events.ConfigChangedListener; import org.eclipse.jgit.events.ConfigChangedListener;
@ -1100,29 +1101,29 @@ public class Config {
return newEntries; return newEntries;
} }
private void addIncludedConfig(final List<ConfigLine> newEntries, /**
ConfigLine line, int depth) throws ConfigInvalidException { * Read the included config from the specified (possibly) relative path
if (!line.name.equals("path") || //$NON-NLS-1$ *
line.value == null || line.value.equals(MAGIC_EMPTY_VALUE)) { * @param relPath
throw new ConfigInvalidException( * possibly relative path to the included config, as specified in
JGitText.get().invalidLineInConfigFile); * this config
} * @return the read bytes, or null if the included config should be ignored
File path = new File(line.value); * @throws ConfigInvalidException
* if something went wrong while reading the config
* @since 4.10
*/
@Nullable
protected byte[] readIncludedConfig(String relPath)
throws ConfigInvalidException {
File path = new File(relPath);
try { try {
byte[] bytes = IO.readFully(path); return IO.readFully(path);
String decoded;
if (isUtf8(bytes)) {
decoded = RawParseUtils.decode(RawParseUtils.UTF8_CHARSET,
bytes, 3, bytes.length);
} else {
decoded = RawParseUtils.decode(bytes);
}
newEntries.addAll(fromTextRecurse(decoded, depth + 1));
} catch (FileNotFoundException fnfe) { } catch (FileNotFoundException fnfe) {
if (path.exists()) { if (path.exists()) {
throw new ConfigInvalidException(MessageFormat throw new ConfigInvalidException(MessageFormat
.format(JGitText.get().cannotReadFile, path), fnfe); .format(JGitText.get().cannotReadFile, path), fnfe);
} }
return null;
} catch (IOException ioe) { } catch (IOException ioe) {
throw new ConfigInvalidException( throw new ConfigInvalidException(
MessageFormat.format(JGitText.get().cannotReadFile, path), MessageFormat.format(JGitText.get().cannotReadFile, path),
@ -1130,6 +1131,28 @@ public class Config {
} }
} }
private void addIncludedConfig(final List<ConfigLine> newEntries,
ConfigLine line, int depth) throws ConfigInvalidException {
if (!line.name.equals("path") || //$NON-NLS-1$
line.value == null || line.value.equals(MAGIC_EMPTY_VALUE)) {
throw new ConfigInvalidException(
JGitText.get().invalidLineInConfigFile);
}
byte[] bytes = readIncludedConfig(line.value);
if (bytes == null) {
return;
}
String decoded;
if (isUtf8(bytes)) {
decoded = RawParseUtils.decode(RawParseUtils.UTF8_CHARSET, bytes, 3,
bytes.length);
} else {
decoded = RawParseUtils.decode(bytes);
}
newEntries.addAll(fromTextRecurse(decoded, depth + 1));
}
private ConfigSnapshot newState() { private ConfigSnapshot newState() {
return new ConfigSnapshot(Collections.<ConfigLine> emptyList(), return new ConfigSnapshot(Collections.<ConfigLine> emptyList(),
getBaseState()); getBaseState());

Loading…
Cancel
Save