Mercurial > jhg

comparison src/org/tmatesoft/hg/repo/HgRepository.java @ 483:e31e85cf4d4c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 6c67debed07e
children ae4d6604debd
comparison
equal deleted inserted replaced
482:6c67debed07e 483:e31e85cf4d4c
323 ConfigFile configFile = impl.readConfiguration(this, getRepositoryRoot()); 323 ConfigFile configFile = impl.readConfiguration(this, getRepositoryRoot());
324 repoConfig = new HgRepoConfig(configFile); 324 repoConfig = new HgRepoConfig(configFile);
325 } catch (IOException ex) { 325 } catch (IOException ex) {
326 String m = "Errors while reading user configuration file"; 326 String m = "Errors while reading user configuration file";
327 getContext().getLog().dump(getClass(), Warn, ex, m); 327 getContext().getLog().dump(getClass(), Warn, ex, m);
328 return new HgRepoConfig(new ConfigFile()); // empty config, do not cache, allow to try once again 328 return new HgRepoConfig(new ConfigFile(getContext())); // empty config, do not cache, allow to try once again
329 //throw new HgInvalidControlFileException(m, ex, null); 329 //throw new HgInvalidControlFileException(m, ex, null);
330 } 330 }
331 } 331 }
332 return repoConfig; 332 return repoConfig;
333 } 333 }