git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[JGIT PATCH 07/19] Correct user config to be of type FileBasedConfig

From
Shawn O. Pearce <spearce@spearce.org>
Date
Jul 25, 2009, 18:52 UTC
Message-ID
<1248547982-4003-8-git-send-email-spearce@spearce.org>
In-Reply-To
<1248547982-4003-7-git-send-email-spearce@spearce.org>

The user's ~/.gitconfig file is a file, but not a repository specific file. Since RepositoryConfig has been refactored into base classes that handle file based configuration, we no longer need to use the RepositoryConfig type to access ~/.gitconfig.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---
 .../src/org/spearce/jgit/lib/RepositoryConfig.java |    4 ++--
 .../src/org/spearce/jgit/util/SystemReader.java    |    5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/org.spearce.jgit/src/org/spearce/jgit/lib/RepositoryConfig.java b/org.spearce.jgit/src/org/spearce/jgit/lib/RepositoryConfig.java
index 9be7c1b..5c912b7 100644
--- a/org.spearce.jgit/src/org/spearce/jgit/lib/RepositoryConfig.java
+++ b/org.spearce.jgit/src/org/spearce/jgit/lib/RepositoryConfig.java
@@ -60,7 +60,7 @@
 	 * @return a new configuration instance to read the user's global
 	 *         configuration file from their home directory.
 	 */
-	public static RepositoryConfig openUserConfig() {
+	public static FileBasedConfig openUserConfig() {
 		return SystemReader.getInstance().openUserConfig();
 	}
 
@@ -85,7 +85,7 @@ public static RepositoryConfig openUserConfig() {
 	 * @param cfgLocation
 	 *            path of the file to load (or save).
 	 */
-	public RepositoryConfig(final RepositoryConfig base, final File cfgLocation) {
+	public RepositoryConfig(final Config base, final File cfgLocation) {
 		super(base, cfgLocation);
 	}
 
diff --git a/org.spearce.jgit/src/org/spearce/jgit/util/SystemReader.java b/org.spearce.jgit/src/org/spearce/jgit/util/SystemReader.java
index 36c188c..a30dfef 100644
--- a/org.spearce.jgit/src/org/spearce/jgit/util/SystemReader.java
+++ b/org.spearce.jgit/src/org/spearce/jgit/util/SystemReader.java
@@ -41,6 +41,7 @@
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 
+import org.spearce.jgit.lib.FileBasedConfig;
 import org.spearce.jgit.lib.RepositoryConfig;
 
 /**
@@ -63,7 +64,7 @@ public String getProperty(String key) {
 			return System.getProperty(key);
 		}
 
-		public RepositoryConfig openUserConfig() {
+		public FileBasedConfig openUserConfig() {
 			final File home = FS.userHome();
 			return new RepositoryConfig(null, new File(home, ".gitconfig"));
 		}
@@ -119,5 +120,5 @@ public static void setInstance(SystemReader newReader) {
 	/**
 	 * @return the git configuration found in the user home
 	 */
-	public abstract RepositoryConfig openUserConfig();
+	public abstract FileBasedConfig openUserConfig();
 }

-- 
1.6.4.rc2.216.g769fa
Previous: Shawn O. PearceNext: Shawn O. Pearce
Message 8 of 26 in “More Config class cleanup work”
  1. 00/19 More Config class cleanup workShawn O. Pearce, Jul 25, 2009
  2. 01/19 Cleanup nonstandard references to encoding strings to bytesShawn O. Pearce, Jul 25, 2009
  3. 02/19 Delete incorrect Javadoc from Config's getRawString methodShawn O. Pearce, Jul 25, 2009
  4. 03/19 Make Config.escapeValue a private methodShawn O. Pearce, Jul 25, 2009
  5. 04/19 Allow a RemoteConfig to use the more generic Config classShawn O. Pearce, Jul 25, 2009
  6. 05/19 Use type specific sets when creating a new RepositoryConfigShawn O. Pearce, Jul 25, 2009
  7. 06/19 Move SystemReader out of RepositoryConfigShawn O. Pearce, Jul 25, 2009
  8. 07/19 Correct user config to be of type FileBasedConfigShawn O. Pearce, Jul 25, 2009
  9. 08/19 Extract the test specific SystemReader out of RepositoryTestCaseShawn O. Pearce, Jul 25, 2009
  10. 09/19 Refactor Config hierarchy to make IO more explicitShawn O. Pearce, Jul 25, 2009
  11. 10/19 Test for the config file when creating a new repositoryShawn O. Pearce, Jul 25, 2009
  12. 11/19 Remove the map lookup for values in ConfigShawn O. Pearce, Jul 25, 2009
  13. 12/19 Return base values first from Config.getStringList()Shawn O. Pearce, Jul 25, 2009
  14. 13/19 Make Config thread safe by using copy-on-write semanticsShawn O. Pearce, Jul 25, 2009
  15. 14/19 Support cached application models in a ConfigShawn O. Pearce, Jul 25, 2009
  16. 15/19 Cache Config subsection names when requested by application codeShawn O. Pearce, Jul 25, 2009
  17. 16/19 Refactor author/committer lookup to use cached dataShawn O. Pearce, Jul 25, 2009
  18. 17/19 Move repository config creation fully into Repository classShawn O. Pearce, Jul 25, 2009
  19. 18/19 Use Config SectionParser cache to store daemon enable statesShawn O. Pearce, Jul 25, 2009
  20. 19/19 Use Config cache for fetch and receive configuration parsingShawn O. Pearce, Jul 25, 2009
  21. Robin RosenbergJul 25, 2009
  22. Shawn O. PearceJul 25, 2009
  23. Robin RosenbergJul 25, 2009
  24. Shawn O. PearceJul 25, 2009
  25. Robin RosenbergJul 25, 2009
  26. Shawn O. PearceJul 25, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.