Mercurial > jhg
annotate src/org/tmatesoft/hg/repo/HgBundle.java @ 340:a54bfe0db959
IAE using stale data from branchheads file (invalid due to repository rollback)
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> | 
|---|---|
| date | Thu, 17 Nov 2011 06:16:20 +0100 | 
| parents | 694ebabb5cb3 | 
| children | 5f9073eabf06 | 
| rev | line source | 
|---|---|
| 
36
 
205f9b59b400
Strip parsing logic out from console frontend
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
1 /* | 
| 
74
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
47 
diff
changeset
 | 
2 * Copyright (c) 2011 TMate Software Ltd | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
47 
diff
changeset
 | 
3 * | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
47 
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: 
47 
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: 
47 
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: 
47 
diff
changeset
 | 
7 * | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
47 
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: 
47 
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: 
47 
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: 
47 
diff
changeset
 | 
11 * GNU General Public License for more details. | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
47 
diff
changeset
 | 
12 * | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
47 
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: 
47 
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: 
77 
diff
changeset
 | 
15 * contact TMate Software at support@hg4j.com | 
| 
36
 
205f9b59b400
Strip parsing logic out from console frontend
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
16 */ | 
| 
74
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
47 
diff
changeset
 | 
17 package org.tmatesoft.hg.repo; | 
| 
36
 
205f9b59b400
Strip parsing logic out from console frontend
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
18 | 
| 
 
205f9b59b400
Strip parsing logic out from console frontend
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
19 import java.io.File; | 
| 
 
205f9b59b400
Strip parsing logic out from console frontend
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
20 import java.io.IOException; | 
| 
 
205f9b59b400
Strip parsing logic out from console frontend
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
21 import java.util.LinkedList; | 
| 
 
205f9b59b400
Strip parsing logic out from console frontend
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
22 | 
| 
169
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
23 import org.tmatesoft.hg.core.HgBadStateException; | 
| 
157
 
d5268ca7715b
Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
diff
changeset
 | 
24 import org.tmatesoft.hg.core.HgException; | 
| 
295
 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
274 
diff
changeset
 | 
25 import org.tmatesoft.hg.core.HgInvalidFileException; | 
| 
74
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
47 
diff
changeset
 | 
26 import org.tmatesoft.hg.core.Nodeid; | 
| 
157
 
d5268ca7715b
Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
diff
changeset
 | 
27 import org.tmatesoft.hg.internal.ByteArrayChannel; | 
| 
 
d5268ca7715b
Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
diff
changeset
 | 
28 import org.tmatesoft.hg.internal.ByteArrayDataAccess; | 
| 
74
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
47 
diff
changeset
 | 
29 import org.tmatesoft.hg.internal.DataAccess; | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
47 
diff
changeset
 | 
30 import org.tmatesoft.hg.internal.DataAccessProvider; | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
47 
diff
changeset
 | 
31 import org.tmatesoft.hg.internal.DigestHelper; | 
| 
169
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
32 import org.tmatesoft.hg.internal.InflaterDataAccess; | 
| 
329
 
694ebabb5cb3
Refactor revlog patch mechanism, towards patch merging
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
33 import org.tmatesoft.hg.internal.Patch; | 
| 
154
 
ba2bf656f00f
Changeset => RawChangeset
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
129 
diff
changeset
 | 
34 import org.tmatesoft.hg.repo.HgChangelog.RawChangeset; | 
| 
157
 
d5268ca7715b
Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
diff
changeset
 | 
35 import org.tmatesoft.hg.util.CancelledException; | 
| 
74
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
47 
diff
changeset
 | 
36 | 
| 
36
 
205f9b59b400
Strip parsing logic out from console frontend
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
37 /** | 
| 
 
205f9b59b400
Strip parsing logic out from console frontend
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
38 * @see http://mercurial.selenic.com/wiki/BundleFormat | 
| 
169
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
39 * | 
| 
74
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
47 
diff
changeset
 | 
40 * @author Artem Tikhomirov | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
47 
diff
changeset
 | 
41 * @author TMate Software Ltd. | 
| 
36
 
205f9b59b400
Strip parsing logic out from console frontend
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
42 */ | 
| 
 
205f9b59b400
Strip parsing logic out from console frontend
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
43 public class HgBundle { | 
| 
 
205f9b59b400
Strip parsing logic out from console frontend
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
44 | 
| 
 
205f9b59b400
Strip parsing logic out from console frontend
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
45 private final File bundleFile; | 
| 
 
205f9b59b400
Strip parsing logic out from console frontend
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
46 private final DataAccessProvider accessProvider; | 
| 
 
205f9b59b400
Strip parsing logic out from console frontend
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
47 | 
| 
169
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
48 HgBundle(DataAccessProvider dap, File bundle) { | 
| 
36
 
205f9b59b400
Strip parsing logic out from console frontend
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
49 accessProvider = dap; | 
| 
 
205f9b59b400
Strip parsing logic out from console frontend
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
50 bundleFile = bundle; | 
| 
 
205f9b59b400
Strip parsing logic out from console frontend
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
51 } | 
| 
 
205f9b59b400
Strip parsing logic out from console frontend
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
52 | 
| 
169
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
53 private DataAccess getDataStream() throws IOException { | 
| 
37
 
e45e75e22523
Parse changesets from bundle's changelog group. Refactor Revlog to provide access to revision's raw content
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
36 
diff
changeset
 | 
54 DataAccess da = accessProvider.create(bundleFile); | 
| 
169
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
55 byte[] signature = new byte[6]; | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
56 if (da.length() > 6) { | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
57 da.readBytes(signature, 0, 6); | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
58 if (signature[0] == 'H' && signature[1] == 'G' && signature[2] == '1' && signature[3] == '0') { | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
59 if (signature[4] == 'G' && signature[5] == 'Z') { | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
60 return new InflaterDataAccess(da, 6, da.length() - 6); | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
61 } | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
62 if (signature[4] == 'B' && signature[5] == 'Z') { | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
63 throw HgRepository.notImplemented(); | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
64 } | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
65 if (signature[4] != 'U' || signature[5] != 'N') { | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
66 throw new HgBadStateException("Bad bundle signature:" + new String(signature)); | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
67 } | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
68 // "...UN", fall-through | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
69 } else { | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
70 da.reset(); | 
| 
39
 
4e9b66b07a28
Check changelog group starts with proper (known) base
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
37 
diff
changeset
 | 
71 } | 
| 
169
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
72 } | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
73 return da; | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
74 } | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
75 | 
| 
186
 
44a34baabea0
Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
182 
diff
changeset
 | 
76 private int uses = 0; | 
| 
 
44a34baabea0
Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
182 
diff
changeset
 | 
77 public HgBundle link() { | 
| 
 
44a34baabea0
Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
182 
diff
changeset
 | 
78 uses++; | 
| 
 
44a34baabea0
Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
182 
diff
changeset
 | 
79 return this; | 
| 
 
44a34baabea0
Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
182 
diff
changeset
 | 
80 } | 
| 
 
44a34baabea0
Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
182 
diff
changeset
 | 
81 public void unlink() { | 
| 
 
44a34baabea0
Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
182 
diff
changeset
 | 
82 uses--; | 
| 
 
44a34baabea0
Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
182 
diff
changeset
 | 
83 if (uses == 0 && bundleFile != null) { | 
| 
 
44a34baabea0
Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
182 
diff
changeset
 | 
84 bundleFile.deleteOnExit(); | 
| 
 
44a34baabea0
Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
182 
diff
changeset
 | 
85 } | 
| 
 
44a34baabea0
Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
182 
diff
changeset
 | 
86 } | 
| 
 
44a34baabea0
Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
182 
diff
changeset
 | 
87 public boolean inUse() { | 
| 
 
44a34baabea0
Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
182 
diff
changeset
 | 
88 return uses > 0; | 
| 
 
44a34baabea0
Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
182 
diff
changeset
 | 
89 } | 
| 
 
44a34baabea0
Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
182 
diff
changeset
 | 
90 | 
| 
182
 
f26ffe04ced0
Refactor HgBundle to dispatch changes found through callback
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
170 
diff
changeset
 | 
91 /** | 
| 
 
f26ffe04ced0
Refactor HgBundle to dispatch changes found through callback
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
170 
diff
changeset
 | 
92 * Get changes recorded in the bundle that are missing from the supplied repository. | 
| 
 
f26ffe04ced0
Refactor HgBundle to dispatch changes found through callback
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
170 
diff
changeset
 | 
93 * @param hgRepo repository that shall possess base revision for this bundle | 
| 
 
f26ffe04ced0
Refactor HgBundle to dispatch changes found through callback
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
170 
diff
changeset
 | 
94 * @param inspector callback to get each changeset found | 
| 
 
f26ffe04ced0
Refactor HgBundle to dispatch changes found through callback
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
170 
diff
changeset
 | 
95 */ | 
| 
295
 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
274 
diff
changeset
 | 
96 public void changes(final HgRepository hgRepo, final HgChangelog.Inspector inspector) throws HgInvalidFileException { | 
| 
182
 
f26ffe04ced0
Refactor HgBundle to dispatch changes found through callback
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
170 
diff
changeset
 | 
97 Inspector bundleInsp = new Inspector() { | 
| 
169
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
98 DigestHelper dh = new DigestHelper(); | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
99 boolean emptyChangelog = true; | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
100 private DataAccess prevRevContent; | 
| 
182
 
f26ffe04ced0
Refactor HgBundle to dispatch changes found through callback
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
170 
diff
changeset
 | 
101 private int revisionIndex; | 
| 
169
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
102 | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
103 public void changelogStart() { | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
104 emptyChangelog = true; | 
| 
182
 
f26ffe04ced0
Refactor HgBundle to dispatch changes found through callback
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
170 
diff
changeset
 | 
105 revisionIndex = 0; | 
| 
169
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
106 } | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
107 | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
108 public void changelogEnd() { | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
109 if (emptyChangelog) { | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
110 throw new IllegalStateException("No changelog group in the bundle"); // XXX perhaps, just be silent and/or log? | 
| 
42
 
92c3d0920d58
Real integrity check, with exception. DigestHelper refactored to accomodate new needs
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
41 
diff
changeset
 | 
111 } | 
| 
37
 
e45e75e22523
Parse changesets from bundle's changelog group. Refactor Revlog to provide access to revision's raw content
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
36 
diff
changeset
 | 
112 } | 
| 
169
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
113 | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
114 /* | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
115 * Despite that BundleFormat wiki says: "Each Changelog entry patches the result of all previous patches | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
116 * (the previous, or parent patch of a given patch p is the patch that has a node equal to p's p1 field)", | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
117 * it seems not to hold true. Instead, each entry patches previous one, regardless of whether the one | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
118 * before is its parent (i.e. ge.firstParent()) or not. | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
119 * | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
120 Actual state in the changelog.i | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
121 Index Offset Flags Packed Actual Base Rev Link Rev Parent1 Parent2 nodeid | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
122 50: 9212 0 209 329 48 50 49 -1 f1db8610da62a3e0beb8d360556ee1fd6eb9885e | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
123 51: 9421 0 278 688 48 51 50 -1 9429c7bd1920fab164a9d2b621d38d57bcb49ae0 | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
124 52: 9699 0 154 179 52 52 50 -1 30bd389788464287cee22ccff54c330a4b715de5 | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
125 53: 9853 0 133 204 52 53 51 52 a6f39e595b2b54f56304470269a936ead77f5725 | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
126 54: 9986 0 156 182 54 54 52 -1 fd4f2c98995beb051070630c272a9be87bef617d | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
127 | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
128 Excerpt from bundle (nodeid, p1, p2, cs): | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
129 f1db8610da62a3e0beb8d360556ee1fd6eb9885e 26e3eeaa39623de552b45ee1f55c14f36460f220 0000000000000000000000000000000000000000 f1db8610da62a3e0beb8d360556ee1fd6eb9885e; patches:4 | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
130 9429c7bd1920fab164a9d2b621d38d57bcb49ae0 f1db8610da62a3e0beb8d360556ee1fd6eb9885e 0000000000000000000000000000000000000000 9429c7bd1920fab164a9d2b621d38d57bcb49ae0; patches:3 | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
131 > 30bd389788464287cee22ccff54c330a4b715de5 f1db8610da62a3e0beb8d360556ee1fd6eb9885e 0000000000000000000000000000000000000000 30bd389788464287cee22ccff54c330a4b715de5; patches:3 | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
132 a6f39e595b2b54f56304470269a936ead77f5725 9429c7bd1920fab164a9d2b621d38d57bcb49ae0 30bd389788464287cee22ccff54c330a4b715de5 a6f39e595b2b54f56304470269a936ead77f5725; patches:3 | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
133 fd4f2c98995beb051070630c272a9be87bef617d 30bd389788464287cee22ccff54c330a4b715de5 0000000000000000000000000000000000000000 fd4f2c98995beb051070630c272a9be87bef617d; patches:3 | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
134 | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
135 To recreate 30bd..e5, one have to take content of 9429..e0, not its p1 f1db..5e | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
136 */ | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
137 public boolean element(GroupElement ge) { | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
138 emptyChangelog = false; | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
139 HgChangelog changelog = hgRepo.getChangelog(); | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
140 try { | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
141 if (prevRevContent == null) { | 
| 
274
 
9fb50c04f03c
Use Nodeid.isNull check instead of NULL.equals
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
186 
diff
changeset
 | 
142 if (ge.firstParent().isNull() && ge.secondParent().isNull()) { | 
| 
169
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
143 prevRevContent = new ByteArrayDataAccess(new byte[0]); | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
144 } else { | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
145 final Nodeid base = ge.firstParent(); | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
146 if (!changelog.isKnown(base) /*only first parent, that's Bundle contract*/) { | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
147 throw new IllegalStateException(String.format("Revision %s needs a parent %s, which is missing in the supplied repo %s", ge.node().shortNotation(), base.shortNotation(), hgRepo.toString())); | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
148 } | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
149 ByteArrayChannel bac = new ByteArrayChannel(); | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
150 changelog.rawContent(base, bac); // FIXME get DataAccess directly, to avoid | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
151 // extra byte[] (inside ByteArrayChannel) duplication just for the sake of subsequent ByteArrayDataChannel wrap. | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
152 prevRevContent = new ByteArrayDataAccess(bac.toArray()); | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
153 } | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
154 } | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
155 // | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
156 byte[] csetContent = ge.apply(prevRevContent); | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
157 dh = dh.sha1(ge.firstParent(), ge.secondParent(), csetContent); // XXX ge may give me access to byte[] content of nodeid directly, perhaps, I don't need DH to be friend of Nodeid? | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
158 if (!ge.node().equalsTo(dh.asBinary())) { | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
159 throw new IllegalStateException("Integrity check failed on " + bundleFile + ", node:" + ge.node()); | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
160 } | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
161 ByteArrayDataAccess csetDataAccess = new ByteArrayDataAccess(csetContent); | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
162 RawChangeset cs = RawChangeset.parse(csetDataAccess); | 
| 
182
 
f26ffe04ced0
Refactor HgBundle to dispatch changes found through callback
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
170 
diff
changeset
 | 
163 inspector.next(revisionIndex++, ge.node(), cs); | 
| 
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: 
169 
diff
changeset
 | 
164 prevRevContent.done(); | 
| 
169
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
165 prevRevContent = csetDataAccess.reset(); | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
166 } catch (CancelledException ex) { | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
167 return false; | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
168 } catch (Exception ex) { | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
169 throw new HgBadStateException(ex); // FIXME | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
170 } | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
171 return true; | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
172 } | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
173 | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
174 public void manifestStart() {} | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
175 public void manifestEnd() {} | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
176 public void fileStart(String name) {} | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
177 public void fileEnd(String name) {} | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
178 | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
179 }; | 
| 
182
 
f26ffe04ced0
Refactor HgBundle to dispatch changes found through callback
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
170 
diff
changeset
 | 
180 inspectChangelog(bundleInsp); | 
| 
169
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
181 } | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
182 | 
| 
295
 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
274 
diff
changeset
 | 
183 public void dump() throws HgException { | 
| 
169
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
184 Dump dump = new Dump(); | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
185 inspectAll(dump); | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
186 System.out.println("Total files:" + dump.names.size()); | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
187 for (String s : dump.names) { | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
188 System.out.println(s); | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
189 } | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
190 } | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
191 | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
192 // callback to minimize amount of Strings and Nodeids instantiated | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
193 public interface Inspector { | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
194 void changelogStart(); | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
195 | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
196 void changelogEnd(); | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
197 | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
198 void manifestStart(); | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
199 | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
200 void manifestEnd(); | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
201 | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
202 void fileStart(String name); | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
203 | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
204 void fileEnd(String name); | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
205 | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
206 /** | 
| 
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: 
169 
diff
changeset
 | 
207 * XXX desperately need exceptions here | 
| 
 
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: 
169 
diff
changeset
 | 
208 * @param element data element, instance might be reused, don't keep a reference to it or its raw data | 
| 
169
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
209 * @return <code>true</code> to continue | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
210 */ | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
211 boolean element(GroupElement element); | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
212 } | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
213 | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
214 public static class Dump implements Inspector { | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
215 public final LinkedList<String> names = new LinkedList<String>(); | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
216 | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
217 public void changelogStart() { | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
218 System.out.println("Changelog group"); | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
219 } | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
220 | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
221 public void changelogEnd() { | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
222 } | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
223 | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
224 public void manifestStart() { | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
225 System.out.println("Manifest group"); | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
226 } | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
227 | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
228 public void manifestEnd() { | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
229 } | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
230 | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
231 public void fileStart(String name) { | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
232 names.add(name); | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
233 System.out.println(name); | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
234 } | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
235 | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
236 public void fileEnd(String name) { | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
237 } | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
238 | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
239 public boolean element(GroupElement ge) { | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
240 try { | 
| 
329
 
694ebabb5cb3
Refactor revlog patch mechanism, towards patch merging
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
241 System.out.printf(" %s %s %s %s; patches:%d\n", ge.node(), ge.firstParent(), ge.secondParent(), ge.cset(), ge.patch().count()); | 
| 
169
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
242 } catch (Exception ex) { | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
243 ex.printStackTrace(); // FIXME | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
244 } | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
245 return true; | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
246 } | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
247 } | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
248 | 
| 
295
 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
274 
diff
changeset
 | 
249 public void inspectChangelog(Inspector inspector) throws HgInvalidFileException { | 
| 
169
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
250 if (inspector == null) { | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
251 throw new IllegalArgumentException(); | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
252 } | 
| 
295
 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
274 
diff
changeset
 | 
253 DataAccess da = null; | 
| 
169
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
254 try { | 
| 
295
 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
274 
diff
changeset
 | 
255 da = getDataStream(); | 
| 
182
 
f26ffe04ced0
Refactor HgBundle to dispatch changes found through callback
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
170 
diff
changeset
 | 
256 internalInspectChangelog(da, inspector); | 
| 
295
 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
274 
diff
changeset
 | 
257 } catch (IOException ex) { | 
| 
 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
274 
diff
changeset
 | 
258 throw new HgInvalidFileException("Bundle.inspectChangelog failed", ex, bundleFile); | 
| 
37
 
e45e75e22523
Parse changesets from bundle's changelog group. Refactor Revlog to provide access to revision's raw content
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
36 
diff
changeset
 | 
259 } finally { | 
| 
295
 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
274 
diff
changeset
 | 
260 if (da != null) { | 
| 
 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
274 
diff
changeset
 | 
261 da.done(); | 
| 
 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
274 
diff
changeset
 | 
262 } | 
| 
37
 
e45e75e22523
Parse changesets from bundle's changelog group. Refactor Revlog to provide access to revision's raw content
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
36 
diff
changeset
 | 
263 } | 
| 
 
e45e75e22523
Parse changesets from bundle's changelog group. Refactor Revlog to provide access to revision's raw content
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
36 
diff
changeset
 | 
264 } | 
| 
 
e45e75e22523
Parse changesets from bundle's changelog group. Refactor Revlog to provide access to revision's raw content
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
36 
diff
changeset
 | 
265 | 
| 
295
 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
274 
diff
changeset
 | 
266 public void inspectManifest(Inspector inspector) throws HgInvalidFileException { | 
| 
169
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
267 if (inspector == null) { | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
268 throw new IllegalArgumentException(); | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
269 } | 
| 
295
 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
274 
diff
changeset
 | 
270 DataAccess da = null; | 
| 
36
 
205f9b59b400
Strip parsing logic out from console frontend
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
271 try { | 
| 
295
 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
274 
diff
changeset
 | 
272 da = getDataStream(); | 
| 
169
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
273 if (da.isEmpty()) { | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
274 return; | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
275 } | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
276 skipGroup(da); // changelog | 
| 
182
 
f26ffe04ced0
Refactor HgBundle to dispatch changes found through callback
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
170 
diff
changeset
 | 
277 internalInspectManifest(da, inspector); | 
| 
295
 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
274 
diff
changeset
 | 
278 } catch (IOException ex) { | 
| 
 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
274 
diff
changeset
 | 
279 throw new HgInvalidFileException("Bundle.inspectManifest failed", ex, bundleFile); | 
| 
36
 
205f9b59b400
Strip parsing logic out from console frontend
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
280 } finally { | 
| 
295
 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
274 
diff
changeset
 | 
281 if (da != null) { | 
| 
 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
274 
diff
changeset
 | 
282 da.done(); | 
| 
 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
274 
diff
changeset
 | 
283 } | 
| 
36
 
205f9b59b400
Strip parsing logic out from console frontend
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
284 } | 
| 
 
205f9b59b400
Strip parsing logic out from console frontend
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
285 } | 
| 
 
205f9b59b400
Strip parsing logic out from console frontend
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
286 | 
| 
295
 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
274 
diff
changeset
 | 
287 public void inspectFiles(Inspector inspector) throws HgInvalidFileException { | 
| 
169
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
288 if (inspector == null) { | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
289 throw new IllegalArgumentException(); | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
290 } | 
| 
295
 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
274 
diff
changeset
 | 
291 DataAccess da = null; | 
| 
169
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
292 try { | 
| 
295
 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
274 
diff
changeset
 | 
293 da = getDataStream(); | 
| 
182
 
f26ffe04ced0
Refactor HgBundle to dispatch changes found through callback
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
170 
diff
changeset
 | 
294 if (da.isEmpty()) { | 
| 
 
f26ffe04ced0
Refactor HgBundle to dispatch changes found through callback
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
170 
diff
changeset
 | 
295 return; | 
| 
169
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
296 } | 
| 
182
 
f26ffe04ced0
Refactor HgBundle to dispatch changes found through callback
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
170 
diff
changeset
 | 
297 skipGroup(da); // changelog | 
| 
 
f26ffe04ced0
Refactor HgBundle to dispatch changes found through callback
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
170 
diff
changeset
 | 
298 if (da.isEmpty()) { | 
| 
 
f26ffe04ced0
Refactor HgBundle to dispatch changes found through callback
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
170 
diff
changeset
 | 
299 return; | 
| 
169
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
300 } | 
| 
182
 
f26ffe04ced0
Refactor HgBundle to dispatch changes found through callback
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
170 
diff
changeset
 | 
301 skipGroup(da); // manifest | 
| 
 
f26ffe04ced0
Refactor HgBundle to dispatch changes found through callback
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
170 
diff
changeset
 | 
302 internalInspectFiles(da, inspector); | 
| 
295
 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
274 
diff
changeset
 | 
303 } catch (IOException ex) { | 
| 
 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
274 
diff
changeset
 | 
304 throw new HgInvalidFileException("Bundle.inspectFiles failed", ex, bundleFile); | 
| 
169
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
305 } finally { | 
| 
295
 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
274 
diff
changeset
 | 
306 if (da != null) { | 
| 
 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
274 
diff
changeset
 | 
307 da.done(); | 
| 
 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
274 
diff
changeset
 | 
308 } | 
| 
169
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
309 } | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
310 } | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
311 | 
| 
295
 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
274 
diff
changeset
 | 
312 public void inspectAll(Inspector inspector) throws HgInvalidFileException { | 
| 
169
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
313 if (inspector == null) { | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
314 throw new IllegalArgumentException(); | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
315 } | 
| 
295
 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
274 
diff
changeset
 | 
316 DataAccess da = null; | 
| 
169
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
317 try { | 
| 
295
 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
274 
diff
changeset
 | 
318 da = getDataStream(); | 
| 
182
 
f26ffe04ced0
Refactor HgBundle to dispatch changes found through callback
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
170 
diff
changeset
 | 
319 internalInspectChangelog(da, inspector); | 
| 
 
f26ffe04ced0
Refactor HgBundle to dispatch changes found through callback
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
170 
diff
changeset
 | 
320 internalInspectManifest(da, inspector); | 
| 
 
f26ffe04ced0
Refactor HgBundle to dispatch changes found through callback
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
170 
diff
changeset
 | 
321 internalInspectFiles(da, inspector); | 
| 
295
 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
274 
diff
changeset
 | 
322 } catch (IOException ex) { | 
| 
 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
274 
diff
changeset
 | 
323 throw new HgInvalidFileException("Bundle.inspectAll failed", ex, bundleFile); | 
| 
169
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
324 } finally { | 
| 
295
 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
274 
diff
changeset
 | 
325 if (da != null) { | 
| 
 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
274 
diff
changeset
 | 
326 da.done(); | 
| 
 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
274 
diff
changeset
 | 
327 } | 
| 
169
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
328 } | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
329 } | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
330 | 
| 
182
 
f26ffe04ced0
Refactor HgBundle to dispatch changes found through callback
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
170 
diff
changeset
 | 
331 private void internalInspectChangelog(DataAccess da, Inspector inspector) throws IOException { | 
| 
 
f26ffe04ced0
Refactor HgBundle to dispatch changes found through callback
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
170 
diff
changeset
 | 
332 if (da.isEmpty()) { | 
| 
 
f26ffe04ced0
Refactor HgBundle to dispatch changes found through callback
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
170 
diff
changeset
 | 
333 return; | 
| 
 
f26ffe04ced0
Refactor HgBundle to dispatch changes found through callback
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
170 
diff
changeset
 | 
334 } | 
| 
 
f26ffe04ced0
Refactor HgBundle to dispatch changes found through callback
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
170 
diff
changeset
 | 
335 inspector.changelogStart(); | 
| 
 
f26ffe04ced0
Refactor HgBundle to dispatch changes found through callback
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
170 
diff
changeset
 | 
336 readGroup(da, inspector); | 
| 
 
f26ffe04ced0
Refactor HgBundle to dispatch changes found through callback
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
170 
diff
changeset
 | 
337 inspector.changelogEnd(); | 
| 
 
f26ffe04ced0
Refactor HgBundle to dispatch changes found through callback
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
170 
diff
changeset
 | 
338 } | 
| 
 
f26ffe04ced0
Refactor HgBundle to dispatch changes found through callback
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
170 
diff
changeset
 | 
339 | 
| 
 
f26ffe04ced0
Refactor HgBundle to dispatch changes found through callback
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
170 
diff
changeset
 | 
340 private void internalInspectManifest(DataAccess da, Inspector inspector) throws IOException { | 
| 
 
f26ffe04ced0
Refactor HgBundle to dispatch changes found through callback
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
170 
diff
changeset
 | 
341 if (da.isEmpty()) { | 
| 
 
f26ffe04ced0
Refactor HgBundle to dispatch changes found through callback
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
170 
diff
changeset
 | 
342 return; | 
| 
 
f26ffe04ced0
Refactor HgBundle to dispatch changes found through callback
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
170 
diff
changeset
 | 
343 } | 
| 
 
f26ffe04ced0
Refactor HgBundle to dispatch changes found through callback
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
170 
diff
changeset
 | 
344 inspector.manifestStart(); | 
| 
 
f26ffe04ced0
Refactor HgBundle to dispatch changes found through callback
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
170 
diff
changeset
 | 
345 readGroup(da, inspector); | 
| 
 
f26ffe04ced0
Refactor HgBundle to dispatch changes found through callback
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
170 
diff
changeset
 | 
346 inspector.manifestEnd(); | 
| 
 
f26ffe04ced0
Refactor HgBundle to dispatch changes found through callback
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
170 
diff
changeset
 | 
347 } | 
| 
 
f26ffe04ced0
Refactor HgBundle to dispatch changes found through callback
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
170 
diff
changeset
 | 
348 | 
| 
 
f26ffe04ced0
Refactor HgBundle to dispatch changes found through callback
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
170 
diff
changeset
 | 
349 private void internalInspectFiles(DataAccess da, Inspector inspector) throws IOException { | 
| 
 
f26ffe04ced0
Refactor HgBundle to dispatch changes found through callback
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
170 
diff
changeset
 | 
350 while (!da.isEmpty()) { | 
| 
 
f26ffe04ced0
Refactor HgBundle to dispatch changes found through callback
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
170 
diff
changeset
 | 
351 int fnameLen = da.readInt(); | 
| 
 
f26ffe04ced0
Refactor HgBundle to dispatch changes found through callback
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
170 
diff
changeset
 | 
352 if (fnameLen <= 4) { | 
| 
 
f26ffe04ced0
Refactor HgBundle to dispatch changes found through callback
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
170 
diff
changeset
 | 
353 break; // null chunk, the last one. | 
| 
 
f26ffe04ced0
Refactor HgBundle to dispatch changes found through callback
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
170 
diff
changeset
 | 
354 } | 
| 
 
f26ffe04ced0
Refactor HgBundle to dispatch changes found through callback
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
170 
diff
changeset
 | 
355 byte[] fnameBuf = new byte[fnameLen - 4]; | 
| 
 
f26ffe04ced0
Refactor HgBundle to dispatch changes found through callback
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
170 
diff
changeset
 | 
356 da.readBytes(fnameBuf, 0, fnameBuf.length); | 
| 
 
f26ffe04ced0
Refactor HgBundle to dispatch changes found through callback
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
170 
diff
changeset
 | 
357 String name = new String(fnameBuf); | 
| 
 
f26ffe04ced0
Refactor HgBundle to dispatch changes found through callback
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
170 
diff
changeset
 | 
358 inspector.fileStart(name); | 
| 
 
f26ffe04ced0
Refactor HgBundle to dispatch changes found through callback
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
170 
diff
changeset
 | 
359 readGroup(da, inspector); | 
| 
 
f26ffe04ced0
Refactor HgBundle to dispatch changes found through callback
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
170 
diff
changeset
 | 
360 inspector.fileEnd(name); | 
| 
 
f26ffe04ced0
Refactor HgBundle to dispatch changes found through callback
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
170 
diff
changeset
 | 
361 } | 
| 
 
f26ffe04ced0
Refactor HgBundle to dispatch changes found through callback
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
170 
diff
changeset
 | 
362 } | 
| 
 
f26ffe04ced0
Refactor HgBundle to dispatch changes found through callback
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
170 
diff
changeset
 | 
363 | 
| 
169
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
364 private static void readGroup(DataAccess da, Inspector inspector) throws IOException { | 
| 
36
 
205f9b59b400
Strip parsing logic out from console frontend
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
365 int len = da.readInt(); | 
| 
169
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
366 boolean good2go = true; | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
367 while (len > 4 && !da.isEmpty() && good2go) { | 
| 
36
 
205f9b59b400
Strip parsing logic out from console frontend
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
368 byte[] nb = new byte[80]; | 
| 
 
205f9b59b400
Strip parsing logic out from console frontend
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
369 da.readBytes(nb, 0, 80); | 
| 
169
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
370 int dataLength = len - 84 /* length field + 4 nodeids */; | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
371 byte[] data = new byte[dataLength]; | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
372 da.readBytes(data, 0, dataLength); | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
373 DataAccess slice = new ByteArrayDataAccess(data); // XXX in fact, may pass a slicing DataAccess. | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
374 // Just need to make sure that we seek to proper location afterwards (where next GroupElement starts), | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
375 // regardless whether that slice has read it or not. | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
376 GroupElement ge = new GroupElement(nb, slice); | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
377 good2go = inspector.element(ge); | 
| 
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: 
169 
diff
changeset
 | 
378 slice.done(); // BADA doesn't implement done(), but it could (e.g. free array) | 
| 
 
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: 
169 
diff
changeset
 | 
379 /// and we'd better tell it we are not going to use it any more. However, it's important to ensure Inspector | 
| 
 
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: 
169 
diff
changeset
 | 
380 // implementations out there do not retain GroupElement.rawData() | 
| 
36
 
205f9b59b400
Strip parsing logic out from console frontend
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
381 len = da.isEmpty() ? 0 : da.readInt(); | 
| 
 
205f9b59b400
Strip parsing logic out from console frontend
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
382 } | 
| 
169
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
383 // need to skip up to group end if inspector told he don't want to continue with the group, | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
384 // because outer code may try to read next group immediately as we return back. | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
385 while (len > 4 && !da.isEmpty()) { | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
386 da.skip(len - 4 /* length field */); | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
387 len = da.isEmpty() ? 0 : da.readInt(); | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
388 } | 
| 
36
 
205f9b59b400
Strip parsing logic out from console frontend
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
389 } | 
| 
 
205f9b59b400
Strip parsing logic out from console frontend
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
390 | 
| 
169
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
391 private static void skipGroup(DataAccess da) throws IOException { | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
392 int len = da.readInt(); | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
393 while (len > 4 && !da.isEmpty()) { | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
394 da.skip(len - 4); // sizeof(int) | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
395 len = da.isEmpty() ? 0 : da.readInt(); | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
396 } | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
397 } | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
398 | 
| 
329
 
694ebabb5cb3
Refactor revlog patch mechanism, towards patch merging
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
399 // FIXME GroupElement exposes some internal API!!! (DataAccess) | 
| 
169
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
400 public static class GroupElement { | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
401 private final byte[] header; // byte[80] takes 120 bytes, 4 Nodeids - 192 | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
402 private final DataAccess dataAccess; | 
| 
329
 
694ebabb5cb3
Refactor revlog patch mechanism, towards patch merging
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
403 private Patch patches; | 
| 
169
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
404 | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
405 GroupElement(byte[] fourNodeids, DataAccess rawDataAccess) { | 
| 
36
 
205f9b59b400
Strip parsing logic out from console frontend
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
406 assert fourNodeids != null && fourNodeids.length == 80; | 
| 
 
205f9b59b400
Strip parsing logic out from console frontend
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
407 header = fourNodeids; | 
| 
169
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
408 dataAccess = rawDataAccess; | 
| 
36
 
205f9b59b400
Strip parsing logic out from console frontend
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
409 } | 
| 
169
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
410 | 
| 
274
 
9fb50c04f03c
Use Nodeid.isNull check instead of NULL.equals
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
186 
diff
changeset
 | 
411 // non-null | 
| 
36
 
205f9b59b400
Strip parsing logic out from console frontend
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
412 public Nodeid node() { | 
| 
 
205f9b59b400
Strip parsing logic out from console frontend
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
413 return Nodeid.fromBinary(header, 0); | 
| 
 
205f9b59b400
Strip parsing logic out from console frontend
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
414 } | 
| 
169
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
415 | 
| 
274
 
9fb50c04f03c
Use Nodeid.isNull check instead of NULL.equals
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
186 
diff
changeset
 | 
416 // non-null | 
| 
36
 
205f9b59b400
Strip parsing logic out from console frontend
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
417 public Nodeid firstParent() { | 
| 
 
205f9b59b400
Strip parsing logic out from console frontend
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
418 return Nodeid.fromBinary(header, 20); | 
| 
 
205f9b59b400
Strip parsing logic out from console frontend
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
419 } | 
| 
169
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
420 | 
| 
274
 
9fb50c04f03c
Use Nodeid.isNull check instead of NULL.equals
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
186 
diff
changeset
 | 
421 // non-null | 
| 
36
 
205f9b59b400
Strip parsing logic out from console frontend
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
422 public Nodeid secondParent() { | 
| 
 
205f9b59b400
Strip parsing logic out from console frontend
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
423 return Nodeid.fromBinary(header, 40); | 
| 
 
205f9b59b400
Strip parsing logic out from console frontend
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
424 } | 
| 
169
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
425 | 
| 
274
 
9fb50c04f03c
Use Nodeid.isNull check instead of NULL.equals
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
186 
diff
changeset
 | 
426 // non-null | 
| 
37
 
e45e75e22523
Parse changesets from bundle's changelog group. Refactor Revlog to provide access to revision's raw content
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
36 
diff
changeset
 | 
427 public Nodeid cset() { // cs seems to be changeset | 
| 
36
 
205f9b59b400
Strip parsing logic out from console frontend
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
428 return Nodeid.fromBinary(header, 60); | 
| 
 
205f9b59b400
Strip parsing logic out from console frontend
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
429 } | 
| 
169
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
430 | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
431 public DataAccess rawData() { | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
432 return dataAccess; | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
433 } | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
434 | 
| 
329
 
694ebabb5cb3
Refactor revlog patch mechanism, towards patch merging
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
435 /*package-local*/ Patch patch() throws IOException { | 
| 
169
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
436 if (patches == null) { | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
437 dataAccess.reset(); | 
| 
329
 
694ebabb5cb3
Refactor revlog patch mechanism, towards patch merging
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
438 patches = new Patch(); | 
| 
 
694ebabb5cb3
Refactor revlog patch mechanism, towards patch merging
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
439 patches.read(dataAccess); | 
| 
169
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
440 } | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
441 return patches; | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
442 } | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
443 | 
| 
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
444 public byte[] apply(DataAccess baseContent) throws IOException { | 
| 
329
 
694ebabb5cb3
Refactor revlog patch mechanism, towards patch merging
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
295 
diff
changeset
 | 
445 return patch().apply(baseContent, -1); | 
| 
169
 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
157 
diff
changeset
 | 
446 } | 
| 
36
 
205f9b59b400
Strip parsing logic out from console frontend
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
447 } | 
| 
 
205f9b59b400
Strip parsing logic out from console frontend
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
448 } | 
