Mercurial > hg4j
comparison src/org/tmatesoft/hg/internal/Internals.java @ 711:a62079bc422b
Keyword filtering that doesn't depend on input buffer size and the way input lines got split between filter() calls. KewordFilter got state to keep processed suspicious ...$ lines
author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
---|---|
date | Fri, 11 Oct 2013 21:35:41 +0200 |
parents | b4242b7e7dfe |
children | 661e77dc88ba |
comparison
equal
deleted
inserted
replaced
710:cf200271439a | 711:a62079bc422b |
---|---|
407 */ | 407 */ |
408 public ConfigFile readConfiguration() throws HgIOException { | 408 public ConfigFile readConfiguration() throws HgIOException { |
409 ConfigFile configFile = readConfiguration(repo.getSessionContext()); | 409 ConfigFile configFile = readConfiguration(repo.getSessionContext()); |
410 // last one, overrides anything else | 410 // last one, overrides anything else |
411 // <repo>/.hg/hgrc | 411 // <repo>/.hg/hgrc |
412 configFile.addLocation(getFileFromRepoDir("hgrc")); | 412 configFile.addLocation(getRepositoryFile(HgRepositoryFiles.RepoConfig)); |
413 return configFile; | 413 return configFile; |
414 } | 414 } |
415 | 415 |
416 /*package-local*/ImplAccess getImplAccess() { | 416 /*package-local*/ImplAccess getImplAccess() { |
417 return implAccess; | 417 return implAccess; |