Mercurial > jhg
annotate src/org/tmatesoft/hg/internal/RangeSeq.java @ 616:5e0313485eef
encode directories as demanded by fncache format
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> | 
|---|---|
| date | Tue, 14 May 2013 17:31:35 +0200 | 
| parents | d3c71498919c | 
| children | 
| rev | line source | 
|---|---|
| 
558
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
1 /* | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
2 * Copyright (c) 2013 TMate Software Ltd | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
3 * | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
4 * This program is free software; you can redistribute it and/or modify | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
5 * it under the terms of the GNU General Public License as published by | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
6 * the Free Software Foundation; version 2 of the License. | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
7 * | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
8 * This program is distributed in the hope that it will be useful, | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
11 * GNU General Public License for more details. | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
12 * | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
13 * For information on how to redistribute this software under | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
14 * the terms of a license other than GNU General Public License | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
15 * contact TMate Software at support@hg4j.com | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
16 */ | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
17 package org.tmatesoft.hg.internal; | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
18 | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
19 import java.util.Formatter; | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
20 | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
21 /** | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
22 * Sequence of range pairs (denoted origin and target), {originStart, targetStart, length}, tailored for diff/annotate | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
23 * | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
24 * @author Artem Tikhomirov | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
25 * @author TMate Software Ltd. | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
26 */ | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
27 public final class RangeSeq { | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
28 // XXX smth like IntSliceVector to access triples (or slices of any size, in fact) | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
29 // with easy indexing, e.g. #get(sliceIndex, indexWithinSlice) | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
30 // and vect.get(7,2) instead of vect.get(7*SIZEOF_SLICE+2) | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
31 private final IntVector ranges = new IntVector(3*10, 3*5); | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
32 private int count; | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
33 | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
34 public void add(int start1, int start2, int length) { | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
35 if (count > 0) { | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
36 int lastIndex = 3 * (count-1); | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
37 int lastS1 = ranges.get(lastIndex); | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
38 int lastS2 = ranges.get(lastIndex + 1); | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
39 int lastLen = ranges.get(lastIndex + 2); | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
40 if (start1 == lastS1 + lastLen && start2 == lastS2 + lastLen) { | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
41 // new range continues the previous one - just increase the length | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
42 ranges.set(lastIndex + 2, lastLen + length); | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
43 return; | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
44 } | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
45 } | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
46 ranges.add(start1, start2, length); | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
47 count++; | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
48 } | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
49 | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
50 public void clear() { | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
51 ranges.clear(); | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
52 count = 0; | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
53 } | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
54 | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
55 public int size() { | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
56 return count; | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
57 } | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
58 | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
59 /** | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
60 * find out line index in the target that matches specified origin line | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
61 */ | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
62 public int mapLineIndex(int ln) { | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
63 for (int i = 0; i < ranges.size(); i += 3) { | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
64 int s1 = ranges.get(i); | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
65 if (s1 > ln) { | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
66 return -1; | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
67 } | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
68 int l = ranges.get(i+2); | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
69 if (s1 + l > ln) { | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
70 int s2 = ranges.get(i + 1); | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
71 return s2 + (ln - s1); | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
72 } | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
73 } | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
74 return -1; | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
75 } | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
76 | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
77 /** | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
78 * find out line index in origin that matches specified target line | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
79 */ | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
80 public int reverseMapLine(int targetLine) { | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
81 for (int i = 0; i < ranges.size(); i +=3) { | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
82 int ts = ranges.get(i + 1); | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
83 if (ts > targetLine) { | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
84 return -1; | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
85 } | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
86 int l = ranges.get(i + 2); | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
87 if (ts + l > targetLine) { | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
88 int os = ranges.get(i); | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
89 return os + (targetLine - ts); | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
90 } | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
91 } | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
92 return -1; | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
93 } | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
94 | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
95 public RangeSeq intersect(RangeSeq target) { | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
96 RangeSeq v = new RangeSeq(); | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
97 for (int i = 0; i < ranges.size(); i += 3) { | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
98 int originLine = ranges.get(i); | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
99 int targetLine = ranges.get(i + 1); | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
100 int length = ranges.get(i + 2); | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
101 int startTargetLine = -1, startOriginLine = -1, c = 0; | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
102 for (int j = 0; j < length; j++) { | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
103 int lnInFinal = target.mapLineIndex(targetLine + j); | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
104 if (lnInFinal == -1 || (startTargetLine != -1 && lnInFinal != startTargetLine + c)) { | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
105 // the line is not among "same" in ultimate origin | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
106 // or belongs to another/next "same" chunk | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
107 if (startOriginLine == -1) { | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
108 continue; | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
109 } | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
110 v.add(startOriginLine, startTargetLine, c); | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
111 c = 0; | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
112 startOriginLine = startTargetLine = -1; | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
113 // fall-through to check if it's not complete miss but a next chunk | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
114 } | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
115 if (lnInFinal != -1) { | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
116 if (startOriginLine == -1) { | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
117 startOriginLine = originLine + j; | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
118 startTargetLine = lnInFinal; | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
119 c = 1; | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
120 } else { | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
121 // lnInFinal != startTargetLine + s is covered above | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
122 assert lnInFinal == startTargetLine + c; | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
123 c++; | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
124 } | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
125 } | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
126 } | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
127 if (startOriginLine != -1) { | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
128 assert c > 0; | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
129 v.add(startOriginLine, startTargetLine, c); | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
130 } | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
131 } | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
132 return v; | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
133 } | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
134 | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
135 // true when specified line in origin is equal to a line in target | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
136 public boolean includesOriginLine(int ln) { | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
137 return includes(ln, 0); | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
138 } | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
139 | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
140 // true when specified line in target is equal to a line in origin | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
141 public boolean includesTargetLine(int ln) { | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
142 return includes(ln, 1); | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
143 } | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
144 | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
145 private boolean includes(int ln, int o) { | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
146 for (int i = 2; i < ranges.size(); o += 3, i+=3) { | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
147 int rangeStart = ranges.get(o); | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
148 if (rangeStart > ln) { | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
149 return false; | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
150 } | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
151 int rangeLen = ranges.get(i); | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
152 if (rangeStart + rangeLen > ln) { | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
153 return true; | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
154 } | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
155 } | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
156 return false; | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
157 } | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
158 | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
159 public CharSequence dump() { | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
160 StringBuilder sb = new StringBuilder(); | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
161 Formatter f = new Formatter(sb); | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
162 for (int i = 0; i < ranges.size(); i += 3) { | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
163 int s1 = ranges.get(i); | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
164 int s2 = ranges.get(i + 1); | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
165 int len = ranges.get(i + 2); | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
166 f.format("[%d..%d) == [%d..%d); ", s1, s1 + len, s2, s2 + len); | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
167 } | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
168 return sb; | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
169 } | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
170 | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
171 @Override | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
172 public String toString() { | 
| 
561
 
d3c71498919c
Do not process child revisions before all possible parent paths were visited
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
558 
diff
changeset
 | 
173 return String.format("RangeSeq[%d]:%s", count, dump()); | 
| 
558
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
174 } | 
| 
 
154718ae23ed
Annotate: refactor/reuse range handling code
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
175 } | 
