jhg: src/org/tmatesoft/hg/repo/Revlog.java annotate

annotate src/org/tmatesoft/hg/repo/Revlog.java @ 514:5dcb4581c8ef

Report renames when following file history tree with HgFileRenameHandlerMixin

author	Artem Tikhomirov <tikhomirov.artem@gmail.com>
date	Mon, 17 Dec 2012 19:06:07 +0100
parents	b3c16d1aede0
children	243202f1bda5

rev	line source
22 603806cd2dc6 Status of local working dir against non-tip base revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 21 diff changeset	1 /*
388 b015f3918120 Work on FIXME: correct HgDataFile#workingCopy with tests; BasicSessionContext with property override; platform-specific options to internals 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: 56 diff changeset	3 *
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 56 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: 56 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: 56 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: 56 diff changeset	7 *
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 56 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: 56 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: 56 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: 56 diff changeset	11 * GNU General Public License for more details.
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 56 diff changeset	12 *
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 56 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: 56 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: 88 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: 56 diff changeset	17 package org.tmatesoft.hg.repo;
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	18
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	19 import static org.tmatesoft.hg.repo.HgRepository.*;
456 909306e412e2 Refactor LogFacility and SessionContext, better API for both Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 437 diff changeset	20 import static org.tmatesoft.hg.util.LogFacility.Severity.Warn;
56 576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	21
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 135 diff changeset	22 import java.io.IOException;
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 135 diff changeset	23 import java.nio.ByteBuffer;
317 09628675bcee Rework file history build approach to match rest of the API Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 308 diff changeset	24 import java.util.ArrayList;
56 576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	25 import java.util.Arrays;
171 2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 157 diff changeset	26 import java.util.List;
29 6cce719bbb62 Collector for nodes and their parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 24 diff changeset	27
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 56 diff changeset	28 import org.tmatesoft.hg.core.Nodeid;
157 d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 135 diff changeset	29 import org.tmatesoft.hg.internal.DataAccess;
324 283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	30 import org.tmatesoft.hg.internal.Experimental;
448 2e402c12ebc6 Issue 31: Revlog#walk() fails with AIOOBE when start > 0 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 445 diff changeset	31 import org.tmatesoft.hg.internal.IntMap;
355 f2c11fe7f3e9 Newline filter shall respect whole stream when deciding whether to process line terminators, hence added stream preview functionality Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 354 diff changeset	32 import org.tmatesoft.hg.internal.Preview;
77 c677e1593919 Moved RevlogStream implementation into .internal Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 74 diff changeset	33 import org.tmatesoft.hg.internal.RevlogStream;
324 283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	34 import org.tmatesoft.hg.util.Adaptable;
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 135 diff changeset	35 import org.tmatesoft.hg.util.ByteChannel;
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 135 diff changeset	36 import org.tmatesoft.hg.util.CancelSupport;
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 135 diff changeset	37 import org.tmatesoft.hg.util.CancelledException;
355 f2c11fe7f3e9 Newline filter shall respect whole stream when deciding whether to process line terminators, hence added stream preview functionality Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 354 diff changeset	38 import org.tmatesoft.hg.util.LogFacility;
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 135 diff changeset	39 import org.tmatesoft.hg.util.ProgressSupport;
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 56 diff changeset	40
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 56 diff changeset	41
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	42 /**
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 135 diff changeset	43 * Base class for all Mercurial entities that are serialized in a so called revlog format (changelog, manifest, data files).
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 135 diff changeset	44 *
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 135 diff changeset	45 * Implementation note:
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 135 diff changeset	46 * Hides actual actual revlog stream implementation and its access methods (i.e. RevlogStream.Inspector), iow shall not expose anything internal
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 135 diff changeset	47 * in public methods.
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 135 diff changeset	48 *
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 56 diff changeset	49 * @author Artem Tikhomirov
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 56 diff changeset	50 * @author TMate Software Ltd.
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	51 */
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 56 diff changeset	52 abstract class Revlog {
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	53
115 c0cc2535462c Introduced channels to pipeline (and easily filter) data streams Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 102 diff changeset	54 private final HgRepository repo;
21 e929cecae4e1 Refactor to move revlog content to base class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 3 diff changeset	55 protected final RevlogStream content;
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	56
115 c0cc2535462c Introduced channels to pipeline (and easily filter) data streams Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 102 diff changeset	57 protected Revlog(HgRepository hgRepo, RevlogStream contentStream) {
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	58 if (hgRepo == null) {
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 56 diff changeset	59 throw new IllegalArgumentException();
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 56 diff changeset	60 }
115 c0cc2535462c Introduced channels to pipeline (and easily filter) data streams Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 102 diff changeset	61 if (contentStream == null) {
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 56 diff changeset	62 throw new IllegalArgumentException();
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	63 }
115 c0cc2535462c Introduced channels to pipeline (and easily filter) data streams Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 102 diff changeset	64 repo = hgRepo;
c0cc2535462c Introduced channels to pipeline (and easily filter) data streams Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 102 diff changeset	65 content = contentStream;
c0cc2535462c Introduced channels to pipeline (and easily filter) data streams Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 102 diff changeset	66 }
c0cc2535462c Introduced channels to pipeline (and easily filter) data streams Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 102 diff changeset	67
c0cc2535462c Introduced channels to pipeline (and easily filter) data streams Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 102 diff changeset	68 // invalid Revlog
c0cc2535462c Introduced channels to pipeline (and easily filter) data streams Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 102 diff changeset	69 protected Revlog(HgRepository hgRepo) {
c0cc2535462c Introduced channels to pipeline (and easily filter) data streams Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 102 diff changeset	70 repo = hgRepo;
c0cc2535462c Introduced channels to pipeline (and easily filter) data streams Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 102 diff changeset	71 content = null;
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	72 }
08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	73
08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	74 public final HgRepository getRepo() {
115 c0cc2535462c Introduced channels to pipeline (and easily filter) data streams Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 102 diff changeset	75 return repo;
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	76 }
08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	77
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	78 /**
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	79 * @return total number of revisions kept in this revlog
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	80 * @throws HgRuntimeException subclass thereof to indicate issues with the library. <em>Runtime exception</em>
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	81 */
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	82 public final int getRevisionCount() throws HgRuntimeException {
21 e929cecae4e1 Refactor to move revlog content to base class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 3 diff changeset	83 return content.revisionCount();
e929cecae4e1 Refactor to move revlog content to base class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 3 diff changeset	84 }
80 4222b04f34ee Follow history of a file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	85
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	86 /**
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	87 * @return index of last known revision, a.k.a. {@link HgRepository#TIP}
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	88 * @throws HgRuntimeException subclass thereof to indicate issues with the library. <em>Runtime exception</em>
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	89 */
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	90 public final int getLastRevision() throws HgRuntimeException {
135 3959bffb14e9 explicit op name instead math op to get last rev number Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 115 diff changeset	91 return content.revisionCount() - 1;
3959bffb14e9 explicit op name instead math op to get last rev number Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 115 diff changeset	92 }
354 5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	93
5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	94 /**
388 b015f3918120 Work on FIXME: correct HgDataFile#workingCopy with tests; BasicSessionContext with property override; platform-specific options to internals Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 385 diff changeset	95 * Map revision index to unique revision identifier (nodeid).
354 5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	96 *
437 32184ddcf46d Better argument names Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 433 diff changeset	97 * @param revisionIndex index of the entry in this revlog, may be {@link HgRepository#TIP}
354 5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	98 * @return revision nodeid of the entry
5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	99 *
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	100 * @throws HgRuntimeException subclass thereof to indicate issues with the library. <em>Runtime exception</em>
354 5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	101 */
437 32184ddcf46d Better argument names Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 433 diff changeset	102 public final Nodeid getRevision(int revisionIndex) throws HgRuntimeException {
328 a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 327 diff changeset	103 // XXX cache nodeids? Rather, if context.getCache(this).getRevisionMap(create == false) != null, use it
437 32184ddcf46d Better argument names Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 433 diff changeset	104 return Nodeid.fromBinary(content.nodeid(revisionIndex), 0);
80 4222b04f34ee Follow history of a file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	105 }
317 09628675bcee Rework file history build approach to match rest of the API Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 308 diff changeset	106
328 a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 327 diff changeset	107 /**
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	108 * Effective alternative to map few revision indexes to corresponding nodeids at once.
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	109 * <p>Note, there are few aspects to be careful about when using this method<ul>
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	110 * <li>ordering of the revisions in the return list is unspecified, it's likely won't match that of the method argument
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	111 * <li>supplied array get modified (sorted)</ul>
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	112 * @return list of mapped revisions in no particular order
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	113 * @throws HgRuntimeException subclass thereof to indicate issues with the library. <em>Runtime exception</em>
328 a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 327 diff changeset	114 */
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	115 public final List<Nodeid> getRevisions(int... revisions) throws HgRuntimeException {
317 09628675bcee Rework file history build approach to match rest of the API Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 308 diff changeset	116 ArrayList<Nodeid> rv = new ArrayList<Nodeid>(revisions.length);
09628675bcee Rework file history build approach to match rest of the API Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 308 diff changeset	117 Arrays.sort(revisions);
09628675bcee Rework file history build approach to match rest of the API Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 308 diff changeset	118 getRevisionsInternal(rv, revisions);
09628675bcee Rework file history build approach to match rest of the API Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 308 diff changeset	119 return rv;
09628675bcee Rework file history build approach to match rest of the API Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 308 diff changeset	120 }
09628675bcee Rework file history build approach to match rest of the API Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 308 diff changeset	121
366 189dc6dc1c3e Use exceptions to expose errors reading mercurial data Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 356 diff changeset	122 /package-local/ void getRevisionsInternal(final List<Nodeid> retVal, int[] sortedRevs) throws HgInvalidRevisionException, HgInvalidControlFileException {
317 09628675bcee Rework file history build approach to match rest of the API Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 308 diff changeset	123 // once I have getRevisionMap and may find out whether it is avalable from cache,
09628675bcee Rework file history build approach to match rest of the API Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 308 diff changeset	124 // may use it, perhaps only for small number of revisions
09628675bcee Rework file history build approach to match rest of the API Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 308 diff changeset	125 content.iterate(sortedRevs, false, new RevlogStream.Inspector() {
09628675bcee Rework file history build approach to match rest of the API Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 308 diff changeset	126
09628675bcee Rework file history build approach to match rest of the API Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 308 diff changeset	127 public void next(int revisionNumber, int actualLen, int baseRevision, int linkRevision, int parent1Revision, int parent2Revision, byte[] nodeid, DataAccess data) {
09628675bcee Rework file history build approach to match rest of the API Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 308 diff changeset	128 retVal.add(Nodeid.fromBinary(nodeid, 0));
09628675bcee Rework file history build approach to match rest of the API Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 308 diff changeset	129 }
09628675bcee Rework file history build approach to match rest of the API Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 308 diff changeset	130 });
09628675bcee Rework file history build approach to match rest of the API Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 308 diff changeset	131 }
37 e45e75e22523 Parse changesets from bundle's changelog group. Refactor Revlog to provide access to revision's raw content Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 31 diff changeset	132
243 0e01f9182e16 External cache Nodeid<->int added, Revlog.RevisionMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 218 diff changeset	133 /**
368 8107b95f4280 Update Javadoc with 'revision index' Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 367 diff changeset	134 * Get local index of the specified revision.
347 8da7ade36c57 Add specific IAE subclass to handle wrong (e.g. outdated after rollback) revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 328 diff changeset	135 * If unsure, use {@link #isKnown(Nodeid)} to find out whether nodeid belongs to this revlog.
243 0e01f9182e16 External cache Nodeid<->int added, Revlog.RevisionMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 218 diff changeset	136 *
0e01f9182e16 External cache Nodeid<->int added, Revlog.RevisionMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 218 diff changeset	137 * For occasional queries, this method works with decent performance, despite its O(n/2) approach.
433 be697c3e951e Revlog.RevisionMap helper class got promoted as TLC, renamed to HgRevisionMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 432 diff changeset	138 * Alternatively, if you need to perform multiple queries (e.g. at least 15-20), {@link HgRevisionMap} may come handy.
347 8da7ade36c57 Add specific IAE subclass to handle wrong (e.g. outdated after rollback) revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 328 diff changeset	139 *
243 0e01f9182e16 External cache Nodeid<->int added, Revlog.RevisionMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 218 diff changeset	140 * @param nid revision to look up
347 8da7ade36c57 Add specific IAE subclass to handle wrong (e.g. outdated after rollback) revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 328 diff changeset	141 * @return revision local index in this revlog
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	142 * @throws HgRuntimeException subclass thereof to indicate issues with the library. <em>Runtime exception</em>
243 0e01f9182e16 External cache Nodeid<->int added, Revlog.RevisionMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 218 diff changeset	143 */
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	144 public final int getRevisionIndex(Nodeid nid) throws HgRuntimeException {
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	145 int revision = content.findRevisionIndex(nid);
80 4222b04f34ee Follow history of a file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	146 if (revision == BAD_REVISION) {
393 728708de3597 Resolve FIXMEs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 388 diff changeset	147 // using toString() to identify revlog. HgDataFile.toString includes path, HgManifest and HgChangelog instances
728708de3597 Resolve FIXMEs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 388 diff changeset	148 // are fine with default (class name)
728708de3597 Resolve FIXMEs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 388 diff changeset	149 // Perhaps, more tailored description method would be suitable here
728708de3597 Resolve FIXMEs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 388 diff changeset	150 throw new HgInvalidRevisionException(String.format("Can't find revision %s in %s", nid.shortNotation(), this), nid, null);
49 26e3eeaa3962 branch and user filtering for log operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 39 diff changeset	151 }
26e3eeaa3962 branch and user filtering for log operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 39 diff changeset	152 return revision;
26e3eeaa3962 branch and user filtering for log operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 39 diff changeset	153 }
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	154
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	155 /**
354 5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	156 * Note, {@link Nodeid#NULL} nodeid is not reported as known in any revlog.
5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	157 *
5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	158 * @param nodeid
419 7f136a3fa671 Clean javadoc to fix obvious warnings Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 418 diff changeset	159 * @return <code>true</code> if revision is part of this revlog
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	160 * @throws HgRuntimeException subclass thereof to indicate issues with the library. <em>Runtime exception</em>
354 5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	161 */
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	162 public final boolean isKnown(Nodeid nodeid) throws HgRuntimeException {
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	163 final int rn = content.findRevisionIndex(nodeid);
218 047b1dec7a04 Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 200 diff changeset	164 if (BAD_REVISION == rn) {
39 4e9b66b07a28 Check changelog group starts with proper (known) base Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 37 diff changeset	165 return false;
4e9b66b07a28 Check changelog group starts with proper (known) base Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 37 diff changeset	166 }
49 26e3eeaa3962 branch and user filtering for log operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 39 diff changeset	167 if (rn < 0 \|\| rn >= content.revisionCount()) {
26e3eeaa3962 branch and user filtering for log operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 39 diff changeset	168 // Sanity check
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: 419 diff changeset	169 throw new HgInvalidStateException(String.format("Revision index %d found for nodeid %s is not from the range [0..%d]", rn, nodeid.shortNotation(), content.revisionCount()-1));
49 26e3eeaa3962 branch and user filtering for log operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 39 diff changeset	170 }
26e3eeaa3962 branch and user filtering for log operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 39 diff changeset	171 return true;
39 4e9b66b07a28 Check changelog group starts with proper (known) base Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 37 diff changeset	172 }
49 26e3eeaa3962 branch and user filtering for log operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 39 diff changeset	173
37 e45e75e22523 Parse changesets from bundle's changelog group. Refactor Revlog to provide access to revision's raw content Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 31 diff changeset	174 /**
394 f52ca9530774 Resolve FIXMEs: more consistent exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 393 diff changeset	175 * Access to revision data as is, equivalent to <code>rawContent(getRevisionIndex(nodeid), sink)</code>
f52ca9530774 Resolve FIXMEs: more consistent exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 393 diff changeset	176 *
f52ca9530774 Resolve FIXMEs: more consistent exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 393 diff changeset	177 * @param nodeid revision to retrieve
f52ca9530774 Resolve FIXMEs: more consistent exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 393 diff changeset	178 * @param sink data destination
f52ca9530774 Resolve FIXMEs: more consistent exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 393 diff changeset	179 *
f52ca9530774 Resolve FIXMEs: more consistent exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 393 diff changeset	180 * @throws HgInvalidRevisionException if supplied argument doesn't represent revision index in this revlog
f52ca9530774 Resolve FIXMEs: more consistent exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 393 diff changeset	181 * @throws HgInvalidControlFileException if access to revlog index/data entry failed
f52ca9530774 Resolve FIXMEs: more consistent exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 393 diff changeset	182 * @throws CancelledException if content retrieval operation was cancelled
f52ca9530774 Resolve FIXMEs: more consistent exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 393 diff changeset	183 *
f52ca9530774 Resolve FIXMEs: more consistent exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 393 diff changeset	184 * @see #rawContent(int, ByteChannel)
37 e45e75e22523 Parse changesets from bundle's changelog group. Refactor Revlog to provide access to revision's raw content Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 31 diff changeset	185 */
394 f52ca9530774 Resolve FIXMEs: more consistent exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 393 diff changeset	186 protected void rawContent(Nodeid nodeid, ByteChannel sink) throws HgInvalidControlFileException, CancelledException, HgInvalidRevisionException {
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	187 rawContent(getRevisionIndex(nodeid), sink);
37 e45e75e22523 Parse changesets from bundle's changelog group. Refactor Revlog to provide access to revision's raw content Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 31 diff changeset	188 }
29 6cce719bbb62 Collector for nodes and their parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 24 diff changeset	189
37 e45e75e22523 Parse changesets from bundle's changelog group. Refactor Revlog to provide access to revision's raw content Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 31 diff changeset	190 /**
394 f52ca9530774 Resolve FIXMEs: more consistent exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 393 diff changeset	191 * Access to revision data as is (decompressed, but otherwise unprocessed, i.e. not parsed for e.g. changeset or manifest entries).
f52ca9530774 Resolve FIXMEs: more consistent exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 393 diff changeset	192 *
416 d30083c80d52 Better names - non-confusing and aligned with the rest of API Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 405 diff changeset	193 * @param revisionIndex index of this revlog change (not a changelog revision index), non-negative. From predefined constants, only {@link HgRepository#TIP} makes sense.
394 f52ca9530774 Resolve FIXMEs: more consistent exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 393 diff changeset	194 * @param sink data destination
f52ca9530774 Resolve FIXMEs: more consistent exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 393 diff changeset	195 *
f52ca9530774 Resolve FIXMEs: more consistent exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 393 diff changeset	196 * @throws HgInvalidRevisionException if supplied argument doesn't represent revision index in this revlog
f52ca9530774 Resolve FIXMEs: more consistent exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 393 diff changeset	197 * @throws HgInvalidControlFileException if access to revlog index/data entry failed
f52ca9530774 Resolve FIXMEs: more consistent exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 393 diff changeset	198 * @throws CancelledException if content retrieval operation was cancelled
37 e45e75e22523 Parse changesets from bundle's changelog group. Refactor Revlog to provide access to revision's raw content Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 31 diff changeset	199 */
416 d30083c80d52 Better names - non-confusing and aligned with the rest of API Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 405 diff changeset	200 protected void rawContent(int revisionIndex, ByteChannel sink) throws HgInvalidControlFileException, CancelledException, HgInvalidRevisionException {
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 135 diff changeset	201 if (sink == null) {
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 135 diff changeset	202 throw new IllegalArgumentException();
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 135 diff changeset	203 }
394 f52ca9530774 Resolve FIXMEs: more consistent exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 393 diff changeset	204 try {
490 b3c16d1aede0 Refactoring: move HgRepository's implementation aspects to Internals (which is now its imlementation counterpart and primary repository class to be used by other parts of the library) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 471 diff changeset	205 ContentPipe insp = new ContentPipe(sink, 0, repo.getSessionContext().getLog());
394 f52ca9530774 Resolve FIXMEs: more consistent exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 393 diff changeset	206 insp.checkCancelled();
416 d30083c80d52 Better names - non-confusing and aligned with the rest of API Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 405 diff changeset	207 content.iterate(revisionIndex, revisionIndex, true, insp);
394 f52ca9530774 Resolve FIXMEs: more consistent exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 393 diff changeset	208 insp.checkFailed();
f52ca9530774 Resolve FIXMEs: more consistent exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 393 diff changeset	209 } catch (IOException ex) {
416 d30083c80d52 Better names - non-confusing and aligned with the rest of API Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 405 diff changeset	210 HgInvalidControlFileException e = new HgInvalidControlFileException(String.format("Access to revision %d content failed", revisionIndex), ex, null);
d30083c80d52 Better names - non-confusing and aligned with the rest of API Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 405 diff changeset	211 e.setRevisionIndex(revisionIndex);
418 528b6780a8bd A bit of FIXME cleanup (mostly degraded to TODO post 1.0), comments and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 416 diff changeset	212 // TODO post 1.0 e.setFileName(content.getIndexFile() or this.getHumanFriendlyPath()) - shall decide whether
528b6780a8bd A bit of FIXME cleanup (mostly degraded to TODO post 1.0), comments and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 416 diff changeset	213 // protected abstract getHFPath() with impl in HgDataFile, HgManifest and HgChangelog or path is data of either Revlog or RevlogStream
394 f52ca9530774 Resolve FIXMEs: more consistent exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 393 diff changeset	214 // Do the same (add file name) below
f52ca9530774 Resolve FIXMEs: more consistent exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 393 diff changeset	215 throw e;
f52ca9530774 Resolve FIXMEs: more consistent exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 393 diff changeset	216 } catch (HgInvalidControlFileException ex) {
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	217 throw ex.isRevisionIndexSet() ? ex : ex.setRevisionIndex(revisionIndex);
394 f52ca9530774 Resolve FIXMEs: more consistent exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 393 diff changeset	218 }
37 e45e75e22523 Parse changesets from bundle's changelog group. Refactor Revlog to provide access to revision's raw content Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 31 diff changeset	219 }
e45e75e22523 Parse changesets from bundle's changelog group. Refactor Revlog to provide access to revision's raw content Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 31 diff changeset	220
56 576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	221 /**
405 866fc3b597a0 Add an explicit constant instead of -1 to indicate 'no revision' case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 403 diff changeset	222 * Fills supplied arguments with information about revision parents.
56 576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	223 *
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	224 * @param revision - revision to query parents, or {@link HgRepository#TIP}
405 866fc3b597a0 Add an explicit constant instead of -1 to indicate 'no revision' case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 403 diff changeset	225 * @param parentRevisions - int[2] to get local revision numbers of parents (e.g. {6, -1}), {@link HgRepository#NO_REVISION} indicates parent not set
56 576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	226 * @param parent1 - byte[20] or null, if parent's nodeid is not needed
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	227 * @param parent2 - byte[20] or null, if second parent's nodeid is not needed
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	228 * @throws IllegalArgumentException if passed arrays can't fit requested data
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	229 * @throws HgRuntimeException subclass thereof to indicate issues with the library. <em>Runtime exception</em>
56 576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	230 */
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	231 public void parents(int revision, int[] parentRevisions, byte[] parent1, byte[] parent2) throws HgRuntimeException, IllegalArgumentException {
56 576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	232 if (revision != TIP && !(revision >= 0 && revision < content.revisionCount())) {
347 8da7ade36c57 Add specific IAE subclass to handle wrong (e.g. outdated after rollback) revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 328 diff changeset	233 throw new HgInvalidRevisionException(revision);
56 576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	234 }
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	235 if (parentRevisions == null \|\| parentRevisions.length < 2) {
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	236 throw new IllegalArgumentException(String.valueOf(parentRevisions));
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	237 }
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	238 if (parent1 != null && parent1.length < 20) {
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	239 throw new IllegalArgumentException(parent1.toString());
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	240 }
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	241 if (parent2 != null && parent2.length < 20) {
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	242 throw new IllegalArgumentException(parent2.toString());
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	243 }
77 c677e1593919 Moved RevlogStream implementation into .internal Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 74 diff changeset	244 class ParentCollector implements RevlogStream.Inspector {
56 576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	245 public int p1 = -1;
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	246 public int p2 = -1;
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	247 public byte[] nodeid;
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	248
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 135 diff changeset	249 public void next(int revisionNumber, int actualLen, int baseRevision, int linkRevision, int parent1Revision, int parent2Revision, byte[] nodeid, DataAccess da) {
56 576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	250 p1 = parent1Revision;
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	251 p2 = parent2Revision;
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	252 this.nodeid = new byte[20];
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	253 // nodeid arg now comes in 32 byte from (as in file format description), however upper 12 bytes are zeros.
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	254 System.arraycopy(nodeid, nodeid.length > 20 ? nodeid.length - 20 : 0, this.nodeid, 0, 20);
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	255 }
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	256 };
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	257 ParentCollector pc = new ParentCollector();
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	258 content.iterate(revision, revision, false, pc);
405 866fc3b597a0 Add an explicit constant instead of -1 to indicate 'no revision' case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 403 diff changeset	259 // although next code looks odd (NO_REVISION is -1), it's safer to be explicit
866fc3b597a0 Add an explicit constant instead of -1 to indicate 'no revision' case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 403 diff changeset	260 parentRevisions[0] = pc.p1 == -1 ? NO_REVISION : pc.p1;
866fc3b597a0 Add an explicit constant instead of -1 to indicate 'no revision' case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 403 diff changeset	261 parentRevisions[1] = pc.p2 == -1 ? NO_REVISION : pc.p2;
56 576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	262 if (parent1 != null) {
405 866fc3b597a0 Add an explicit constant instead of -1 to indicate 'no revision' case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 403 diff changeset	263 if (parentRevisions[0] == NO_REVISION) {
56 576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	264 Arrays.fill(parent1, 0, 20, (byte) 0);
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	265 } else {
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	266 content.iterate(parentRevisions[0], parentRevisions[0], false, pc);
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	267 System.arraycopy(pc.nodeid, 0, parent1, 0, 20);
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	268 }
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	269 }
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	270 if (parent2 != null) {
405 866fc3b597a0 Add an explicit constant instead of -1 to indicate 'no revision' case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 403 diff changeset	271 if (parentRevisions[1] == NO_REVISION) {
56 576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	272 Arrays.fill(parent2, 0, 20, (byte) 0);
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	273 } else {
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	274 content.iterate(parentRevisions[1], parentRevisions[1], false, pc);
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	275 System.arraycopy(pc.nodeid, 0, parent2, 0, 20);
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	276 }
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	277 }
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	278 }
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	279
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	280 /**
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	281 * EXPERIMENTAL CODE, DO NOT USE
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	282 *
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	283 * Alternative revlog iteration
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	284 *
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	285 * @param start
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	286 * @param end
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	287 * @param inspector
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	288 * @throws HgRuntimeException subclass thereof to indicate issues with the library. <em>Runtime exception</em>
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	289 */
324 283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	290 @Experimental
471 7bcfbc255f48 Merge changes from smartgit3 branch into 1.1 stream Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 456 448 diff changeset	291 public final void indexWalk(int start, int end, final Revlog.Inspector inspector) throws HgRuntimeException {
324 283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	292 int lastRev = getLastRevision();
448 2e402c12ebc6 Issue 31: Revlog#walk() fails with AIOOBE when start > 0 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 445 diff changeset	293 final int _start = start == TIP ? lastRev : start;
324 283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	294 if (end == TIP) {
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	295 end = lastRev;
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	296 }
356 91d75e1bac9f Consistent approach to deal with adaptable objects. Give adaptable precedence over instanceof to allow conditional response when classes do implement desired interface Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 355 diff changeset	297 final RevisionInspector revisionInsp = Adaptable.Factory.getAdapter(inspector, RevisionInspector.class, null);
91d75e1bac9f Consistent approach to deal with adaptable objects. Give adaptable precedence over instanceof to allow conditional response when classes do implement desired interface Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 355 diff changeset	298 final ParentInspector parentInsp = Adaptable.Factory.getAdapter(inspector, ParentInspector.class, null);
448 2e402c12ebc6 Issue 31: Revlog#walk() fails with AIOOBE when start > 0 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 445 diff changeset	299 final Nodeid[] allRevisions = parentInsp == null ? null : new Nodeid[end - _start + 1];
2e402c12ebc6 Issue 31: Revlog#walk() fails with AIOOBE when start > 0 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 445 diff changeset	300 // next are to build set of parent indexes that are not part of the range iteration
2e402c12ebc6 Issue 31: Revlog#walk() fails with AIOOBE when start > 0 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 445 diff changeset	301 // i.e. those parents we need to read separately. See Issue 31 for details.
2e402c12ebc6 Issue 31: Revlog#walk() fails with AIOOBE when start > 0 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 445 diff changeset	302 final int[] firstParentIndexes = parentInsp == null \|\| _start == 0 ? null : new int[allRevisions.length];
2e402c12ebc6 Issue 31: Revlog#walk() fails with AIOOBE when start > 0 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 445 diff changeset	303 final int[] secondParentIndexes = parentInsp == null \|\| _start == 0 ? null : new int[allRevisions.length];
2e402c12ebc6 Issue 31: Revlog#walk() fails with AIOOBE when start > 0 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 445 diff changeset	304 final IntMap<Nodeid> missingParents = parentInsp == null \|\| _start == 0 ? null : new IntMap<Nodeid>(16);
324 283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	305
448 2e402c12ebc6 Issue 31: Revlog#walk() fails with AIOOBE when start > 0 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 445 diff changeset	306 content.iterate(_start, end, false, new RevlogStream.Inspector() {
2e402c12ebc6 Issue 31: Revlog#walk() fails with AIOOBE when start > 0 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 445 diff changeset	307 private int i = 0;
324 283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	308
448 2e402c12ebc6 Issue 31: Revlog#walk() fails with AIOOBE when start > 0 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 445 diff changeset	309 public void next(int revisionIndex, int actualLen, int baseRevIndex, int linkRevIndex, int parent1RevIndex, int parent2RevIndex, byte[] nodeid, DataAccess data) {
324 283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	310 Nodeid nid = Nodeid.fromBinary(nodeid, 0);
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	311 if (revisionInsp != null) {
448 2e402c12ebc6 Issue 31: Revlog#walk() fails with AIOOBE when start > 0 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 445 diff changeset	312 revisionInsp.next(revisionIndex, nid, linkRevIndex);
324 283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	313 }
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	314 if (parentInsp != null) {
448 2e402c12ebc6 Issue 31: Revlog#walk() fails with AIOOBE when start > 0 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 445 diff changeset	315 allRevisions[i] = nid;
2e402c12ebc6 Issue 31: Revlog#walk() fails with AIOOBE when start > 0 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 445 diff changeset	316 if (_start > 0) {
2e402c12ebc6 Issue 31: Revlog#walk() fails with AIOOBE when start > 0 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 445 diff changeset	317 firstParentIndexes[i] = parent1RevIndex;
2e402c12ebc6 Issue 31: Revlog#walk() fails with AIOOBE when start > 0 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 445 diff changeset	318 secondParentIndexes[i] = parent2RevIndex;
2e402c12ebc6 Issue 31: Revlog#walk() fails with AIOOBE when start > 0 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 445 diff changeset	319 if (parent1RevIndex < _start && parent1RevIndex >= 0) {
2e402c12ebc6 Issue 31: Revlog#walk() fails with AIOOBE when start > 0 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 445 diff changeset	320 missingParents.put(parent1RevIndex, null);
2e402c12ebc6 Issue 31: Revlog#walk() fails with AIOOBE when start > 0 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 445 diff changeset	321 }
2e402c12ebc6 Issue 31: Revlog#walk() fails with AIOOBE when start > 0 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 445 diff changeset	322 if (parent2RevIndex < _start && parent2RevIndex >= 0) {
2e402c12ebc6 Issue 31: Revlog#walk() fails with AIOOBE when start > 0 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 445 diff changeset	323 missingParents.put(parent2RevIndex, null);
2e402c12ebc6 Issue 31: Revlog#walk() fails with AIOOBE when start > 0 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 445 diff changeset	324 }
2e402c12ebc6 Issue 31: Revlog#walk() fails with AIOOBE when start > 0 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 445 diff changeset	325 } else {
2e402c12ebc6 Issue 31: Revlog#walk() fails with AIOOBE when start > 0 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 445 diff changeset	326 Nodeid p1 = parent1RevIndex == -1 ? Nodeid.NULL : allRevisions[parent1RevIndex];
2e402c12ebc6 Issue 31: Revlog#walk() fails with AIOOBE when start > 0 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 445 diff changeset	327 Nodeid p2 = parent2RevIndex == -1 ? Nodeid.NULL : allRevisions[parent2RevIndex];
2e402c12ebc6 Issue 31: Revlog#walk() fails with AIOOBE when start > 0 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 445 diff changeset	328 parentInsp.next(revisionIndex, allRevisions[i], parent1RevIndex, parent2RevIndex, p1, p2);
2e402c12ebc6 Issue 31: Revlog#walk() fails with AIOOBE when start > 0 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 445 diff changeset	329 }
2e402c12ebc6 Issue 31: Revlog#walk() fails with AIOOBE when start > 0 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 445 diff changeset	330 i++;
324 283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	331 }
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	332 }
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	333 });
448 2e402c12ebc6 Issue 31: Revlog#walk() fails with AIOOBE when start > 0 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 445 diff changeset	334 if (parentInsp != null && _start > 0) {
2e402c12ebc6 Issue 31: Revlog#walk() fails with AIOOBE when start > 0 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 445 diff changeset	335 assert missingParents.size() > 0; // in fact, more relaxed than assert. rather 'assume'
2e402c12ebc6 Issue 31: Revlog#walk() fails with AIOOBE when start > 0 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 445 diff changeset	336 // TODO int[] IntMap#keys() or even sort of iterator that can modify values
2e402c12ebc6 Issue 31: Revlog#walk() fails with AIOOBE when start > 0 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 445 diff changeset	337 for (int k = missingParents.firstKey(), l = missingParents.lastKey(); k <= l; k++) {
2e402c12ebc6 Issue 31: Revlog#walk() fails with AIOOBE when start > 0 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 445 diff changeset	338 if (missingParents.containsKey(k)) {
2e402c12ebc6 Issue 31: Revlog#walk() fails with AIOOBE when start > 0 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 445 diff changeset	339 Nodeid nid = getRepo().getChangelog().getRevision(k);
2e402c12ebc6 Issue 31: Revlog#walk() fails with AIOOBE when start > 0 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 445 diff changeset	340 missingParents.put(k, nid);
2e402c12ebc6 Issue 31: Revlog#walk() fails with AIOOBE when start > 0 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 445 diff changeset	341 }
2e402c12ebc6 Issue 31: Revlog#walk() fails with AIOOBE when start > 0 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 445 diff changeset	342 }
2e402c12ebc6 Issue 31: Revlog#walk() fails with AIOOBE when start > 0 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 445 diff changeset	343
2e402c12ebc6 Issue 31: Revlog#walk() fails with AIOOBE when start > 0 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 445 diff changeset	344 for (int i = 0, revNum = _start; i < allRevisions.length; i++, revNum++) {
2e402c12ebc6 Issue 31: Revlog#walk() fails with AIOOBE when start > 0 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 445 diff changeset	345 int riP1 = firstParentIndexes[i];
2e402c12ebc6 Issue 31: Revlog#walk() fails with AIOOBE when start > 0 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 445 diff changeset	346 int riP2 = secondParentIndexes[i];
2e402c12ebc6 Issue 31: Revlog#walk() fails with AIOOBE when start > 0 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 445 diff changeset	347 Nodeid p1, p2;
2e402c12ebc6 Issue 31: Revlog#walk() fails with AIOOBE when start > 0 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 445 diff changeset	348 p1 = p2 = Nodeid.NULL;
2e402c12ebc6 Issue 31: Revlog#walk() fails with AIOOBE when start > 0 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 445 diff changeset	349 if (riP1 >= _start) {
2e402c12ebc6 Issue 31: Revlog#walk() fails with AIOOBE when start > 0 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 445 diff changeset	350 // p1 of revNum's revision is out of iterated range
2e402c12ebc6 Issue 31: Revlog#walk() fails with AIOOBE when start > 0 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 445 diff changeset	351 // (don't check for riP1<end as I assume parents come prior to children in the changelog)
2e402c12ebc6 Issue 31: Revlog#walk() fails with AIOOBE when start > 0 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 445 diff changeset	352 p1 = allRevisions[riP1 - start];
2e402c12ebc6 Issue 31: Revlog#walk() fails with AIOOBE when start > 0 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 445 diff changeset	353 } else if (riP1 != -1) {
2e402c12ebc6 Issue 31: Revlog#walk() fails with AIOOBE when start > 0 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 445 diff changeset	354 assert riP1 >=0 && riP1 < _start;
2e402c12ebc6 Issue 31: Revlog#walk() fails with AIOOBE when start > 0 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 445 diff changeset	355 p1 = missingParents.get(riP1);
2e402c12ebc6 Issue 31: Revlog#walk() fails with AIOOBE when start > 0 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 445 diff changeset	356 }
2e402c12ebc6 Issue 31: Revlog#walk() fails with AIOOBE when start > 0 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 445 diff changeset	357 // same for Pp2
2e402c12ebc6 Issue 31: Revlog#walk() fails with AIOOBE when start > 0 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 445 diff changeset	358 if (riP2 >= _start) {
2e402c12ebc6 Issue 31: Revlog#walk() fails with AIOOBE when start > 0 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 445 diff changeset	359 p2 = allRevisions[riP2 - start];
2e402c12ebc6 Issue 31: Revlog#walk() fails with AIOOBE when start > 0 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 445 diff changeset	360 } else if (riP2 != -1) {
2e402c12ebc6 Issue 31: Revlog#walk() fails with AIOOBE when start > 0 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 445 diff changeset	361 assert riP2 >= 0 && riP2 < _start;
2e402c12ebc6 Issue 31: Revlog#walk() fails with AIOOBE when start > 0 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 445 diff changeset	362 p2 = missingParents.get(riP2);
2e402c12ebc6 Issue 31: Revlog#walk() fails with AIOOBE when start > 0 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 445 diff changeset	363 }
2e402c12ebc6 Issue 31: Revlog#walk() fails with AIOOBE when start > 0 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 445 diff changeset	364 parentInsp.next(revNum, allRevisions[i], riP1, riP2, p1, p2);
2e402c12ebc6 Issue 31: Revlog#walk() fails with AIOOBE when start > 0 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 445 diff changeset	365 }
2e402c12ebc6 Issue 31: Revlog#walk() fails with AIOOBE when start > 0 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 445 diff changeset	366 }
324 283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	367 }
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	368
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	369 /**
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	370 * MARKER
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	371 */
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	372 @Experimental
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	373 public interface Inspector {
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	374 }
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	375
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	376 @Experimental
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	377 public interface RevisionInspector extends Inspector {
368 8107b95f4280 Update Javadoc with 'revision index' Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 367 diff changeset	378 void next(int revisionIndex, Nodeid revision, int linkedRevisionIndex);
324 283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	379 }
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	380
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	381 @Experimental
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	382 public interface ParentInspector extends Inspector {
327 3f09b8c19142 Tests for Revlog.Inspectors Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 324 diff changeset	383 // XXX document whether parentX is -1 or a constant (BAD_REVISION? or dedicated?)
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	384 void next(int revisionIndex, Nodeid revision, int parent1, int parent2, Nodeid nidParent1, Nodeid nidParent2);
324 283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	385 }
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	386
432 1fc0da631200 Revlog.ParentWalker helper class got promoted as TLC, renamed to HgParentChildMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 431 diff changeset	387 protected HgParentChildMap<? extends Revlog> getParentWalker() {
1fc0da631200 Revlog.ParentWalker helper class got promoted as TLC, renamed to HgParentChildMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 431 diff changeset	388 HgParentChildMap<Revlog> pw = new HgParentChildMap<Revlog>(this);
1fc0da631200 Revlog.ParentWalker helper class got promoted as TLC, renamed to HgParentChildMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 431 diff changeset	389 pw.init();
1fc0da631200 Revlog.ParentWalker helper class got promoted as TLC, renamed to HgParentChildMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 431 diff changeset	390 return pw;
29 6cce719bbb62 Collector for nodes and their parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 24 diff changeset	391 }
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 135 diff changeset	392
433 be697c3e951e Revlog.RevisionMap helper class got promoted as TLC, renamed to HgRevisionMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 432 diff changeset	393 /*
be697c3e951e Revlog.RevisionMap helper class got promoted as TLC, renamed to HgRevisionMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 432 diff changeset	394 * class with cancel and few other exceptions support. TODO consider general superclass to share with e.g. HgManifestCommand.Mediator
243 0e01f9182e16 External cache Nodeid<->int added, Revlog.RevisionMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 218 diff changeset	395 */
277 74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	396 protected abstract static class ErrorHandlingInspector implements RevlogStream.Inspector, CancelSupport {
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 135 diff changeset	397 private Exception failure;
277 74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	398 private CancelSupport cancelSupport;
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 135 diff changeset	399
277 74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	400 protected void setCancelSupport(CancelSupport cs) {
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	401 assert cancelSupport == null; // no reason to set it twice
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	402 cancelSupport = cs;
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 135 diff changeset	403 }
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 135 diff changeset	404
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 135 diff changeset	405 protected void recordFailure(Exception ex) {
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 135 diff changeset	406 assert failure == null;
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 135 diff changeset	407 failure = ex;
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 135 diff changeset	408 }
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 135 diff changeset	409
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	410 public void checkFailed() throws HgRuntimeException, IOException, CancelledException {
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 135 diff changeset	411 if (failure == null) {
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 135 diff changeset	412 return;
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 135 diff changeset	413 }
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 135 diff changeset	414 if (failure instanceof IOException) {
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 135 diff changeset	415 throw (IOException) failure;
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 135 diff changeset	416 }
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 135 diff changeset	417 if (failure instanceof CancelledException) {
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 135 diff changeset	418 throw (CancelledException) failure;
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 135 diff changeset	419 }
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	420 if (failure instanceof HgRuntimeException) {
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	421 throw (HgRuntimeException) failure;
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 135 diff changeset	422 }
423 9c9c442b5f2e Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 419 diff changeset	423 throw new HgInvalidStateException(failure.toString());
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 135 diff changeset	424 }
277 74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	425
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	426 public void checkCancelled() throws CancelledException {
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	427 if (cancelSupport != null) {
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	428 cancelSupport.checkCancelled();
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	429 }
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	430 }
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	431 }
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	432
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	433 protected static class ContentPipe extends ErrorHandlingInspector implements RevlogStream.Inspector, CancelSupport {
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	434 private final ByteChannel sink;
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	435 private final int offset;
355 f2c11fe7f3e9 Newline filter shall respect whole stream when deciding whether to process line terminators, hence added stream preview functionality Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 354 diff changeset	436 private final LogFacility logFacility;
277 74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	437
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	438 /**
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	439 * @param _sink - cannot be <code>null</code>
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	440 * @param seekOffset - when positive, orders to pipe bytes to the sink starting from specified offset, not from the first byte available in DataAccess
355 f2c11fe7f3e9 Newline filter shall respect whole stream when deciding whether to process line terminators, hence added stream preview functionality Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 354 diff changeset	441 * @param log optional facility to put warnings/debug messages into, may be null.
277 74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	442 */
355 f2c11fe7f3e9 Newline filter shall respect whole stream when deciding whether to process line terminators, hence added stream preview functionality Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 354 diff changeset	443 public ContentPipe(ByteChannel _sink, int seekOffset, LogFacility log) {
277 74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	444 assert _sink != null;
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	445 sink = _sink;
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	446 setCancelSupport(CancelSupport.Factory.get(_sink));
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	447 offset = seekOffset;
355 f2c11fe7f3e9 Newline filter shall respect whole stream when deciding whether to process line terminators, hence added stream preview functionality Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 354 diff changeset	448 logFacility = log;
277 74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	449 }
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	450
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	451 protected void prepare(int revisionNumber, DataAccess da) throws IOException {
277 74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	452 if (offset > 0) { // save few useless reset/rewind operations
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	453 da.seek(offset);
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	454 }
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	455 }
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	456
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	457 public void next(int revisionNumber, int actualLen, int baseRevision, int linkRevision, int parent1Revision, int parent2Revision, byte[] nodeid, DataAccess da) {
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	458 try {
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	459 prepare(revisionNumber, da); // XXX perhaps, prepare shall return DA (sliced, if needed)
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	460 final ProgressSupport progressSupport = ProgressSupport.Factory.get(sink);
355 f2c11fe7f3e9 Newline filter shall respect whole stream when deciding whether to process line terminators, hence added stream preview functionality Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 354 diff changeset	461 ByteBuffer buf = ByteBuffer.allocate(actualLen > 8192 ? 8192 : actualLen);
356 91d75e1bac9f Consistent approach to deal with adaptable objects. Give adaptable precedence over instanceof to allow conditional response when classes do implement desired interface Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 355 diff changeset	462 Preview p = Adaptable.Factory.getAdapter(sink, Preview.class, null);
355 f2c11fe7f3e9 Newline filter shall respect whole stream when deciding whether to process line terminators, hence added stream preview functionality Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 354 diff changeset	463 if (p != null) {
f2c11fe7f3e9 Newline filter shall respect whole stream when deciding whether to process line terminators, hence added stream preview functionality Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 354 diff changeset	464 progressSupport.start(2 * da.length());
f2c11fe7f3e9 Newline filter shall respect whole stream when deciding whether to process line terminators, hence added stream preview functionality Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 354 diff changeset	465 while (!da.isEmpty()) {
f2c11fe7f3e9 Newline filter shall respect whole stream when deciding whether to process line terminators, hence added stream preview functionality Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 354 diff changeset	466 checkCancelled();
f2c11fe7f3e9 Newline filter shall respect whole stream when deciding whether to process line terminators, hence added stream preview functionality Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 354 diff changeset	467 da.readBytes(buf);
f2c11fe7f3e9 Newline filter shall respect whole stream when deciding whether to process line terminators, hence added stream preview functionality Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 354 diff changeset	468 p.preview(buf);
f2c11fe7f3e9 Newline filter shall respect whole stream when deciding whether to process line terminators, hence added stream preview functionality Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 354 diff changeset	469 buf.clear();
f2c11fe7f3e9 Newline filter shall respect whole stream when deciding whether to process line terminators, hence added stream preview functionality Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 354 diff changeset	470 }
f2c11fe7f3e9 Newline filter shall respect whole stream when deciding whether to process line terminators, hence added stream preview functionality Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 354 diff changeset	471 da.reset();
f2c11fe7f3e9 Newline filter shall respect whole stream when deciding whether to process line terminators, hence added stream preview functionality Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 354 diff changeset	472 prepare(revisionNumber, da);
f2c11fe7f3e9 Newline filter shall respect whole stream when deciding whether to process line terminators, hence added stream preview functionality Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 354 diff changeset	473 progressSupport.worked(da.length());
f2c11fe7f3e9 Newline filter shall respect whole stream when deciding whether to process line terminators, hence added stream preview functionality Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 354 diff changeset	474 buf.clear();
f2c11fe7f3e9 Newline filter shall respect whole stream when deciding whether to process line terminators, hence added stream preview functionality Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 354 diff changeset	475 } else {
f2c11fe7f3e9 Newline filter shall respect whole stream when deciding whether to process line terminators, hence added stream preview functionality Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 354 diff changeset	476 progressSupport.start(da.length());
f2c11fe7f3e9 Newline filter shall respect whole stream when deciding whether to process line terminators, hence added stream preview functionality Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 354 diff changeset	477 }
277 74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	478 while (!da.isEmpty()) {
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	479 checkCancelled();
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	480 da.readBytes(buf);
355 f2c11fe7f3e9 Newline filter shall respect whole stream when deciding whether to process line terminators, hence added stream preview functionality Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 354 diff changeset	481 buf.flip(); // post: position == 0
277 74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	482 // XXX I may not rely on returned number of bytes but track change in buf position instead.
355 f2c11fe7f3e9 Newline filter shall respect whole stream when deciding whether to process line terminators, hence added stream preview functionality Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 354 diff changeset	483
f2c11fe7f3e9 Newline filter shall respect whole stream when deciding whether to process line terminators, hence added stream preview functionality Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 354 diff changeset	484 int consumed = sink.write(buf);
f2c11fe7f3e9 Newline filter shall respect whole stream when deciding whether to process line terminators, hence added stream preview functionality Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 354 diff changeset	485 if ((consumed == 0 \|\| consumed != buf.position()) && logFacility != null) {
456 909306e412e2 Refactor LogFacility and SessionContext, better API for both Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 437 diff changeset	486 logFacility.dump(getClass(), Warn, "Bad data sink when reading revision %d. Reported %d bytes consumed, byt actually read %d", revisionNumber, consumed, buf.position());
355 f2c11fe7f3e9 Newline filter shall respect whole stream when deciding whether to process line terminators, hence added stream preview functionality Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 354 diff changeset	487 }
f2c11fe7f3e9 Newline filter shall respect whole stream when deciding whether to process line terminators, hence added stream preview functionality Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 354 diff changeset	488 if (buf.position() == 0) {
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: 419 diff changeset	489 throw new HgInvalidStateException("Bad sink implementation (consumes no bytes) results in endless loop");
355 f2c11fe7f3e9 Newline filter shall respect whole stream when deciding whether to process line terminators, hence added stream preview functionality Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 354 diff changeset	490 }
f2c11fe7f3e9 Newline filter shall respect whole stream when deciding whether to process line terminators, hence added stream preview functionality Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 354 diff changeset	491 buf.compact(); // ensure (a) there's space for new (b) data starts at 0
277 74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	492 progressSupport.worked(consumed);
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	493 }
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	494 progressSupport.done(); // XXX shall specify whether #done() is invoked always or only if completed successfully.
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	495 } catch (IOException ex) {
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	496 recordFailure(ex);
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	497 } catch (CancelledException ex) {
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	498 recordFailure(ex);
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	499 }
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	500 }
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 135 diff changeset	501 }
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	502 }

Mercurial > jhg

annotate src/org/tmatesoft/hg/repo/Revlog.java @ 514:5dcb4581c8ef