Mercurial > jhg
annotate src/org/tmatesoft/hg/repo/HgManifest.java @ 692:e970b333f284
Refactor HgLogCommand to utilize correct file.isCopy(int)
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> | 
|---|---|
| date | Sat, 03 Aug 2013 17:11:33 +0200 | 
| parents | 5d8798772cca | 
| children | 42b88709e41d | 
| rev | line source | 
|---|---|
| 13 
df8c67f3006a
Basic manifest parsing to analyze what's in there
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
2diff
changeset | 1 /* | 
| 537 
5a455624be4f
Update javadoc for HgManifest.Inspector and fix erroneous internal API
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
490diff
changeset | 2 * Copyright (c) 2010-2013 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.*; | 
| 456 
909306e412e2
Refactor LogFacility and SessionContext, better API for both
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
431diff
changeset | 21 import static org.tmatesoft.hg.util.LogFacility.Severity.Info; | 
| 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 | 22 | 
| 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.Arrays; | 
| 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 | 25 | 
| 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 | 26 import org.tmatesoft.hg.core.HgChangesetFileSneaker; | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
28diff
changeset | 27 import org.tmatesoft.hg.core.Nodeid; | 
| 574 
88afffd39899
Improve memory consumption of HgManifest#getFileRevision(): avoid extra byte[] instances
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
571diff
changeset | 28 import org.tmatesoft.hg.internal.ByteVector; | 
| 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 | 29 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 | 30 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 | 31 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 | 32 import org.tmatesoft.hg.internal.EncodingHelper; | 
| 574 
88afffd39899
Improve memory consumption of HgManifest#getFileRevision(): avoid extra byte[] instances
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
571diff
changeset | 33 import org.tmatesoft.hg.internal.IdentityPool; | 
| 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 | 34 import org.tmatesoft.hg.internal.IntMap; | 
| 597 
c895b5556937
Wrap manifest revision map completion into single file access
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
583diff
changeset | 35 import org.tmatesoft.hg.internal.IntVector; | 
| 312 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
304diff
changeset | 36 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 | 37 import org.tmatesoft.hg.internal.Lifecycle; | 
| 600 
46f29b73e51e
Utilize RevisionLookup to speed-up getRevisionIndex of both manifest and changelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
598diff
changeset | 38 import org.tmatesoft.hg.internal.RevisionLookup; | 
| 77 
c677e1593919
Moved RevlogStream implementation into .internal
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
74diff
changeset | 39 import org.tmatesoft.hg.internal.RevlogStream; | 
| 597 
c895b5556937
Wrap manifest revision map completion into single file access
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
583diff
changeset | 40 import org.tmatesoft.hg.repo.HgChangelog.RawChangeset; | 
| 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; | 
| 574 
88afffd39899
Improve memory consumption of HgManifest#getFileRevision(): avoid extra byte[] instances
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
571diff
changeset | 42 import org.tmatesoft.hg.util.LogFacility.Severity; | 
| 232 
b7347daa50e3
Allow to cat a file with changeset revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
222diff
changeset | 43 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 | 44 import org.tmatesoft.hg.util.ProgressSupport; | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
28diff
changeset | 45 | 
| 2 
08db726a0fb7
Shaping out low-level Hg structures
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 46 | 
| 
08db726a0fb7
Shaping out low-level Hg structures
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 47 /** | 
| 425 
48f993aa2f41
FIXMEs: exceptions, javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
424diff
changeset | 48 * 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 | 49 * | 
| 
48f993aa2f41
FIXMEs: exceptions, javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
424diff
changeset | 50 * @see http://mercurial.selenic.com/wiki/Manifest | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
28diff
changeset | 51 * @author Artem Tikhomirov | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
28diff
changeset | 52 * @author TMate Software Ltd. | 
| 2 
08db726a0fb7
Shaping out low-level Hg structures
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 53 */ | 
| 426 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 54 public final 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 | 55 private RevisionMapper revisionMap; | 
| 574 
88afffd39899
Improve memory consumption of HgManifest#getFileRevision(): avoid extra byte[] instances
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
571diff
changeset | 56 private final EncodingHelper encodingHelper; | 
| 
88afffd39899
Improve memory consumption of HgManifest#getFileRevision(): avoid extra byte[] instances
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
571diff
changeset | 57 private final Path.Source pathFactory; | 
| 607 
66f1cc23b906
Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
601diff
changeset | 58 private final RevlogStream.Observer revisionMapCleaner = new RevlogStream.Observer() { | 
| 
66f1cc23b906
Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
601diff
changeset | 59 public void reloaded(RevlogStream src) { | 
| 
66f1cc23b906
Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
601diff
changeset | 60 revisionMap = null; | 
| 
66f1cc23b906
Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
601diff
changeset | 61 // TODO RevlogDerivedCache<T> class, to wrap revisionMap and super.revisionLookup | 
| 
66f1cc23b906
Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
601diff
changeset | 62 // and their respective cleanup observers, or any other all-in-one alternative | 
| 
66f1cc23b906
Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
601diff
changeset | 63 // not to keep both field and it's cleaner | 
| 
66f1cc23b906
Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
601diff
changeset | 64 } | 
| 
66f1cc23b906
Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
601diff
changeset | 65 }; | 
| 285 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 66 | 
| 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 | 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 * 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 | 69 */ | 
| 285 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 70 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 | 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 * 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 | 73 */ | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 74 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 | 75 /** | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 76 * 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 | 77 */ | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 78 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 | 79 /** | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 80 * 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 | 81 */ | 
| 
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 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 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 | 85 if ("x".equalsIgnoreCase(flags)) { | 
| 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 86 return Exec; | 
| 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 87 } | 
| 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 88 if ("l".equalsIgnoreCase(flags)) { | 
| 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 89 return Link; | 
| 
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 (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 | 92 return RegularFile; | 
| 285 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 93 } | 
| 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 94 throw new IllegalStateException(flags); | 
| 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 95 } | 
| 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 96 | 
| 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 97 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 | 98 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 | 99 return RegularFile; | 
| 285 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 100 } | 
| 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 101 if (length == 1) { | 
| 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 102 if (data[start] == 'x') { | 
| 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 103 return Exec; | 
| 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 104 } | 
| 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 105 if (data[start] == 'l') { | 
| 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 106 return Link; | 
| 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 107 } | 
| 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 108 // FALL THROUGH | 
| 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 109 } | 
| 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 110 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 | 111 } | 
| 608 
e1b29756f901
Clean, organize and resolve some TODOs and FIXMEs: minor refactorings and comments
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
607diff
changeset | 112 | 
| 
e1b29756f901
Clean, organize and resolve some TODOs and FIXMEs: minor refactorings and comments
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
607diff
changeset | 113 static Flags parse(int dirstateFileMode) { | 
| 
e1b29756f901
Clean, organize and resolve some TODOs and FIXMEs: minor refactorings and comments
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
607diff
changeset | 114 // source/include/linux/stat.h | 
| 
e1b29756f901
Clean, organize and resolve some TODOs and FIXMEs: minor refactorings and comments
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
607diff
changeset | 115 final int S_IFLNK = 0120000, S_IXUSR = 00100; | 
| 
e1b29756f901
Clean, organize and resolve some TODOs and FIXMEs: minor refactorings and comments
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
607diff
changeset | 116 if ((dirstateFileMode & S_IFLNK) == S_IFLNK) { | 
| 
e1b29756f901
Clean, organize and resolve some TODOs and FIXMEs: minor refactorings and comments
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
607diff
changeset | 117 return Link; | 
| 
e1b29756f901
Clean, organize and resolve some TODOs and FIXMEs: minor refactorings and comments
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
607diff
changeset | 118 } | 
| 
e1b29756f901
Clean, organize and resolve some TODOs and FIXMEs: minor refactorings and comments
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
607diff
changeset | 119 if ((dirstateFileMode & S_IXUSR) == S_IXUSR) { | 
| 
e1b29756f901
Clean, organize and resolve some TODOs and FIXMEs: minor refactorings and comments
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
607diff
changeset | 120 return Exec; | 
| 
e1b29756f901
Clean, organize and resolve some TODOs and FIXMEs: minor refactorings and comments
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
607diff
changeset | 121 } | 
| 
e1b29756f901
Clean, organize and resolve some TODOs and FIXMEs: minor refactorings and comments
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
607diff
changeset | 122 return RegularFile; | 
| 
e1b29756f901
Clean, organize and resolve some TODOs and FIXMEs: minor refactorings and comments
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
607diff
changeset | 123 } | 
| 
e1b29756f901
Clean, organize and resolve some TODOs and FIXMEs: minor refactorings and comments
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
607diff
changeset | 124 | 
| 285 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 125 String nativeString() { | 
| 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 126 if (this == Exec) { | 
| 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 127 return "x"; | 
| 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 128 } | 
| 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 129 if (this == Link) { | 
| 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 130 return "l"; | 
| 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 131 } | 
| 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 | 132 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 | 133 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 | 134 } | 
| 285 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 135 throw new IllegalStateException(toString()); | 
| 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 136 } | 
| 574 
88afffd39899
Improve memory consumption of HgManifest#getFileRevision(): avoid extra byte[] instances
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
571diff
changeset | 137 | 
| 
88afffd39899
Improve memory consumption of HgManifest#getFileRevision(): avoid extra byte[] instances
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
571diff
changeset | 138 public int fsMode() { | 
| 
88afffd39899
Improve memory consumption of HgManifest#getFileRevision(): avoid extra byte[] instances
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
571diff
changeset | 139 if (this == Exec) { | 
| 
88afffd39899
Improve memory consumption of HgManifest#getFileRevision(): avoid extra byte[] instances
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
571diff
changeset | 140 return 0755; | 
| 
88afffd39899
Improve memory consumption of HgManifest#getFileRevision(): avoid extra byte[] instances
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
571diff
changeset | 141 } | 
| 
88afffd39899
Improve memory consumption of HgManifest#getFileRevision(): avoid extra byte[] instances
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
571diff
changeset | 142 return 0644; | 
| 
88afffd39899
Improve memory consumption of HgManifest#getFileRevision(): avoid extra byte[] instances
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
571diff
changeset | 143 } | 
| 285 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 144 } | 
| 2 
08db726a0fb7
Shaping out low-level Hg structures
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 145 | 
| 412 
63c5a9d7ca3f
Follow-up for Issue 29: unify path translation for manifest and dirstate
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 146 /*package-local*/ HgManifest(HgRepository hgRepo, RevlogStream content, EncodingHelper eh) { | 
| 600 
46f29b73e51e
Utilize RevisionLookup to speed-up getRevisionIndex of both manifest and changelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
598diff
changeset | 147 super(hgRepo, content, true); | 
| 412 
63c5a9d7ca3f
Follow-up for Issue 29: unify path translation for manifest and dirstate
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 148 encodingHelper = eh; | 
| 574 
88afffd39899
Improve memory consumption of HgManifest#getFileRevision(): avoid extra byte[] instances
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
571diff
changeset | 149 pathFactory = hgRepo.getSessionContext().getPathFactory(); | 
| 13 
df8c67f3006a
Basic manifest parsing to analyze what's in there
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
2diff
changeset | 150 } | 
| 
df8c67f3006a
Basic manifest parsing to analyze what's in there
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
2diff
changeset | 151 | 
| 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 /** | 
| 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 | 153 * 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 | 154 * 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 | 155 * 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 | 156 * <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 | 157 * 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 | 158 * 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 | 159 * 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 | 160 * </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 | 161 * 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 | 162 * 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 | 163 * | 
| 
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 * <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 | 165 * 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 | 166 * 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 | 167 * <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 | 168 * <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 | 169 * (<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 | 170 * 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 | 171 * 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 | 172 * 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 | 173 * <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 | 174 * 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 | 175 * 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 | 176 * 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 | 177 * </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 | 178 * 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 | 179 * <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 | 180 * | 
| 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 | 181 * @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 | 182 * @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 | 183 * @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 | 184 * @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 | 185 * @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 | 186 * @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 | 187 */ | 
| 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 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 | 189 if (inspector == null) { | 
| 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
157diff
changeset | 190 throw new IllegalArgumentException(); | 
| 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
157diff
changeset | 191 } | 
| 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 | 192 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 | 193 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 | 194 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 | 195 manifestFirst = fromChangelog(csetFirst+i); | 
| 403 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 196 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 | 197 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 | 198 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 | 199 } | 
| 
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 | 200 i++; | 
| 403 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 201 } while (manifestFirst == BAD_REVISION && csetFirst+i <= csetLast); | 
| 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 202 if (manifestFirst == BAD_REVISION) { | 
| 490 
b3c16d1aede0
Refactoring: move HgRepository's implementation aspects to Internals (which is now its imlementation counterpart and primary repository class to be used by other parts of the library)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
456diff
changeset | 203 getRepo().getSessionContext().getLog().dump(getClass(), Info, "None of changesets [%d..%d] have associated manifest revision", 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 | 204 // 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 | 205 // 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 | 206 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 | 207 } | 
| 
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 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 | 209 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 | 210 manifestLast = fromChangelog(csetLast-i); | 
| 403 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 211 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 | 212 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 | 213 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 | 214 } | 
| 
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 | 215 i++; | 
| 403 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 216 } while (manifestLast == BAD_REVISION && csetLast-i >= csetFirst); | 
| 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 217 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 | 218 // 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 | 219 // 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 | 220 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 | 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 if (manifestLast < manifestFirst) { | 
| 300 
650b45d290b1
Share range check code
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
285diff
changeset | 223 // 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 | 224 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 | 225 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 | 226 manifestFirst = x; | 
| 300 
650b45d290b1
Share range check code
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
285diff
changeset | 227 } | 
| 571 
e4ee4bf4c7d0
Let session context control creation of Path instances
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
550diff
changeset | 228 content.iterate(manifestFirst, manifestLast, true, new ManifestParser(inspector)); | 
| 19 
40532cdc92fc
Inspector (visitor) for manifest
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
16diff
changeset | 229 } | 
| 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 | 230 | 
| 254 
a620f0663a37
Collect tags for a file - improve performance of 'sparse' manifest reads
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
232diff
changeset | 231 /** | 
| 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 | 232 * "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 | 233 * <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 | 234 * 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 | 235 * 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 | 236 * 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 | 237 * | 
| 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 | 238 * @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 | 239 * @param revisionIndexes local indexes of changesets to visit, non-<code>null</code> | 
| 628 
6526d8adbc0f
Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
608diff
changeset | 240 * @throws HgInvalidRevisionException if method argument specifies non-existent revision index. <em>Runtime exception</em> | 
| 
6526d8adbc0f
Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
608diff
changeset | 241 * @throws HgInvalidControlFileException if failed to access revlog index/data entry. <em>Runtime exception</em> | 
| 
6526d8adbc0f
Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
608diff
changeset | 242 * @throws HgRuntimeException subclass thereof to indicate other issues with the library. <em>Runtime exception</em> | 
| 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 | 243 * @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 | 244 */ | 
| 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 | 245 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 | 246 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 | 247 throw new IllegalArgumentException(); | 
| 
a620f0663a37
Collect tags for a file - improve performance of 'sparse' manifest reads
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
232diff
changeset | 248 } | 
| 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 | 249 int[] manifestRevs = toManifestRevisionIndexes(revisionIndexes, inspector); | 
| 571 
e4ee4bf4c7d0
Let session context control creation of Path instances
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
550diff
changeset | 250 content.iterate(manifestRevs, true, new ManifestParser(inspector)); | 
| 254 
a620f0663a37
Collect tags for a file - improve performance of 'sparse' manifest reads
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
232diff
changeset | 251 } | 
| 
a620f0663a37
Collect tags for a file - improve performance of 'sparse' manifest reads
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
232diff
changeset | 252 | 
| 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 | 253 // | 
| 
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 | 254 /** | 
| 403 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 255 * 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 | 256 * 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 | 257 * @return manifest revision index, non-negative, or {@link HgRepository#BAD_REVISION}. | 
| 628 
6526d8adbc0f
Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
608diff
changeset | 258 * @throws HgInvalidRevisionException if method argument specifies non-existent revision index. <em>Runtime exception</em> | 
| 
6526d8adbc0f
Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
608diff
changeset | 259 * @throws HgInvalidControlFileException if failed to access revlog index/data entry. <em>Runtime exception</em> | 
| 
6526d8adbc0f
Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
608diff
changeset | 260 * @throws HgRuntimeException subclass thereof to indicate other issues with the library. <em>Runtime exception</em> | 
| 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 | 261 */ | 
| 628 
6526d8adbc0f
Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
608diff
changeset | 262 /*package-local*/ int fromChangelog(int changesetRevisionIndex) throws HgRuntimeException { | 
| 368 
8107b95f4280
Update Javadoc with 'revision index'
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
367diff
changeset | 263 if (HgInternals.wrongRevisionIndex(changesetRevisionIndex)) { | 
| 425 
48f993aa2f41
FIXMEs: exceptions, javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
424diff
changeset | 264 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 | 265 } | 
| 368 
8107b95f4280
Update Javadoc with 'revision index'
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
367diff
changeset | 266 if (changesetRevisionIndex == HgRepository.WORKING_COPY || changesetRevisionIndex == HgRepository.BAD_REVISION) { | 
| 425 
48f993aa2f41
FIXMEs: exceptions, javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
424diff
changeset | 267 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 | 268 } | 
| 
f39fb6b3cc76
Handle revision constants correctly
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
254diff
changeset | 269 // revisionNumber == TIP is processed by RevisionMapper | 
| 607 
66f1cc23b906
Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
601diff
changeset | 270 if (revisionMap == null || content.shallDropDerivedCaches()) { | 
| 
66f1cc23b906
Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
601diff
changeset | 271 content.detach(revisionMapCleaner); | 
| 
66f1cc23b906
Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
601diff
changeset | 272 final boolean buildOwnLookup = super.revisionLookup == null; | 
| 
66f1cc23b906
Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
601diff
changeset | 273 RevisionMapper rmap = new RevisionMapper(buildOwnLookup); | 
| 
66f1cc23b906
Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
601diff
changeset | 274 content.iterate(0, TIP, false, rmap); | 
| 
66f1cc23b906
Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
601diff
changeset | 275 rmap.fixReusedManifests(); | 
| 
66f1cc23b906
Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
601diff
changeset | 276 if (buildOwnLookup && super.useRevisionLookup) { | 
| 600 
46f29b73e51e
Utilize RevisionLookup to speed-up getRevisionIndex of both manifest and changelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
598diff
changeset | 277 // reuse RevisionLookup if there's none yet | 
| 607 
66f1cc23b906
Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
601diff
changeset | 278 super.setRevisionLookup(rmap.manifestNodeids); | 
| 600 
46f29b73e51e
Utilize RevisionLookup to speed-up getRevisionIndex of both manifest and changelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
598diff
changeset | 279 } | 
| 607 
66f1cc23b906
Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
601diff
changeset | 280 rmap.manifestNodeids = null; | 
| 
66f1cc23b906
Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
601diff
changeset | 281 revisionMap = rmap; | 
| 
66f1cc23b906
Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
601diff
changeset | 282 // although in most cases modified manifest is accessed through one of the methods in this class | 
| 
66f1cc23b906
Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
601diff
changeset | 283 // and hence won't have a chance till this moment to be reloaded via revisionMapCleaner | 
| 
66f1cc23b906
Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
601diff
changeset | 284 // (RevlogStream sends events on attempt to read revlog, and so far we haven't tried to read anything, | 
| 
66f1cc23b906
Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
601diff
changeset | 285 // it's still reasonable to have this cleaner attached, just in case any method from Revlog base class | 
| 
66f1cc23b906
Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
601diff
changeset | 286 // has been called (e.g. getLastRevision()) | 
| 
66f1cc23b906
Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
601diff
changeset | 287 content.attach(revisionMapCleaner); | 
| 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 | 288 } | 
| 368 
8107b95f4280
Update Javadoc with 'revision index'
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
367diff
changeset | 289 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 | 290 } | 
| 
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 | 291 | 
| 232 
b7347daa50e3
Allow to cat a file with changeset revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
222diff
changeset | 292 /** | 
| 
b7347daa50e3
Allow to cat a file with changeset revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
222diff
changeset | 293 * Extracts file revision as it was known at the time of given changeset. | 
| 426 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 294 * <p>For more thorough details about file at specific changeset, use {@link HgChangesetFileSneaker}. | 
| 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 295 * <p>To visit few changesets for the same file, use {@link #walkFileRevisions(Path, Inspector, int...)} | 
| 232 
b7347daa50e3
Allow to cat a file with changeset revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
222diff
changeset | 296 * | 
| 426 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 297 * @see #walkFileRevisions(Path, Inspector, int...) | 
| 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 | 298 * @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 | 299 * @param changelogRevisionIndex local changeset index | 
| 232 
b7347daa50e3
Allow to cat a file with changeset revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
222diff
changeset | 300 * @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 | 301 * @return file revision or <code>null</code> if manifest at specified revision doesn't list such file | 
| 628 
6526d8adbc0f
Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
608diff
changeset | 302 * @throws HgInvalidRevisionException if supplied revision doesn't identify revision from this revlog. <em>Runtime exception</em> | 
| 
6526d8adbc0f
Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
608diff
changeset | 303 * @throws HgInvalidControlFileException if failed to access revlog index/data entry. <em>Runtime exception</em> | 
| 
6526d8adbc0f
Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
608diff
changeset | 304 * @throws HgRuntimeException subclass thereof to indicate other 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 | 305 */ | 
| 628 
6526d8adbc0f
Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
608diff
changeset | 306 public Nodeid getFileRevision(int changelogRevisionIndex, final Path file) throws HgRuntimeException { | 
| 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 | 307 // 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 | 308 // 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 | 309 // both file revision and changeset revision index. But there's no easy way to go from changesetRevisionIndex to | 
| 547 
66fc86e8c0dd
#getFileRevision() shall accept TIP as an argument
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
537diff
changeset | 310 // file revision (the task this method solves), except for HgFileInformer | 
| 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 | 311 // I feel methods dealing with changeset indexes shall be more exposed in HgChangelog and HgManifest API. | 
| 547 
66fc86e8c0dd
#getFileRevision() shall accept TIP as an argument
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
537diff
changeset | 312 // TODO need tests (e.g. pass TIP here to see resMap.get(-1) doesn't fail) | 
| 426 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 313 int manifestRevIndex = fromChangelog(changelogRevisionIndex); | 
| 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 314 if (manifestRevIndex == BAD_REVISION) { | 
| 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 315 return null; | 
| 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 316 } | 
| 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 317 IntMap<Nodeid> resMap = new IntMap<Nodeid>(3); | 
| 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 318 FileLookupInspector parser = new FileLookupInspector(encodingHelper, file, resMap, null); | 
| 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 319 parser.walk(manifestRevIndex, content); | 
| 550 
c1478cc31f45
Regression: expect file to be missing in a manifest
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
547diff
changeset | 320 assert resMap.size() <= 1; // size() == 0 if file wasn't found | 
| 547 
66fc86e8c0dd
#getFileRevision() shall accept TIP as an argument
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
537diff
changeset | 321 // can't use changelogRevisionIndex as key - it might have been TIP | 
| 550 
c1478cc31f45
Regression: expect file to be missing in a manifest
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
547diff
changeset | 322 return resMap.size() == 0 ? null : resMap.get(resMap.firstKey()); | 
| 326 
d42a45a2c9d6
Alternative tag collection approach for a file history
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
324diff
changeset | 323 } | 
| 426 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 324 | 
| 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 325 /** | 
| 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 326 * Visit file revisions as they were recorded at the time of given changesets. Same file revision may be reported as many times as | 
| 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 327 * there are changesets that refer to that revision. Both {@link Inspector#begin(int, Nodeid, int)} and {@link Inspector#end(int)} | 
| 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 328 * with appropriate values are invoked around {@link Inspector#next(Nodeid, Path, Flags)} call for the supplied file | 
| 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 329 * | 
| 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 330 * <p>NOTE, this method doesn't respect return values from callback (i.e. to stop iteration), as it's lookup of a single file | 
| 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 331 * and canceling it seems superfluous. However, this may change in future and it's recommended to return <code>true</code> from | 
| 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 332 * all {@link Inspector} methods. | 
| 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 333 * | 
| 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 334 * @see #getFileRevision(int, Path) | 
| 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 335 * @param file path of interest | 
| 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 336 * @param inspector callback to receive details about selected file | 
| 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 337 * @param changelogRevisionIndexes changeset indexes to visit | 
| 628 
6526d8adbc0f
Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
608diff
changeset | 338 * @throws HgInvalidRevisionException if supplied revision doesn't identify revision from this revlog. <em>Runtime exception</em> | 
| 
6526d8adbc0f
Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
608diff
changeset | 339 * @throws HgInvalidControlFileException if failed to access revlog index/data entry. <em>Runtime exception</em> | 
| 
6526d8adbc0f
Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
608diff
changeset | 340 * @throws HgRuntimeException subclass thereof to indicate other issues with the library. <em>Runtime exception</em> | 
| 426 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 341 */ | 
| 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 342 public void walkFileRevisions(Path file, Inspector inspector, int... changelogRevisionIndexes) throws HgRuntimeException { | 
| 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 343 if (file == null || inspector == null || changelogRevisionIndexes == null) { | 
| 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 344 throw new IllegalArgumentException(); | 
| 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 345 } | 
| 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 346 // TODO [post-1.0] need tests. There's Main#checkWalkFileRevisions that may be a starting point | 
| 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 347 int[] manifestRevIndexes = toManifestRevisionIndexes(changelogRevisionIndexes, null); | 
| 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 348 FileLookupInspector parser = new FileLookupInspector(encodingHelper, file, inspector); | 
| 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 349 parser.walk(manifestRevIndexes, content); | 
| 232 
b7347daa50e3
Allow to cat a file with changeset revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
222diff
changeset | 350 } | 
| 326 
d42a45a2c9d6
Alternative tag collection approach for a file history
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
324diff
changeset | 351 | 
| 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 | 352 /** | 
| 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 | 353 * 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 | 354 * | 
| 
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 | 355 * @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 | 356 * @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 | 357 * @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 | 358 * @return one of predefined enum values, or <code>null</code> if file was not known in the specified revision | 
| 628 
6526d8adbc0f
Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
608diff
changeset | 359 * @throws HgInvalidRevisionException if supplied revision doesn't identify revision from this revlog. <em>Runtime exception</em> | 
| 
6526d8adbc0f
Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
608diff
changeset | 360 * @throws HgInvalidControlFileException if failed to access revlog index/data entry. <em>Runtime exception</em> | 
| 
6526d8adbc0f
Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
608diff
changeset | 361 * @throws HgRuntimeException subclass thereof to indicate other 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 | 362 */ | 
| 628 
6526d8adbc0f
Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
608diff
changeset | 363 public Flags getFileFlags(int changesetRevIndex, Path file) throws HgRuntimeException { | 
| 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 | 364 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 | 365 IntMap<Flags> resMap = new IntMap<Flags>(2); | 
| 426 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 366 FileLookupInspector parser = new FileLookupInspector(encodingHelper, file, null, resMap); | 
| 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 367 parser.walk(manifestRevIdx, content); | 
| 550 
c1478cc31f45
Regression: expect file to be missing in a manifest
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
547diff
changeset | 368 assert resMap.size() <= 1; // size() == 0 if not found | 
| 547 
66fc86e8c0dd
#getFileRevision() shall accept TIP as an argument
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
537diff
changeset | 369 // can't use changesetRevIndex as key - it might have been TIP | 
| 550 
c1478cc31f45
Regression: expect file to be missing in a manifest
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
547diff
changeset | 370 return resMap.size() == 0 ? null : resMap.get(resMap.firstKey()); | 
| 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 | 371 } | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 372 | 
| 326 
d42a45a2c9d6
Alternative tag collection approach for a file history
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
324diff
changeset | 373 | 
| 607 
66f1cc23b906
Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
601diff
changeset | 374 /*package-local*/ void dropCachesOnChangelogChange() { | 
| 
66f1cc23b906
Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
601diff
changeset | 375 // sort of a hack as it may happen that #fromChangelog() | 
| 
66f1cc23b906
Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
601diff
changeset | 376 // is invoked for modified repository where revisionMap still points to an old state | 
| 
66f1cc23b906
Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
601diff
changeset | 377 // Since there's no access to RevlogStream in #fromChangelog() if there's revisionMap | 
| 
66f1cc23b906
Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
601diff
changeset | 378 // in place, there's no chance for RevlogStream to detect the change and to dispatch | 
| 
66f1cc23b906
Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
601diff
changeset | 379 // change notification so that revisionMap got cleared. | 
| 
66f1cc23b906
Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
601diff
changeset | 380 revisionMap = null; | 
| 
66f1cc23b906
Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
601diff
changeset | 381 } | 
| 
66f1cc23b906
Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
601diff
changeset | 382 | 
| 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 | 383 /** | 
| 
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 | 384 * @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 | 385 * @param inspector may be null if reporting of missing manifests is not needed | 
| 628 
6526d8adbc0f
Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
608diff
changeset | 386 * @throws HgInvalidRevisionException if supplied revision doesn't identify revision from this revlog. <em>Runtime exception</em> | 
| 
6526d8adbc0f
Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
608diff
changeset | 387 * @throws HgInvalidControlFileException if failed to access revlog index/data entry. <em>Runtime exception</em> | 
| 
6526d8adbc0f
Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
608diff
changeset | 388 * @throws HgRuntimeException subclass thereof to indicate other issues with the library. <em>Runtime exception</em> | 
| 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 | 389 */ | 
| 628 
6526d8adbc0f
Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
608diff
changeset | 390 private int[] toManifestRevisionIndexes(int[] changelogRevisionIndexes, Inspector inspector) throws HgRuntimeException { | 
| 368 
8107b95f4280
Update Javadoc with 'revision index'
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
367diff
changeset | 391 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 | 392 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 | 393 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 | 394 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 | 395 final int manifestRevisionIndex = fromChangelog(changelogRevisionIndexes[i]); | 
| 403 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 396 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 | 397 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 | 398 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 | 399 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 | 400 } | 
| 
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 | 401 // 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 | 402 } 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 | 403 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 | 404 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 | 405 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 | 406 } | 
| 
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 | 407 j++; | 
| 326 
d42a45a2c9d6
Alternative tag collection approach for a file history
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
324diff
changeset | 408 } | 
| 
d42a45a2c9d6
Alternative tag collection approach for a file history
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
324diff
changeset | 409 } | 
| 
d42a45a2c9d6
Alternative tag collection approach for a file history
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
324diff
changeset | 410 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 | 411 Arrays.sort(manifestRevs, 0, j); | 
| 326 
d42a45a2c9d6
Alternative tag collection approach for a file history
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
324diff
changeset | 412 } | 
| 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 | 413 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 | 414 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 | 415 } 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 | 416 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 | 417 //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 | 418 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 | 419 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 | 420 } | 
| 326 
d42a45a2c9d6
Alternative tag collection approach for a file history
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
324diff
changeset | 421 } | 
| 
d42a45a2c9d6
Alternative tag collection approach for a file history
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
324diff
changeset | 422 | 
| 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 | 423 @Callback | 
| 19 
40532cdc92fc
Inspector (visitor) for manifest
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
16diff
changeset | 424 public interface Inspector { | 
| 285 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 425 /** | 
| 537 
5a455624be4f
Update javadoc for HgManifest.Inspector and fix erroneous internal API
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
490diff
changeset | 426 * Denotes entering specific manifest revision, separate entries are | 
| 
5a455624be4f
Update javadoc for HgManifest.Inspector and fix erroneous internal API
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
490diff
changeset | 427 * reported with subsequence {@link #next(Nodeid, Path, Flags)} calls. | 
| 
5a455624be4f
Update javadoc for HgManifest.Inspector and fix erroneous internal API
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
490diff
changeset | 428 * | 
| 583 
47dfa0ec7e35
Effective revlog patching
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
574diff
changeset | 429 * @param manifestRevisionIndex local revision index of the inspected revision | 
| 537 
5a455624be4f
Update javadoc for HgManifest.Inspector and fix erroneous internal API
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
490diff
changeset | 430 * @param manifestRevision revision of the manifest we're about to iterate through | 
| 
5a455624be4f
Update javadoc for HgManifest.Inspector and fix erroneous internal API
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
490diff
changeset | 431 * @param changelogRevisionIndex local revision index of changelog this manifest points to | 
| 
5a455624be4f
Update javadoc for HgManifest.Inspector and fix erroneous internal API
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
490diff
changeset | 432 * @return <code>true</code> to continue iteration, <code>false</code> to stop | 
| 628 
6526d8adbc0f
Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
608diff
changeset | 433 * @throws HgRuntimeException propagates library issues. <em>Runtime exception</em> | 
| 537 
5a455624be4f
Update javadoc for HgManifest.Inspector and fix erroneous internal API
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
490diff
changeset | 434 */ | 
| 628 
6526d8adbc0f
Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
608diff
changeset | 435 boolean begin(int manifestRevisionIndex, Nodeid manifestRevision, int changelogRevisionIndex) throws HgRuntimeException; | 
| 537 
5a455624be4f
Update javadoc for HgManifest.Inspector and fix erroneous internal API
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
490diff
changeset | 436 | 
| 
5a455624be4f
Update javadoc for HgManifest.Inspector and fix erroneous internal API
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
490diff
changeset | 437 | 
| 
5a455624be4f
Update javadoc for HgManifest.Inspector and fix erroneous internal API
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
490diff
changeset | 438 /** | 
| 
5a455624be4f
Update javadoc for HgManifest.Inspector and fix erroneous internal API
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
490diff
changeset | 439 * Reports each manifest entry | 
| 
5a455624be4f
Update javadoc for HgManifest.Inspector and fix erroneous internal API
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
490diff
changeset | 440 * | 
| 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 | 441 * @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 | 442 * @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 | 443 * @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 | 444 * @return <code>true</code> to continue iteration, <code>false</code> to stop | 
| 628 
6526d8adbc0f
Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
608diff
changeset | 445 * @throws HgRuntimeException propagates library issues. <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 | 446 */ | 
| 628 
6526d8adbc0f
Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
608diff
changeset | 447 boolean next(Nodeid nid, Path fname, Flags flags) throws HgRuntimeException; | 
| 537 
5a455624be4f
Update javadoc for HgManifest.Inspector and fix erroneous internal API
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
490diff
changeset | 448 | 
| 
5a455624be4f
Update javadoc for HgManifest.Inspector and fix erroneous internal API
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
490diff
changeset | 449 /** | 
| 
5a455624be4f
Update javadoc for HgManifest.Inspector and fix erroneous internal API
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
490diff
changeset | 450 * Denotes leaving specific manifest revision, after all entries were reported using {@link #next(Nodeid, Path, Flags)} | 
| 
5a455624be4f
Update javadoc for HgManifest.Inspector and fix erroneous internal API
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
490diff
changeset | 451 * | 
| 
5a455624be4f
Update javadoc for HgManifest.Inspector and fix erroneous internal API
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
490diff
changeset | 452 * @param manifestRevisionIndex indicates manifest revision, corresponds to opening {@link #begin(int, Nodeid, int)} | 
| 
5a455624be4f
Update javadoc for HgManifest.Inspector and fix erroneous internal API
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
490diff
changeset | 453 * @return <code>true</code> to continue iteration, <code>false</code> to stop | 
| 628 
6526d8adbc0f
Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
608diff
changeset | 454 * @throws HgRuntimeException propagates library issues. <em>Runtime exception</em> | 
| 537 
5a455624be4f
Update javadoc for HgManifest.Inspector and fix erroneous internal API
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
490diff
changeset | 455 */ | 
| 628 
6526d8adbc0f
Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
608diff
changeset | 456 boolean end(int manifestRevisionIndex) throws HgRuntimeException; | 
| 267 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 457 } | 
| 424 
6437d261048a
Deprecated code removed
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
423diff
changeset | 458 | 
| 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 | 459 /** | 
| 
c5980f287cc4
Use StringProxy when parsing manifest to minimize number of useless conversions and array instances
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
267diff
changeset | 460 * 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 | 461 * 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 | 462 * 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 | 463 * 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 | 464 * | 
| 285 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 465 * 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 | 466 * 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 | 467 * 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 | 468 */ | 
| 571 
e4ee4bf4c7d0
Let session context control creation of Path instances
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
550diff
changeset | 469 private final 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 | 470 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 | 471 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 | 472 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 | 473 private Path result; | 
| 267 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 474 | 
| 571 
e4ee4bf4c7d0
Let session context control creation of Path instances
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
550diff
changeset | 475 public PathProxy(byte[] data, int start, int length) { | 
| 267 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 476 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 | 477 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 | 478 this.length = length; | 
| 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 479 | 
| 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 | 480 // 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 | 481 // 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 | 482 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 | 483 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 | 484 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 | 485 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 | 486 } | 
| 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 487 hash = h; | 
| 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 488 } | 
| 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 489 | 
| 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 490 @Override | 
| 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 491 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 | 492 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 | 493 return false; | 
| 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 494 } | 
| 285 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 495 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 | 496 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 | 497 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 | 498 } | 
| 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 | 499 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 | 500 return false; | 
| 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 501 } | 
| 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 502 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 | 503 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 | 504 return false; | 
| 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 505 } | 
| 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 506 } | 
| 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 507 return true; | 
| 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 508 } | 
| 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 509 @Override | 
| 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 510 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 | 511 return hash; | 
| 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 512 } | 
| 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 513 | 
| 285 
6dbbc53fc46d
Use Path instead of plain String for manifest file names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
268diff
changeset | 514 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 | 515 if (result == null) { | 
| 574 
88afffd39899
Improve memory consumption of HgManifest#getFileRevision(): avoid extra byte[] instances
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
571diff
changeset | 516 Path.Source pf = HgManifest.this.pathFactory; | 
| 
88afffd39899
Improve memory consumption of HgManifest#getFileRevision(): avoid extra byte[] instances
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
571diff
changeset | 517 result = pf.path(HgManifest.this.encodingHelper.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 | 518 // 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 | 519 // 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 | 520 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 | 521 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 | 522 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 | 523 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 | 524 } | 
| 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 525 return result; | 
| 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 526 } | 
| 
ec921ef0628e
Revert manifest parser changes - no single string and back to HashMap Pool
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
266diff
changeset | 527 } | 
| 196 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
157diff
changeset | 528 | 
| 571 
e4ee4bf4c7d0
Let session context control creation of Path instances
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
550diff
changeset | 529 private 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 | 530 private final Inspector inspector; | 
| 431 
12f668401613
FIXMEs: awkward API refactored, what need to be internal got hidden; public aspects got captured in slim interfaces
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
426diff
changeset | 531 private IdentityPool<Nodeid> nodeidPool, thisRevPool; | 
| 
12f668401613
FIXMEs: awkward API refactored, what need to be internal got hidden; public aspects got captured in slim interfaces
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
426diff
changeset | 532 private final IdentityPool<PathProxy> fnamePool; | 
| 266 
0a2f445de774
Improve manifest parsing: reduce number of arrays instantiated for Nodeid
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
264diff
changeset | 533 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 | 534 private final ProgressSupport progressHelper; | 
| 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
304diff
changeset | 535 private IterateControlMediator iterateControl; | 
| 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 | 536 | 
| 571 
e4ee4bf4c7d0
Let session context control creation of Path instances
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
550diff
changeset | 537 public ManifestParser(Inspector delegate) { | 
| 196 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
157diff
changeset | 538 assert delegate != null; | 
| 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
157diff
changeset | 539 inspector = delegate; | 
| 431 
12f668401613
FIXMEs: awkward API refactored, what need to be internal got hidden; public aspects got captured in slim interfaces
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
426diff
changeset | 540 nodeidPool = new IdentityPool<Nodeid>(); | 
| 
12f668401613
FIXMEs: awkward API refactored, what need to be internal got hidden; public aspects got captured in slim interfaces
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
426diff
changeset | 541 fnamePool = new IdentityPool<PathProxy>(); | 
| 
12f668401613
FIXMEs: awkward API refactored, what need to be internal got hidden; public aspects got captured in slim interfaces
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
426diff
changeset | 542 thisRevPool = new IdentityPool<Nodeid>(); | 
| 312 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
304diff
changeset | 543 progressHelper = ProgressSupport.Factory.get(delegate); | 
| 196 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
157diff
changeset | 544 } | 
| 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 | 545 | 
| 628 
6526d8adbc0f
Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
608diff
changeset | 546 public void next(int revisionNumber, int actualLen, int baseRevision, int linkRevision, int parent1Revision, int parent2Revision, byte[] nodeid, DataAccess da) throws HgRuntimeException { | 
| 196 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
157diff
changeset | 547 try { | 
| 312 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
304diff
changeset | 548 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 | 549 iterateControl.stop(); | 
| 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
304diff
changeset | 550 return; | 
| 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
304diff
changeset | 551 } | 
| 372 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 552 if (!da.isEmpty()) { | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 553 // 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 | 554 Path fname = null; | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 555 Flags flags = null; | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 556 Nodeid nid = null; | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 557 int i; | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 558 byte[] data = da.byteArray(); | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 559 for (i = 0; i < actualLen; i++) { | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 560 int x = i; | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 561 for( ; data[i] != '\n' && i < actualLen; i++) { | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 562 if (fname == null && data[i] == 0) { | 
| 571 
e4ee4bf4c7d0
Let session context control creation of Path instances
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
550diff
changeset | 563 PathProxy px = fnamePool.unify(new PathProxy(data, x, i - x)); | 
| 372 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 564 // 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 | 565 // 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 | 566 fname = px.freeze(); | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 567 x = i+1; | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 568 } | 
| 196 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
157diff
changeset | 569 } | 
| 372 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 570 if (i < actualLen) { | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 571 assert data[i] == '\n'; | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 572 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 | 573 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 | 574 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 | 575 Nodeid cached = nodeidPool.unify(nid); | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 576 if (cached == nid) { | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 577 // buffer now belongs to the cached nodeid | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 578 nodeidLookupBuffer = new byte[20]; | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 579 } else { | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 580 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 | 581 } // 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 | 582 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 | 583 if (nodeidLen + x < i) { | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 584 // '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 | 585 // 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 | 586 // 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 | 587 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 | 588 } 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 | 589 flags = Flags.RegularFile; | 
| 372 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 590 } | 
| 424 
6437d261048a
Deprecated code removed
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
423diff
changeset | 591 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 | 592 if (!good2go) { | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 593 iterateControl.stop(); | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 594 return; | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 595 } | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 596 } | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 597 nid = null; | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 598 fname = null; | 
| 
155c1893bda4
Issue 22: UnsupportedOperationException on empty manifest entry
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
368diff
changeset | 599 flags = null; | 
| 196 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
157diff
changeset | 600 } | 
| 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
157diff
changeset | 601 } | 
| 312 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
304diff
changeset | 602 if (!inspector.end(revisionNumber)) { | 
| 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
304diff
changeset | 603 iterateControl.stop(); | 
| 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
304diff
changeset | 604 return; | 
| 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
304diff
changeset | 605 } | 
| 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 | 606 // | 
| 
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 | 607 // 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 | 608 // (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 | 609 // 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 | 610 nodeidPool.clear(); | 
| 431 
12f668401613
FIXMEs: awkward API refactored, what need to be internal got hidden; public aspects got captured in slim interfaces
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
426diff
changeset | 611 IdentityPool<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 | 612 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 | 613 thisRevPool = t; | 
| 313 
c1e3c18fd2f2
Test manifest cancellation
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
312diff
changeset | 614 iterateControl.checkCancelled(); | 
| 312 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
304diff
changeset | 615 progressHelper.worked(1); | 
| 196 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
157diff
changeset | 616 } 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 | 617 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 | 618 } | 
| 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
157diff
changeset | 619 } | 
| 312 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
304diff
changeset | 620 | 
| 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
304diff
changeset | 621 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 | 622 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 | 623 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 | 624 progressHelper.start(count); | 
| 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
304diff
changeset | 625 } | 
| 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
304diff
changeset | 626 | 
| 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
304diff
changeset | 627 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 | 628 progressHelper.done(); | 
| 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
304diff
changeset | 629 } | 
| 196 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
157diff
changeset | 630 } | 
| 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 | 631 | 
| 600 
46f29b73e51e
Utilize RevisionLookup to speed-up getRevisionIndex of both manifest and changelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
598diff
changeset | 632 private class RevisionMapper implements RevlogStream.Inspector, Lifecycle { | 
| 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 | 633 | 
| 403 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 634 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 | 635 private int[] changelog2manifest; | 
| 600 
46f29b73e51e
Utilize RevisionLookup to speed-up getRevisionIndex of both manifest and changelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
598diff
changeset | 636 RevisionLookup manifestNodeids; | 
| 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 | 637 | 
| 628 
6526d8adbc0f
Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
608diff
changeset | 638 private RevisionMapper(boolean useOwnRevisionLookup) throws HgRuntimeException { | 
| 600 
46f29b73e51e
Utilize RevisionLookup to speed-up getRevisionIndex of both manifest and changelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
598diff
changeset | 639 changelogRevisionCount = HgManifest.this.getRepo().getChangelog().getRevisionCount(); | 
| 
46f29b73e51e
Utilize RevisionLookup to speed-up getRevisionIndex of both manifest and changelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
598diff
changeset | 640 if (useOwnRevisionLookup) { | 
| 
46f29b73e51e
Utilize RevisionLookup to speed-up getRevisionIndex of both manifest and changelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
598diff
changeset | 641 manifestNodeids = new RevisionLookup(HgManifest.this.content); | 
| 
46f29b73e51e
Utilize RevisionLookup to speed-up getRevisionIndex of both manifest and changelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
598diff
changeset | 642 } | 
| 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 | 643 } | 
| 600 
46f29b73e51e
Utilize RevisionLookup to speed-up getRevisionIndex of both manifest and changelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
598diff
changeset | 644 | 
| 403 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 645 /** | 
| 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 646 * 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 | 647 * @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 | 648 * @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 | 649 * @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 | 650 */ | 
| 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 651 public int at(int changesetRevisionIndex) throws HgInvalidRevisionException { | 
| 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 652 if (changesetRevisionIndex == TIP) { | 
| 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 653 changesetRevisionIndex = changelogRevisionCount - 1; | 
| 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 654 } | 
| 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 655 if (changesetRevisionIndex >= changelogRevisionCount) { | 
| 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 656 throw new HgInvalidRevisionException(changesetRevisionIndex); | 
| 257 
f39fb6b3cc76
Handle revision constants correctly
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
254diff
changeset | 657 } | 
| 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 | 658 if (changelog2manifest != null) { | 
| 403 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 659 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 | 660 } | 
| 403 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 661 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 | 662 } | 
| 
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 | 663 | 
| 600 
46f29b73e51e
Utilize RevisionLookup to speed-up getRevisionIndex of both manifest and changelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
598diff
changeset | 664 // XXX can be replaced with Revlog.RevisionInspector, but I don't want Nodeid instances | 
| 638 
2f1cd1c26de5
AIOOBE in HgManifest.RevisionMapper: provide more details about exception context. Create lock file atomically. Picked from changeset 8a5cdcb27b8f
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
583diff
changeset | 665 public void next(int revisionNumber, int actualLen, int baseRevision, int linkRevision, int parent1Revision, int parent2Revision, byte[] nodeid, DataAccess data) throws HgInvalidRevisionException { | 
| 
2f1cd1c26de5
AIOOBE in HgManifest.RevisionMapper: provide more details about exception context. Create lock file atomically. Picked from changeset 8a5cdcb27b8f
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
583diff
changeset | 666 if (linkRevision >= changelogRevisionCount) { | 
| 631 
8a5cdcb27b8f
AIOOBE in HgManifest.RevisionMapper. Provide more details about exception context. Create lock file atomically. Test concurrent pull-rebase and read
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
628diff
changeset | 667 String storeLock = HgManifest.this.getRepo().getStoreLock().readLockInfo(); | 
| 638 
2f1cd1c26de5
AIOOBE in HgManifest.RevisionMapper: provide more details about exception context. Create lock file atomically. Picked from changeset 8a5cdcb27b8f
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
583diff
changeset | 668 String message = String.format("Manifest revision %d references changeset %d, which is beyond known scope [0..%d). Lock: %s", revisionNumber, linkRevision, changelogRevisionCount, storeLock); | 
| 
2f1cd1c26de5
AIOOBE in HgManifest.RevisionMapper: provide more details about exception context. Create lock file atomically. Picked from changeset 8a5cdcb27b8f
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
583diff
changeset | 669 throw new HgInvalidRevisionException(message, null, linkRevision); | 
| 
2f1cd1c26de5
AIOOBE in HgManifest.RevisionMapper: provide more details about exception context. Create lock file atomically. Picked from changeset 8a5cdcb27b8f
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
583diff
changeset | 670 } | 
| 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 | 671 if (changelog2manifest != null) { | 
| 220 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
218diff
changeset | 672 // 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 | 673 // 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 | 674 // 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 | 675 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 | 676 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 | 677 } 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 | 678 if (revisionNumber != linkRevision) { | 
| 403 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 679 changelog2manifest = new int[changelogRevisionCount]; | 
| 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 680 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 | 681 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 | 682 ; | 
| 
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 | 683 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 | 684 } | 
| 
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 | 685 } | 
| 600 
46f29b73e51e
Utilize RevisionLookup to speed-up getRevisionIndex of both manifest and changelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
598diff
changeset | 686 if (manifestNodeids != null) { | 
| 
46f29b73e51e
Utilize RevisionLookup to speed-up getRevisionIndex of both manifest and changelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
598diff
changeset | 687 manifestNodeids.next(revisionNumber, nodeid); | 
| 
46f29b73e51e
Utilize RevisionLookup to speed-up getRevisionIndex of both manifest and changelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
598diff
changeset | 688 } | 
| 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 | 689 } | 
| 
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 | 690 | 
| 
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 | 691 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 | 692 if (count != changelogRevisionCount) { | 
| 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 693 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 | 694 // 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 | 695 // 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 | 696 // 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 | 697 // 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 | 698 changelog2manifest = new int[changelogRevisionCount]; | 
| 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
390diff
changeset | 699 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 | 700 } | 
| 600 
46f29b73e51e
Utilize RevisionLookup to speed-up getRevisionIndex of both manifest and changelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
598diff
changeset | 701 if (manifestNodeids != null) { | 
| 
46f29b73e51e
Utilize RevisionLookup to speed-up getRevisionIndex of both manifest and changelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
598diff
changeset | 702 manifestNodeids.prepare(count); | 
| 
46f29b73e51e
Utilize RevisionLookup to speed-up getRevisionIndex of both manifest and changelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
598diff
changeset | 703 } | 
| 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 | 704 } | 
| 
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 | 705 | 
| 
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 | 706 public void finish(Object token) { | 
| 600 
46f29b73e51e
Utilize RevisionLookup to speed-up getRevisionIndex of both manifest and changelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
598diff
changeset | 707 // it's not a nice idea to fix changesets that reuse existing manifest entries from inside | 
| 
46f29b73e51e
Utilize RevisionLookup to speed-up getRevisionIndex of both manifest and changelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
598diff
changeset | 708 // #finish, as the manifest read operation is not complete at the moment. | 
| 
46f29b73e51e
Utilize RevisionLookup to speed-up getRevisionIndex of both manifest and changelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
598diff
changeset | 709 } | 
| 
46f29b73e51e
Utilize RevisionLookup to speed-up getRevisionIndex of both manifest and changelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
598diff
changeset | 710 | 
| 628 
6526d8adbc0f
Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
608diff
changeset | 711 public void fixReusedManifests() throws HgRuntimeException { | 
| 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 | 712 if (changelog2manifest == null) { | 
| 600 
46f29b73e51e
Utilize RevisionLookup to speed-up getRevisionIndex of both manifest and changelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
598diff
changeset | 713 // direct, 1-1 mapping of changeset indexes to manifest | 
| 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 | 714 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 | 715 } | 
| 
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 | 716 // I assume there'd be not too many revisions we don't know manifest of | 
| 597 
c895b5556937
Wrap manifest revision map completion into single file access
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
583diff
changeset | 717 IntVector undefinedChangelogRevision = new IntVector(); | 
| 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 | 718 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 | 719 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 | 720 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 | 721 } | 
| 
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 | 722 } | 
| 597 
c895b5556937
Wrap manifest revision map completion into single file access
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
583diff
changeset | 723 if (undefinedChangelogRevision.size() > 0) { | 
| 
c895b5556937
Wrap manifest revision map completion into single file access
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
583diff
changeset | 724 final IntMap<Nodeid> missingCsetToManifest = new IntMap<Nodeid>(undefinedChangelogRevision.size()); | 
| 
c895b5556937
Wrap manifest revision map completion into single file access
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
583diff
changeset | 725 int[] undefinedClogRevs = undefinedChangelogRevision.toArray(); | 
| 
c895b5556937
Wrap manifest revision map completion into single file access
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
583diff
changeset | 726 // undefinedChangelogRevision is sorted by the nature it's created | 
| 600 
46f29b73e51e
Utilize RevisionLookup to speed-up getRevisionIndex of both manifest and changelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
598diff
changeset | 727 HgManifest.this.getRepo().getChangelog().rangeInternal(new HgChangelog.Inspector() { | 
| 597 
c895b5556937
Wrap manifest revision map completion into single file access
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
583diff
changeset | 728 | 
| 
c895b5556937
Wrap manifest revision map completion into single file access
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
583diff
changeset | 729 public void next(int revisionIndex, Nodeid nodeid, RawChangeset cset) { | 
| 
c895b5556937
Wrap manifest revision map completion into single file access
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
583diff
changeset | 730 missingCsetToManifest.put(revisionIndex, cset.manifest()); | 
| 
c895b5556937
Wrap manifest revision map completion into single file access
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
583diff
changeset | 731 } | 
| 
c895b5556937
Wrap manifest revision map completion into single file access
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
583diff
changeset | 732 }, undefinedClogRevs); | 
| 
c895b5556937
Wrap manifest revision map completion into single file access
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
583diff
changeset | 733 assert missingCsetToManifest.size() == undefinedChangelogRevision.size(); | 
| 
c895b5556937
Wrap manifest revision map completion into single file access
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
583diff
changeset | 734 for (int u : undefinedClogRevs) { | 
| 
c895b5556937
Wrap manifest revision map completion into single file access
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
583diff
changeset | 735 Nodeid manifest = missingCsetToManifest.get(u); | 
| 
c895b5556937
Wrap manifest revision map completion into single file access
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
583diff
changeset | 736 if (manifest == null || manifest.isNull()) { | 
| 600 
46f29b73e51e
Utilize RevisionLookup to speed-up getRevisionIndex of both manifest and changelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
598diff
changeset | 737 HgManifest.this.getRepo().getSessionContext().getLog().dump(getClass(), Severity.Warn, "Changeset %d has no associated manifest entry", u); | 
| 
46f29b73e51e
Utilize RevisionLookup to speed-up getRevisionIndex of both manifest and changelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
598diff
changeset | 738 // keep BAD_REVISION in the changelog2manifest map. | 
| 598 
d29d9dc6c128
Utilize the fact nodeids are very different and are read anyway to speed up reverse lookup
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
597diff
changeset | 739 continue; | 
| 
d29d9dc6c128
Utilize the fact nodeids are very different and are read anyway to speed up reverse lookup
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
597diff
changeset | 740 } | 
| 600 
46f29b73e51e
Utilize RevisionLookup to speed-up getRevisionIndex of both manifest and changelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
598diff
changeset | 741 if (manifestNodeids != null) { | 
| 
46f29b73e51e
Utilize RevisionLookup to speed-up getRevisionIndex of both manifest and changelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
598diff
changeset | 742 int manifestRevIndex = manifestNodeids.findIndex(manifest); | 
| 
46f29b73e51e
Utilize RevisionLookup to speed-up getRevisionIndex of both manifest and changelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
598diff
changeset | 743 // mimic HgManifest#getRevisionIndex() to keep behavior the same | 
| 
46f29b73e51e
Utilize RevisionLookup to speed-up getRevisionIndex of both manifest and changelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
598diff
changeset | 744 if (manifestRevIndex == BAD_REVISION) { | 
| 
46f29b73e51e
Utilize RevisionLookup to speed-up getRevisionIndex of both manifest and changelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
598diff
changeset | 745 throw new HgInvalidRevisionException(String.format("Can't find index of revision %s", manifest.shortNotation()), manifest, null); | 
| 598 
d29d9dc6c128
Utilize the fact nodeids are very different and are read anyway to speed up reverse lookup
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
597diff
changeset | 746 } | 
| 600 
46f29b73e51e
Utilize RevisionLookup to speed-up getRevisionIndex of both manifest and changelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
598diff
changeset | 747 changelog2manifest[u] = manifestRevIndex; | 
| 
46f29b73e51e
Utilize RevisionLookup to speed-up getRevisionIndex of both manifest and changelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
598diff
changeset | 748 } else { | 
| 
46f29b73e51e
Utilize RevisionLookup to speed-up getRevisionIndex of both manifest and changelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
598diff
changeset | 749 changelog2manifest[u] = HgManifest.this.getRevisionIndex(manifest); | 
| 597 
c895b5556937
Wrap manifest revision map completion into single file access
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
583diff
changeset | 750 } | 
| 354 
5f9073eabf06
Propagate errors with exceptions up to a end client
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
326diff
changeset | 751 } | 
| 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 | 752 } | 
| 
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 | 753 } | 
| 
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 | 754 } | 
| 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 | 755 | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 756 /** | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 757 * 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 | 758 */ | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 759 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 | 760 | 
| 426 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 761 private final Path filename; | 
| 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 | 762 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 | 763 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 | 764 private final IntMap<Flags> csetIndex2Flags; | 
| 426 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 765 private final Inspector delegate; | 
| 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 | 766 | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 767 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 | 768 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 | 769 // 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 | 770 assert csetIndex2FileRevMap != null || csetIndex2FlagsMap != null; | 
| 426 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 771 filename = fileToLookUp; | 
| 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 772 filenameAsBytes = eh.toManifest(fileToLookUp.toString()); | 
| 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 773 delegate = 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 | 774 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 | 775 csetIndex2Flags = csetIndex2FlagsMap; | 
| 426 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 776 } | 
| 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 777 | 
| 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 778 public FileLookupInspector(EncodingHelper eh, Path fileToLookUp, Inspector delegateInspector) { | 
| 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 779 assert fileToLookUp != null; | 
| 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 780 assert delegateInspector != null; | 
| 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 781 filename = fileToLookUp; | 
| 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 | 782 filenameAsBytes = eh.toManifest(fileToLookUp.toString()); | 
| 426 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 783 delegate = delegateInspector; | 
| 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 784 csetIndex2FileRev = null; | 
| 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 785 csetIndex2Flags = null; | 
| 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 786 } | 
| 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 787 | 
| 628 
6526d8adbc0f
Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
608diff
changeset | 788 void walk(int manifestRevIndex, RevlogStream content) throws HgRuntimeException { | 
| 426 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 789 content.iterate(manifestRevIndex, manifestRevIndex, true, this); | 
| 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 790 } | 
| 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 791 | 
| 628 
6526d8adbc0f
Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
608diff
changeset | 792 void walk(int[] manifestRevIndexes, RevlogStream content) throws HgRuntimeException { | 
| 426 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 793 content.iterate(manifestRevIndexes, true, this); | 
| 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 | 794 } | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 795 | 
| 628 
6526d8adbc0f
Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
608diff
changeset | 796 public void next(int revisionNumber, int actualLen, int baseRevision, int linkRevision, int parent1Revision, int parent2Revision, byte[] nodeid, DataAccess data) throws HgRuntimeException { | 
| 574 
88afffd39899
Improve memory consumption of HgManifest#getFileRevision(): avoid extra byte[] instances
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
571diff
changeset | 797 ByteVector byteVector = new ByteVector(256, 128); // allocate for long paths right away | 
| 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 | 798 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 | 799 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 | 800 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 | 801 if (b != 0) { | 
| 574 
88afffd39899
Improve memory consumption of HgManifest#getFileRevision(): avoid extra byte[] instances
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
571diff
changeset | 802 byteVector.add(b); | 
| 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 | 803 } else { | 
| 574 
88afffd39899
Improve memory consumption of HgManifest#getFileRevision(): avoid extra byte[] instances
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
571diff
changeset | 804 if (byteVector.equalsTo(filenameAsBytes)) { | 
| 426 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 805 Nodeid fileRev = null; | 
| 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 806 Flags flags = null; | 
| 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 807 if (csetIndex2FileRev != null || delegate != 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 | 808 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 | 809 data.readBytes(nid, 0, 40); | 
| 426 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 810 fileRev = Nodeid.fromAscii(nid, 0, 40); | 
| 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 | 811 } 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 | 812 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 | 813 } | 
| 426 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 814 if (csetIndex2Flags != null || delegate != null) { | 
| 574 
88afffd39899
Improve memory consumption of HgManifest#getFileRevision(): avoid extra byte[] instances
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
571diff
changeset | 815 byteVector.clear(); | 
| 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 | 816 while (!data.isEmpty() && (b = data.readByte()) != '\n') { | 
| 574 
88afffd39899
Improve memory consumption of HgManifest#getFileRevision(): avoid extra byte[] instances
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
571diff
changeset | 817 byteVector.add(b); | 
| 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 | 818 } | 
| 574 
88afffd39899
Improve memory consumption of HgManifest#getFileRevision(): avoid extra byte[] instances
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
571diff
changeset | 819 if (byteVector.size() == 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 | 820 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 | 821 } else { | 
| 574 
88afffd39899
Improve memory consumption of HgManifest#getFileRevision(): avoid extra byte[] instances
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
571diff
changeset | 822 flags = Flags.parse(byteVector.toByteArray(), 0, byteVector.size()); | 
| 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 | 823 } | 
| 426 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 824 } | 
| 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 825 if (delegate != null) { | 
| 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 826 assert flags != null; | 
| 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 827 assert fileRev != null; | 
| 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 828 delegate.begin(revisionNumber, Nodeid.fromBinary(nodeid, 0), linkRevision); | 
| 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 829 delegate.next(fileRev, filename, flags); | 
| 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 830 delegate.end(revisionNumber); | 
| 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 831 | 
| 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 832 } else { | 
| 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 833 if (csetIndex2FileRev != null) { | 
| 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 834 csetIndex2FileRev.put(linkRevision, fileRev); | 
| 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 835 } | 
| 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 836 if (csetIndex2Flags != null) { | 
| 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 837 csetIndex2Flags.put(linkRevision, flags); | 
| 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 838 } | 
| 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 | 839 } | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 840 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 | 841 } 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 | 842 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 | 843 } | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 844 // 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 | 845 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 | 846 ; | 
| 574 
88afffd39899
Improve memory consumption of HgManifest#getFileRevision(): avoid extra byte[] instances
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
571diff
changeset | 847 | 
| 
88afffd39899
Improve memory consumption of HgManifest#getFileRevision(): avoid extra byte[] instances
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
571diff
changeset | 848 byteVector.clear(); | 
| 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 | 849 } | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 850 } | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 851 } 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 | 852 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 | 853 } | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 854 } | 
| 
ee8264d80747
Explicit constant for regular file flags, access to flags for a given file revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
414diff
changeset | 855 } | 
| 2 
08db726a0fb7
Shaping out low-level Hg structures
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 856 } | 
