Mercurial > hg4j

comparison src/org/tmatesoft/hg/repo/HgRepository.java @ 468:3ca4ae7bdd38 v1.0.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Clean experimental marks and deprecation code. Update version number to release
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Wed, 11 Jul 2012 17:48:17 +0200
parents 909306e412e2
children 7bcfbc255f48
comparison
equal deleted inserted replaced
467:51d682cf9cdc 468:3ca4ae7bdd38
30 import org.tmatesoft.hg.core.Nodeid; 30 import org.tmatesoft.hg.core.Nodeid;
31 import org.tmatesoft.hg.core.SessionContext; 31 import org.tmatesoft.hg.core.SessionContext;
32 import org.tmatesoft.hg.internal.ByteArrayChannel; 32 import org.tmatesoft.hg.internal.ByteArrayChannel;
33 import org.tmatesoft.hg.internal.ConfigFile; 33 import org.tmatesoft.hg.internal.ConfigFile;
34 import org.tmatesoft.hg.internal.DataAccessProvider; 34 import org.tmatesoft.hg.internal.DataAccessProvider;
35 import org.tmatesoft.hg.internal.Experimental;
36 import org.tmatesoft.hg.internal.Filter; 35 import org.tmatesoft.hg.internal.Filter;
37 import org.tmatesoft.hg.internal.Internals; 36 import org.tmatesoft.hg.internal.Internals;
38 import org.tmatesoft.hg.internal.RevlogStream; 37 import org.tmatesoft.hg.internal.RevlogStream;
39 import org.tmatesoft.hg.internal.SubrepoManager; 38 import org.tmatesoft.hg.internal.SubrepoManager;
40 import org.tmatesoft.hg.util.CancelledException; 39 import org.tmatesoft.hg.util.CancelledException;
233 branches.collect(ProgressSupport.Factory.get(null)); 232 branches.collect(ProgressSupport.Factory.get(null));
234 } 233 }
235 return branches; 234 return branches;
236 } 235 }
237 236
238 @Experimental(reason="Perhaps, shall not cache instance, and provide loadMergeState as it may change often")
239 public HgMergeState getMergeState() { 237 public HgMergeState getMergeState() {
240 if (mergeState == null) { 238 if (mergeState == null) {
241 mergeState = new HgMergeState(this); 239 mergeState = new HgMergeState(this);
242 } 240 }
243 return mergeState; 241 return mergeState;