Mercurial > jhg
annotate src/org/tmatesoft/hg/repo/HgBranches.java @ 266:0a2f445de774
Improve manifest parsing: reduce number of arrays instantiated for Nodeid
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> | 
|---|---|
| date | Fri, 19 Aug 2011 04:59:32 +0200 | 
| parents | 4b661efb9374 | 
| children | 981f9f50bb6c | 
| rev | line source | 
|---|---|
| 220 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 1 /* | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 2 * Copyright (c) 2011 TMate Software Ltd | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 3 * | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 4 * This program is free software; you can redistribute it and/or modify | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 5 * it under the terms of the GNU General Public License as published by | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 6 * the Free Software Foundation; version 2 of the License. | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 7 * | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 8 * This program is distributed in the hope that it will be useful, | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 9 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 11 * GNU General Public License for more details. | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 12 * | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 13 * For information on how to redistribute this software under | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 14 * the terms of a license other than GNU General Public License | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 15 * contact TMate Software at support@hg4j.com | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 16 */ | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 17 package org.tmatesoft.hg.repo; | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 18 | 
| 236 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 19 import java.io.BufferedReader; | 
| 244 
4b661efb9374
Use updated location of cache files (cache/ folder instead of .cache filename extension). Provide means to update (write down) cache for subsequent uses
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 20 import java.io.BufferedWriter; | 
| 236 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 21 import java.io.File; | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 22 import java.io.FileReader; | 
| 244 
4b661efb9374
Use updated location of cache files (cache/ folder instead of .cache filename extension). Provide means to update (write down) cache for subsequent uses
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 23 import java.io.FileWriter; | 
| 236 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 24 import java.io.IOException; | 
| 220 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 25 import java.util.ArrayList; | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 26 import java.util.Arrays; | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 27 import java.util.Collections; | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 28 import java.util.HashMap; | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 29 import java.util.HashSet; | 
| 236 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 30 import java.util.LinkedHashSet; | 
| 220 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 31 import java.util.LinkedList; | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 32 import java.util.List; | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 33 import java.util.Map; | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 34 import java.util.TreeMap; | 
| 236 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 35 import java.util.regex.Pattern; | 
| 220 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 36 | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 37 import org.tmatesoft.hg.core.Nodeid; | 
| 244 
4b661efb9374
Use updated location of cache files (cache/ folder instead of .cache filename extension). Provide means to update (write down) cache for subsequent uses
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 38 import org.tmatesoft.hg.internal.Experimental; | 
| 220 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 39 import org.tmatesoft.hg.repo.HgChangelog.RawChangeset; | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 40 import org.tmatesoft.hg.util.ProgressSupport; | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 41 | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 42 /** | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 43 * | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 44 * @author Artem Tikhomirov | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 45 * @author TMate Software Ltd. | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 46 */ | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 47 public class HgBranches { | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 48 | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 49 private final Map<String, BranchInfo> branches = new TreeMap<String, BranchInfo>(); | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 50 private final HgRepository repo; | 
| 244 
4b661efb9374
Use updated location of cache files (cache/ folder instead of .cache filename extension). Provide means to update (write down) cache for subsequent uses
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 51 private boolean isCacheActual = false; | 
| 
4b661efb9374
Use updated location of cache files (cache/ folder instead of .cache filename extension). Provide means to update (write down) cache for subsequent uses
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 52 | 
| 220 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 53 HgBranches(HgRepository hgRepo) { | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 54 repo = hgRepo; | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 55 } | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 56 | 
| 236 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 57 private int readCache() { | 
| 244 
4b661efb9374
Use updated location of cache files (cache/ folder instead of .cache filename extension). Provide means to update (write down) cache for subsequent uses
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 58 File branchheadsCache = getCacheFile(); | 
| 236 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 59 int lastInCache = -1; | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 60 if (!branchheadsCache.canRead()) { | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 61 return lastInCache; | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 62 } | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 63 BufferedReader br = null; | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 64 final Pattern spacePattern = Pattern.compile(" "); | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 65 try { | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 66 br = new BufferedReader(new FileReader(branchheadsCache)); | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 67 String line = br.readLine(); | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 68 if (line == null || line.trim().length() == 0) { | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 69 return lastInCache; | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 70 } | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 71 String[] cacheIdentity = spacePattern.split(line.trim()); | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 72 lastInCache = Integer.parseInt(cacheIdentity[1]); | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 73 // XXX may want to check if nodeid of cset from repo.getChangelog() of lastInCache index match cacheIdentity[0] | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 74 // | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 75 while ((line = br.readLine()) != null) { | 
| 244 
4b661efb9374
Use updated location of cache files (cache/ folder instead of .cache filename extension). Provide means to update (write down) cache for subsequent uses
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 76 String[] elements = spacePattern.split(line.trim()); | 
| 236 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 77 if (elements.length < 2) { | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 78 // bad entry | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 79 continue; | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 80 } | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 81 Nodeid[] branchHeads = new Nodeid[elements.length - 1]; | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 82 for (int i = 0; i < elements.length - 1; i++) { | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 83 branchHeads[i] = Nodeid.fromAscii(elements[i]); | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 84 } | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 85 // I assume split returns substrings of the original string, hence copy of a branch name | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 86 String branchName = new String(elements[elements.length-1]); | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 87 BranchInfo bi = new BranchInfo(branchName, branchHeads); | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 88 branches.put(branchName, bi); | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 89 } | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 90 return lastInCache; | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 91 } catch (IOException ex) { | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 92 ex.printStackTrace(); // XXX log error, but otherwise do nothing | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 93 } finally { | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 94 if (br != null) { | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 95 try { | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 96 br.close(); | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 97 } catch (IOException ex) { | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 98 ex.printStackTrace(); // ignore | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 99 } | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 100 } | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 101 } | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 102 return -1; // deliberately not lastInCache, to avoid anything but -1 when 1st line was read and there's error is in lines 2..end | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 103 } | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 104 | 
| 220 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 105 void collect(final ProgressSupport ps) { | 
| 236 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 106 branches.clear(); | 
| 220 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 107 ps.start(1 + repo.getChangelog().getRevisionCount() * 2); | 
| 236 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 108 // | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 109 int lastCached = readCache(); | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 110 /* | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 111 * Next code was supposed to fill missing aspects of the BranchInfo, but is too slow | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 112 * | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 113 if (lastCached != -1 && lastCached <= repo.getChangelog().getLastRevision()) { | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 114 LinkedList<BranchInfo> incompleteBranches = new LinkedList<HgBranches.BranchInfo>(branches.values()); | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 115 for (BranchInfo bi : incompleteBranches) { | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 116 LinkedList<Nodeid> closedHeads = new LinkedList<Nodeid>(); | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 117 for (Nodeid h : bi.getHeads()) { | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 118 if ("1".equals(repo.getChangelog().changeset(h).extras().get("close"))) { | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 119 closedHeads.add(h); | 
| 220 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 120 } | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 121 } | 
| 236 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 122 HashSet<Nodeid> earliest = new HashSet<Nodeid>(bi.getHeads()); | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 123 HashSet<Nodeid> visited = new HashSet<Nodeid>(); | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 124 ArrayList<Nodeid> parents = new ArrayList<Nodeid>(2); | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 125 HashSet<Nodeid> candidate = new HashSet<Nodeid>(); | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 126 do { | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 127 candidate.clear(); | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 128 for (Nodeid e : earliest) { | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 129 parents.clear(); | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 130 if (pw.appendParentsOf(e, parents)) { | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 131 // at least one parent | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 132 Nodeid p1 = parents.get(0); | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 133 if (p1 != null && !visited.contains(p1) && bi.getName().equals(repo.getChangelog().changeset(p1).branch())) { | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 134 visited.add(p1); | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 135 candidate.add(p1); | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 136 } | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 137 Nodeid p2 = parents.size() > 1 ? parents.get(1) : null; | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 138 if (p2 != null && !visited.contains(p2) && bi.getName().equals(repo.getChangelog().changeset(p2).branch())) { | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 139 visited.add(p2); | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 140 candidate.add(p2); | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 141 } | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 142 } | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 143 } | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 144 if (!candidate.isEmpty()) { | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 145 earliest.clear(); | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 146 earliest.addAll(candidate); | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 147 } | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 148 } while (!candidate.isEmpty()); | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 149 // earliest can't be empty, we've started with non-empty heads. | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 150 Nodeid first = null; | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 151 if (earliest.size() == 1) { | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 152 first = earliest.iterator().next(); | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 153 } else { | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 154 int earliestRevNum = Integer.MAX_VALUE; | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 155 for (Nodeid e : earliest) { | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 156 int x = repo.getChangelog().getLocalRevision(e); | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 157 if (x < earliestRevNum) { | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 158 earliestRevNum = x; | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 159 first = e; | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 160 } | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 161 } | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 162 } | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 163 assert first != null; | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 164 System.out.println("Updated branch " + bi.getName()); | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 165 branches.put(bi.getName(), new BranchInfo(bi.getName(), first, bi.getHeads().toArray(new Nodeid[0]), closedHeads.size() == bi.getHeads().size())); | 
| 220 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 166 } | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 167 } | 
| 236 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 168 */ | 
| 244 
4b661efb9374
Use updated location of cache files (cache/ folder instead of .cache filename extension). Provide means to update (write down) cache for subsequent uses
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 169 isCacheActual = lastCached == repo.getChangelog().getLastRevision(); | 
| 
4b661efb9374
Use updated location of cache files (cache/ folder instead of .cache filename extension). Provide means to update (write down) cache for subsequent uses
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 170 if (!isCacheActual) { | 
| 236 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 171 final HgChangelog.ParentWalker pw = repo.getChangelog().new ParentWalker(); | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 172 pw.init(); | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 173 ps.worked(repo.getChangelog().getRevisionCount()); | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 174 final HashMap<String, Nodeid> branchStart = new HashMap<String, Nodeid>(); | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 175 final HashMap<String, Nodeid> branchLastSeen = new HashMap<String, Nodeid>(); | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 176 final HashMap<String, List<Nodeid>> branchHeads = new HashMap<String, List<Nodeid>>(); | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 177 final HashSet<String> closedBranches = new HashSet<String>(); | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 178 HgChangelog.Inspector insp = new HgChangelog.Inspector() { | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 179 | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 180 public void next(int revisionNumber, Nodeid nodeid, RawChangeset cset) { | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 181 String branchName = cset.branch(); | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 182 if (!branchStart.containsKey(branchName)) { | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 183 branchStart.put(branchName, nodeid); | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 184 branchHeads.put(branchName, new LinkedList<Nodeid>()); | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 185 } | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 186 branchLastSeen.remove(branchName); | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 187 if ("1".equals(cset.extras().get("close"))) { | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 188 branchHeads.get(branchName).add(nodeid); // XXX what if it still has children? | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 189 closedBranches.add(branchName); | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 190 } else { | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 191 if (pw.hasChildren(nodeid)) { | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 192 // children may be in another branch | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 193 // and unless we later came across another element from this branch, | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 194 // we need to record all these as valid heads | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 195 // XXX what about next case: head1 with children in different branch, and head2 without children | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 196 // head1 would get lost | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 197 branchLastSeen.put(branchName, nodeid); | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 198 } else { | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 199 // no more children known for this node, it's (one of the) head of the branch | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 200 branchHeads.get(branchName).add(nodeid); | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 201 } | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 202 } | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 203 ps.worked(1); | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 204 } | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 205 }; | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 206 repo.getChangelog().range(lastCached == -1 ? 0 : lastCached+1, HgRepository.TIP, insp); | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 207 for (String bn : branchLastSeen.keySet()) { | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 208 branchHeads.get(bn).add(branchLastSeen.get(bn)); | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 209 } | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 210 for (String bn : branchStart.keySet()) { | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 211 BranchInfo bi = branches.get(bn); | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 212 if (bi != null) { | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 213 // although heads from cache shall not intersect with heads after lastCached, | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 214 // use of LHS doesn't hurt (and makes sense e.g. if cache is not completely correct in my tests) | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 215 LinkedHashSet<Nodeid> heads = new LinkedHashSet<Nodeid>(bi.getHeads()); | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 216 for (Nodeid oldHead : bi.getHeads()) { | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 217 // XXX perhaps, need pw.canReach(Nodeid from, Collection<Nodeid> to) | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 218 List<Nodeid> newChildren = pw.childrenOf(Collections.singletonList(oldHead)); | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 219 if (!newChildren.isEmpty()) { | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 220 // likely not a head any longer, | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 221 // check if any new head can be reached from old one, and, if yes, | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 222 // do not consider that old head as head. | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 223 for (Nodeid newHead : branchHeads.get(bn)) { | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 224 if (newChildren.contains(newHead)) { | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 225 heads.remove(oldHead); | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 226 break; | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 227 } | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 228 } | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 229 } // else - oldHead still head for the branch | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 230 } | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 231 heads.addAll(branchHeads.get(bn)); | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 232 bi = new BranchInfo(bn, bi.getStart(), heads.toArray(new Nodeid[0]), bi.isClosed() && closedBranches.contains(bn)); | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 233 } else { | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 234 Nodeid[] heads = branchHeads.get(bn).toArray(new Nodeid[0]); | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 235 bi = new BranchInfo(bn, branchStart.get(bn), heads, closedBranches.contains(bn)); | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 236 } | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 237 branches.put(bn, bi); | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 238 } | 
| 220 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 239 } | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 240 ps.done(); | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 241 } | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 242 | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 243 public List<BranchInfo> getAllBranches() { | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 244 return new LinkedList<BranchInfo>(branches.values()); | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 245 | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 246 } | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 247 | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 248 public BranchInfo getBranch(String name) { | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 249 return branches.get(name); | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 250 } | 
| 244 
4b661efb9374
Use updated location of cache files (cache/ folder instead of .cache filename extension). Provide means to update (write down) cache for subsequent uses
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 251 | 
| 
4b661efb9374
Use updated location of cache files (cache/ folder instead of .cache filename extension). Provide means to update (write down) cache for subsequent uses
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 252 /** | 
| 
4b661efb9374
Use updated location of cache files (cache/ folder instead of .cache filename extension). Provide means to update (write down) cache for subsequent uses
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 253 * Writes down information about repository branches in a format Mercurial native client can understand. | 
| 
4b661efb9374
Use updated location of cache files (cache/ folder instead of .cache filename extension). Provide means to update (write down) cache for subsequent uses
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 254 * Cache file gets overwritten only if it is out of date (i.e. misses some branch information) | 
| 
4b661efb9374
Use updated location of cache files (cache/ folder instead of .cache filename extension). Provide means to update (write down) cache for subsequent uses
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 255 */ | 
| 
4b661efb9374
Use updated location of cache files (cache/ folder instead of .cache filename extension). Provide means to update (write down) cache for subsequent uses
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 256 @Experimental(reason="Usage of cache isn't supposed to be public knowledge") | 
| 
4b661efb9374
Use updated location of cache files (cache/ folder instead of .cache filename extension). Provide means to update (write down) cache for subsequent uses
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 257 public void writeCache() { | 
| 
4b661efb9374
Use updated location of cache files (cache/ folder instead of .cache filename extension). Provide means to update (write down) cache for subsequent uses
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 258 if (isCacheActual) { | 
| 
4b661efb9374
Use updated location of cache files (cache/ folder instead of .cache filename extension). Provide means to update (write down) cache for subsequent uses
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 259 return; | 
| 
4b661efb9374
Use updated location of cache files (cache/ folder instead of .cache filename extension). Provide means to update (write down) cache for subsequent uses
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 260 } | 
| 
4b661efb9374
Use updated location of cache files (cache/ folder instead of .cache filename extension). Provide means to update (write down) cache for subsequent uses
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 261 try { | 
| 
4b661efb9374
Use updated location of cache files (cache/ folder instead of .cache filename extension). Provide means to update (write down) cache for subsequent uses
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 262 File branchheadsCache = getCacheFile(); | 
| 
4b661efb9374
Use updated location of cache files (cache/ folder instead of .cache filename extension). Provide means to update (write down) cache for subsequent uses
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 263 if (!branchheadsCache.exists()) { | 
| 
4b661efb9374
Use updated location of cache files (cache/ folder instead of .cache filename extension). Provide means to update (write down) cache for subsequent uses
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 264 branchheadsCache.getParentFile().mkdirs(); // just in case cache/ doesn't exist jet | 
| 
4b661efb9374
Use updated location of cache files (cache/ folder instead of .cache filename extension). Provide means to update (write down) cache for subsequent uses
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 265 branchheadsCache.createNewFile(); | 
| 
4b661efb9374
Use updated location of cache files (cache/ folder instead of .cache filename extension). Provide means to update (write down) cache for subsequent uses
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 266 } | 
| 
4b661efb9374
Use updated location of cache files (cache/ folder instead of .cache filename extension). Provide means to update (write down) cache for subsequent uses
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 267 if (!branchheadsCache.canWrite()) { | 
| 
4b661efb9374
Use updated location of cache files (cache/ folder instead of .cache filename extension). Provide means to update (write down) cache for subsequent uses
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 268 return; | 
| 
4b661efb9374
Use updated location of cache files (cache/ folder instead of .cache filename extension). Provide means to update (write down) cache for subsequent uses
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 269 } | 
| 
4b661efb9374
Use updated location of cache files (cache/ folder instead of .cache filename extension). Provide means to update (write down) cache for subsequent uses
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 270 final int lastRev = repo.getChangelog().getLastRevision(); | 
| 
4b661efb9374
Use updated location of cache files (cache/ folder instead of .cache filename extension). Provide means to update (write down) cache for subsequent uses
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 271 final Nodeid lastNid = repo.getChangelog().getRevision(lastRev); | 
| 
4b661efb9374
Use updated location of cache files (cache/ folder instead of .cache filename extension). Provide means to update (write down) cache for subsequent uses
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 272 BufferedWriter bw = new BufferedWriter(new FileWriter(branchheadsCache)); | 
| 
4b661efb9374
Use updated location of cache files (cache/ folder instead of .cache filename extension). Provide means to update (write down) cache for subsequent uses
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 273 bw.write(lastNid.toString()); | 
| 
4b661efb9374
Use updated location of cache files (cache/ folder instead of .cache filename extension). Provide means to update (write down) cache for subsequent uses
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 274 bw.write((int) ' '); | 
| 
4b661efb9374
Use updated location of cache files (cache/ folder instead of .cache filename extension). Provide means to update (write down) cache for subsequent uses
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 275 bw.write(Integer.toString(lastRev)); | 
| 
4b661efb9374
Use updated location of cache files (cache/ folder instead of .cache filename extension). Provide means to update (write down) cache for subsequent uses
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 276 bw.write("\n"); | 
| 
4b661efb9374
Use updated location of cache files (cache/ folder instead of .cache filename extension). Provide means to update (write down) cache for subsequent uses
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 277 for (BranchInfo bi : branches.values()) { | 
| 
4b661efb9374
Use updated location of cache files (cache/ folder instead of .cache filename extension). Provide means to update (write down) cache for subsequent uses
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 278 for (Nodeid nid : bi.getHeads()) { | 
| 
4b661efb9374
Use updated location of cache files (cache/ folder instead of .cache filename extension). Provide means to update (write down) cache for subsequent uses
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 279 bw.write(nid.toString()); | 
| 
4b661efb9374
Use updated location of cache files (cache/ folder instead of .cache filename extension). Provide means to update (write down) cache for subsequent uses
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 280 bw.write((int) ' '); | 
| 
4b661efb9374
Use updated location of cache files (cache/ folder instead of .cache filename extension). Provide means to update (write down) cache for subsequent uses
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 281 bw.write(bi.getName()); | 
| 
4b661efb9374
Use updated location of cache files (cache/ folder instead of .cache filename extension). Provide means to update (write down) cache for subsequent uses
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 282 bw.write("\n"); | 
| 
4b661efb9374
Use updated location of cache files (cache/ folder instead of .cache filename extension). Provide means to update (write down) cache for subsequent uses
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 283 } | 
| 
4b661efb9374
Use updated location of cache files (cache/ folder instead of .cache filename extension). Provide means to update (write down) cache for subsequent uses
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 284 } | 
| 
4b661efb9374
Use updated location of cache files (cache/ folder instead of .cache filename extension). Provide means to update (write down) cache for subsequent uses
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 285 bw.close(); | 
| 
4b661efb9374
Use updated location of cache files (cache/ folder instead of .cache filename extension). Provide means to update (write down) cache for subsequent uses
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 286 } catch (IOException e) { | 
| 
4b661efb9374
Use updated location of cache files (cache/ folder instead of .cache filename extension). Provide means to update (write down) cache for subsequent uses
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 287 // TODO Auto-generated catch block | 
| 
4b661efb9374
Use updated location of cache files (cache/ folder instead of .cache filename extension). Provide means to update (write down) cache for subsequent uses
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 288 e.printStackTrace(); | 
| 
4b661efb9374
Use updated location of cache files (cache/ folder instead of .cache filename extension). Provide means to update (write down) cache for subsequent uses
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 289 } | 
| 
4b661efb9374
Use updated location of cache files (cache/ folder instead of .cache filename extension). Provide means to update (write down) cache for subsequent uses
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 290 } | 
| 
4b661efb9374
Use updated location of cache files (cache/ folder instead of .cache filename extension). Provide means to update (write down) cache for subsequent uses
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 291 | 
| 
4b661efb9374
Use updated location of cache files (cache/ folder instead of .cache filename extension). Provide means to update (write down) cache for subsequent uses
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 292 private File getCacheFile() { | 
| 
4b661efb9374
Use updated location of cache files (cache/ folder instead of .cache filename extension). Provide means to update (write down) cache for subsequent uses
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 293 // prior to 1.8 used to be .hg/branchheads.cache | 
| 
4b661efb9374
Use updated location of cache files (cache/ folder instead of .cache filename extension). Provide means to update (write down) cache for subsequent uses
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 294 return new File(repo.getRepositoryRoot(), "cache/branchheads"); | 
| 
4b661efb9374
Use updated location of cache files (cache/ folder instead of .cache filename extension). Provide means to update (write down) cache for subsequent uses
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 295 } | 
| 
4b661efb9374
Use updated location of cache files (cache/ folder instead of .cache filename extension). Provide means to update (write down) cache for subsequent uses
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 296 | 
| 220 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 297 public static class BranchInfo { | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 298 private final String name; | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 299 private final List<Nodeid> heads; | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 300 private final boolean closed; | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 301 private final Nodeid start; | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 302 | 
| 236 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 303 // XXX in fact, few but not all branchHeads might be closed, and isClosed for whole branch is not | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 304 // possible to determine. | 
| 220 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 305 BranchInfo(String branchName, Nodeid first, Nodeid[] branchHeads, boolean isClosed) { | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 306 name = branchName; | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 307 start = first; | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 308 heads = Collections.unmodifiableList(new ArrayList<Nodeid>(Arrays.asList(branchHeads))); | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 309 closed = isClosed; | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 310 } | 
| 236 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 311 | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 312 // incomplete branch, there's not enough information at the time of creation. shall be replaced with | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 313 // proper BI in #collect() | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 314 BranchInfo(String branchName, Nodeid[] branchHeads) { | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 315 this(branchName, Nodeid.NULL, branchHeads, false); | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 316 } | 
| 220 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 317 | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 318 public String getName() { | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 319 return name; | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 320 } | 
| 236 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 321 /*public*/ boolean isClosed() { | 
| 220 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 322 return closed; | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 323 } | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 324 public List<Nodeid> getHeads() { | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 325 return heads; | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 326 } | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 327 // public Nodeid getTip() { | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 328 // } | 
| 236 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 329 /*public*/ Nodeid getStart() { | 
| 220 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 330 // first node where branch appears | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 331 return start; | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 332 } | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 333 } | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 334 } | 
