Mercurial > hg4j
annotate src/org/tmatesoft/hg/core/Nodeid.java @ 191:b777502a06f5
Do not assume second parent can be set only when first one is set, again
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> | 
|---|---|
| date | Thu, 14 Apr 2011 19:53:31 +0200 | 
| parents | 71ddbf8603e8 | 
| children | 3a7696fb457c | 
| rev | line source | 
|---|---|
| 
20
 
11cfabe692b3
Status operation for two repository revisions (no local dir involved)
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
13 
diff
changeset
 | 
1 /* | 
| 
74
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
46 
diff
changeset
 | 
2 * Copyright (c) 2010-2011 TMate Software Ltd | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
46 
diff
changeset
 | 
3 * | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
46 
diff
changeset
 | 
4 * This program is free software; you can redistribute it and/or modify | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
46 
diff
changeset
 | 
5 * it under the terms of the GNU General Public License as published by | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
46 
diff
changeset
 | 
6 * the Free Software Foundation; version 2 of the License. | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
46 
diff
changeset
 | 
7 * | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
46 
diff
changeset
 | 
8 * This program is distributed in the hope that it will be useful, | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
46 
diff
changeset
 | 
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
46 
diff
changeset
 | 
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
46 
diff
changeset
 | 
11 * GNU General Public License for more details. | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
46 
diff
changeset
 | 
12 * | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
46 
diff
changeset
 | 
13 * For information on how to redistribute this software under | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
46 
diff
changeset
 | 
14 * the terms of a license other than GNU General Public License | 
| 
102
 
a3a2e5deb320
Updated contact address to support@hg4j.com
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
78 
diff
changeset
 | 
15 * contact TMate Software at support@hg4j.com | 
| 
0
 
dbd663faec1f
Basic changelog parsing
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
16 */ | 
| 
74
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
46 
diff
changeset
 | 
17 package org.tmatesoft.hg.core; | 
| 
0
 
dbd663faec1f
Basic changelog parsing
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
18 | 
| 
74
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
46 
diff
changeset
 | 
19 import static org.tmatesoft.hg.internal.DigestHelper.toHexString; | 
| 
31
 
346b66add79d
Basic lookup for incoming changes
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
28 
diff
changeset
 | 
20 | 
| 
24
 
d4fdd1845b3f
Nodeid with array of exactly 20 bytes
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
22 
diff
changeset
 | 
21 import java.util.Arrays; | 
| 
 
d4fdd1845b3f
Nodeid with array of exactly 20 bytes
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
22 
diff
changeset
 | 
22 | 
| 
20
 
11cfabe692b3
Status operation for two repository revisions (no local dir involved)
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
13 
diff
changeset
 | 
23 | 
| 
0
 
dbd663faec1f
Basic changelog parsing
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
24 | 
| 
 
dbd663faec1f
Basic changelog parsing
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
25 /** | 
| 
74
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
46 
diff
changeset
 | 
26 * A 20-bytes (40 characters) long hash value to identify a revision. | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
46 
diff
changeset
 | 
27 * @see http://mercurial.selenic.com/wiki/Nodeid | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
46 
diff
changeset
 | 
28 * | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
46 
diff
changeset
 | 
29 * @author Artem Tikhomirov | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
46 
diff
changeset
 | 
30 * @author TMate Software Ltd. | 
| 
0
 
dbd663faec1f
Basic changelog parsing
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
31 * | 
| 
 
dbd663faec1f
Basic changelog parsing
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
32 */ | 
| 
170
 
71ddbf8603e8
Initial clone: populate given directory from a bundle. Everything but remote server access is there, albeit prototype code style
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
148 
diff
changeset
 | 
33 public final class Nodeid implements Comparable<Nodeid> { | 
| 
0
 
dbd663faec1f
Basic changelog parsing
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
34 | 
| 
74
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
46 
diff
changeset
 | 
35 /** | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
46 
diff
changeset
 | 
36 * <b>nullid</b>, empty root revision. | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
46 
diff
changeset
 | 
37 */ | 
| 
31
 
346b66add79d
Basic lookup for incoming changes
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
28 
diff
changeset
 | 
38 public static final Nodeid NULL = new Nodeid(new byte[20], false); | 
| 
74
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
46 
diff
changeset
 | 
39 | 
| 
0
 
dbd663faec1f
Basic changelog parsing
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
40 private final byte[] binaryData; | 
| 
 
dbd663faec1f
Basic changelog parsing
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
41 | 
| 
24
 
d4fdd1845b3f
Nodeid with array of exactly 20 bytes
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
22 
diff
changeset
 | 
42 /** | 
| 
74
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
46 
diff
changeset
 | 
43 * @param binaryRepresentation - array of exactly 20 bytes | 
| 
148
 
1a7a9a20e1f9
Exceptions, javadoc. Initial cancel and progress support
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
125 
diff
changeset
 | 
44 * @param shallClone - true if array is subject to future modification and shall be copied, not referenced | 
| 
 
1a7a9a20e1f9
Exceptions, javadoc. Initial cancel and progress support
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
125 
diff
changeset
 | 
45 * @throws IllegalArgumentException if supplied binary representation doesn't correspond to 20 bytes of sha1 digest | 
| 
24
 
d4fdd1845b3f
Nodeid with array of exactly 20 bytes
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
22 
diff
changeset
 | 
46 */ | 
| 
28
 
b2251b7a9823
Explicit cons arg for clone is more error-prone
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
24 
diff
changeset
 | 
47 public Nodeid(byte[] binaryRepresentation, boolean shallClone) { | 
| 
0
 
dbd663faec1f
Basic changelog parsing
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
48 // 5 int fields => 32 bytes | 
| 
 
dbd663faec1f
Basic changelog parsing
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
49 // byte[20] => 48 bytes | 
| 
24
 
d4fdd1845b3f
Nodeid with array of exactly 20 bytes
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
22 
diff
changeset
 | 
50 if (binaryRepresentation == null || binaryRepresentation.length != 20) { | 
| 
 
d4fdd1845b3f
Nodeid with array of exactly 20 bytes
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
22 
diff
changeset
 | 
51 throw new IllegalArgumentException(); | 
| 
 
d4fdd1845b3f
Nodeid with array of exactly 20 bytes
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
22 
diff
changeset
 | 
52 } | 
| 
28
 
b2251b7a9823
Explicit cons arg for clone is more error-prone
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
24 
diff
changeset
 | 
53 this.binaryData = shallClone ? binaryRepresentation.clone() : binaryRepresentation; | 
| 
0
 
dbd663faec1f
Basic changelog parsing
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
54 } | 
| 
 
dbd663faec1f
Basic changelog parsing
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
55 | 
| 
24
 
d4fdd1845b3f
Nodeid with array of exactly 20 bytes
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
22 
diff
changeset
 | 
56 @Override | 
| 
 
d4fdd1845b3f
Nodeid with array of exactly 20 bytes
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
22 
diff
changeset
 | 
57 public int hashCode() { | 
| 
46
 
4022c34a4804
Better hashCode impl
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
41 
diff
changeset
 | 
58 // digest (part thereof) seems to be nice candidate for the hashCode | 
| 
 
4022c34a4804
Better hashCode impl
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
41 
diff
changeset
 | 
59 byte[] b = binaryData; | 
| 
 
4022c34a4804
Better hashCode impl
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
41 
diff
changeset
 | 
60 return b[0] << 24 | (b[1] & 0xFF) << 16 | (b[2] & 0xFF) << 8 | (b[3] & 0xFF); | 
| 
24
 
d4fdd1845b3f
Nodeid with array of exactly 20 bytes
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
22 
diff
changeset
 | 
61 } | 
| 
 
d4fdd1845b3f
Nodeid with array of exactly 20 bytes
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
22 
diff
changeset
 | 
62 | 
| 
 
d4fdd1845b3f
Nodeid with array of exactly 20 bytes
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
22 
diff
changeset
 | 
63 @Override | 
| 
 
d4fdd1845b3f
Nodeid with array of exactly 20 bytes
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
22 
diff
changeset
 | 
64 public boolean equals(Object o) { | 
| 
 
d4fdd1845b3f
Nodeid with array of exactly 20 bytes
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
22 
diff
changeset
 | 
65 if (o instanceof Nodeid) { | 
| 
125
 
26ad21b250e4
Explicit op to tell merge revisions
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
102 
diff
changeset
 | 
66 return this == o || equalsTo(((Nodeid) o).binaryData); | 
| 
24
 
d4fdd1845b3f
Nodeid with array of exactly 20 bytes
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
22 
diff
changeset
 | 
67 } | 
| 
 
d4fdd1845b3f
Nodeid with array of exactly 20 bytes
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
22 
diff
changeset
 | 
68 return false; | 
| 
22
 
603806cd2dc6
Status of local working dir against non-tip base revision
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
20 
diff
changeset
 | 
69 } | 
| 
 
603806cd2dc6
Status of local working dir against non-tip base revision
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
20 
diff
changeset
 | 
70 | 
| 
 
603806cd2dc6
Status of local working dir against non-tip base revision
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
20 
diff
changeset
 | 
71 public boolean equalsTo(byte[] buf) { | 
| 
24
 
d4fdd1845b3f
Nodeid with array of exactly 20 bytes
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
22 
diff
changeset
 | 
72 return Arrays.equals(this.binaryData, buf); | 
| 
22
 
603806cd2dc6
Status of local working dir against non-tip base revision
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
20 
diff
changeset
 | 
73 } | 
| 
 
603806cd2dc6
Status of local working dir against non-tip base revision
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
20 
diff
changeset
 | 
74 | 
| 
170
 
71ddbf8603e8
Initial clone: populate given directory from a bundle. Everything but remote server access is there, albeit prototype code style
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
148 
diff
changeset
 | 
75 public int compareTo(Nodeid o) { | 
| 
 
71ddbf8603e8
Initial clone: populate given directory from a bundle. Everything but remote server access is there, albeit prototype code style
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
148 
diff
changeset
 | 
76 if (this == o) { | 
| 
 
71ddbf8603e8
Initial clone: populate given directory from a bundle. Everything but remote server access is there, albeit prototype code style
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
148 
diff
changeset
 | 
77 return 0; | 
| 
 
71ddbf8603e8
Initial clone: populate given directory from a bundle. Everything but remote server access is there, albeit prototype code style
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
148 
diff
changeset
 | 
78 } | 
| 
 
71ddbf8603e8
Initial clone: populate given directory from a bundle. Everything but remote server access is there, albeit prototype code style
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
148 
diff
changeset
 | 
79 for (int i = 0; i < 20; i++) { | 
| 
 
71ddbf8603e8
Initial clone: populate given directory from a bundle. Everything but remote server access is there, albeit prototype code style
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
148 
diff
changeset
 | 
80 if (binaryData[i] != o.binaryData[i]) { | 
| 
 
71ddbf8603e8
Initial clone: populate given directory from a bundle. Everything but remote server access is there, albeit prototype code style
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
148 
diff
changeset
 | 
81 return binaryData[i] < o.binaryData[i] ? -1 : 1; | 
| 
 
71ddbf8603e8
Initial clone: populate given directory from a bundle. Everything but remote server access is there, albeit prototype code style
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
148 
diff
changeset
 | 
82 } | 
| 
 
71ddbf8603e8
Initial clone: populate given directory from a bundle. Everything but remote server access is there, albeit prototype code style
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
148 
diff
changeset
 | 
83 } | 
| 
 
71ddbf8603e8
Initial clone: populate given directory from a bundle. Everything but remote server access is there, albeit prototype code style
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
148 
diff
changeset
 | 
84 return 0; | 
| 
 
71ddbf8603e8
Initial clone: populate given directory from a bundle. Everything but remote server access is there, albeit prototype code style
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
148 
diff
changeset
 | 
85 } | 
| 
 
71ddbf8603e8
Initial clone: populate given directory from a bundle. Everything but remote server access is there, albeit prototype code style
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
148 
diff
changeset
 | 
86 | 
| 
0
 
dbd663faec1f
Basic changelog parsing
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
87 @Override | 
| 
 
dbd663faec1f
Basic changelog parsing
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
88 public String toString() { | 
| 
34
 
51bc56c0addd
Static Nodeid creation methods to reuse NULL id
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
31 
diff
changeset
 | 
89 // XXX may want to output just single 0 for the NULL id? | 
| 
31
 
346b66add79d
Basic lookup for incoming changes
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
28 
diff
changeset
 | 
90 return toHexString(binaryData, 0, binaryData.length); | 
| 
0
 
dbd663faec1f
Basic changelog parsing
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
91 } | 
| 
31
 
346b66add79d
Basic lookup for incoming changes
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
28 
diff
changeset
 | 
92 | 
| 
 
346b66add79d
Basic lookup for incoming changes
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
28 
diff
changeset
 | 
93 public String shortNotation() { | 
| 
 
346b66add79d
Basic lookup for incoming changes
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
28 
diff
changeset
 | 
94 return toHexString(binaryData, 0, 6); | 
| 
 
346b66add79d
Basic lookup for incoming changes
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
28 
diff
changeset
 | 
95 } | 
| 
34
 
51bc56c0addd
Static Nodeid creation methods to reuse NULL id
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
31 
diff
changeset
 | 
96 | 
| 
 
51bc56c0addd
Static Nodeid creation methods to reuse NULL id
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
31 
diff
changeset
 | 
97 public boolean isNull() { | 
| 
 
51bc56c0addd
Static Nodeid creation methods to reuse NULL id
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
31 
diff
changeset
 | 
98 if (this == NULL) { | 
| 
 
51bc56c0addd
Static Nodeid creation methods to reuse NULL id
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
31 
diff
changeset
 | 
99 return true; | 
| 
 
51bc56c0addd
Static Nodeid creation methods to reuse NULL id
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
31 
diff
changeset
 | 
100 } | 
| 
 
51bc56c0addd
Static Nodeid creation methods to reuse NULL id
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
31 
diff
changeset
 | 
101 for (int i = 0; i < 20; i++) { | 
| 
 
51bc56c0addd
Static Nodeid creation methods to reuse NULL id
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
31 
diff
changeset
 | 
102 if (this.binaryData[i] != 0) { | 
| 
 
51bc56c0addd
Static Nodeid creation methods to reuse NULL id
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
31 
diff
changeset
 | 
103 return false; | 
| 
 
51bc56c0addd
Static Nodeid creation methods to reuse NULL id
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
31 
diff
changeset
 | 
104 } | 
| 
 
51bc56c0addd
Static Nodeid creation methods to reuse NULL id
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
31 
diff
changeset
 | 
105 } | 
| 
 
51bc56c0addd
Static Nodeid creation methods to reuse NULL id
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
31 
diff
changeset
 | 
106 return true; | 
| 
 
51bc56c0addd
Static Nodeid creation methods to reuse NULL id
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
31 
diff
changeset
 | 
107 } | 
| 
 
51bc56c0addd
Static Nodeid creation methods to reuse NULL id
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
31 
diff
changeset
 | 
108 | 
| 
74
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
46 
diff
changeset
 | 
109 // copy | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
46 
diff
changeset
 | 
110 public byte[] toByteArray() { | 
| 
41
 
858d1b2458cb
Check integrity for bundle changelog. Sort nodeids when calculating hash
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
34 
diff
changeset
 | 
111 return binaryData.clone(); | 
| 
 
858d1b2458cb
Check integrity for bundle changelog. Sort nodeids when calculating hash
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
34 
diff
changeset
 | 
112 } | 
| 
 
858d1b2458cb
Check integrity for bundle changelog. Sort nodeids when calculating hash
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
34 
diff
changeset
 | 
113 | 
| 
148
 
1a7a9a20e1f9
Exceptions, javadoc. Initial cancel and progress support
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
125 
diff
changeset
 | 
114 /** | 
| 
 
1a7a9a20e1f9
Exceptions, javadoc. Initial cancel and progress support
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
125 
diff
changeset
 | 
115 * Factory for {@link Nodeid Nodeids}. | 
| 
 
1a7a9a20e1f9
Exceptions, javadoc. Initial cancel and progress support
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
125 
diff
changeset
 | 
116 * Primary difference with cons is handling of NULL id (this method returns constant) and control over array | 
| 
 
1a7a9a20e1f9
Exceptions, javadoc. Initial cancel and progress support
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
125 
diff
changeset
 | 
117 * duplication - this method always makes a copy of an array passed | 
| 
 
1a7a9a20e1f9
Exceptions, javadoc. Initial cancel and progress support
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
125 
diff
changeset
 | 
118 * @param binaryRepresentation - byte array of a length at least offset + 20 | 
| 
 
1a7a9a20e1f9
Exceptions, javadoc. Initial cancel and progress support
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
125 
diff
changeset
 | 
119 * @param offset - index in the array to start from | 
| 
 
1a7a9a20e1f9
Exceptions, javadoc. Initial cancel and progress support
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
125 
diff
changeset
 | 
120 * @throws IllegalArgumentException when arguments don't select 20 bytes | 
| 
 
1a7a9a20e1f9
Exceptions, javadoc. Initial cancel and progress support
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
125 
diff
changeset
 | 
121 */ | 
| 
34
 
51bc56c0addd
Static Nodeid creation methods to reuse NULL id
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
31 
diff
changeset
 | 
122 public static Nodeid fromBinary(byte[] binaryRepresentation, int offset) { | 
| 
 
51bc56c0addd
Static Nodeid creation methods to reuse NULL id
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
31 
diff
changeset
 | 
123 if (binaryRepresentation == null || binaryRepresentation.length - offset < 20) { | 
| 
 
51bc56c0addd
Static Nodeid creation methods to reuse NULL id
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
31 
diff
changeset
 | 
124 throw new IllegalArgumentException(); | 
| 
 
51bc56c0addd
Static Nodeid creation methods to reuse NULL id
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
31 
diff
changeset
 | 
125 } | 
| 
 
51bc56c0addd
Static Nodeid creation methods to reuse NULL id
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
31 
diff
changeset
 | 
126 int i = 0; | 
| 
 
51bc56c0addd
Static Nodeid creation methods to reuse NULL id
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
31 
diff
changeset
 | 
127 while (i < 20 && binaryRepresentation[offset+i] == 0) i++; | 
| 
 
51bc56c0addd
Static Nodeid creation methods to reuse NULL id
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
31 
diff
changeset
 | 
128 if (i == 20) { | 
| 
 
51bc56c0addd
Static Nodeid creation methods to reuse NULL id
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
31 
diff
changeset
 | 
129 return NULL; | 
| 
 
51bc56c0addd
Static Nodeid creation methods to reuse NULL id
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
31 
diff
changeset
 | 
130 } | 
| 
 
51bc56c0addd
Static Nodeid creation methods to reuse NULL id
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
31 
diff
changeset
 | 
131 if (offset == 0 && binaryRepresentation.length == 20) { | 
| 
 
51bc56c0addd
Static Nodeid creation methods to reuse NULL id
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
31 
diff
changeset
 | 
132 return new Nodeid(binaryRepresentation, true); | 
| 
 
51bc56c0addd
Static Nodeid creation methods to reuse NULL id
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
31 
diff
changeset
 | 
133 } | 
| 
 
51bc56c0addd
Static Nodeid creation methods to reuse NULL id
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
31 
diff
changeset
 | 
134 byte[] b = new byte[20]; // create new instance if no other reasonable guesses possible | 
| 
 
51bc56c0addd
Static Nodeid creation methods to reuse NULL id
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
31 
diff
changeset
 | 
135 System.arraycopy(binaryRepresentation, offset, b, 0, 20); | 
| 
 
51bc56c0addd
Static Nodeid creation methods to reuse NULL id
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
31 
diff
changeset
 | 
136 return new Nodeid(b, false); | 
| 
 
51bc56c0addd
Static Nodeid creation methods to reuse NULL id
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
31 
diff
changeset
 | 
137 } | 
| 
31
 
346b66add79d
Basic lookup for incoming changes
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
28 
diff
changeset
 | 
138 | 
| 
148
 
1a7a9a20e1f9
Exceptions, javadoc. Initial cancel and progress support
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
125 
diff
changeset
 | 
139 /** | 
| 
 
1a7a9a20e1f9
Exceptions, javadoc. Initial cancel and progress support
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
125 
diff
changeset
 | 
140 * Parse encoded representation. | 
| 
 
1a7a9a20e1f9
Exceptions, javadoc. Initial cancel and progress support
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
125 
diff
changeset
 | 
141 * | 
| 
 
1a7a9a20e1f9
Exceptions, javadoc. Initial cancel and progress support
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
125 
diff
changeset
 | 
142 * @param asciiRepresentation - encoded form of the Nodeid. | 
| 
 
1a7a9a20e1f9
Exceptions, javadoc. Initial cancel and progress support
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
125 
diff
changeset
 | 
143 * @return object representation | 
| 
 
1a7a9a20e1f9
Exceptions, javadoc. Initial cancel and progress support
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
125 
diff
changeset
 | 
144 * @throws IllegalArgumentException when argument doesn't match encoded form of 20-bytes sha1 digest. | 
| 
 
1a7a9a20e1f9
Exceptions, javadoc. Initial cancel and progress support
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
125 
diff
changeset
 | 
145 */ | 
| 
78
 
c25c5c348d1b
Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
74 
diff
changeset
 | 
146 public static Nodeid fromAscii(String asciiRepresentation) { | 
| 
 
c25c5c348d1b
Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
74 
diff
changeset
 | 
147 if (asciiRepresentation.length() != 40) { | 
| 
 
c25c5c348d1b
Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
74 
diff
changeset
 | 
148 throw new IllegalArgumentException(); | 
| 
 
c25c5c348d1b
Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
74 
diff
changeset
 | 
149 } | 
| 
 
c25c5c348d1b
Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
74 
diff
changeset
 | 
150 // XXX is better impl for String possible? | 
| 
 
c25c5c348d1b
Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
74 
diff
changeset
 | 
151 return fromAscii(asciiRepresentation.getBytes(), 0, 40); | 
| 
 
c25c5c348d1b
Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
74 
diff
changeset
 | 
152 } | 
| 
148
 
1a7a9a20e1f9
Exceptions, javadoc. Initial cancel and progress support
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
125 
diff
changeset
 | 
153 | 
| 
 
1a7a9a20e1f9
Exceptions, javadoc. Initial cancel and progress support
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
125 
diff
changeset
 | 
154 /** | 
| 
 
1a7a9a20e1f9
Exceptions, javadoc. Initial cancel and progress support
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
125 
diff
changeset
 | 
155 * Parse encoded representation. Similar to {@link #fromAscii(String)}. | 
| 
 
1a7a9a20e1f9
Exceptions, javadoc. Initial cancel and progress support
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
125 
diff
changeset
 | 
156 */ | 
| 
0
 
dbd663faec1f
Basic changelog parsing
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
157 public static Nodeid fromAscii(byte[] asciiRepresentation, int offset, int length) { | 
| 
24
 
d4fdd1845b3f
Nodeid with array of exactly 20 bytes
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
22 
diff
changeset
 | 
158 if (length != 40) { | 
| 
 
d4fdd1845b3f
Nodeid with array of exactly 20 bytes
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
22 
diff
changeset
 | 
159 throw new IllegalArgumentException(); | 
| 
 
d4fdd1845b3f
Nodeid with array of exactly 20 bytes
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
22 
diff
changeset
 | 
160 } | 
| 
 
d4fdd1845b3f
Nodeid with array of exactly 20 bytes
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
22 
diff
changeset
 | 
161 byte[] data = new byte[20]; | 
| 
31
 
346b66add79d
Basic lookup for incoming changes
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
28 
diff
changeset
 | 
162 boolean zeroBytes = true; | 
| 
0
 
dbd663faec1f
Basic changelog parsing
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
163 for (int i = 0, j = offset; i < data.length; i++) { | 
| 
 
dbd663faec1f
Basic changelog parsing
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
164 int hiNibble = Character.digit(asciiRepresentation[j++], 16); | 
| 
 
dbd663faec1f
Basic changelog parsing
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
165 int lowNibble = Character.digit(asciiRepresentation[j++], 16); | 
| 
31
 
346b66add79d
Basic lookup for incoming changes
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
28 
diff
changeset
 | 
166 byte b = (byte) (((hiNibble << 4) | lowNibble) & 0xFF); | 
| 
 
346b66add79d
Basic lookup for incoming changes
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
28 
diff
changeset
 | 
167 data[i] = b; | 
| 
 
346b66add79d
Basic lookup for incoming changes
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
28 
diff
changeset
 | 
168 zeroBytes = zeroBytes && b == 0; | 
| 
 
346b66add79d
Basic lookup for incoming changes
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
28 
diff
changeset
 | 
169 } | 
| 
 
346b66add79d
Basic lookup for incoming changes
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
28 
diff
changeset
 | 
170 if (zeroBytes) { | 
| 
 
346b66add79d
Basic lookup for incoming changes
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
28 
diff
changeset
 | 
171 return NULL; | 
| 
0
 
dbd663faec1f
Basic changelog parsing
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
172 } | 
| 
28
 
b2251b7a9823
Explicit cons arg for clone is more error-prone
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
24 
diff
changeset
 | 
173 return new Nodeid(data, false); | 
| 
0
 
dbd663faec1f
Basic changelog parsing
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
174 } | 
| 
 
dbd663faec1f
Basic changelog parsing
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
175 } | 
