Mercurial > jhg
annotate src/org/tmatesoft/hg/repo/HgManifest.java @ 425:48f993aa2f41
FIXMEs: exceptions, javadoc
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> | 
|---|---|
| date | Wed, 28 Mar 2012 18:39:29 +0200 | 
| parents | 6437d261048a | 
| children | 063b0663495a | 
| rev | line source | 
|---|---|
| 13 
df8c67f3006a
Basic manifest parsing to analyze what's in there
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
2diff
changeset | 1 /* | 
| 390 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 2 * Copyright (c) 2010-2012 TMate Software Ltd | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
28diff
changeset | 3 * | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
28diff
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: 
28diff
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: 
28diff
changeset | 6 * the Free Software Foundation; version 2 of the License. | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
28diff
changeset | 7 * | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
28diff
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: 
28diff
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: 
28diff
changeset | 10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
28diff
changeset | 11 * GNU General Public License for more details. | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
28diff
changeset | 12 * | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
28diff
changeset | 13 * For information on how to redistribute this software under | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
28diff
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: 
77diff
changeset | 15 * contact TMate Software at support@hg4j.com | 
| 2 
08db726a0fb7
Shaping out low-level Hg structures
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 16 */ | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
28diff
changeset | 17 package org.tmatesoft.hg.repo; | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
28diff
changeset | 18 | 
| 390 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 19 import static org.tmatesoft.hg.core.Nodeid.NULL; | 
| 423 
9c9c442b5f2e
Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
421diff
changeset | 20 import static org.tmatesoft.hg.repo.HgRepository.*; | 
| 218 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 21 | 
| 232 
b7347daa50e3
Allow to cat a file with changeset revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
222diff
changeset | 22 import java.io.ByteArrayOutputStream; | 
| 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 | 23 import java.io.IOException; | 
| 218 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 24 import java.util.ArrayList; | 
| 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 25 import java.util.Arrays; | 
| 326 
d42a45a2c9d6
Alternative tag collection approach for a file history
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
324diff
changeset | 26 import java.util.HashMap; | 
| 
d42a45a2c9d6
Alternative tag collection approach for a file history
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
324diff
changeset | 27 import java.util.Map; | 
| 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 | 28 | 
| 417 
ccd7d25e5aea
New and better name for HgFileInformer - HgChangesetFileSneaker. Explain (comments) ties between HgManifest, HgDataFile, HgChangesetFileSneaker and reasons for method placement
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
415diff
changeset | 29 import org.tmatesoft.hg.core.HgChangesetFileSneaker; | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
28diff
changeset | 30 import org.tmatesoft.hg.core.Nodeid; | 
| 423 
9c9c442b5f2e
Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
421diff
changeset | 31 import org.tmatesoft.hg.internal.Callback; | 
| 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 | 32 import org.tmatesoft.hg.internal.DataAccess; | 
| 266 
0a2f445de774
Improve manifest parsing: reduce number of arrays instantiated for Nodeid
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
264diff
changeset | 33 import org.tmatesoft.hg.internal.DigestHelper; | 
| 320 
678e326fd27c
Issue 15: Exception accessing oddly named file from history
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
313diff
changeset | 34 import org.tmatesoft.hg.internal.EncodingHelper; | 
| 232 
b7347daa50e3
Allow to cat a file with changeset revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
222diff
changeset | 35 import org.tmatesoft.hg.internal.Experimental; | 
| 415 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 36 import org.tmatesoft.hg.internal.IntMap; | 
| 312 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
304diff
changeset | 37 import org.tmatesoft.hg.internal.IterateControlMediator; | 
| 218 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 38 import org.tmatesoft.hg.internal.Lifecycle; | 
| 304 
85b8efde5586
Use memory-friendly set implementation to canonicalize filenames and nodeids
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
300diff
changeset | 39 import org.tmatesoft.hg.internal.Pool2; | 
| 77 
c677e1593919
Moved RevlogStream implementation into .internal
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
74diff
changeset | 40 import org.tmatesoft.hg.internal.RevlogStream; | 
| 312 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
304diff
changeset | 41 import org.tmatesoft.hg.util.CancelSupport; | 
| 232 
b7347daa50e3
Allow to cat a file with changeset revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
222diff
changeset | 42 import org.tmatesoft.hg.util.Path; | 
| 312 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
304diff
changeset | 43 import org.tmatesoft.hg.util.ProgressSupport; | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
28diff
changeset | 44 | 
| 2 
08db726a0fb7
Shaping out low-level Hg structures
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 45 | 
| 
08db726a0fb7
Shaping out low-level Hg structures
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 46 /** | 
| 425 
48f993aa2f41
FIXMEs: exceptions, javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
424diff
changeset | 47 * Representation of Mercurial manifest file (list of file names and their revisions in a particular changeset) | 
| 
48f993aa2f41
FIXMEs: exceptions, javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
424diff
changeset | 48 * | 
| 
48f993aa2f41
FIXMEs: exceptions, javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
424diff
changeset | 49 * @see http://mercurial.selenic.com/wiki/Manifest | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
28diff
changeset | 50 * @author Artem Tikhomirov | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
28diff
changeset | 51 * @author TMate Software Ltd. | 
| 2 
08db726a0fb7
Shaping out low-level Hg structures
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 52 */ | 
| 
08db726a0fb7
Shaping out low-level Hg structures
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 53 public class HgManifest extends Revlog { | 
| 218 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 54 private RevisionMapper revisionMap; | 
| 412 
63c5a9d7ca3f
Follow-up for Issue 29: unify path translation for manifest and dirstate
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 55 private EncodingHelper encodingHelper; | 
| 285 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 56 | 
| 415 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 57 /** | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 58 * File flags recorded in manifest | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 59 */ | 
| 285 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 60 public enum Flags { | 
| 415 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 61 /** | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 62 * Executable bit set | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 63 */ | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 64 Exec, | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 65 /** | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 66 * Symbolic link | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 67 */ | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 68 Link, | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 69 /** | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 70 * Regular file | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 71 */ | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 72 RegularFile; | 
| 285 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 73 | 
| 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 74 static Flags parse(String flags) { | 
| 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 75 if ("x".equalsIgnoreCase(flags)) { | 
| 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 76 return Exec; | 
| 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 77 } | 
| 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 78 if ("l".equalsIgnoreCase(flags)) { | 
| 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 79 return Link; | 
| 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 80 } | 
| 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 81 if (flags == null) { | 
| 415 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 82 return RegularFile; | 
| 285 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 83 } | 
| 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 84 throw new IllegalStateException(flags); | 
| 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 85 } | 
| 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 86 | 
| 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 87 static Flags parse(byte[] data, int start, int length) { | 
| 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 88 if (length == 0) { | 
| 415 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 89 return RegularFile; | 
| 285 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 90 } | 
| 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 91 if (length == 1) { | 
| 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 92 if (data[start] == 'x') { | 
| 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 93 return Exec; | 
| 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 94 } | 
| 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 95 if (data[start] == 'l') { | 
| 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 96 return Link; | 
| 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 97 } | 
| 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 98 // FALL THROUGH | 
| 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 99 } | 
| 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 100 throw new IllegalStateException(new String(data, start, length)); | 
| 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 101 } | 
| 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 102 | 
| 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 103 String nativeString() { | 
| 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 104 if (this == Exec) { | 
| 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 105 return "x"; | 
| 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 106 } | 
| 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 107 if (this == Link) { | 
| 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 108 return "l"; | 
| 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 109 } | 
| 415 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 110 if (this == RegularFile) { | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 111 return ""; | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 112 } | 
| 285 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 113 throw new IllegalStateException(toString()); | 
| 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 114 } | 
| 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 115 } | 
| 2 
08db726a0fb7
Shaping out low-level Hg structures
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 116 | 
| 412 
63c5a9d7ca3f
Follow-up for Issue 29: unify path translation for manifest and dirstate
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 117 /*package-local*/ HgManifest(HgRepository hgRepo, RevlogStream content, EncodingHelper eh) { | 
| 21 
e929cecae4e1
Refactor to move revlog content to base class
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
20diff
changeset | 118 super(hgRepo, content); | 
| 412 
63c5a9d7ca3f
Follow-up for Issue 29: unify path translation for manifest and dirstate
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 119 encodingHelper = eh; | 
| 13 
df8c67f3006a
Basic manifest parsing to analyze what's in there
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
2diff
changeset | 120 } | 
| 
df8c67f3006a
Basic manifest parsing to analyze what's in there
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
2diff
changeset | 121 | 
| 218 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 122 /** | 
| 390 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 123 * Walks manifest revisions that correspond to specified range of changesets. The order in which manifest versions get reported | 
| 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 124 * to the inspector corresponds to physical order of manifest revisions, not that of changesets (with few exceptions as noted below). | 
| 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 125 * That is, for cset-manifest revision pairs: | 
| 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 126 * <pre> | 
| 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 127 * 3 8 | 
| 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 128 * 4 7 | 
| 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 129 * 5 9 | 
| 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 130 * </pre> | 
| 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 131 * call <code>walk(3,5, insp)</code> would yield (4,7), (3,8) and (5,9) to the inspector; | 
| 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 132 * different order of arguments, <code>walk(5, 3, insp)</code>, makes no difference. | 
| 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 133 * | 
| 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 134 * <p>Physical layout of mercurial files (revlog) doesn't impose any restriction on whether manifest and changeset revisions shall go | 
| 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 135 * incrementally, nor it mandates presence of manifest version for a changeset. Thus, there might be changesets that record {@link Nodeid#NULL} | 
| 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 136 * as corresponding manifest revision. This situation is deemed exceptional now and what would <code>inspector</code> get depends on whether | 
| 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 137 * <code>start</code> or <code>end</code> arguments point to such changeset, or such changeset happen to be somewhere inside the range | 
| 423 
9c9c442b5f2e
Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
421diff
changeset | 138 * <code>[start..end]</code>. Implementation does it best to report empty manifests | 
| 
9c9c442b5f2e
Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
421diff
changeset | 139 * (<code>Inspector.begin(HgRepository.NO_REVISION, NULL, csetRevIndex);</code> | 
| 
9c9c442b5f2e
Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
421diff
changeset | 140 * followed immediately by <code>Inspector.end(HgRepository.NO_REVISION)</code> | 
| 
9c9c442b5f2e
Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
421diff
changeset | 141 * when <code>start</code> and/or <code>end</code> point to changeset with no associated | 
| 390 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 142 * manifest revision. However, if changeset-manifest revision pairs look like: | 
| 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 143 * <pre> | 
| 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 144 * 3 8 | 
| 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 145 * 4 -1 (cset records null revision for manifest) | 
| 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 146 * 5 9 | 
| 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 147 * </pre> | 
| 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 148 * call <code>walk(3,5, insp)</code> would yield only (3,8) and (5,9) to the inspector, without additional empty | 
| 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 149 * <code>Inspector.begin(); Inspector.end()</code> call pair. | 
| 218 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 150 * | 
| 423 
9c9c442b5f2e
Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
421diff
changeset | 151 * @see HgRepository#NO_REVISION | 
| 218 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 152 * @param start changelog (not manifest!) revision to begin with | 
| 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 153 * @param end changelog (not manifest!) revision to stop, inclusive. | 
| 390 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 154 * @param inspector manifest revision visitor, can't be <code>null</code> | 
| 423 
9c9c442b5f2e
Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
421diff
changeset | 155 * @throws HgRuntimeException subclass thereof to indicate issues with the library. <em>Runtime exception</em> | 
| 
9c9c442b5f2e
Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
421diff
changeset | 156 * @throws IllegalArgumentException if inspector callback is <code>null</code> | 
| 218 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 157 */ | 
| 423 
9c9c442b5f2e
Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
421diff
changeset | 158 public void walk(int start, int end, final Inspector inspector) throws HgRuntimeException, IllegalArgumentException { | 
| 196 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
157diff
changeset | 159 if (inspector == null) { | 
| 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
157diff
changeset | 160 throw new IllegalArgumentException(); | 
| 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
157diff
changeset | 161 } | 
| 390 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 162 final int csetFirst = start <= end ? start : end, csetLast = start > end ? start : end; | 
| 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 163 int manifestFirst, manifestLast, i = 0; | 
| 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 164 do { | 
| 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 165 manifestFirst = fromChangelog(csetFirst+i); | 
| 403 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 166 if (manifestFirst == BAD_REVISION) { | 
| 423 
9c9c442b5f2e
Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
421diff
changeset | 167 inspector.begin(NO_REVISION, NULL, csetFirst+i); | 
| 
9c9c442b5f2e
Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
421diff
changeset | 168 inspector.end(NO_REVISION); | 
| 390 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 169 } | 
| 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 170 i++; | 
| 403 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 171 } while (manifestFirst == BAD_REVISION && csetFirst+i <= csetLast); | 
| 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 172 if (manifestFirst == BAD_REVISION) { | 
| 390 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 173 getRepo().getContext().getLog().info(getClass(), "None of changesets [%d..%d] have associated manifest revision", csetFirst, csetLast); | 
| 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 174 // we ran through all revisions in [start..end] and none of them had manifest. | 
| 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 175 // we reported that to inspector and proceeding is done now. | 
| 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 176 return; | 
| 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 177 } | 
| 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 178 i = 0; | 
| 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 179 do { | 
| 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 180 manifestLast = fromChangelog(csetLast-i); | 
| 403 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 181 if (manifestLast == BAD_REVISION) { | 
| 423 
9c9c442b5f2e
Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
421diff
changeset | 182 inspector.begin(NO_REVISION, NULL, csetLast-i); | 
| 
9c9c442b5f2e
Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
421diff
changeset | 183 inspector.end(NO_REVISION); | 
| 390 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 184 } | 
| 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 185 i++; | 
| 403 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 186 } while (manifestLast == BAD_REVISION && csetLast-i >= csetFirst); | 
| 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 187 if (manifestLast == BAD_REVISION) { | 
| 423 
9c9c442b5f2e
Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
421diff
changeset | 188 // hmm, manifestFirst != BAD_REVISION here, hence there's i from [csetFirst..csetLast] for which manifest entry exists, | 
| 
9c9c442b5f2e
Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
421diff
changeset | 189 // and thus it's impossible to run into manifestLast == BAD_REVISION. Nevertheless, never hurts to check. | 
| 
9c9c442b5f2e
Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
421diff
changeset | 190 throw new HgInvalidStateException(String.format("Manifest %d-%d(!) for cset range [%d..%d] ", manifestFirst, manifestLast, csetFirst, csetLast)); | 
| 390 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 191 } | 
| 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 192 if (manifestLast < manifestFirst) { | 
| 300 
650b45d290b1
Share range check code
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
285diff
changeset | 193 // there are tool-constructed repositories that got order of changeset revisions completely different from that of manifest | 
| 390 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 194 int x = manifestLast; | 
| 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 195 manifestLast = manifestFirst; | 
| 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 196 manifestFirst = x; | 
| 300 
650b45d290b1
Share range check code
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
285diff
changeset | 197 } | 
| 412 
63c5a9d7ca3f
Follow-up for Issue 29: unify path translation for manifest and dirstate
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 198 content.iterate(manifestFirst, manifestLast, true, new ManifestParser(inspector, encodingHelper)); | 
| 19 
40532cdc92fc
Inspector (visitor) for manifest
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
16diff
changeset | 199 } | 
| 218 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 200 | 
| 254 
a620f0663a37
Collect tags for a file - improve performance of 'sparse' manifest reads
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
232diff
changeset | 201 /** | 
| 390 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 202 * "Sparse" iteration of the manifest, more effective than accessing revisions one by one. | 
| 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 203 * <p> Inspector is invoked for each changeset revision supplied, even when there's no manifest | 
| 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 204 * revision associated with a changeset (@see {@link #walk(int, int, Inspector)} for more details when it happens). Order inspector | 
| 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 205 * gets invoked doesn't resemble order of changeset revisions supplied, manifest revisions are reported in the order they appear | 
| 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 206 * in manifest revlog (with exception of changesets with missing manifest that may be reported in any order). | 
| 254 
a620f0663a37
Collect tags for a file - improve performance of 'sparse' manifest reads
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
232diff
changeset | 207 * | 
| 390 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 208 * @param inspector manifest revision visitor, can't be <code>null</code> | 
| 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 209 * @param revisionIndexes local indexes of changesets to visit, non-<code>null</code> | 
| 423 
9c9c442b5f2e
Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
421diff
changeset | 210 * @throws HgRuntimeException subclass thereof to indicate issues with the library. <em>Runtime exception</em> | 
| 
9c9c442b5f2e
Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
421diff
changeset | 211 * @throws InvalidArgumentException if supplied arguments are <code>null</code>s | 
| 254 
a620f0663a37
Collect tags for a file - improve performance of 'sparse' manifest reads
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
232diff
changeset | 212 */ | 
| 423 
9c9c442b5f2e
Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
421diff
changeset | 213 public void walk(final Inspector inspector, int... revisionIndexes) throws HgRuntimeException, IllegalArgumentException { | 
| 367 
2fadf8695f8a
Use 'revision index' instead of the vague 'local revision number' concept in the API
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
366diff
changeset | 214 if (inspector == null || revisionIndexes == null) { | 
| 254 
a620f0663a37
Collect tags for a file - improve performance of 'sparse' manifest reads
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
232diff
changeset | 215 throw new IllegalArgumentException(); | 
| 
a620f0663a37
Collect tags for a file - improve performance of 'sparse' manifest reads
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
232diff
changeset | 216 } | 
| 390 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 217 int[] manifestRevs = toManifestRevisionIndexes(revisionIndexes, inspector); | 
| 412 
63c5a9d7ca3f
Follow-up for Issue 29: unify path translation for manifest and dirstate
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 218 content.iterate(manifestRevs, true, new ManifestParser(inspector, encodingHelper)); | 
| 254 
a620f0663a37
Collect tags for a file - improve performance of 'sparse' manifest reads
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
232diff
changeset | 219 } | 
| 
a620f0663a37
Collect tags for a file - improve performance of 'sparse' manifest reads
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
232diff
changeset | 220 | 
| 390 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 221 // | 
| 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 222 /** | 
| 403 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 223 * Tells manifest revision number that corresponds to the given changeset. May return {@link HgRepository#BAD_REVISION} | 
| 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 224 * if changeset has no associated manifest (cset records NULL nodeid for manifest). | 
| 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 225 * @return manifest revision index, non-negative, or {@link HgRepository#BAD_REVISION}. | 
| 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 226 * @throws HgInvalidRevisionException if method argument specifies non-existent revision index | 
| 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 227 * @throws HgInvalidControlFileException if access to revlog index/data entry failed | 
| 390 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 228 */ | 
| 403 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 229 /*package-local*/ int fromChangelog(int changesetRevisionIndex) throws HgInvalidRevisionException, HgInvalidControlFileException { | 
| 368 
8107b95f4280
Update Javadoc with 'revision index'
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
367diff
changeset | 230 if (HgInternals.wrongRevisionIndex(changesetRevisionIndex)) { | 
| 425 
48f993aa2f41
FIXMEs: exceptions, javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
424diff
changeset | 231 throw new HgInvalidRevisionException(changesetRevisionIndex); | 
| 218 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 232 } | 
| 368 
8107b95f4280
Update Javadoc with 'revision index'
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
367diff
changeset | 233 if (changesetRevisionIndex == HgRepository.WORKING_COPY || changesetRevisionIndex == HgRepository.BAD_REVISION) { | 
| 425 
48f993aa2f41
FIXMEs: exceptions, javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
424diff
changeset | 234 throw new HgInvalidRevisionException("Can't use constants like WORKING_COPY or BAD_REVISION", null, changesetRevisionIndex); | 
| 257 
f39fb6b3cc76
Handle revision constants correctly
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
254diff
changeset | 235 } | 
| 
f39fb6b3cc76
Handle revision constants correctly
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
254diff
changeset | 236 // revisionNumber == TIP is processed by RevisionMapper | 
| 218 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 237 if (revisionMap == null) { | 
| 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 238 revisionMap = new RevisionMapper(getRepo()); | 
| 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 239 content.iterate(0, TIP, false, revisionMap); | 
| 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 240 } | 
| 368 
8107b95f4280
Update Javadoc with 'revision index'
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
367diff
changeset | 241 return revisionMap.at(changesetRevisionIndex); | 
| 218 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 242 } | 
| 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 243 | 
| 232 
b7347daa50e3
Allow to cat a file with changeset revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
222diff
changeset | 244 /** | 
| 
b7347daa50e3
Allow to cat a file with changeset revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
222diff
changeset | 245 * Extracts file revision as it was known at the time of given changeset. | 
| 417 
ccd7d25e5aea
New and better name for HgFileInformer - HgChangesetFileSneaker. Explain (comments) ties between HgManifest, HgDataFile, HgChangesetFileSneaker and reasons for method placement
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
415diff
changeset | 246 * For more thorough details about file at specific changeset, use {@link HgChangesetFileSneaker}. | 
| 232 
b7347daa50e3
Allow to cat a file with changeset revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
222diff
changeset | 247 * | 
| 417 
ccd7d25e5aea
New and better name for HgFileInformer - HgChangesetFileSneaker. Explain (comments) ties between HgManifest, HgDataFile, HgChangesetFileSneaker and reasons for method placement
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
415diff
changeset | 248 * @see HgChangesetFileSneaker | 
| 367 
2fadf8695f8a
Use 'revision index' instead of the vague 'local revision number' concept in the API
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
366diff
changeset | 249 * @param changelogRevisionIndex local changeset index | 
| 232 
b7347daa50e3
Allow to cat a file with changeset revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
222diff
changeset | 250 * @param file path to file in question | 
| 
b7347daa50e3
Allow to cat a file with changeset revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
222diff
changeset | 251 * @return file revision or <code>null</code> if manifest at specified revision doesn't list such file | 
| 425 
48f993aa2f41
FIXMEs: exceptions, javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
424diff
changeset | 252 * @throws HgRuntimeException subclass thereof to indicate issues with the library. <em>Runtime exception</em> | 
| 232 
b7347daa50e3
Allow to cat a file with changeset revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
222diff
changeset | 253 */ | 
| 403 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 254 public Nodeid getFileRevision(int changelogRevisionIndex, final Path file) throws HgInvalidRevisionException, HgInvalidControlFileException { | 
| 417 
ccd7d25e5aea
New and better name for HgFileInformer - HgChangesetFileSneaker. Explain (comments) ties between HgManifest, HgDataFile, HgChangesetFileSneaker and reasons for method placement
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
415diff
changeset | 255 // there's no need for HgDataFile to own this method, or get a delegate | 
| 
ccd7d25e5aea
New and better name for HgFileInformer - HgChangesetFileSneaker. Explain (comments) ties between HgManifest, HgDataFile, HgChangesetFileSneaker and reasons for method placement
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
415diff
changeset | 256 // as most of HgDataFile API is using file revision indexes, and there's easy step from file revision index to | 
| 
ccd7d25e5aea
New and better name for HgFileInformer - HgChangesetFileSneaker. Explain (comments) ties between HgManifest, HgDataFile, HgChangesetFileSneaker and reasons for method placement
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
415diff
changeset | 257 // both file revision and changeset revision index. But there's no easy way to go from changesetRevisionIndex to | 
| 
ccd7d25e5aea
New and better name for HgFileInformer - HgChangesetFileSneaker. Explain (comments) ties between HgManifest, HgDataFile, HgChangesetFileSneaker and reasons for method placement
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
415diff
changeset | 258 // file revision (the task this method solves), exept for HgFileInformer | 
| 
ccd7d25e5aea
New and better name for HgFileInformer - HgChangesetFileSneaker. Explain (comments) ties between HgManifest, HgDataFile, HgChangesetFileSneaker and reasons for method placement
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
415diff
changeset | 259 // I feel methods dealing with changeset indexes shall be more exposed in HgChangelog and HgManifest API. | 
| 367 
2fadf8695f8a
Use 'revision index' instead of the vague 'local revision number' concept in the API
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
366diff
changeset | 260 return getFileRevisions(file, changelogRevisionIndex).get(changelogRevisionIndex); | 
| 326 
d42a45a2c9d6
Alternative tag collection approach for a file history
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
324diff
changeset | 261 } | 
| 417 
ccd7d25e5aea
New and better name for HgFileInformer - HgChangesetFileSneaker. Explain (comments) ties between HgManifest, HgDataFile, HgChangesetFileSneaker and reasons for method placement
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
415diff
changeset | 262 | 
| 
ccd7d25e5aea
New and better name for HgFileInformer - HgChangesetFileSneaker. Explain (comments) ties between HgManifest, HgDataFile, HgChangesetFileSneaker and reasons for method placement
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
415diff
changeset | 263 // XXX package-local or better API | 
| 
ccd7d25e5aea
New and better name for HgFileInformer - HgChangesetFileSneaker. Explain (comments) ties between HgManifest, HgDataFile, HgChangesetFileSneaker and reasons for method placement
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
415diff
changeset | 264 @Experimental(reason="Map as return value isn't that good") | 
| 403 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 265 public Map<Integer, Nodeid> getFileRevisions(final Path file, int... changelogRevisionIndexes) throws HgInvalidRevisionException, HgInvalidControlFileException { | 
| 417 
ccd7d25e5aea
New and better name for HgFileInformer - HgChangesetFileSneaker. Explain (comments) ties between HgManifest, HgDataFile, HgChangesetFileSneaker and reasons for method placement
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
415diff
changeset | 266 // FIXME in fact, walk(Inspectr, path, int[]) might be better alternative than get() | 
| 403 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 267 // TODO need tests | 
| 390 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 268 int[] manifestRevisionIndexes = toManifestRevisionIndexes(changelogRevisionIndexes, null); | 
| 415 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 269 IntMap<Nodeid> resMap = new IntMap<Nodeid>(changelogRevisionIndexes.length); | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 270 content.iterate(manifestRevisionIndexes, true, new FileLookupInspector(encodingHelper, file, resMap, null)); | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 271 // IntMap to HashMap, | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 272 HashMap<Integer,Nodeid> rv = new HashMap<Integer, Nodeid>(); | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 273 resMap.fill(rv); | 
| 326 
d42a45a2c9d6
Alternative tag collection approach for a file history
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
324diff
changeset | 274 return rv; | 
| 232 
b7347daa50e3
Allow to cat a file with changeset revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
222diff
changeset | 275 } | 
| 326 
d42a45a2c9d6
Alternative tag collection approach for a file history
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
324diff
changeset | 276 | 
| 415 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 277 /** | 
| 417 
ccd7d25e5aea
New and better name for HgFileInformer - HgChangesetFileSneaker. Explain (comments) ties between HgManifest, HgDataFile, HgChangesetFileSneaker and reasons for method placement
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
415diff
changeset | 278 * Extract file {@link Flags flags} as they were recorded in appropriate manifest version. | 
| 
ccd7d25e5aea
New and better name for HgFileInformer - HgChangesetFileSneaker. Explain (comments) ties between HgManifest, HgDataFile, HgChangesetFileSneaker and reasons for method placement
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
415diff
changeset | 279 * | 
| 
ccd7d25e5aea
New and better name for HgFileInformer - HgChangesetFileSneaker. Explain (comments) ties between HgManifest, HgDataFile, HgChangesetFileSneaker and reasons for method placement
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
415diff
changeset | 280 * @see HgDataFile#getFlags(int) | 
| 415 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 281 * @param changesetRevIndex changeset revision index | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 282 * @param file path to look up | 
| 417 
ccd7d25e5aea
New and better name for HgFileInformer - HgChangesetFileSneaker. Explain (comments) ties between HgManifest, HgDataFile, HgChangesetFileSneaker and reasons for method placement
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
415diff
changeset | 283 * @return one of predefined enum values, or <code>null</code> if file was not known in the specified revision | 
| 425 
48f993aa2f41
FIXMEs: exceptions, javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
424diff
changeset | 284 * @throws HgRuntimeException subclass thereof to indicate issues with the library. <em>Runtime exception</em> | 
| 415 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 285 */ | 
| 417 
ccd7d25e5aea
New and better name for HgFileInformer - HgChangesetFileSneaker. Explain (comments) ties between HgManifest, HgDataFile, HgChangesetFileSneaker and reasons for method placement
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
415diff
changeset | 286 public Flags getFileFlags(int changesetRevIndex, Path file) throws HgInvalidRevisionException, HgInvalidControlFileException { | 
| 415 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 287 int manifestRevIdx = fromChangelog(changesetRevIndex); | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 288 IntMap<Flags> resMap = new IntMap<Flags>(2); | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 289 content.iterate(manifestRevIdx, manifestRevIdx, true, new FileLookupInspector(encodingHelper, file, null, resMap)); | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 290 return resMap.get(changesetRevIndex); | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 291 } | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 292 | 
| 326 
d42a45a2c9d6
Alternative tag collection approach for a file history
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
324diff
changeset | 293 | 
| 390 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 294 /** | 
| 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 295 * @param changelogRevisionIndexes non-null | 
| 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 296 * @param inspector may be null if reporting of missing manifests is not needed | 
| 403 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 297 * @throws HgInvalidRevisionException if arguments specify non-existent revision index | 
| 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 298 * @throws IllegalArgumentException if any index argument is not a revision index | 
| 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 299 * @throws HgInvalidControlFileException if access to revlog index/data entry failed | 
| 390 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 300 */ | 
| 403 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 301 private int[] toManifestRevisionIndexes(int[] changelogRevisionIndexes, Inspector inspector) throws HgInvalidRevisionException, HgInvalidControlFileException { | 
| 368 
8107b95f4280
Update Javadoc with 'revision index'
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
367diff
changeset | 302 int[] manifestRevs = new int[changelogRevisionIndexes.length]; | 
| 326 
d42a45a2c9d6
Alternative tag collection approach for a file history
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
324diff
changeset | 303 boolean needsSort = false; | 
| 390 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 304 int j = 0; | 
| 367 
2fadf8695f8a
Use 'revision index' instead of the vague 'local revision number' concept in the API
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
366diff
changeset | 305 for (int i = 0; i < changelogRevisionIndexes.length; i++) { | 
| 
2fadf8695f8a
Use 'revision index' instead of the vague 'local revision number' concept in the API
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
366diff
changeset | 306 final int manifestRevisionIndex = fromChangelog(changelogRevisionIndexes[i]); | 
| 403 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 307 if (manifestRevisionIndex == BAD_REVISION) { | 
| 390 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 308 if (inspector != null) { | 
| 423 
9c9c442b5f2e
Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
421diff
changeset | 309 inspector.begin(NO_REVISION, NULL, changelogRevisionIndexes[i]); | 
| 
9c9c442b5f2e
Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
421diff
changeset | 310 inspector.end(NO_REVISION); | 
| 390 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 311 } | 
| 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 312 // othrwise, ignore changeset without manifest | 
| 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 313 } else { | 
| 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 314 manifestRevs[j] = manifestRevisionIndex; | 
| 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 315 if (j > 0 && manifestRevs[j-1] > manifestRevisionIndex) { | 
| 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 316 needsSort = true; | 
| 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 317 } | 
| 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 318 j++; | 
| 326 
d42a45a2c9d6
Alternative tag collection approach for a file history
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
324diff
changeset | 319 } | 
| 
d42a45a2c9d6
Alternative tag collection approach for a file history
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
324diff
changeset | 320 } | 
| 
d42a45a2c9d6
Alternative tag collection approach for a file history
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
324diff
changeset | 321 if (needsSort) { | 
| 390 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 322 Arrays.sort(manifestRevs, 0, j); | 
| 326 
d42a45a2c9d6
Alternative tag collection approach for a file history
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
324diff
changeset | 323 } | 
| 390 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 324 if (j == manifestRevs.length) { | 
| 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 325 return manifestRevs; | 
| 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 326 } else { | 
| 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 327 int[] rv = new int[j]; | 
| 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 328 //Arrays.copyOfRange | 
| 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 329 System.arraycopy(manifestRevs, 0, rv, 0, j); | 
| 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 330 return rv; | 
| 
6952d9ce97f1
Handle missing manifest revision case (brought up with Issue 23), do my best to report missing manifests when walking few manifest revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
385diff
changeset | 331 } | 
| 326 
d42a45a2c9d6
Alternative tag collection approach for a file history
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
324diff
changeset | 332 } | 
| 
d42a45a2c9d6
Alternative tag collection approach for a file history
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
324diff
changeset | 333 | 
| 423 
9c9c442b5f2e
Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
421diff
changeset | 334 @Callback | 
| 19 
40532cdc92fc
Inspector (visitor) for manifest
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
16diff
changeset | 335 public interface Inspector { | 
| 222 
373e07cd3991
Due to discrepancy in manifest and changelor indexes, wrong manifest revisions got cached and compared
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
220diff
changeset | 336 boolean begin(int mainfestRevision, Nodeid nid, int changelogRevision); | 
| 285 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 337 /** | 
| 415 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 338 * @param nid file revision | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 339 * @param fname file name | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 340 * @param flags one of {@link HgManifest.Flags} constants, not <code>null</code> | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 341 * @return <code>true</code> to continue iteration, <code>false</code> to stop | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 342 */ | 
| 285 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 343 boolean next(Nodeid nid, Path fname, Flags flags); | 
| 424 
6437d261048a
Deprecated code removed
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
423diff
changeset | 344 boolean end(int manifestRevision); | 
| 267 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 345 } | 
| 424 
6437d261048a
Deprecated code removed
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
423diff
changeset | 346 | 
| 268 
c5980f287cc4
Use StringProxy when parsing manifest to minimize number of useless conversions and array instances
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
267diff
changeset | 347 /** | 
| 
c5980f287cc4
Use StringProxy when parsing manifest to minimize number of useless conversions and array instances
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
267diff
changeset | 348 * When Pool uses Strings directly, | 
| 
c5980f287cc4
Use StringProxy when parsing manifest to minimize number of useless conversions and array instances
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
267diff
changeset | 349 * ManifestParser creates new String instance with new char[] value, and does byte->char conversion. | 
| 
c5980f287cc4
Use StringProxy when parsing manifest to minimize number of useless conversions and array instances
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
267diff
changeset | 350 * For cpython repo, walk(0..10k), there are over 16 million filenames, of them only 3020 unique. | 
| 
c5980f287cc4
Use StringProxy when parsing manifest to minimize number of useless conversions and array instances
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
267diff
changeset | 351 * This means there are 15.9 million useless char[] instances and byte->char conversions | 
| 
c5980f287cc4
Use StringProxy when parsing manifest to minimize number of useless conversions and array instances
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
267diff
changeset | 352 * | 
| 285 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 353 * When String (Path) is wrapped into {@link PathProxy}, there's extra overhead of byte[] representation | 
| 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 354 * of the String, but these are only for unique Strings (Paths) (3020 in the example above). Besides, I save | 
| 268 
c5980f287cc4
Use StringProxy when parsing manifest to minimize number of useless conversions and array instances
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
267diff
changeset | 355 * useless char[] and byte->char conversions. | 
| 
c5980f287cc4
Use StringProxy when parsing manifest to minimize number of useless conversions and array instances
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
267diff
changeset | 356 */ | 
| 285 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 357 private static class PathProxy { | 
| 267 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 358 private byte[] data; | 
| 268 
c5980f287cc4
Use StringProxy when parsing manifest to minimize number of useless conversions and array instances
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
267diff
changeset | 359 private int start; | 
| 
c5980f287cc4
Use StringProxy when parsing manifest to minimize number of useless conversions and array instances
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
267diff
changeset | 360 private final int hash, length; | 
| 285 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 361 private Path result; | 
| 412 
63c5a9d7ca3f
Follow-up for Issue 29: unify path translation for manifest and dirstate
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 362 private final EncodingHelper encHelper; | 
| 267 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 363 | 
| 412 
63c5a9d7ca3f
Follow-up for Issue 29: unify path translation for manifest and dirstate
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 364 public PathProxy(byte[] data, int start, int length, EncodingHelper eh) { | 
| 267 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 365 this.data = data; | 
| 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 366 this.start = start; | 
| 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 367 this.length = length; | 
| 412 
63c5a9d7ca3f
Follow-up for Issue 29: unify path translation for manifest and dirstate
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 368 this.encHelper = eh; | 
| 267 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 369 | 
| 268 
c5980f287cc4
Use StringProxy when parsing manifest to minimize number of useless conversions and array instances
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
267diff
changeset | 370 // copy from String.hashCode(). In fact, not necessarily match result of String(data).hashCode | 
| 
c5980f287cc4
Use StringProxy when parsing manifest to minimize number of useless conversions and array instances
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
267diff
changeset | 371 // just need some nice algorithm here | 
| 267 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 372 int h = 0; | 
| 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 373 byte[] d = data; | 
| 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 374 for (int i = 0, off = start, len = length; i < len; i++) { | 
| 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 375 h = 31 * h + d[off++]; | 
| 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 376 } | 
| 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 377 hash = h; | 
| 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 378 } | 
| 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 379 | 
| 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 380 @Override | 
| 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 381 public boolean equals(Object obj) { | 
| 285 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 382 if (false == obj instanceof PathProxy) { | 
| 267 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 383 return false; | 
| 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 384 } | 
| 285 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 385 PathProxy o = (PathProxy) obj; | 
| 267 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 386 if (o.result != null && result != null) { | 
| 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 387 return result.equals(o.result); | 
| 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 388 } | 
| 268 
c5980f287cc4
Use StringProxy when parsing manifest to minimize number of useless conversions and array instances
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
267diff
changeset | 389 if (o.length != length || o.hash != hash) { | 
| 267 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 390 return false; | 
| 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 391 } | 
| 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 392 for (int i = 0, x = o.start, y = start; i < length; i++) { | 
| 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 393 if (o.data[x++] != data[y++]) { | 
| 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 394 return false; | 
| 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 395 } | 
| 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 396 } | 
| 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 397 return true; | 
| 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 398 } | 
| 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 399 @Override | 
| 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 400 public int hashCode() { | 
| 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 401 return hash; | 
| 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 402 } | 
| 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 403 | 
| 285 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 404 public Path freeze() { | 
| 267 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 405 if (result == null) { | 
| 412 
63c5a9d7ca3f
Follow-up for Issue 29: unify path translation for manifest and dirstate
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 406 result = Path.create(encHelper.fromManifest(data, start, length)); | 
| 268 
c5980f287cc4
Use StringProxy when parsing manifest to minimize number of useless conversions and array instances
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
267diff
changeset | 407 // release reference to bigger data array, make a copy of relevant part only | 
| 285 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 408 // use original bytes, not those from String above to avoid cache misses due to different encodings | 
| 268 
c5980f287cc4
Use StringProxy when parsing manifest to minimize number of useless conversions and array instances
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
267diff
changeset | 409 byte[] d = new byte[length]; | 
| 
c5980f287cc4
Use StringProxy when parsing manifest to minimize number of useless conversions and array instances
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
267diff
changeset | 410 System.arraycopy(data, start, d, 0, length); | 
| 
c5980f287cc4
Use StringProxy when parsing manifest to minimize number of useless conversions and array instances
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
267diff
changeset | 411 data = d; | 
| 
c5980f287cc4
Use StringProxy when parsing manifest to minimize number of useless conversions and array instances
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
267diff
changeset | 412 start = 0; | 
| 267 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 413 } | 
| 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 414 return result; | 
| 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 415 } | 
| 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 416 } | 
| 196 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
157diff
changeset | 417 | 
| 312 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
304diff
changeset | 418 private static class ManifestParser implements RevlogStream.Inspector, Lifecycle { | 
| 196 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
157diff
changeset | 419 private final Inspector inspector; | 
| 304 
85b8efde5586
Use memory-friendly set implementation to canonicalize filenames and nodeids
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
300diff
changeset | 420 private Pool2<Nodeid> nodeidPool, thisRevPool; | 
| 
85b8efde5586
Use memory-friendly set implementation to canonicalize filenames and nodeids
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
300diff
changeset | 421 private final Pool2<PathProxy> fnamePool; | 
| 266 
0a2f445de774
Improve manifest parsing: reduce number of arrays instantiated for Nodeid
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
264diff
changeset | 422 private byte[] nodeidLookupBuffer = new byte[20]; // get reassigned each time new Nodeid is added to pool | 
| 312 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
304diff
changeset | 423 private final ProgressSupport progressHelper; | 
| 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
304diff
changeset | 424 private IterateControlMediator iterateControl; | 
| 412 
63c5a9d7ca3f
Follow-up for Issue 29: unify path translation for manifest and dirstate
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 425 private final EncodingHelper encHelper; | 
| 262 
3dcd3dd90c77
Improve manifest parsing: decode bytes to chars once, minimize arraycopy on String instantiation, keep set of file revisions from previous manifest only
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
257diff
changeset | 426 | 
| 412 
63c5a9d7ca3f
Follow-up for Issue 29: unify path translation for manifest and dirstate
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 427 public ManifestParser(Inspector delegate, EncodingHelper eh) { | 
| 196 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
157diff
changeset | 428 assert delegate != null; | 
| 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
157diff
changeset | 429 inspector = delegate; | 
| 412 
63c5a9d7ca3f
Follow-up for Issue 29: unify path translation for manifest and dirstate
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 430 encHelper = eh; | 
| 304 
85b8efde5586
Use memory-friendly set implementation to canonicalize filenames and nodeids
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
300diff
changeset | 431 nodeidPool = new Pool2<Nodeid>(); | 
| 
85b8efde5586
Use memory-friendly set implementation to canonicalize filenames and nodeids
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
300diff
changeset | 432 fnamePool = new Pool2<PathProxy>(); | 
| 
85b8efde5586
Use memory-friendly set implementation to canonicalize filenames and nodeids
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
300diff
changeset | 433 thisRevPool = new Pool2<Nodeid>(); | 
| 312 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
304diff
changeset | 434 progressHelper = ProgressSupport.Factory.get(delegate); | 
| 196 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
157diff
changeset | 435 } | 
| 268 
c5980f287cc4
Use StringProxy when parsing manifest to minimize number of useless conversions and array instances
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
267diff
changeset | 436 | 
| 423 
9c9c442b5f2e
Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
421diff
changeset | 437 public void next(int revisionNumber, int actualLen, int baseRevision, int linkRevision, int parent1Revision, int parent2Revision, byte[] nodeid, DataAccess da) { | 
| 196 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
157diff
changeset | 438 try { | 
| 312 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
304diff
changeset | 439 if (!inspector.begin(revisionNumber, new Nodeid(nodeid, true), linkRevision)) { | 
| 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
304diff
changeset | 440 iterateControl.stop(); | 
| 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
304diff
changeset | 441 return; | 
| 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
304diff
changeset | 442 } | 
| 372 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 443 if (!da.isEmpty()) { | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 444 // although unlikely, manifest entry may be empty, when all files have been deleted from the repository | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 445 Path fname = null; | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 446 Flags flags = null; | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 447 Nodeid nid = null; | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 448 int i; | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 449 byte[] data = da.byteArray(); | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 450 for (i = 0; i < actualLen; i++) { | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 451 int x = i; | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 452 for( ; data[i] != '\n' && i < actualLen; i++) { | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 453 if (fname == null && data[i] == 0) { | 
| 412 
63c5a9d7ca3f
Follow-up for Issue 29: unify path translation for manifest and dirstate
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 454 PathProxy px = fnamePool.unify(new PathProxy(data, x, i - x, encHelper)); | 
| 372 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 455 // if (cached = fnamePool.unify(px))== px then cacheMiss, else cacheHit | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 456 // cpython 0..10k: hits: 15 989 152, misses: 3020 | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 457 fname = px.freeze(); | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 458 x = i+1; | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 459 } | 
| 196 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
157diff
changeset | 460 } | 
| 372 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 461 if (i < actualLen) { | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 462 assert data[i] == '\n'; | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 463 int nodeidLen = i - x < 40 ? i-x : 40; // if > 40, there are flags | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 464 DigestHelper.ascii2bin(data, x, nodeidLen, nodeidLookupBuffer); // ignore return value as it's unlikely to have NULL in manifest | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 465 nid = new Nodeid(nodeidLookupBuffer, false); // this Nodeid is for pool lookup only, mock object | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 466 Nodeid cached = nodeidPool.unify(nid); | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 467 if (cached == nid) { | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 468 // buffer now belongs to the cached nodeid | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 469 nodeidLookupBuffer = new byte[20]; | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 470 } else { | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 471 nid = cached; // use existing version, discard the lookup object | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 472 } // for cpython 0..10k, cache hits are 15 973 301, vs 18871 misses. | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 473 thisRevPool.record(nid); // memorize revision for the next iteration. | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 474 if (nodeidLen + x < i) { | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 475 // 'x' and 'l' for executable bits and symlinks? | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 476 // hg --debug manifest shows 644 for each regular file in my repo | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 477 // for cpython 0..10k, there are 4361062 flag checks, and there's only 1 unique flag | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 478 flags = Flags.parse(data, x + nodeidLen, i-x-nodeidLen); | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 479 } else { | 
| 415 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 480 flags = Flags.RegularFile; | 
| 372 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 481 } | 
| 424 
6437d261048a
Deprecated code removed
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
423diff
changeset | 482 boolean good2go = inspector.next(nid, fname, flags); | 
| 372 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 483 if (!good2go) { | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 484 iterateControl.stop(); | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 485 return; | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 486 } | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 487 } | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 488 nid = null; | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 489 fname = null; | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 490 flags = null; | 
| 196 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
157diff
changeset | 491 } | 
| 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
157diff
changeset | 492 } | 
| 312 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
304diff
changeset | 493 if (!inspector.end(revisionNumber)) { | 
| 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
304diff
changeset | 494 iterateControl.stop(); | 
| 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
304diff
changeset | 495 return; | 
| 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
304diff
changeset | 496 } | 
| 262 
3dcd3dd90c77
Improve manifest parsing: decode bytes to chars once, minimize arraycopy on String instantiation, keep set of file revisions from previous manifest only
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
257diff
changeset | 497 // | 
| 
3dcd3dd90c77
Improve manifest parsing: decode bytes to chars once, minimize arraycopy on String instantiation, keep set of file revisions from previous manifest only
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
257diff
changeset | 498 // keep only actual file revisions, found at this version | 
| 
3dcd3dd90c77
Improve manifest parsing: decode bytes to chars once, minimize arraycopy on String instantiation, keep set of file revisions from previous manifest only
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
257diff
changeset | 499 // (next manifest is likely to refer to most of them, although in specific cases | 
| 
3dcd3dd90c77
Improve manifest parsing: decode bytes to chars once, minimize arraycopy on String instantiation, keep set of file revisions from previous manifest only
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
257diff
changeset | 500 // like commit in another branch a lot may be useless) | 
| 
3dcd3dd90c77
Improve manifest parsing: decode bytes to chars once, minimize arraycopy on String instantiation, keep set of file revisions from previous manifest only
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
257diff
changeset | 501 nodeidPool.clear(); | 
| 304 
85b8efde5586
Use memory-friendly set implementation to canonicalize filenames and nodeids
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
300diff
changeset | 502 Pool2<Nodeid> t = nodeidPool; | 
| 262 
3dcd3dd90c77
Improve manifest parsing: decode bytes to chars once, minimize arraycopy on String instantiation, keep set of file revisions from previous manifest only
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
257diff
changeset | 503 nodeidPool = thisRevPool; | 
| 264 
6bb5e7ed051a
Optimize memory usage (reduce number of objects instantiated) when pooling file names and nodeids during manifest parsing
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
262diff
changeset | 504 thisRevPool = t; | 
| 313 
c1e3c18fd2f2
Test manifest cancellation
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
312diff
changeset | 505 iterateControl.checkCancelled(); | 
| 312 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
304diff
changeset | 506 progressHelper.worked(1); | 
| 196 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
157diff
changeset | 507 } catch (IOException ex) { | 
| 423 
9c9c442b5f2e
Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
421diff
changeset | 508 throw new HgInvalidControlFileException("Failed reading manifest", ex, null).setRevisionIndex(revisionNumber); | 
| 196 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
157diff
changeset | 509 } | 
| 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
157diff
changeset | 510 } | 
| 312 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
304diff
changeset | 511 | 
| 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
304diff
changeset | 512 public void start(int count, Callback callback, Object token) { | 
| 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
304diff
changeset | 513 CancelSupport cs = CancelSupport.Factory.get(inspector, null); | 
| 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
304diff
changeset | 514 iterateControl = new IterateControlMediator(cs, callback); | 
| 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
304diff
changeset | 515 progressHelper.start(count); | 
| 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
304diff
changeset | 516 } | 
| 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
304diff
changeset | 517 | 
| 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
304diff
changeset | 518 public void finish(Object token) { | 
| 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
304diff
changeset | 519 progressHelper.done(); | 
| 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
304diff
changeset | 520 } | 
| 196 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
157diff
changeset | 521 } | 
| 218 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 522 | 
| 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 523 private static class RevisionMapper implements RevlogStream.Inspector, Lifecycle { | 
| 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 524 | 
| 403 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 525 private final int changelogRevisionCount; | 
| 218 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 526 private int[] changelog2manifest; | 
| 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 527 private final HgRepository repo; | 
| 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 528 | 
| 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 529 public RevisionMapper(HgRepository hgRepo) { | 
| 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 530 repo = hgRepo; | 
| 403 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 531 changelogRevisionCount = repo.getChangelog().getRevisionCount(); | 
| 218 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 532 } | 
| 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 533 | 
| 403 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 534 /** | 
| 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 535 * Get index of manifest revision that corresponds to specified changeset | 
| 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 536 * @param changesetRevisionIndex non-negative index of changelog revision, or {@link HgRepository#TIP} | 
| 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 537 * @return index of manifest revision, or {@link HgRepository#BAD_REVISION} if changeset doesn't reference a valid manifest | 
| 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 538 * @throws HgInvalidRevisionException if method argument specifies non-existent revision index | 
| 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 539 */ | 
| 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 540 public int at(int changesetRevisionIndex) throws HgInvalidRevisionException { | 
| 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 541 if (changesetRevisionIndex == TIP) { | 
| 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 542 changesetRevisionIndex = changelogRevisionCount - 1; | 
| 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 543 } | 
| 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 544 if (changesetRevisionIndex >= changelogRevisionCount) { | 
| 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 545 throw new HgInvalidRevisionException(changesetRevisionIndex); | 
| 257 
f39fb6b3cc76
Handle revision constants correctly
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
254diff
changeset | 546 } | 
| 218 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 547 if (changelog2manifest != null) { | 
| 403 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 548 return changelog2manifest[changesetRevisionIndex]; | 
| 218 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 549 } | 
| 403 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 550 return changesetRevisionIndex; | 
| 218 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 551 } | 
| 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 552 | 
| 324 
283b294d1079
Explore alternatives to access file-changelog combined history
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
321diff
changeset | 553 // XXX likely can be replaced with Revlog.RevisionInspector | 
| 218 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 554 public void next(int revisionNumber, int actualLen, int baseRevision, int linkRevision, int parent1Revision, int parent2Revision, byte[] nodeid, DataAccess data) { | 
| 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 555 if (changelog2manifest != null) { | 
| 220 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
218diff
changeset | 556 // next assertion is not an error, rather assumption check, which is too development-related to be explicit exception - | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
218diff
changeset | 557 // I just wonder if there are manifests that have two entries pointing to single changeset. It seems unrealistic, though - | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
218diff
changeset | 558 // changeset records one and only one manifest nodeid | 
| 403 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 559 assert changelog2manifest[linkRevision] == BAD_REVISION : String.format("revision:%d, link:%d, already linked to revision:%d", revisionNumber, linkRevision, changelog2manifest[linkRevision]); | 
| 218 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 560 changelog2manifest[linkRevision] = revisionNumber; | 
| 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 561 } else { | 
| 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 562 if (revisionNumber != linkRevision) { | 
| 403 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 563 changelog2manifest = new int[changelogRevisionCount]; | 
| 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 564 Arrays.fill(changelog2manifest, BAD_REVISION); | 
| 218 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 565 for (int i = 0; i < revisionNumber; changelog2manifest[i] = i, i++) | 
| 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 566 ; | 
| 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 567 changelog2manifest[linkRevision] = revisionNumber; | 
| 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 568 } | 
| 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 569 } | 
| 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 570 } | 
| 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 571 | 
| 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 572 public void start(int count, Callback callback, Object token) { | 
| 403 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 573 if (count != changelogRevisionCount) { | 
| 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 574 assert count < changelogRevisionCount; // no idea what to do if manifest has more revisions than changelog | 
| 218 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 575 // the way how manifest may contain more revisions than changelog, as I can imagine, is a result of | 
| 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 576 // some kind of an import tool (e.g. from SVN or CVS), that creates manifest and changelog independently. | 
| 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 577 // Note, it's pure guess, I didn't see such repository yet (although the way manifest revisions | 
| 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 578 // in cpython repo are numbered makes me think aforementioned way) | 
| 403 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 579 changelog2manifest = new int[changelogRevisionCount]; | 
| 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 580 Arrays.fill(changelog2manifest, BAD_REVISION); | 
| 218 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 581 } | 
| 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 582 } | 
| 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 583 | 
| 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 584 public void finish(Object token) { | 
| 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 585 if (changelog2manifest == null) { | 
| 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 586 return; | 
| 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 587 } | 
| 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 588 // I assume there'd be not too many revisions we don't know manifest of | 
| 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 589 ArrayList<Integer> undefinedChangelogRevision = new ArrayList<Integer>(); | 
| 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 590 for (int i = 0; i < changelog2manifest.length; i++) { | 
| 403 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 591 if (changelog2manifest[i] == BAD_REVISION) { | 
| 218 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 592 undefinedChangelogRevision.add(i); | 
| 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 593 } | 
| 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 594 } | 
| 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 595 for (int u : undefinedChangelogRevision) { | 
| 423 
9c9c442b5f2e
Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
421diff
changeset | 596 Nodeid manifest = repo.getChangelog().range(u, u).get(0).manifest(); | 
| 
9c9c442b5f2e
Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
421diff
changeset | 597 // TODO calculate those missing effectively (e.g. cache and sort nodeids to speed lookup | 
| 
9c9c442b5f2e
Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
421diff
changeset | 598 // right away in the #next (may refactor ParentWalker's sequential and sorted into dedicated helper and reuse here) | 
| 
9c9c442b5f2e
Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
421diff
changeset | 599 if (manifest.isNull()) { | 
| 
9c9c442b5f2e
Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
421diff
changeset | 600 repo.getContext().getLog().warn(getClass(), "Changeset %d has no associated manifest entry", u); | 
| 
9c9c442b5f2e
Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
421diff
changeset | 601 // keep -1 in the changelog2manifest map. | 
| 
9c9c442b5f2e
Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
421diff
changeset | 602 } else { | 
| 
9c9c442b5f2e
Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
421diff
changeset | 603 changelog2manifest[u] = repo.getManifest().getRevisionIndex(manifest); | 
| 354 
5f9073eabf06
Propagate errors with exceptions up to a end client
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
326diff
changeset | 604 } | 
| 218 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 605 } | 
| 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 606 } | 
| 
047b1dec7a04
Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 607 } | 
| 415 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 608 | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 609 /** | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 610 * Look up specified file in possibly multiple manifest revisions, collect file revision and flags. | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 611 */ | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 612 private static class FileLookupInspector implements RevlogStream.Inspector { | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 613 | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 614 private final byte[] filenameAsBytes; | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 615 private final IntMap<Nodeid> csetIndex2FileRev; | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 616 private final IntMap<Flags> csetIndex2Flags; | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 617 | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 618 public FileLookupInspector(EncodingHelper eh, Path fileToLookUp, IntMap<Nodeid> csetIndex2FileRevMap, IntMap<Flags> csetIndex2FlagsMap) { | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 619 assert fileToLookUp != null; | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 620 // need at least one map for the inspector to make any sense | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 621 assert csetIndex2FileRevMap != null || csetIndex2FlagsMap != null; | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 622 csetIndex2FileRev = csetIndex2FileRevMap; | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 623 csetIndex2Flags = csetIndex2FlagsMap; | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 624 filenameAsBytes = eh.toManifest(fileToLookUp.toString()); | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 625 } | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 626 | 
| 423 
9c9c442b5f2e
Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
421diff
changeset | 627 public void next(int revisionNumber, int actualLen, int baseRevision, int linkRevision, int parent1Revision, int parent2Revision, byte[] nodeid, DataAccess data) { | 
| 415 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 628 ByteArrayOutputStream bos = new ByteArrayOutputStream(); | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 629 try { | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 630 byte b; | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 631 while (!data.isEmpty() && (b = data.readByte()) != '\n') { | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 632 if (b != 0) { | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 633 bos.write(b); | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 634 } else { | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 635 byte[] byteArray = bos.toByteArray(); | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 636 bos.reset(); | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 637 if (Arrays.equals(filenameAsBytes, byteArray)) { | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 638 if (csetIndex2FileRev != null) { | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 639 byte[] nid = new byte[40]; | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 640 data.readBytes(nid, 0, 40); | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 641 csetIndex2FileRev.put(linkRevision, Nodeid.fromAscii(nid, 0, 40)); | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 642 } else { | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 643 data.skip(40); | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 644 } | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 645 if (csetIndex2Flags != null) { | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 646 while (!data.isEmpty() && (b = data.readByte()) != '\n') { | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 647 bos.write(b); | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 648 } | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 649 Flags flags; | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 650 if (bos.size() == 0) { | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 651 flags = Flags.RegularFile; | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 652 } else { | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 653 flags = Flags.parse(bos.toByteArray(), 0, bos.size()); | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 654 } | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 655 csetIndex2Flags.put(linkRevision, flags); | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 656 } | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 657 break; | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 658 } else { | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 659 data.skip(40); | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 660 } | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 661 // else skip to the end of line | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 662 while (!data.isEmpty() && (b = data.readByte()) != '\n') | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 663 ; | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 664 } | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 665 } | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 666 } catch (IOException ex) { | 
| 423 
9c9c442b5f2e
Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
421diff
changeset | 667 throw new HgInvalidControlFileException("Failed reading manifest", ex, null); | 
| 415 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 668 } | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 669 } | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 670 } | 
| 2 
08db726a0fb7
Shaping out low-level Hg structures
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 671 } | 
