comparison src/org/tmatesoft/hg/internal/NewlineFilter.java @ 118:68ba22a2133a

Defects in the filter initialization
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Fri, 04 Feb 2011 02:44:32 +0100
parents 46291ec605a0
children 7567f4a42fe5
comparison
equal deleted inserted replaced
117:6c0be854d149 118:68ba22a2133a
165 private String nativeRepoFormat; 165 private String nativeRepoFormat;
166 private String nativeOSFormat; 166 private String nativeOSFormat;
167 167
168 public void initialize(HgRepository hgRepo, ConfigFile cfg) { 168 public void initialize(HgRepository hgRepo, ConfigFile cfg) {
169 failIfInconsistent = cfg.getBoolean("eol", "only-consistent", true); 169 failIfInconsistent = cfg.getBoolean("eol", "only-consistent", true);
170 File cfgFile = new File(new HgInternals(hgRepo).getRepositoryDir(), ".hgeol"); 170 File cfgFile = new File(new HgInternals(hgRepo).getRepositoryDir().getParentFile(), ".hgeol");
171 if (!cfgFile.canRead()) { 171 if (!cfgFile.canRead()) {
172 return; 172 return;
173 } 173 }
174 // XXX if .hgeol is not checked out, we may get it from repository 174 // XXX if .hgeol is not checked out, we may get it from repository
175 // HgDataFile cfgFileNode = hgRepo.getFileNode(".hgeol"); 175 // HgDataFile cfgFileNode = hgRepo.getFileNode(".hgeol");