Mercurial > hg4j
diff src/org/tmatesoft/hg/repo/HgLookup.java @ 483:e31e85cf4d4c
Handle include and unset directives in config files
author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
---|---|
date | Tue, 07 Aug 2012 19:14:53 +0200 |
parents | 909306e412e2 |
children | e4eaa23e3442 |
line wrap: on
line diff
--- a/src/org/tmatesoft/hg/repo/HgLookup.java Tue Aug 07 14:27:13 2012 +0200 +++ b/src/org/tmatesoft/hg/repo/HgLookup.java Tue Aug 07 19:14:53 2012 +0200 @@ -132,10 +132,10 @@ private ConfigFile getGlobalConfig() { if (globalCfg == null) { - globalCfg = new ConfigFile(); + globalCfg = new ConfigFile(getContext()); try { globalCfg.addLocation(new File(System.getProperty("user.home"), ".hgrc")); - } catch (IOException ex) { + } catch (HgInvalidFileException ex) { // XXX perhaps, makes sense to let caller/client know that we've failed to read global config? getContext().getLog().dump(getClass(), Warn, ex, null); }