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

annotate src/org/tmatesoft/hg/repo/Revlog.java @ 469:e04e7ecc4882

Release tag 'v1.0.0' added for changeset 3ca4ae7bdd38

author	Artem Tikhomirov <tikhomirov.artem@gmail.com>
date	Wed, 11 Jul 2012 17:59:17 +0200
parents	909306e412e2
children	7bcfbc255f48

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;
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	31 import org.tmatesoft.hg.internal.Preview;
77 c677e1593919 Moved RevlogStream implementation into .internal Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 74 diff changeset	32 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	33 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	34 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	35 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	36 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	37 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	38 import org.tmatesoft.hg.util.ProgressSupport;
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 56 diff changeset	39
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 56 diff changeset	40
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	41 /**
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	42 * 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	43 *
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 * 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	45 * 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	46 * 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	47 *
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 56 diff changeset	48 * @author Artem Tikhomirov
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 56 diff changeset	49 * @author TMate Software Ltd.
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	50 */
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 56 diff changeset	51 abstract class Revlog {
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	52
115 c0cc2535462c Introduced channels to pipeline (and easily filter) data streams Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 102 diff changeset	53 private final HgRepository repo;
21 e929cecae4e1 Refactor to move revlog content to base class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 3 diff changeset	54 protected final RevlogStream content;
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	55
115 c0cc2535462c Introduced channels to pipeline (and easily filter) data streams Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 102 diff changeset	56 protected Revlog(HgRepository hgRepo, RevlogStream contentStream) {
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	57 if (hgRepo == null) {
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 56 diff changeset	58 throw new IllegalArgumentException();
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 56 diff changeset	59 }
115 c0cc2535462c Introduced channels to pipeline (and easily filter) data streams Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 102 diff changeset	60 if (contentStream == null) {
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 56 diff changeset	61 throw new IllegalArgumentException();
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	62 }
115 c0cc2535462c Introduced channels to pipeline (and easily filter) data streams Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 102 diff changeset	63 repo = hgRepo;
c0cc2535462c Introduced channels to pipeline (and easily filter) data streams Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 102 diff changeset	64 content = contentStream;
c0cc2535462c Introduced channels to pipeline (and easily filter) data streams Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 102 diff changeset	65 }
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 // invalid Revlog
c0cc2535462c Introduced channels to pipeline (and easily filter) data streams Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 102 diff changeset	68 protected Revlog(HgRepository hgRepo) {
c0cc2535462c Introduced channels to pipeline (and easily filter) data streams Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 102 diff changeset	69 repo = hgRepo;
c0cc2535462c Introduced channels to pipeline (and easily filter) data streams Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 102 diff changeset	70 content = null;
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	71 }
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 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	74 return repo;
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	75 }
08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	76
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	77 /**
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	78 * @return total number of revisions kept in this revlog
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	79 * @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	80 */
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	81 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	82 return content.revisionCount();
e929cecae4e1 Refactor to move revlog content to base class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 3 diff changeset	83 }
80 4222b04f34ee Follow history of a file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	84
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	85 /**
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	86 * @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	87 * @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	88 */
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	89 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	90 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	91 }
354 5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	92
5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	93 /**
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	94 * 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	95 *
437 32184ddcf46d Better argument names Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 433 diff changeset	96 * @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	97 * @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	98 *
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	99 * @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	100 */
437 32184ddcf46d Better argument names Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 433 diff changeset	101 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	102 // 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	103 return Nodeid.fromBinary(content.nodeid(revisionIndex), 0);
80 4222b04f34ee Follow history of a file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	104 }
317 09628675bcee Rework file history build approach to match rest of the API Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 308 diff changeset	105
328 a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 327 diff changeset	106 /**
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	107 * 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	108 * <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	109 * <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	110 * <li>supplied array get modified (sorted)</ul>
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	111 * @return list of mapped revisions in no particular order
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	112 * @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	113 */
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	114 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	115 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	116 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	117 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	118 return rv;
09628675bcee Rework file history build approach to match rest of the API Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 308 diff changeset	119 }
09628675bcee Rework file history build approach to match rest of the API Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 308 diff changeset	120
366 189dc6dc1c3e Use exceptions to expose errors reading mercurial data Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 356 diff changeset	121 /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	122 // 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	123 // 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	124 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	125
09628675bcee Rework file history build approach to match rest of the API Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 308 diff changeset	126 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	127 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	128 }
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 }
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	131
243 0e01f9182e16 External cache Nodeid<->int added, Revlog.RevisionMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 218 diff changeset	132 /**
368 8107b95f4280 Update Javadoc with 'revision index' Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 367 diff changeset	133 * 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	134 * 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	135 *
0e01f9182e16 External cache Nodeid<->int added, Revlog.RevisionMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 218 diff changeset	136 * 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	137 * 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	138 *
243 0e01f9182e16 External cache Nodeid<->int added, Revlog.RevisionMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 218 diff changeset	139 * @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	140 * @return revision local index in this revlog
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	141 * @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	142 */
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	143 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	144 int revision = content.findRevisionIndex(nid);
80 4222b04f34ee Follow history of a file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	145 if (revision == BAD_REVISION) {
393 728708de3597 Resolve FIXMEs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 388 diff changeset	146 // 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	147 // are fine with default (class name)
728708de3597 Resolve FIXMEs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 388 diff changeset	148 // Perhaps, more tailored description method would be suitable here
728708de3597 Resolve FIXMEs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 388 diff changeset	149 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	150 }
26e3eeaa3962 branch and user filtering for log operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 39 diff changeset	151 return revision;
26e3eeaa3962 branch and user filtering for log operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 39 diff changeset	152 }
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	153
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 /**
354 5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	155 * 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	156 *
5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	157 * @param nodeid
419 7f136a3fa671 Clean javadoc to fix obvious warnings Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 418 diff changeset	158 * @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	159 * @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	160 */
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	161 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	162 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	163 if (BAD_REVISION == rn) {
39 4e9b66b07a28 Check changelog group starts with proper (known) base Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 37 diff changeset	164 return false;
4e9b66b07a28 Check changelog group starts with proper (known) base Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 37 diff changeset	165 }
49 26e3eeaa3962 branch and user filtering for log operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 39 diff changeset	166 if (rn < 0 \|\| rn >= content.revisionCount()) {
26e3eeaa3962 branch and user filtering for log operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 39 diff changeset	167 // 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	168 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	169 }
26e3eeaa3962 branch and user filtering for log operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 39 diff changeset	170 return true;
39 4e9b66b07a28 Check changelog group starts with proper (known) base Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 37 diff changeset	171 }
49 26e3eeaa3962 branch and user filtering for log operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 39 diff changeset	172
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	173 /**
394 f52ca9530774 Resolve FIXMEs: more consistent exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 393 diff changeset	174 * 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	175 *
f52ca9530774 Resolve FIXMEs: more consistent exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 393 diff changeset	176 * @param nodeid revision to retrieve
f52ca9530774 Resolve FIXMEs: more consistent exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 393 diff changeset	177 * @param sink data destination
f52ca9530774 Resolve FIXMEs: more consistent exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 393 diff changeset	178 *
f52ca9530774 Resolve FIXMEs: more consistent exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 393 diff changeset	179 * @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	180 * @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	181 * @throws CancelledException if content retrieval operation was cancelled
f52ca9530774 Resolve FIXMEs: more consistent exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 393 diff changeset	182 *
f52ca9530774 Resolve FIXMEs: more consistent exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 393 diff changeset	183 * @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	184 */
394 f52ca9530774 Resolve FIXMEs: more consistent exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 393 diff changeset	185 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	186 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	187 }
29 6cce719bbb62 Collector for nodes and their parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 24 diff changeset	188
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	189 /**
394 f52ca9530774 Resolve FIXMEs: more consistent exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 393 diff changeset	190 * 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	191 *
416 d30083c80d52 Better names - non-confusing and aligned with the rest of API Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 405 diff changeset	192 * @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	193 * @param sink data destination
f52ca9530774 Resolve FIXMEs: more consistent exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 393 diff changeset	194 *
f52ca9530774 Resolve FIXMEs: more consistent exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 393 diff changeset	195 * @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	196 * @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	197 * @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	198 */
416 d30083c80d52 Better names - non-confusing and aligned with the rest of API Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 405 diff changeset	199 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	200 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	201 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	202 }
394 f52ca9530774 Resolve FIXMEs: more consistent exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 393 diff changeset	203 try {
f52ca9530774 Resolve FIXMEs: more consistent exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 393 diff changeset	204 ContentPipe insp = new ContentPipe(sink, 0, repo.getContext().getLog());
f52ca9530774 Resolve FIXMEs: more consistent exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 393 diff changeset	205 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	206 content.iterate(revisionIndex, revisionIndex, true, insp);
394 f52ca9530774 Resolve FIXMEs: more consistent exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 393 diff changeset	207 insp.checkFailed();
f52ca9530774 Resolve FIXMEs: more consistent exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 393 diff changeset	208 } 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	209 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	210 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	211 // 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	212 // 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	213 // Do the same (add file name) below
f52ca9530774 Resolve FIXMEs: more consistent exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 393 diff changeset	214 throw e;
f52ca9530774 Resolve FIXMEs: more consistent exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 393 diff changeset	215 } catch (HgInvalidControlFileException ex) {
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	216 throw ex.isRevisionIndexSet() ? ex : ex.setRevisionIndex(revisionIndex);
394 f52ca9530774 Resolve FIXMEs: more consistent exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 393 diff changeset	217 }
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	218 }
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
56 576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	220 /**
405 866fc3b597a0 Add an explicit constant instead of -1 to indicate 'no revision' case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 403 diff changeset	221 * 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	222 *
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	223 * @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	224 * @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	225 * @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	226 * @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	227 * @throws IllegalArgumentException if passed arrays can't fit requested data
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	228 * @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	229 */
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	230 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	231 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	232 throw new HgInvalidRevisionException(revision);
56 576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	233 }
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	234 if (parentRevisions == null \|\| parentRevisions.length < 2) {
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	235 throw new IllegalArgumentException(String.valueOf(parentRevisions));
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	236 }
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	237 if (parent1 != null && parent1.length < 20) {
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	238 throw new IllegalArgumentException(parent1.toString());
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	239 }
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	240 if (parent2 != null && parent2.length < 20) {
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	241 throw new IllegalArgumentException(parent2.toString());
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	242 }
77 c677e1593919 Moved RevlogStream implementation into .internal Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 74 diff changeset	243 class ParentCollector implements RevlogStream.Inspector {
56 576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	244 public int p1 = -1;
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	245 public int p2 = -1;
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	246 public byte[] nodeid;
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	247
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	248 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	249 p1 = parent1Revision;
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	250 p2 = parent2Revision;
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	251 this.nodeid = new byte[20];
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	252 // 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	253 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	254 }
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 ParentCollector pc = new ParentCollector();
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	257 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	258 // 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	259 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	260 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	261 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	262 if (parentRevisions[0] == NO_REVISION) {
56 576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	263 Arrays.fill(parent1, 0, 20, (byte) 0);
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	264 } else {
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	265 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	266 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	267 }
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 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	270 if (parentRevisions[1] == NO_REVISION) {
56 576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	271 Arrays.fill(parent2, 0, 20, (byte) 0);
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	272 } else {
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	273 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	274 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	275 }
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 }
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	278
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 * EXPERIMENTAL CODE, DO NOT USE
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	281 *
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	282 * Alternative revlog iteration
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	283 *
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	284 * @param start
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	285 * @param end
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	286 * @param inspector
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	287 * @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	288 */
324 283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	289 @Experimental
431 12f668401613 FIXMEs: awkward API refactored, what need to be internal got hidden; public aspects got captured in slim interfaces Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 425 diff changeset	290 public 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	291 int lastRev = getLastRevision();
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	292 if (start == TIP) {
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	293 start = lastRev;
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	294 }
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	295 if (end == TIP) {
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	296 end = lastRev;
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	297 }
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	298 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	299 final ParentInspector parentInsp = Adaptable.Factory.getAdapter(inspector, ParentInspector.class, null);
324 283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	300 final Nodeid[] allRevisions = parentInsp == null ? null : new Nodeid[end - start + 1];
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	301
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	302 content.iterate(start, end, false, new RevlogStream.Inspector() {
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	303
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	304 public void next(int revisionNumber, int actualLen, int baseRevision, int linkRevision, int parent1Revision, int parent2Revision, byte[] nodeid, DataAccess data) {
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	305 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	306 if (revisionInsp != null) {
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	307 revisionInsp.next(revisionNumber, nid, linkRevision);
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	308 }
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	309 if (parentInsp != null) {
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	310 Nodeid p1 = parent1Revision == -1 ? Nodeid.NULL : allRevisions[parent1Revision];
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	311 Nodeid p2 = parent2Revision == -1 ? Nodeid.NULL : allRevisions[parent2Revision];
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	312 allRevisions[revisionNumber] = nid;
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	313 parentInsp.next(revisionNumber, nid, parent1Revision, parent2Revision, p1, p2);
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	314 }
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	315 }
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	316 });
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	317 }
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	318
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	319 /**
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	320 * MARKER
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	321 */
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	322 @Experimental
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	323 public interface Inspector {
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	324 }
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	325
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	326 @Experimental
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	327 public interface RevisionInspector extends Inspector {
368 8107b95f4280 Update Javadoc with 'revision index' Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 367 diff changeset	328 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	329 }
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	330
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	331 @Experimental
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	332 public interface ParentInspector extends Inspector {
327 3f09b8c19142 Tests for Revlog.Inspectors Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 324 diff changeset	333 // 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	334 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	335 }
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	336
432 1fc0da631200 Revlog.ParentWalker helper class got promoted as TLC, renamed to HgParentChildMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 431 diff changeset	337 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	338 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	339 pw.init();
1fc0da631200 Revlog.ParentWalker helper class got promoted as TLC, renamed to HgParentChildMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 431 diff changeset	340 return pw;
29 6cce719bbb62 Collector for nodes and their parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 24 diff changeset	341 }
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	342
433 be697c3e951e Revlog.RevisionMap helper class got promoted as TLC, renamed to HgRevisionMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 432 diff changeset	343 /*
be697c3e951e Revlog.RevisionMap helper class got promoted as TLC, renamed to HgRevisionMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 432 diff changeset	344 * 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	345 */
277 74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	346 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	347 private Exception failure;
277 74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	348 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	349
277 74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	350 protected void setCancelSupport(CancelSupport cs) {
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	351 assert cancelSupport == null; // no reason to set it twice
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	352 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	353 }
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	354
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	355 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	356 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	357 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	358 }
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	359
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	360 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	361 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	362 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	363 }
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	364 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	365 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	366 }
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	367 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	368 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	369 }
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	370 if (failure instanceof HgRuntimeException) {
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	371 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	372 }
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	373 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	374 }
277 74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	375
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	376 public void checkCancelled() throws CancelledException {
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	377 if (cancelSupport != null) {
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	378 cancelSupport.checkCancelled();
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	379 }
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	380 }
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	381 }
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	382
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	383 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	384 private final ByteChannel sink;
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	385 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	386 private final LogFacility logFacility;
277 74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	387
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	388 /**
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	389 * @param _sink - cannot be <code>null</code>
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	390 * @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	391 * @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	392 */
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	393 public ContentPipe(ByteChannel _sink, int seekOffset, LogFacility log) {
277 74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	394 assert _sink != null;
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	395 sink = _sink;
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	396 setCancelSupport(CancelSupport.Factory.get(_sink));
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	397 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	398 logFacility = log;
277 74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	399 }
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	400
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	401 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	402 if (offset > 0) { // save few useless reset/rewind operations
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	403 da.seek(offset);
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	404 }
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	405 }
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	406
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	407 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	408 try {
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	409 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	410 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	411 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	412 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	413 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	414 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	415 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	416 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	417 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	418 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	419 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	420 }
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	421 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	422 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	423 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	424 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	425 } 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	426 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	427 }
277 74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	428 while (!da.isEmpty()) {
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	429 checkCancelled();
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	430 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	431 buf.flip(); // post: position == 0
277 74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	432 // 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	433
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	434 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	435 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	436 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	437 }
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	438 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	439 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	440 }
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 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	442 progressSupport.worked(consumed);
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	443 }
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	444 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	445 } catch (IOException ex) {
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	446 recordFailure(ex);
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	447 } catch (CancelledException ex) {
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	448 recordFailure(ex);
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 }
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	451 }
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	452 }

Mercurial > hg4j

annotate src/org/tmatesoft/hg/repo/Revlog.java @ 469:e04e7ecc4882