Mercurial > hg4j

comparison src/org/tmatesoft/hg/repo/HgBranches.java @ 662:af5223b86dd3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge branch smartgit-4.6
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Wed, 10 Jul 2013 11:53:19 +0200
parents 6334b0267103 a5cf64f2e7e4
children
comparison
equal deleted inserted replaced
661:5d8798772cca 662:af5223b86dd3
254 bw.close(); 254 bw.close();
255 } 255 }
256 256
257 private File getCacheFile() { 257 private File getCacheFile() {
258 // prior to 1.8 used to be .hg/branchheads.cache 258 // prior to 1.8 used to be .hg/branchheads.cache
259 // since 2.5 there is filter suffix
260 File f = internalRepo.getFileFromRepoDir("cache/branchheads-base");
261 if (f.exists()) {
262 return f;
263 }
259 return internalRepo.getFileFromRepoDir("cache/branchheads"); 264 return internalRepo.getFileFromRepoDir("cache/branchheads");
260 } 265 }
261 266
262 /*package-local*/ void reloadIfChanged(ProgressSupport ps) throws HgRuntimeException { 267 /*package-local*/ void reloadIfChanged(ProgressSupport ps) throws HgRuntimeException {
263 if (repoChangeTracker.isChanged()) { 268 if (repoChangeTracker.isChanged()) {