hg4j: src/org/tmatesoft/hg/repo/HgManifest.java annotate

annotate src/org/tmatesoft/hg/repo/HgManifest.java @ 424:6437d261048a

Deprecated code removed

author	Artem Tikhomirov <tikhomirov.artem@gmail.com>
date	Wed, 28 Mar 2012 15:42:15 +0200
parents	9c9c442b5f2e
children	48f993aa2f41

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

Mercurial > hg4j

annotate src/org/tmatesoft/hg/repo/HgManifest.java @ 424:6437d261048a