Mercurial > hg4j
comparison src/org/tmatesoft/hg/internal/NewlineFilter.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 | b3c16d1aede0 |
comparison
equal
deleted
inserted
replaced
482:6c67debed07e | 483:e31e85cf4d4c |
---|---|
22 import static org.tmatesoft.hg.internal.Filter.Direction.ToRepo; | 22 import static org.tmatesoft.hg.internal.Filter.Direction.ToRepo; |
23 import static org.tmatesoft.hg.internal.KeywordFilter.copySlice; | 23 import static org.tmatesoft.hg.internal.KeywordFilter.copySlice; |
24 import static org.tmatesoft.hg.util.LogFacility.Severity.Warn; | 24 import static org.tmatesoft.hg.util.LogFacility.Severity.Warn; |
25 | 25 |
26 import java.io.File; | 26 import java.io.File; |
27 import java.io.IOException; | |
28 import java.nio.ByteBuffer; | 27 import java.nio.ByteBuffer; |
29 import java.util.ArrayList; | 28 import java.util.ArrayList; |
30 import java.util.Map; | 29 import java.util.Map; |
31 | 30 |
32 import org.tmatesoft.hg.repo.HgInternals; | 31 import org.tmatesoft.hg.repo.HgInternals; |
32 import org.tmatesoft.hg.repo.HgInvalidFileException; | |
33 import org.tmatesoft.hg.repo.HgInvalidStateException; | 33 import org.tmatesoft.hg.repo.HgInvalidStateException; |
34 import org.tmatesoft.hg.repo.HgRepository; | 34 import org.tmatesoft.hg.repo.HgRepository; |
35 import org.tmatesoft.hg.util.Adaptable; | 35 import org.tmatesoft.hg.util.Adaptable; |
36 import org.tmatesoft.hg.util.Path; | 36 import org.tmatesoft.hg.util.Path; |
37 | 37 |
310 // HgDataFile cfgFileNode = hgRepo.getFileNode(".hgeol"); | 310 // HgDataFile cfgFileNode = hgRepo.getFileNode(".hgeol"); |
311 // if (!cfgFileNode.exists()) { | 311 // if (!cfgFileNode.exists()) { |
312 // return; | 312 // return; |
313 // } | 313 // } |
314 // XXX perhaps, add HgDataFile.hasWorkingCopy and workingCopyContent()? | 314 // XXX perhaps, add HgDataFile.hasWorkingCopy and workingCopyContent()? |
315 ConfigFile hgeol = new ConfigFile(); | 315 ConfigFile hgeol = new ConfigFile(HgInternals.getContext(hgRepo)); |
316 try { | 316 try { |
317 hgeol.addLocation(cfgFile); | 317 hgeol.addLocation(cfgFile); |
318 } catch (IOException ex) { | 318 } catch (HgInvalidFileException ex) { |
319 HgInternals.getContext(hgRepo).getLog().dump(getClass(), Warn, ex, null); | 319 HgInternals.getContext(hgRepo).getLog().dump(getClass(), Warn, ex, null); |
320 } | 320 } |
321 nativeRepoFormat = hgeol.getSection("repository").get("native"); | 321 nativeRepoFormat = hgeol.getSection("repository").get("native"); |
322 if (nativeRepoFormat == null) { | 322 if (nativeRepoFormat == null) { |
323 nativeRepoFormat = "LF"; | 323 nativeRepoFormat = "LF"; |