Mercurial > jhg

comparison src/org/tmatesoft/hg/internal/Internals.java @ 643:a8ce405da1f5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
v1.2 line of dev: update versions, use patch merge code by default
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Wed, 19 Jun 2013 16:03:11 +0200
parents 6526d8adbc0f
children c75297c17867
comparison
equal deleted inserted replaced
642:9ef1fab9f5e3 643:a8ce405da1f5
140 dataPathHelper = repoInit.buildDataFilesHelper(getSessionContext()); 140 dataPathHelper = repoInit.buildDataFilesHelper(getSessionContext());
141 repoPathHelper = repoInit.buildStoreFilesHelper(); 141 repoPathHelper = repoInit.buildStoreFilesHelper();
142 final PropertyMarshal pm = new PropertyMarshal(ctx); 142 final PropertyMarshal pm = new PropertyMarshal(ctx);
143 boolean shallCacheRevlogsInRepo = pm.getBoolean(CFG_PROPERTY_REVLOG_STREAM_CACHE, true); 143 boolean shallCacheRevlogsInRepo = pm.getBoolean(CFG_PROPERTY_REVLOG_STREAM_CACHE, true);
144 streamProvider = new RevlogStreamFactory(this, shallCacheRevlogsInRepo); 144 streamProvider = new RevlogStreamFactory(this, shallCacheRevlogsInRepo);
145 shallMergePatches = pm.getBoolean(Internals.CFG_PROPERTY_PATCH_MERGE, false); 145 shallMergePatches = pm.getBoolean(Internals.CFG_PROPERTY_PATCH_MERGE, true);
146 } 146 }
147 147
148 public boolean isInvalid() { 148 public boolean isInvalid() {
149 return !repoDir.exists() || !repoDir.isDirectory(); 149 return !repoDir.exists() || !repoDir.isDirectory();
150 } 150 }