Mercurial > hg4j
annotate src/org/tmatesoft/hg/repo/HgBranches.java @ 351:5abba41751e6
Read extra predefined locations with mercurial configuration files
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> | 
|---|---|
| date | Wed, 30 Nov 2011 04:39:50 +0100 | 
| parents | a0864b2892cd | 
| children | 5f9073eabf06 | 
| 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: 
220 
diff
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: 
236 
diff
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: 
220 
diff
changeset
 | 
21 import java.io.File; | 
| 
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
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: 
236 
diff
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: 
220 
diff
changeset
 | 
24 import java.io.IOException; | 
| 
315
 
8952f89be195
Allow to query specific branch heads if they are closed
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
309 
diff
changeset
 | 
25 import java.util.ArrayList; | 
| 
220
 
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; | 
| 
308
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
29 import java.util.LinkedHashMap; | 
| 
236
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
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: 
220 
diff
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: 
236 
diff
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: 
236 
diff
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: 
236 
diff
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 | 
| 
348
 
a0864b2892cd
Expose errors reading mercurial control files with exception
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
340 
diff
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: 
236 
diff
changeset
 | 
58 File branchheadsCache = getCacheFile(); | 
| 
236
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
59 int lastInCache = -1; | 
| 
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
60 if (!branchheadsCache.canRead()) { | 
| 
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
61 return lastInCache; | 
| 
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
62 } | 
| 
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
63 BufferedReader br = null; | 
| 
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
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: 
220 
diff
changeset
 | 
65 try { | 
| 
308
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
66 final LinkedHashMap<String, List<Nodeid>> branchHeads = new LinkedHashMap<String, List<Nodeid>>(); | 
| 
236
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
67 br = new BufferedReader(new FileReader(branchheadsCache)); | 
| 
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
68 String line = br.readLine(); | 
| 
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
69 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: 
220 
diff
changeset
 | 
70 return lastInCache; | 
| 
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
71 } | 
| 
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
72 String[] cacheIdentity = spacePattern.split(line.trim()); | 
| 
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
73 lastInCache = Integer.parseInt(cacheIdentity[1]); | 
| 
340
 
a54bfe0db959
IAE using stale data from branchheads file (invalid due to repository rollback)
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
315 
diff
changeset
 | 
74 final int lastKnownRepoRevIndex = repo.getChangelog().getLastRevision(); | 
| 
 
a54bfe0db959
IAE using stale data from branchheads file (invalid due to repository rollback)
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
315 
diff
changeset
 | 
75 if (lastInCache > lastKnownRepoRevIndex || !repo.getChangelog().getRevision(lastKnownRepoRevIndex).equals(Nodeid.fromAscii(cacheIdentity[0]))) { | 
| 
 
a54bfe0db959
IAE using stale data from branchheads file (invalid due to repository rollback)
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
315 
diff
changeset
 | 
76 // there are chances cache file got invalid entries due to e.g. rollback operation | 
| 
 
a54bfe0db959
IAE using stale data from branchheads file (invalid due to repository rollback)
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
315 
diff
changeset
 | 
77 return -1; | 
| 
 
a54bfe0db959
IAE using stale data from branchheads file (invalid due to repository rollback)
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
315 
diff
changeset
 | 
78 } | 
| 
236
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
79 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: 
236 
diff
changeset
 | 
80 String[] elements = spacePattern.split(line.trim()); | 
| 
308
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
81 if (elements.length != 2) { | 
| 
236
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
82 // bad entry | 
| 
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
83 continue; | 
| 
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
84 } | 
| 
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
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: 
220 
diff
changeset
 | 
86 String branchName = new String(elements[elements.length-1]); | 
| 
308
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
87 List<Nodeid> heads = branchHeads.get(elements[1]); | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
88 if (heads == null) { | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
89 branchHeads.put(branchName, heads = new LinkedList<Nodeid>()); | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
90 } | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
91 heads.add(Nodeid.fromAscii(elements[0])); | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
92 } | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
93 for (Map.Entry<String, List<Nodeid>> e : branchHeads.entrySet()) { | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
94 Nodeid[] heads = e.getValue().toArray(new Nodeid[e.getValue().size()]); | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
95 BranchInfo bi = new BranchInfo(e.getKey(), heads); | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
96 branches.put(e.getKey(), bi); | 
| 
236
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
97 } | 
| 
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
98 return lastInCache; | 
| 
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
99 } catch (IOException ex) { | 
| 
348
 
a0864b2892cd
Expose errors reading mercurial control files with exception
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
340 
diff
changeset
 | 
100 // log error, but otherwise do nothing | 
| 
 
a0864b2892cd
Expose errors reading mercurial control files with exception
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
340 
diff
changeset
 | 
101 repo.getContext().getLog().warn(getClass(), ex, null); | 
| 
 
a0864b2892cd
Expose errors reading mercurial control files with exception
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
340 
diff
changeset
 | 
102 // FALL THROUGH to return -1 indicating no cache information | 
| 
 
a0864b2892cd
Expose errors reading mercurial control files with exception
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
340 
diff
changeset
 | 
103 } catch (NumberFormatException ex) { | 
| 
 
a0864b2892cd
Expose errors reading mercurial control files with exception
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
340 
diff
changeset
 | 
104 repo.getContext().getLog().warn(getClass(), ex, null); | 
| 
 
a0864b2892cd
Expose errors reading mercurial control files with exception
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
340 
diff
changeset
 | 
105 // FALL THROUGH | 
| 
236
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
106 } finally { | 
| 
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
107 if (br != null) { | 
| 
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
108 try { | 
| 
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
109 br.close(); | 
| 
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
110 } catch (IOException ex) { | 
| 
295
 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
244 
diff
changeset
 | 
111 repo.getContext().getLog().info(getClass(), ex, null); // ignore | 
| 
236
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
112 } | 
| 
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
113 } | 
| 
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
114 } | 
| 
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
115 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: 
220 
diff
changeset
 | 
116 } | 
| 
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
117 | 
| 
220
 
8de327242aa0
Basic information about branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
118 void collect(final ProgressSupport ps) { | 
| 
236
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
119 branches.clear(); | 
| 
220
 
8de327242aa0
Basic information about branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
120 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: 
220 
diff
changeset
 | 
121 // | 
| 
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
122 int lastCached = 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: 
236 
diff
changeset
 | 
123 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: 
236 
diff
changeset
 | 
124 if (!isCacheActual) { | 
| 
236
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
125 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: 
220 
diff
changeset
 | 
126 pw.init(); | 
| 
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
127 ps.worked(repo.getChangelog().getRevisionCount()); | 
| 
308
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
128 // first revision branch found at | 
| 
236
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
129 final HashMap<String, Nodeid> branchStart = new HashMap<String, Nodeid>(); | 
| 
308
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
130 // last revision seen for the branch | 
| 
236
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
131 final HashMap<String, Nodeid> branchLastSeen = new HashMap<String, Nodeid>(); | 
| 
308
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
132 // revisions from the branch that have no children at all | 
| 
236
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
133 final HashMap<String, List<Nodeid>> branchHeads = new HashMap<String, List<Nodeid>>(); | 
| 
309
 
962f78aac342
Branch with few children forked shall not ignore other children once one of them is processed
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
308 
diff
changeset
 | 
134 // revisions that are immediate children of a node from a given branch | 
| 
 
962f78aac342
Branch with few children forked shall not ignore other children once one of them is processed
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
308 
diff
changeset
 | 
135 // after iteration, there are some revisions left in this map (children of a branch last revision | 
| 
 
962f78aac342
Branch with few children forked shall not ignore other children once one of them is processed
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
308 
diff
changeset
 | 
136 // that doesn't belong to the branch. No use of this now, perhaps can deduce isInactive (e.g.those | 
| 
 
962f78aac342
Branch with few children forked shall not ignore other children once one of them is processed
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
308 
diff
changeset
 | 
137 // branches that have non-empty candidates are inactive if all their heads are roots for those left) | 
| 
308
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
138 final HashMap<String, List<Nodeid>> branchHeadCandidates = new HashMap<String, List<Nodeid>>(); | 
| 
236
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
139 HgChangelog.Inspector insp = new HgChangelog.Inspector() { | 
| 
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
140 | 
| 
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
141 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: 
220 
diff
changeset
 | 
142 String branchName = cset.branch(); | 
| 
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
143 if (!branchStart.containsKey(branchName)) { | 
| 
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
144 branchStart.put(branchName, nodeid); | 
| 
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
145 branchHeads.put(branchName, new LinkedList<Nodeid>()); | 
| 
308
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
146 branchHeadCandidates.put(branchName, new LinkedList<Nodeid>()); | 
| 
236
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
147 } else { | 
| 
308
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
148 final List<Nodeid> headCandidates = branchHeadCandidates.get(branchName); | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
149 if (headCandidates.remove(nodeid)) { | 
| 
309
 
962f78aac342
Branch with few children forked shall not ignore other children once one of them is processed
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
308 
diff
changeset
 | 
150 // likely we don't need to keep parent anymore, as we found at least 1 child thereof to be at the same branch | 
| 
 
962f78aac342
Branch with few children forked shall not ignore other children once one of them is processed
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
308 
diff
changeset
 | 
151 // however, it's possible the child we found is a result of an earlier fork, and revision in the | 
| 
 
962f78aac342
Branch with few children forked shall not ignore other children once one of them is processed
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
308 
diff
changeset
 | 
152 // branchLastSeen is 'parallel' head, which needs to be kept | 
| 
 
962f78aac342
Branch with few children forked shall not ignore other children once one of them is processed
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
308 
diff
changeset
 | 
153 Nodeid lastSeenInBranch = branchLastSeen.get(branchName); | 
| 
 
962f78aac342
Branch with few children forked shall not ignore other children once one of them is processed
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
308 
diff
changeset
 | 
154 // check if current revision is on descendant line. Seems direct parents check is enough | 
| 
 
962f78aac342
Branch with few children forked shall not ignore other children once one of them is processed
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
308 
diff
changeset
 | 
155 if (pw.safeFirstParent(nodeid).equals(lastSeenInBranch) || pw.safeSecondParent(nodeid).equals(lastSeenInBranch)) { | 
| 
 
962f78aac342
Branch with few children forked shall not ignore other children once one of them is processed
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
308 
diff
changeset
 | 
156 branchLastSeen.remove(branchName); | 
| 
 
962f78aac342
Branch with few children forked shall not ignore other children once one of them is processed
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
308 
diff
changeset
 | 
157 } | 
| 
236
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
158 } | 
| 
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
159 } | 
| 
308
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
160 List<Nodeid> immediateChildren = pw.directChildren(nodeid); | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
161 if (immediateChildren.size() > 0) { | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
162 // 1) children may be in another branch | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
163 // and unless we later came across another element from this branch, | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
164 // we need to record all these as potential heads | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
165 // | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
166 // 2) head1 with children in different branch, and head2 in this branch without children | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
167 branchLastSeen.put(branchName, nodeid); | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
168 branchHeadCandidates.get(branchName).addAll(immediateChildren); | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
169 } else { | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
170 // no more children known for this node, it's (one of the) head of the branch | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
171 branchHeads.get(branchName).add(nodeid); | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
172 } | 
| 
236
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
173 ps.worked(1); | 
| 
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
174 } | 
| 
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
175 }; | 
| 
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
176 repo.getChangelog().range(lastCached == -1 ? 0 : lastCached+1, HgRepository.TIP, insp); | 
| 
308
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
177 // those last seen revisions from the branch that had no children from the same branch are heads. | 
| 
236
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
178 for (String bn : branchLastSeen.keySet()) { | 
| 
308
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
179 // these are inactive branches? - there were children, but not from the same branch? | 
| 
236
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
180 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: 
220 
diff
changeset
 | 
181 } | 
| 
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
182 for (String bn : branchStart.keySet()) { | 
| 
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
183 BranchInfo bi = branches.get(bn); | 
| 
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
184 if (bi != null) { | 
| 
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
185 // 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: 
220 
diff
changeset
 | 
186 // 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: 
220 
diff
changeset
 | 
187 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: 
220 
diff
changeset
 | 
188 for (Nodeid oldHead : bi.getHeads()) { | 
| 
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
189 // 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: 
220 
diff
changeset
 | 
190 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: 
220 
diff
changeset
 | 
191 if (!newChildren.isEmpty()) { | 
| 
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
192 // likely not a head any longer, | 
| 
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
193 // 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: 
220 
diff
changeset
 | 
194 // 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: 
220 
diff
changeset
 | 
195 for (Nodeid newHead : branchHeads.get(bn)) { | 
| 
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
196 if (newChildren.contains(newHead)) { | 
| 
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
197 heads.remove(oldHead); | 
| 
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
198 break; | 
| 
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
199 } | 
| 
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
200 } | 
| 
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
201 } // 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: 
220 
diff
changeset
 | 
202 } | 
| 
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
203 heads.addAll(branchHeads.get(bn)); | 
| 
308
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
204 bi = new BranchInfo(bn, bi.getStart(), heads.toArray(new Nodeid[0])); | 
| 
236
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
205 } else { | 
| 
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
206 Nodeid[] heads = branchHeads.get(bn).toArray(new Nodeid[0]); | 
| 
308
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
207 bi = new BranchInfo(bn, branchStart.get(bn), heads); | 
| 
236
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
208 } | 
| 
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
209 branches.put(bn, bi); | 
| 
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
210 } | 
| 
220
 
8de327242aa0
Basic information about branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
211 } | 
| 
308
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
212 final HgChangelog clog = repo.getChangelog(); | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
213 final HgChangelog.RevisionMap rmap = clog.new RevisionMap().init(); | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
214 for (BranchInfo bi : branches.values()) { | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
215 bi.validate(clog, rmap); | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
216 } | 
| 
220
 
8de327242aa0
Basic information about branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
217 ps.done(); | 
| 
 
8de327242aa0
Basic information about branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
218 } | 
| 
 
8de327242aa0
Basic information about branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
219 | 
| 
 
8de327242aa0
Basic information about branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
220 public List<BranchInfo> getAllBranches() { | 
| 
 
8de327242aa0
Basic information about branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
221 return new LinkedList<BranchInfo>(branches.values()); | 
| 
 
8de327242aa0
Basic information about branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
222 | 
| 
 
8de327242aa0
Basic information about branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
223 } | 
| 
 
8de327242aa0
Basic information about branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
224 | 
| 
 
8de327242aa0
Basic information about branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
225 public BranchInfo getBranch(String name) { | 
| 
 
8de327242aa0
Basic information about branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
226 return branches.get(name); | 
| 
 
8de327242aa0
Basic information about branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
227 } | 
| 
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: 
236 
diff
changeset
 | 
228 | 
| 
 
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: 
236 
diff
changeset
 | 
229 /** | 
| 
 
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: 
236 
diff
changeset
 | 
230 * 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: 
236 
diff
changeset
 | 
231 * 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: 
236 
diff
changeset
 | 
232 */ | 
| 
 
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: 
236 
diff
changeset
 | 
233 @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: 
236 
diff
changeset
 | 
234 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: 
236 
diff
changeset
 | 
235 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: 
236 
diff
changeset
 | 
236 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: 
236 
diff
changeset
 | 
237 } | 
| 
 
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: 
236 
diff
changeset
 | 
238 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: 
236 
diff
changeset
 | 
239 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: 
236 
diff
changeset
 | 
240 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: 
236 
diff
changeset
 | 
241 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: 
236 
diff
changeset
 | 
242 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: 
236 
diff
changeset
 | 
243 } | 
| 
 
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: 
236 
diff
changeset
 | 
244 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: 
236 
diff
changeset
 | 
245 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: 
236 
diff
changeset
 | 
246 } | 
| 
 
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: 
236 
diff
changeset
 | 
247 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: 
236 
diff
changeset
 | 
248 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: 
236 
diff
changeset
 | 
249 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: 
236 
diff
changeset
 | 
250 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: 
236 
diff
changeset
 | 
251 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: 
236 
diff
changeset
 | 
252 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: 
236 
diff
changeset
 | 
253 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: 
236 
diff
changeset
 | 
254 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: 
236 
diff
changeset
 | 
255 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: 
236 
diff
changeset
 | 
256 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: 
236 
diff
changeset
 | 
257 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: 
236 
diff
changeset
 | 
258 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: 
236 
diff
changeset
 | 
259 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: 
236 
diff
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: 
236 
diff
changeset
 | 
261 } | 
| 
 
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: 
236 
diff
changeset
 | 
262 bw.close(); | 
| 
295
 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
244 
diff
changeset
 | 
263 } catch (IOException ex) { | 
| 
 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
244 
diff
changeset
 | 
264 repo.getContext().getLog().error(getClass(), ex, "Error writing branch cache file"); | 
| 
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: 
236 
diff
changeset
 | 
265 } | 
| 
 
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: 
236 
diff
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: 
236 
diff
changeset
 | 
267 | 
| 
 
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: 
236 
diff
changeset
 | 
268 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: 
236 
diff
changeset
 | 
269 // 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: 
236 
diff
changeset
 | 
270 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: 
236 
diff
changeset
 | 
271 } | 
| 
 
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: 
236 
diff
changeset
 | 
272 | 
| 
220
 
8de327242aa0
Basic information about branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
273 public static class BranchInfo { | 
| 
 
8de327242aa0
Basic information about branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
274 private final String name; | 
| 
308
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
275 private List<Nodeid> heads; | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
276 private boolean closed; | 
| 
220
 
8de327242aa0
Basic information about branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
277 private final Nodeid start; | 
| 
315
 
8952f89be195
Allow to query specific branch heads if they are closed
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
309 
diff
changeset
 | 
278 private List<Nodeid> closedHeads; // subset of heads, those that bear 'closed' flag, or null if closed == true | 
| 
220
 
8de327242aa0
Basic information about branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
279 | 
| 
236
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
280 // 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: 
220 
diff
changeset
 | 
281 // possible to determine. | 
| 
308
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
282 BranchInfo(String branchName, Nodeid first, Nodeid[] branchHeads) { | 
| 
220
 
8de327242aa0
Basic information about branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
283 name = branchName; | 
| 
 
8de327242aa0
Basic information about branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
284 start = first; | 
| 
308
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
285 heads = Arrays.asList(branchHeads); | 
| 
220
 
8de327242aa0
Basic information about branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
286 } | 
| 
236
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
287 | 
| 
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
288 // 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: 
220 
diff
changeset
 | 
289 // proper BI in #collect() | 
| 
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
290 BranchInfo(String branchName, Nodeid[] branchHeads) { | 
| 
308
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
291 this(branchName, Nodeid.NULL, branchHeads); | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
292 } | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
293 | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
294 void validate(HgChangelog clog, HgChangelog.RevisionMap rmap) { | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
295 int[] localCset = new int[heads.size()]; | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
296 int i = 0; | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
297 for (Nodeid h : heads) { | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
298 localCset[i++] = rmap.localRevision(h); | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
299 } | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
300 // [0] tipmost, [1] tipmost open | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
301 final Nodeid[] tipmost = new Nodeid[] {null, null}; | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
302 final boolean[] allClosed = new boolean[] { true }; | 
| 
315
 
8952f89be195
Allow to query specific branch heads if they are closed
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
309 
diff
changeset
 | 
303 final ArrayList<Nodeid> _closedHeads = new ArrayList<Nodeid>(heads.size()); | 
| 
308
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
304 clog.range(new HgChangelog.Inspector() { | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
305 | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
306 public void next(int revisionNumber, Nodeid nodeid, RawChangeset cset) { | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
307 assert heads.contains(nodeid); | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
308 tipmost[0] = nodeid; | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
309 if (!"1".equals(cset.extras().get("close"))) { | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
310 tipmost[1] = nodeid; | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
311 allClosed[0] = false; | 
| 
315
 
8952f89be195
Allow to query specific branch heads if they are closed
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
309 
diff
changeset
 | 
312 } else { | 
| 
 
8952f89be195
Allow to query specific branch heads if they are closed
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
309 
diff
changeset
 | 
313 _closedHeads.add(nodeid); | 
| 
308
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
314 } | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
315 } | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
316 }, localCset); | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
317 closed = allClosed[0]; | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
318 Nodeid[] outcome = new Nodeid[localCset.length]; | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
319 i = 0; | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
320 if (!closed && tipmost[1] != null) { | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
321 outcome[i++] = tipmost[1]; | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
322 if (i < outcome.length && !tipmost[0].equals(tipmost[1])) { | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
323 outcome[i++] = tipmost[0]; | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
324 } | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
325 } else { | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
326 outcome[i++] = tipmost[0]; | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
327 } | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
328 for (Nodeid h : heads) { | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
329 if (!h.equals(tipmost[0]) && !h.equals(tipmost[1])) { | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
330 outcome[i++] = h; | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
331 } | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
332 } | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
333 heads = Arrays.asList(outcome); | 
| 
315
 
8952f89be195
Allow to query specific branch heads if they are closed
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
309 
diff
changeset
 | 
334 if (closed) { | 
| 
 
8952f89be195
Allow to query specific branch heads if they are closed
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
309 
diff
changeset
 | 
335 // no need | 
| 
 
8952f89be195
Allow to query specific branch heads if they are closed
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
309 
diff
changeset
 | 
336 closedHeads = null; | 
| 
 
8952f89be195
Allow to query specific branch heads if they are closed
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
309 
diff
changeset
 | 
337 } else { | 
| 
 
8952f89be195
Allow to query specific branch heads if they are closed
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
309 
diff
changeset
 | 
338 _closedHeads.trimToSize(); | 
| 
 
8952f89be195
Allow to query specific branch heads if they are closed
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
309 
diff
changeset
 | 
339 closedHeads = _closedHeads; | 
| 
 
8952f89be195
Allow to query specific branch heads if they are closed
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
309 
diff
changeset
 | 
340 } | 
| 
236
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
341 } | 
| 
220
 
8de327242aa0
Basic information about branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
342 | 
| 
 
8de327242aa0
Basic information about branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
343 public String getName() { | 
| 
 
8de327242aa0
Basic information about branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
344 return name; | 
| 
 
8de327242aa0
Basic information about branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
345 } | 
| 
308
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
346 /** | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
347 * @return <code>true</code> if all heads of this branch are marked as closed | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
348 */ | 
| 
 
3f40262153a4
Recognize closed branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
349 public boolean isClosed() { | 
| 
220
 
8de327242aa0
Basic information about branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
350 return closed; | 
| 
 
8de327242aa0
Basic information about branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
351 } | 
| 
315
 
8952f89be195
Allow to query specific branch heads if they are closed
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
309 
diff
changeset
 | 
352 | 
| 
 
8952f89be195
Allow to query specific branch heads if they are closed
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
309 
diff
changeset
 | 
353 /** | 
| 
 
8952f89be195
Allow to query specific branch heads if they are closed
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
309 
diff
changeset
 | 
354 * @return all heads for the branch, both open and closed, tip-most head first | 
| 
 
8952f89be195
Allow to query specific branch heads if they are closed
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
309 
diff
changeset
 | 
355 */ | 
| 
220
 
8de327242aa0
Basic information about branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
356 public List<Nodeid> getHeads() { | 
| 
 
8de327242aa0
Basic information about branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
357 return heads; | 
| 
 
8de327242aa0
Basic information about branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
358 } | 
| 
315
 
8952f89be195
Allow to query specific branch heads if they are closed
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
309 
diff
changeset
 | 
359 | 
| 
 
8952f89be195
Allow to query specific branch heads if they are closed
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
309 
diff
changeset
 | 
360 /** | 
| 
 
8952f89be195
Allow to query specific branch heads if they are closed
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
309 
diff
changeset
 | 
361 * | 
| 
 
8952f89be195
Allow to query specific branch heads if they are closed
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
309 
diff
changeset
 | 
362 * @param head one of revision from {@link #getHeads() heads} of this branch | 
| 
 
8952f89be195
Allow to query specific branch heads if they are closed
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
309 
diff
changeset
 | 
363 * @return true if this particular head is closed | 
| 
 
8952f89be195
Allow to query specific branch heads if they are closed
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
309 
diff
changeset
 | 
364 * @throws IllegalArgumentException if argument is not from {@link #getHeads() heads} of this branch | 
| 
 
8952f89be195
Allow to query specific branch heads if they are closed
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
309 
diff
changeset
 | 
365 */ | 
| 
 
8952f89be195
Allow to query specific branch heads if they are closed
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
309 
diff
changeset
 | 
366 public boolean isClosed(Nodeid head) { | 
| 
 
8952f89be195
Allow to query specific branch heads if they are closed
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
309 
diff
changeset
 | 
367 if (!heads.contains(head)) { | 
| 
 
8952f89be195
Allow to query specific branch heads if they are closed
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
309 
diff
changeset
 | 
368 throw new IllegalArgumentException(String.format("Revision %s does not belong to heads of %s branch", head, name), null); | 
| 
 
8952f89be195
Allow to query specific branch heads if they are closed
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
309 
diff
changeset
 | 
369 } | 
| 
 
8952f89be195
Allow to query specific branch heads if they are closed
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
309 
diff
changeset
 | 
370 if (closed) { | 
| 
 
8952f89be195
Allow to query specific branch heads if they are closed
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
309 
diff
changeset
 | 
371 return true; | 
| 
 
8952f89be195
Allow to query specific branch heads if they are closed
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
309 
diff
changeset
 | 
372 } | 
| 
 
8952f89be195
Allow to query specific branch heads if they are closed
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
309 
diff
changeset
 | 
373 return closedHeads.contains(head); | 
| 
 
8952f89be195
Allow to query specific branch heads if they are closed
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
309 
diff
changeset
 | 
374 } | 
| 
220
 
8de327242aa0
Basic information about branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
375 // public Nodeid getTip() { | 
| 
 
8de327242aa0
Basic information about branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
376 // } | 
| 
236
 
883300108179
Speed up branches calculation when cached branch information is available
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
220 
diff
changeset
 | 
377 /*public*/ Nodeid getStart() { | 
| 
220
 
8de327242aa0
Basic information about branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
378 // first node where branch appears | 
| 
 
8de327242aa0
Basic information about branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
379 return start; | 
| 
 
8de327242aa0
Basic information about branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
380 } | 
| 
 
8de327242aa0
Basic information about branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
381 } | 
| 
 
8de327242aa0
Basic information about branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
382 } | 
