Mercurial > jhg
comparison src/org/tmatesoft/hg/internal/Internals.java @ 621:99ad1e3a4e4d
RevlogStream: be aware of existence (not HgDataFile), facilitate use of an added HgDataFile over a commit; Rollback: be more sensitive about file changes (file size is not enough: write/rollback leaves it intact); tests
author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
---|---|
date | Sat, 18 May 2013 22:23:57 +0200 |
parents | 5c68567b3645 |
children | 6526d8adbc0f |
comparison
equal
deleted
inserted
replaced
620:272ecffccc8a | 621:99ad1e3a4e4d |
---|---|
30 import java.util.StringTokenizer; | 30 import java.util.StringTokenizer; |
31 | 31 |
32 import org.tmatesoft.hg.core.SessionContext; | 32 import org.tmatesoft.hg.core.SessionContext; |
33 import org.tmatesoft.hg.repo.HgDataFile; | 33 import org.tmatesoft.hg.repo.HgDataFile; |
34 import org.tmatesoft.hg.repo.HgInternals; | 34 import org.tmatesoft.hg.repo.HgInternals; |
35 import org.tmatesoft.hg.repo.HgInvalidControlFileException; | |
36 import org.tmatesoft.hg.repo.HgRepoConfig.ExtensionsSection; | 35 import org.tmatesoft.hg.repo.HgRepoConfig.ExtensionsSection; |
37 import org.tmatesoft.hg.repo.HgRepository; | 36 import org.tmatesoft.hg.repo.HgRepository; |
38 import org.tmatesoft.hg.repo.HgRepositoryFiles; | 37 import org.tmatesoft.hg.repo.HgRepositoryFiles; |
39 import org.tmatesoft.hg.repo.HgRepositoryLock; | 38 import org.tmatesoft.hg.repo.HgRepositoryLock; |
40 import org.tmatesoft.hg.repo.HgRuntimeException; | 39 import org.tmatesoft.hg.repo.HgRuntimeException; |
491 File chlogFile = getFileFromStoreDir("00changelog.i"); | 490 File chlogFile = getFileFromStoreDir("00changelog.i"); |
492 return streamProvider.create(chlogFile); | 491 return streamProvider.create(chlogFile); |
493 } | 492 } |
494 | 493 |
495 public RevlogStream resolveStoreFile(Path path) { | 494 public RevlogStream resolveStoreFile(Path path) { |
496 return streamProvider.resolveStoreFile(path); | 495 return streamProvider.getStoreFile(path, false); |
497 } | |
498 | |
499 /*package-local*/ RevlogStream createStoreFile(Path path) throws HgInvalidControlFileException { | |
500 return streamProvider.createStoreFile(path); | |
501 } | 496 } |
502 | 497 |
503 // marker method | 498 // marker method |
504 public static IllegalStateException notImplemented() { | 499 public static IllegalStateException notImplemented() { |
505 return new IllegalStateException("Not implemented"); | 500 return new IllegalStateException("Not implemented"); |