motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge "Don't confuse empty configuration variables with booleans"

This commit is contained in:
Shawn Pearce 2010-01-25 10:26:22 -05:00 committed by Code Review
parent e905d93f9f 869c8434f6
commit 6595ab1007
2 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RepositoryConfigTest.java
View File

@ -1,6 +1,6 @@
/*
* Copyright (C) 2007, Dave Watson <dwatson@mimvista.com>
* Copyright (C) 2009, Google Inc.
* Copyright (C) 2009-2010, Google Inc.
* Copyright (C) 2008, Marek Zawirski <marek.zawirski@gmail.com>
* Copyright (C) 2008, Robin Rosenberg <robin.rosenberg@dewire.com>
* Copyright (C) 2008, Shawn O. Pearce <spearce@spearce.org>
@ -242,6 +242,35 @@ public void testReadLong() throws ConfigInvalidException {
}
}
public void testBooleanWithNoValue() throws ConfigInvalidException {
Config c = parse("[my]\n\tempty\n");
assertEquals("", c.getString("my", null, "empty"));
assertEquals(1, c.getStringList("my", null, "empty").length);
assertEquals("", c.getStringList("my", null, "empty")[0]);
assertTrue(c.getBoolean("my", "empty", false));
assertEquals("[my]\n\tempty\n", c.toText());
}
public void testEmptyString() throws ConfigInvalidException {
Config c = parse("[my]\n\tempty =\n");
assertNull(c.getString("my", null, "empty"));
String[] values = c.getStringList("my", null, "empty");
assertNotNull(values);
assertEquals(1, values.length);
assertNull(values[0]);
// always matches the default, because its non-boolean
assertTrue(c.getBoolean("my", "empty", true));
assertFalse(c.getBoolean("my", "empty", false));
assertEquals("[my]\n\tempty =\n", c.toText());
c = new Config();
c.setStringList("my", null, "empty", Arrays.asList(values));
assertEquals("[my]\n\tempty =\n", c.toText());
}
private void assertReadLong(long exp) throws ConfigInvalidException {
assertReadLong(exp, String.valueOf(exp));
}

7
org.eclipse.jgit/src/org/eclipse/jgit/lib/Config.java
View File

@ -715,9 +715,10 @@ public String toText() {
if (e.prefix == null || "".equals(e.prefix))
out.append('\t');
out.append(e.name);
if (e.value != null) {
if (MAGIC_EMPTY_VALUE != e.value) {
out.append(" = ");
if (MAGIC_EMPTY_VALUE != e.value) {
out.append(" =");
if (e.value != null) {
out.append(' ');
out.append(escapeValue(e.value));
}
}