Mercurial > hg4j
diff src/org/tmatesoft/hg/internal/Internals.java @ 628:6526d8adbc0f
Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
|---|---|
| date | Wed, 22 May 2013 15:52:31 +0200 |
| parents | 99ad1e3a4e4d |
| children | a8ce405da1f5 |
line wrap: on
line diff
--- a/src/org/tmatesoft/hg/internal/Internals.java Tue May 21 20:17:33 2013 +0200 +++ b/src/org/tmatesoft/hg/internal/Internals.java Wed May 22 15:52:31 2013 +0200 @@ -19,7 +19,6 @@ import static org.tmatesoft.hg.util.LogFacility.Severity.Error; import java.io.File; -import java.io.IOException; import java.nio.charset.Charset; import java.util.ArrayList; import java.util.Arrays; @@ -29,6 +28,7 @@ import java.util.List; import java.util.StringTokenizer; +import org.tmatesoft.hg.core.HgIOException; import org.tmatesoft.hg.core.SessionContext; import org.tmatesoft.hg.repo.HgDataFile; import org.tmatesoft.hg.repo.HgInternals; @@ -337,10 +337,9 @@ /** * User-specific configuration, from system-wide and user home locations, without any repository-specific data. - * * @see http://www.selenic.com/mercurial/hgrc.5.html */ - public static ConfigFile readConfiguration(SessionContext sessionCtx) throws IOException { + public static ConfigFile readConfiguration(SessionContext sessionCtx) throws HgIOException { ConfigFile configFile = new ConfigFile(sessionCtx); File hgInstallRoot = findHgInstallRoot(sessionCtx); // may be null // @@ -386,7 +385,7 @@ * Repository-specific configuration * @see http://www.selenic.com/mercurial/hgrc.5.html */ - public ConfigFile readConfiguration() throws IOException { + public ConfigFile readConfiguration() throws HgIOException { ConfigFile configFile = readConfiguration(repo.getSessionContext()); // last one, overrides anything else // <repo>/.hg/hgrc