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

annotate src/org/tmatesoft/hg/repo/Revlog.java @ 380:9517df1ef7ec

Comments/javadoc

author	Artem Tikhomirov <tikhomirov.artem@gmail.com>
date	Thu, 09 Feb 2012 18:57:14 +0100
parents	8107b95f4280
children	6150555eb41d

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 /*
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 56 diff changeset	2 * Copyright (c) 2010-2011 TMate Software Ltd
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
80 4222b04f34ee Follow history of a file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	19 import static org.tmatesoft.hg.repo.HgRepository.BAD_REVISION;
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 56 diff changeset	20 import static org.tmatesoft.hg.repo.HgRepository.TIP;
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;
29 6cce719bbb62 Collector for nodes and their parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 24 diff changeset	26 import java.util.Collection;
171 2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 157 diff changeset	27 import java.util.HashSet;
2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 157 diff changeset	28 import java.util.LinkedList;
2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 157 diff changeset	29 import java.util.List;
29 6cce719bbb62 Collector for nodes and their parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 24 diff changeset	30
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	31 import org.tmatesoft.hg.core.HgBadStateException;
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	32 import org.tmatesoft.hg.core.HgException;
354 5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	33 import org.tmatesoft.hg.core.HgInvalidControlFileException;
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	34 import org.tmatesoft.hg.core.HgInvalidRevisionException;
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 56 diff changeset	35 import org.tmatesoft.hg.core.Nodeid;
307 2f2ab5c27f41 Collect sort reverse indexes along with array sorting Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 277 diff changeset	36 import org.tmatesoft.hg.internal.ArrayHelper;
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	37 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	38 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	39 import org.tmatesoft.hg.internal.Preview;
77 c677e1593919 Moved RevlogStream implementation into .internal Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 74 diff changeset	40 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	41 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	42 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	43 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	44 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	45 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	46 import org.tmatesoft.hg.util.ProgressSupport;
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 56 diff changeset	47
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 56 diff changeset	48
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	49 /**
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	50 * 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	51 *
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	52 * 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	53 * 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	54 * 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	55 *
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 56 diff changeset	56 * @author Artem Tikhomirov
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 56 diff changeset	57 * @author TMate Software Ltd.
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	58 */
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 56 diff changeset	59 abstract class Revlog {
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 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 private final HgRepository repo;
21 e929cecae4e1 Refactor to move revlog content to base class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 3 diff changeset	62 protected final RevlogStream content;
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 protected Revlog(HgRepository hgRepo, RevlogStream contentStream) {
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	65 if (hgRepo == null) {
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 56 diff changeset	66 throw new IllegalArgumentException();
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 56 diff changeset	67 }
115 c0cc2535462c Introduced channels to pipeline (and easily filter) data streams Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 102 diff changeset	68 if (contentStream == null) {
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 56 diff changeset	69 throw new IllegalArgumentException();
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	70 }
115 c0cc2535462c Introduced channels to pipeline (and easily filter) data streams Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 102 diff changeset	71 repo = hgRepo;
c0cc2535462c Introduced channels to pipeline (and easily filter) data streams Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 102 diff changeset	72 content = contentStream;
c0cc2535462c Introduced channels to pipeline (and easily filter) data streams Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 102 diff changeset	73 }
c0cc2535462c Introduced channels to pipeline (and easily filter) data streams Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 102 diff changeset	74
c0cc2535462c Introduced channels to pipeline (and easily filter) data streams Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 102 diff changeset	75 // invalid Revlog
c0cc2535462c Introduced channels to pipeline (and easily filter) data streams Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 102 diff changeset	76 protected Revlog(HgRepository hgRepo) {
c0cc2535462c Introduced channels to pipeline (and easily filter) data streams Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 102 diff changeset	77 repo = hgRepo;
c0cc2535462c Introduced channels to pipeline (and easily filter) data streams Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 102 diff changeset	78 content = null;
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	79 }
08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	80
08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	81 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	82 return repo;
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	83 }
08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	84
135 3959bffb14e9 explicit op name instead math op to get last rev number Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 115 diff changeset	85 public final int getRevisionCount() {
21 e929cecae4e1 Refactor to move revlog content to base class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 3 diff changeset	86 return content.revisionCount();
e929cecae4e1 Refactor to move revlog content to base class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 3 diff changeset	87 }
80 4222b04f34ee Follow history of a file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	88
135 3959bffb14e9 explicit op name instead math op to get last rev number Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 115 diff changeset	89 public final int getLastRevision() {
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 /**
5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	94 * Map revision index to unique revision identifier (nodeid)
5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	95 *
5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	96 * @param revision index of the entry in this revlog
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 *
5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	99 * @throws HgInvalidRevisionException if supplied argument doesn't represent revision index in this revlog
5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	100 * @throws HgInvalidControlFileException if access to revlog index/data entry failed
5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	101 */
366 189dc6dc1c3e Use exceptions to expose errors reading mercurial data Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 356 diff changeset	102 public final Nodeid getRevision(int revision) throws HgInvalidRevisionException, HgInvalidControlFileException {
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
80 4222b04f34ee Follow history of a file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	104 return Nodeid.fromBinary(content.nodeid(revision), 0);
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 /**
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 327 diff changeset	108 * FIXME need to be careful about (1) ordering of the revisions in the return list; (2) modifications (sorting) of the argument array
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 327 diff changeset	109 */
366 189dc6dc1c3e Use exceptions to expose errors reading mercurial data Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 356 diff changeset	110 public final List<Nodeid> getRevisions(int... revisions) 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	111 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	112 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	113 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	114 return rv;
09628675bcee Rework file history build approach to match rest of the API Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 308 diff changeset	115 }
09628675bcee Rework file history build approach to match rest of the API Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 308 diff changeset	116
366 189dc6dc1c3e Use exceptions to expose errors reading mercurial data Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 356 diff changeset	117 /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	118 // 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	119 // 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	120 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	121
09628675bcee Rework file history build approach to match rest of the API Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 308 diff changeset	122 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	123 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	124 }
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 }
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	127
243 0e01f9182e16 External cache Nodeid<->int added, Revlog.RevisionMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 218 diff changeset	128 /**
368 8107b95f4280 Update Javadoc with 'revision index' Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 367 diff changeset	129 * 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	130 * 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	131 *
0e01f9182e16 External cache Nodeid<->int added, Revlog.RevisionMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 218 diff changeset	132 * For occasional queries, this method works with decent performance, despite its O(n/2) approach.
0e01f9182e16 External cache Nodeid<->int added, Revlog.RevisionMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 218 diff changeset	133 * Alternatively, if you need to perform multiple queries (e.g. at least 15-20), {@link RevisionMap} 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	134 *
243 0e01f9182e16 External cache Nodeid<->int added, Revlog.RevisionMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 218 diff changeset	135 * @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	136 * @return revision local index in this revlog
8da7ade36c57 Add specific IAE subclass to handle wrong (e.g. outdated after rollback) revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 328 diff changeset	137 * @throws HgInvalidRevisionException if supplied nodeid doesn't identify any revision from this revlog
354 5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	138 * @throws HgInvalidControlFileException if access to revlog index/data entry failed
243 0e01f9182e16 External cache Nodeid<->int added, Revlog.RevisionMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 218 diff changeset	139 */
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	140 public final int getRevisionIndex(Nodeid nid) throws HgInvalidControlFileException, HgInvalidRevisionException {
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	141 int revision = content.findRevisionIndex(nid);
80 4222b04f34ee Follow history of a file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	142 if (revision == BAD_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	143 throw new HgInvalidRevisionException(String.format("Bad revision of %s", this /XXX HgDataFile.getPath might be more suitable here/), nid, null);
49 26e3eeaa3962 branch and user filtering for log operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 39 diff changeset	144 }
26e3eeaa3962 branch and user filtering for log operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 39 diff changeset	145 return revision;
26e3eeaa3962 branch and user filtering for log operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 39 diff changeset	146 }
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	147
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	148 /**
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	149 * @deprecated use {@link #getRevisionIndex(Nodeid)} instead
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	150 */
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	151 @Deprecated
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	152 public final int getLocalRevision(Nodeid nid) throws HgInvalidControlFileException, HgInvalidRevisionException {
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 return getRevisionIndex(nid);
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
49 26e3eeaa3962 branch and user filtering for log operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 39 diff changeset	156
354 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 * 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	159 *
5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	160 * @param nodeid
5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	161 * @return
5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	162 * @throws HgInvalidControlFileException if access to revlog index/data entry failed
5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	163 */
5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	164 public final boolean isKnown(Nodeid nodeid) throws HgInvalidControlFileException {
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	165 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	166 if (BAD_REVISION == rn) {
39 4e9b66b07a28 Check changelog group starts with proper (known) base Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 37 diff changeset	167 return false;
4e9b66b07a28 Check changelog group starts with proper (known) base Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 37 diff changeset	168 }
49 26e3eeaa3962 branch and user filtering for log operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 39 diff changeset	169 if (rn < 0 \|\| rn >= content.revisionCount()) {
26e3eeaa3962 branch and user filtering for log operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 39 diff changeset	170 // Sanity check
354 5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	171 throw new HgBadStateException(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	172 }
26e3eeaa3962 branch and user filtering for log operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 39 diff changeset	173 return true;
39 4e9b66b07a28 Check changelog group starts with proper (known) base Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 37 diff changeset	174 }
49 26e3eeaa3962 branch and user filtering for log operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 39 diff changeset	175
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	176 /**
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	177 * Access to revision data as is (decompressed, but otherwise unprocessed, i.e. not parsed for e.g. changeset or manifest entries)
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	178 * @param nodeid
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	179 */
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	180 protected void rawContent(Nodeid nodeid, ByteChannel sink) throws HgException, IOException, 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	181 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	182 }
29 6cce719bbb62 Collector for nodes and their parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 24 diff changeset	183
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 /**
368 8107b95f4280 Update Javadoc with 'revision index' Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 367 diff changeset	185 * @param fileRevisionIndex - index of this file change (not a changelog revision index), non-negative. From predefined constants, only {@link HgRepository#TIP} makes sense.
354 5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	186 * FIXME is it necessary to have IOException along with HgException here?
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 */
368 8107b95f4280 Update Javadoc with 'revision index' Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 367 diff changeset	188 protected void rawContent(int fileRevisionIndex, ByteChannel sink) throws HgException, IOException, 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	189 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	190 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	191 }
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	192 ContentPipe insp = new ContentPipe(sink, 0, repo.getContext().getLog());
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	193 insp.checkCancelled();
368 8107b95f4280 Update Javadoc with 'revision index' Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 367 diff changeset	194 content.iterate(fileRevisionIndex, fileRevisionIndex, true, insp);
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	195 insp.checkFailed();
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	196 }
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	197
56 576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	198 /**
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	199 * XXX perhaps, return value Nodeid[2] and boolean needNodeids is better (and higher level) API for this query?
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	200 *
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	201 * @param revision - revision to query parents, or {@link HgRepository#TIP}
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	202 * @param parentRevisions - int[2] to get local revision numbers of parents (e.g. {6, -1})
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	203 * @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	204 * @param parent2 - byte[20] or null, if second parent's nodeid is not needed
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	205 * @throws HgInvalidRevisionException
8da7ade36c57 Add specific IAE subclass to handle wrong (e.g. outdated after rollback) revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 328 diff changeset	206 * @throws IllegalArgumentException
56 576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	207 */
366 189dc6dc1c3e Use exceptions to expose errors reading mercurial data Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 356 diff changeset	208 public void parents(int revision, int[] parentRevisions, byte[] parent1, byte[] parent2) throws HgInvalidRevisionException, HgInvalidControlFileException {
56 576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	209 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	210 throw new HgInvalidRevisionException(revision);
56 576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	211 }
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	212 if (parentRevisions == null \|\| parentRevisions.length < 2) {
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	213 throw new IllegalArgumentException(String.valueOf(parentRevisions));
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	214 }
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	215 if (parent1 != null && parent1.length < 20) {
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	216 throw new IllegalArgumentException(parent1.toString());
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	217 }
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	218 if (parent2 != null && parent2.length < 20) {
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	219 throw new IllegalArgumentException(parent2.toString());
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	220 }
77 c677e1593919 Moved RevlogStream implementation into .internal Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 74 diff changeset	221 class ParentCollector implements RevlogStream.Inspector {
56 576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	222 public int p1 = -1;
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	223 public int p2 = -1;
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	224 public byte[] nodeid;
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	225
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	226 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	227 p1 = parent1Revision;
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	228 p2 = parent2Revision;
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	229 this.nodeid = new byte[20];
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	230 // 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	231 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	232 }
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 ParentCollector pc = new ParentCollector();
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	235 content.iterate(revision, revision, false, pc);
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	236 parentRevisions[0] = pc.p1;
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	237 parentRevisions[1] = pc.p2;
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	238 if (parent1 != null) {
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	239 if (parentRevisions[0] == -1) {
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	240 Arrays.fill(parent1, 0, 20, (byte) 0);
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	241 } else {
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	242 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	243 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	244 }
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	245 }
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	246 if (parent2 != null) {
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	247 if (parentRevisions[1] == -1) {
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	248 Arrays.fill(parent2, 0, 20, (byte) 0);
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	249 } else {
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	250 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	251 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	252 }
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	253 }
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	254 }
317 09628675bcee Rework file history build approach to match rest of the API Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 308 diff changeset	255
324 283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	256 @Experimental
366 189dc6dc1c3e Use exceptions to expose errors reading mercurial data Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 356 diff changeset	257 public void walk(int start, int end, final Revlog.Inspector inspector) throws HgInvalidRevisionException, HgInvalidControlFileException {
324 283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	258 int lastRev = getLastRevision();
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	259 if (start == TIP) {
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	260 start = lastRev;
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	261 }
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	262 if (end == TIP) {
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	263 end = lastRev;
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	264 }
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	265 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	266 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	267 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	268
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	269 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	270
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	271 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	272 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	273 if (revisionInsp != null) {
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	274 revisionInsp.next(revisionNumber, nid, linkRevision);
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	275 }
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	276 if (parentInsp != null) {
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	277 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	278 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	279 allRevisions[revisionNumber] = nid;
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	280 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	281 }
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	282 }
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	283 });
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	284 }
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	285
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	286 /**
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	287 * MARKER
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	288 */
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	289 @Experimental
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	290 public interface Inspector {
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	291 }
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	292
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	293 @Experimental
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	294 public interface RevisionInspector extends Inspector {
368 8107b95f4280 Update Javadoc with 'revision index' Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 367 diff changeset	295 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	296 }
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	297
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	298 @Experimental
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	299 public interface ParentInspector extends Inspector {
327 3f09b8c19142 Tests for Revlog.Inspectors Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 324 diff changeset	300 // 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	301 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	302 }
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	303
29 6cce719bbb62 Collector for nodes and their parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 24 diff changeset	304 /*
6cce719bbb62 Collector for nodes and their parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 24 diff changeset	305 * XXX think over if it's better to do either:
6cce719bbb62 Collector for nodes and their parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 24 diff changeset	306 * pw = getChangelog().new ParentWalker(); pw.init() and pass pw instance around as needed
6cce719bbb62 Collector for nodes and their parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 24 diff changeset	307 * or
6cce719bbb62 Collector for nodes and their parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 24 diff changeset	308 * add Revlog#getParentWalker(), static class, make cons() and #init package-local, and keep SoftReference to allow walker reuse.
6cce719bbb62 Collector for nodes and their parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 24 diff changeset	309 *
6cce719bbb62 Collector for nodes and their parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 24 diff changeset	310 * and yes, walker is not a proper name
6cce719bbb62 Collector for nodes and their parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 24 diff changeset	311 */
324 283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	312 public final class ParentWalker implements ParentInspector {
200 114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	313
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	314
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	315 private Nodeid[] sequential; // natural repository order, childrenOf rely on ordering
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	316 private Nodeid[] sorted; // for binary search
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	317 private int[] sorted2natural;
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	318 private Nodeid[] firstParent;
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	319 private Nodeid[] secondParent;
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	320
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	321 // Nodeid instances shall be shared between all arrays
29 6cce719bbb62 Collector for nodes and their parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 24 diff changeset	322
6cce719bbb62 Collector for nodes and their parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 24 diff changeset	323 public ParentWalker() {
6cce719bbb62 Collector for nodes and their parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 24 diff changeset	324 }
6cce719bbb62 Collector for nodes and their parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 24 diff changeset	325
192 e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 191 diff changeset	326 public HgRepository getRepo() {
e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 191 diff changeset	327 return Revlog.this.getRepo();
e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 191 diff changeset	328 }
e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 191 diff changeset	329
324 283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	330 public void next(int revisionNumber, Nodeid revision, int parent1Revision, int parent2Revision, Nodeid nidParent1, Nodeid nidParent2) {
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	331 if (parent1Revision >= revisionNumber \|\| parent2Revision >= revisionNumber) {
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	332 throw new IllegalStateException(); // sanity, revisions are sequential
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	333 }
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	334 int ix = revisionNumber;
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	335 sequential[ix] = sorted[ix] = revision;
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	336 if (parent1Revision != -1) {
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	337 firstParent[ix] = sequential[parent1Revision];
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	338 }
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	339 if (parent2Revision != -1) { // revlog of DataAccess.java has p2 set when p1 is -1
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	340 secondParent[ix] = sequential[parent2Revision];
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	341 }
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	342 }
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	343
366 189dc6dc1c3e Use exceptions to expose errors reading mercurial data Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 356 diff changeset	344 public void init() throws HgInvalidControlFileException {
324 283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	345 final int revisionCount = Revlog.this.getRevisionCount();
200 114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	346 firstParent = new Nodeid[revisionCount];
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	347 // although branches/merges are less frequent, and most of secondParent would be -1/null, some sort of
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	348 // SparseOrderedList might be handy, provided its inner structures do not overweight simplicity of an array
324 283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	349 // FIXME IntMap is right candidate?
200 114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	350 secondParent = new Nodeid[revisionCount];
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	351 //
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	352 sequential = new Nodeid[revisionCount];
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	353 sorted = new Nodeid[revisionCount];
324 283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	354 Revlog.this.walk(0, TIP, this);
200 114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	355 Arrays.sort(sorted);
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	356 sorted2natural = new int[revisionCount];
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	357 for (int i = 0; i < revisionCount; i++) {
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	358 Nodeid n = sequential[i];
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	359 int x = Arrays.binarySearch(sorted, n);
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	360 assertSortedIndex(x);
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	361 sorted2natural[x] = i;
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	362 }
29 6cce719bbb62 Collector for nodes and their parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 24 diff changeset	363 }
6cce719bbb62 Collector for nodes and their parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 24 diff changeset	364
200 114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	365 private void assertSortedIndex(int x) {
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	366 if (x < 0) {
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	367 throw new HgBadStateException();
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	368 }
29 6cce719bbb62 Collector for nodes and their parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 24 diff changeset	369 }
31 346b66add79d Basic lookup for incoming changes Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 29 diff changeset	370
346b66add79d Basic lookup for incoming changes Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 29 diff changeset	371 // FIXME need to decide whether Nodeid(00 * 20) is always known or not
200 114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	372 // right now Nodeid.NULL is not recognized as known if passed to this method,
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	373 // caller is supposed to make explicit check
31 346b66add79d Basic lookup for incoming changes Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 29 diff changeset	374 public boolean knownNode(Nodeid nid) {
200 114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	375 return Arrays.binarySearch(sorted, nid) >= 0;
31 346b66add79d Basic lookup for incoming changes Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 29 diff changeset	376 }
29 6cce719bbb62 Collector for nodes and their parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 24 diff changeset	377
200 114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	378 /**
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	379 * null if none. only known nodes (as per #knownNode) are accepted as arguments
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	380 */
29 6cce719bbb62 Collector for nodes and their parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 24 diff changeset	381 public Nodeid firstParent(Nodeid nid) {
200 114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	382 int x = Arrays.binarySearch(sorted, nid);
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	383 assertSortedIndex(x);
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	384 int i = sorted2natural[x];
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	385 return firstParent[i];
29 6cce719bbb62 Collector for nodes and their parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 24 diff changeset	386 }
49 26e3eeaa3962 branch and user filtering for log operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 39 diff changeset	387
26e3eeaa3962 branch and user filtering for log operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 39 diff changeset	388 // never null, Nodeid.NULL if none known
26e3eeaa3962 branch and user filtering for log operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 39 diff changeset	389 public Nodeid safeFirstParent(Nodeid nid) {
26e3eeaa3962 branch and user filtering for log operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 39 diff changeset	390 Nodeid rv = firstParent(nid);
26e3eeaa3962 branch and user filtering for log operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 39 diff changeset	391 return rv == null ? Nodeid.NULL : rv;
26e3eeaa3962 branch and user filtering for log operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 39 diff changeset	392 }
29 6cce719bbb62 Collector for nodes and their parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 24 diff changeset	393
6cce719bbb62 Collector for nodes and their parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 24 diff changeset	394 public Nodeid secondParent(Nodeid nid) {
200 114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	395 int x = Arrays.binarySearch(sorted, nid);
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	396 assertSortedIndex(x);
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	397 int i = sorted2natural[x];
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	398 return secondParent[i];
29 6cce719bbb62 Collector for nodes and their parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 24 diff changeset	399 }
6cce719bbb62 Collector for nodes and their parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 24 diff changeset	400
49 26e3eeaa3962 branch and user filtering for log operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 39 diff changeset	401 public Nodeid safeSecondParent(Nodeid nid) {
26e3eeaa3962 branch and user filtering for log operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 39 diff changeset	402 Nodeid rv = secondParent(nid);
26e3eeaa3962 branch and user filtering for log operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 39 diff changeset	403 return rv == null ? Nodeid.NULL : rv;
26e3eeaa3962 branch and user filtering for log operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 39 diff changeset	404 }
26e3eeaa3962 branch and user filtering for log operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 39 diff changeset	405
29 6cce719bbb62 Collector for nodes and their parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 24 diff changeset	406 public boolean appendParentsOf(Nodeid nid, Collection<Nodeid> c) {
200 114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	407 int x = Arrays.binarySearch(sorted, nid);
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	408 assertSortedIndex(x);
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	409 int i = sorted2natural[x];
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	410 Nodeid p1 = firstParent[i];
29 6cce719bbb62 Collector for nodes and their parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 24 diff changeset	411 boolean modified = false;
6cce719bbb62 Collector for nodes and their parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 24 diff changeset	412 if (p1 != null) {
6cce719bbb62 Collector for nodes and their parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 24 diff changeset	413 modified = c.add(p1);
191 b777502a06f5 Do not assume second parent can be set only when first one is set, again Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 183 diff changeset	414 }
200 114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	415 Nodeid p2 = secondParent[i];
191 b777502a06f5 Do not assume second parent can be set only when first one is set, again Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 183 diff changeset	416 if (p2 != null) {
b777502a06f5 Do not assume second parent can be set only when first one is set, again Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 183 diff changeset	417 modified = c.add(p2) \|\| modified;
29 6cce719bbb62 Collector for nodes and their parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 24 diff changeset	418 }
6cce719bbb62 Collector for nodes and their parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 24 diff changeset	419 return modified;
6cce719bbb62 Collector for nodes and their parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 24 diff changeset	420 }
171 2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 157 diff changeset	421
2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 157 diff changeset	422 // XXX alternative (and perhaps more reliable) approach would be to make a copy of allNodes and remove
2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 157 diff changeset	423 // nodes, their parents and so on.
2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 157 diff changeset	424
200 114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	425 // @return ordered collection of all children rooted at supplied nodes. Nodes shall not be descendants of each other!
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	426 // Nodeids shall belong to this revlog
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	427 public List<Nodeid> childrenOf(List<Nodeid> roots) {
171 2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 157 diff changeset	428 HashSet<Nodeid> parents = new HashSet<Nodeid>();
200 114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	429 LinkedList<Nodeid> result = new LinkedList<Nodeid>();
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	430 int earliestRevision = Integer.MAX_VALUE;
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	431 assert sequential.length == firstParent.length && firstParent.length == secondParent.length;
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	432 // first, find earliest index of roots in question, as there's no sense
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	433 // to check children among nodes prior to branch's root node
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	434 for (Nodeid r : roots) {
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	435 int x = Arrays.binarySearch(sorted, r);
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	436 assertSortedIndex(x);
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	437 int i = sorted2natural[x];
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	438 if (i < earliestRevision) {
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	439 earliestRevision = i;
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	440 }
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	441 parents.add(sequential[i]); // add canonical instance in hope equals() is bit faster when can do a ==
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	442 }
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	443 for (int i = earliestRevision + 1; i < sequential.length; i++) {
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	444 if (parents.contains(firstParent[i]) \|\| parents.contains(secondParent[i])) {
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	445 parents.add(sequential[i]); // to find next child
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	446 result.add(sequential[i]);
171 2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 157 diff changeset	447 }
2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 157 diff changeset	448 }
200 114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	449 return result;
171 2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 157 diff changeset	450 }
192 e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 191 diff changeset	451
e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 191 diff changeset	452 /**
308 3f40262153a4 Recognize closed branches Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 307 diff changeset	453 * @return revisions that have supplied revision as their immediate parent
3f40262153a4 Recognize closed branches Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 307 diff changeset	454 */
3f40262153a4 Recognize closed branches Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 307 diff changeset	455 public List<Nodeid> directChildren(Nodeid nid) {
3f40262153a4 Recognize closed branches Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 307 diff changeset	456 LinkedList<Nodeid> result = new LinkedList<Nodeid>();
3f40262153a4 Recognize closed branches Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 307 diff changeset	457 int x = Arrays.binarySearch(sorted, nid);
3f40262153a4 Recognize closed branches Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 307 diff changeset	458 assertSortedIndex(x);
3f40262153a4 Recognize closed branches Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 307 diff changeset	459 nid = sorted[x]; // canonical instance
3f40262153a4 Recognize closed branches Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 307 diff changeset	460 int start = sorted2natural[x];
3f40262153a4 Recognize closed branches Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 307 diff changeset	461 for (int i = start + 1; i < sequential.length; i++) {
3f40262153a4 Recognize closed branches Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 307 diff changeset	462 if (nid == firstParent[i] \|\| nid == secondParent[i]) {
3f40262153a4 Recognize closed branches Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 307 diff changeset	463 result.add(sequential[i]);
3f40262153a4 Recognize closed branches Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 307 diff changeset	464 }
3f40262153a4 Recognize closed branches Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 307 diff changeset	465 }
3f40262153a4 Recognize closed branches Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 307 diff changeset	466 return result;
3f40262153a4 Recognize closed branches Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 307 diff changeset	467 }
3f40262153a4 Recognize closed branches Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 307 diff changeset	468
3f40262153a4 Recognize closed branches Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 307 diff changeset	469 /**
200 114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	470 * @param nid possibly parent node, shall be {@link #knownNode(Nodeid) known} in this revlog.
192 e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 191 diff changeset	471 * @return <code>true</code> if there's any node in this revlog that has specified node as one of its parents.
e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 191 diff changeset	472 */
200 114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	473 public boolean hasChildren(Nodeid nid) {
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	474 int x = Arrays.binarySearch(sorted, nid);
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	475 assertSortedIndex(x);
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	476 int i = sorted2natural[x];
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	477 assert firstParent.length == secondParent.length; // just in case later I implement sparse array for secondParent
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	478 assert firstParent.length == sequential.length;
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	479 // to use == instead of equals, take the same Nodeid instance we used to fill all the arrays.
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	480 final Nodeid canonicalNode = sequential[i];
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	481 i++; // no need to check node itself. child nodes may appear in sequential only after revision in question
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	482 for (; i < sequential.length; i++) {
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	483 // FIXME likely, not very effective.
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	484 // May want to optimize it with another (Tree\|Hash)Set, created on demand on first use,
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	485 // however, need to be careful with memory usage
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	486 if (firstParent[i] == canonicalNode \|\| secondParent[i] == canonicalNode) {
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	487 return true;
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	488 }
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	489 }
114c9fe7b643 Performance optimization: reduce memory ParentWalker hogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	490 return false;
192 e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 191 diff changeset	491 }
29 6cce719bbb62 Collector for nodes and their parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 24 diff changeset	492 }
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	493
243 0e01f9182e16 External cache Nodeid<->int added, Revlog.RevisionMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 218 diff changeset	494 /**
0e01f9182e16 External cache Nodeid<->int added, Revlog.RevisionMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 218 diff changeset	495 * Effective int to Nodeid and vice versa translation. It's advised to use this class instead of
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	496 * multiple {@link Revlog#getRevisionIndex(Nodeid)} calls.
243 0e01f9182e16 External cache Nodeid<->int added, Revlog.RevisionMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 218 diff changeset	497 *
368 8107b95f4280 Update Javadoc with 'revision index' Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 367 diff changeset	498 * {@link Revlog#getRevisionIndex(Nodeid)} with straightforward lookup approach performs O(n/2)
8107b95f4280 Update Javadoc with 'revision index' Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 367 diff changeset	499 * {@link RevisionMap#revisionIndex(Nodeid)} is log(n), plus initialization is O(n) (just once).
243 0e01f9182e16 External cache Nodeid<->int added, Revlog.RevisionMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 218 diff changeset	500 */
324 283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	501 public final class RevisionMap implements RevisionInspector {
243 0e01f9182e16 External cache Nodeid<->int added, Revlog.RevisionMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 218 diff changeset	502 /*
368 8107b95f4280 Update Javadoc with 'revision index' Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 367 diff changeset	503 * in fact, initialization is much slower as it instantiates Nodeids, while #getRevisionIndex
243 0e01f9182e16 External cache Nodeid<->int added, Revlog.RevisionMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 218 diff changeset	504 * compares directly against byte buffer. Measuring cpython with 70k+ gives 3 times difference (47 vs 171)
0e01f9182e16 External cache Nodeid<->int added, Revlog.RevisionMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 218 diff changeset	505 * for complete changelog iteration.
0e01f9182e16 External cache Nodeid<->int added, Revlog.RevisionMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 218 diff changeset	506 */
0e01f9182e16 External cache Nodeid<->int added, Revlog.RevisionMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 218 diff changeset	507
0e01f9182e16 External cache Nodeid<->int added, Revlog.RevisionMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 218 diff changeset	508 /*
324 283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	509 * XXX 3 * (x * 4) bytes. Can I do better?
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	510 * It seems, yes. Don't need to keep sorted, always can emulate it with indirect access to sequential through sorted2natural.
283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	511 * i.e. instead sorted[mid].compareTo(toFind), do sequential[sorted2natural[mid]].compareTo(toFind)
243 0e01f9182e16 External cache Nodeid<->int added, Revlog.RevisionMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 218 diff changeset	512 */
0e01f9182e16 External cache Nodeid<->int added, Revlog.RevisionMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 218 diff changeset	513 private Nodeid[] sequential; // natural repository order, childrenOf rely on ordering
0e01f9182e16 External cache Nodeid<->int added, Revlog.RevisionMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 218 diff changeset	514 private Nodeid[] sorted; // for binary search
0e01f9182e16 External cache Nodeid<->int added, Revlog.RevisionMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 218 diff changeset	515 private int[] sorted2natural;
0e01f9182e16 External cache Nodeid<->int added, Revlog.RevisionMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 218 diff changeset	516
0e01f9182e16 External cache Nodeid<->int added, Revlog.RevisionMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 218 diff changeset	517 public RevisionMap() {
0e01f9182e16 External cache Nodeid<->int added, Revlog.RevisionMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 218 diff changeset	518 }
0e01f9182e16 External cache Nodeid<->int added, Revlog.RevisionMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 218 diff changeset	519
0e01f9182e16 External cache Nodeid<->int added, Revlog.RevisionMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 218 diff changeset	520 public HgRepository getRepo() {
0e01f9182e16 External cache Nodeid<->int added, Revlog.RevisionMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 218 diff changeset	521 return Revlog.this.getRepo();
0e01f9182e16 External cache Nodeid<->int added, Revlog.RevisionMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 218 diff changeset	522 }
324 283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	523
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	524 public void next(int revisionIndex, Nodeid revision, int linkedRevision) {
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	525 sequential[revisionIndex] = sorted[revisionIndex] = revision;
324 283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	526 }
243 0e01f9182e16 External cache Nodeid<->int added, Revlog.RevisionMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 218 diff changeset	527
0e01f9182e16 External cache Nodeid<->int added, Revlog.RevisionMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 218 diff changeset	528 /**
0e01f9182e16 External cache Nodeid<->int added, Revlog.RevisionMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 218 diff changeset	529 * @return <code>this</code> for convenience.
0e01f9182e16 External cache Nodeid<->int added, Revlog.RevisionMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 218 diff changeset	530 */
366 189dc6dc1c3e Use exceptions to expose errors reading mercurial data Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 356 diff changeset	531 public RevisionMap init(/XXX Pool<Nodeid> to reuse nodeids, if possible. /) throws HgInvalidControlFileException{
243 0e01f9182e16 External cache Nodeid<->int added, Revlog.RevisionMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 218 diff changeset	532 // XXX HgRepository.register((RepoChangeListener) this); // listen to changes in repo, re-init if needed?
324 283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	533 final int revisionCount = Revlog.this.getRevisionCount();
243 0e01f9182e16 External cache Nodeid<->int added, Revlog.RevisionMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 218 diff changeset	534 sequential = new Nodeid[revisionCount];
0e01f9182e16 External cache Nodeid<->int added, Revlog.RevisionMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 218 diff changeset	535 sorted = new Nodeid[revisionCount];
324 283b294d1079 Explore alternatives to access file-changelog combined history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	536 Revlog.this.walk(0, TIP, this);
307 2f2ab5c27f41 Collect sort reverse indexes along with array sorting Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 277 diff changeset	537 // next is alternative to Arrays.sort(sorted), and build sorted2natural looking up each element of sequential in sorted.
2f2ab5c27f41 Collect sort reverse indexes along with array sorting Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 277 diff changeset	538 // the way sorted2natural was build is O(n*log n).
2f2ab5c27f41 Collect sort reverse indexes along with array sorting Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 277 diff changeset	539 final ArrayHelper ah = new ArrayHelper();
2f2ab5c27f41 Collect sort reverse indexes along with array sorting Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 277 diff changeset	540 ah.sort(sorted);
2f2ab5c27f41 Collect sort reverse indexes along with array sorting Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 277 diff changeset	541 // note, values in ArrayHelper#getReversed are 1-based indexes, not 0-based
2f2ab5c27f41 Collect sort reverse indexes along with array sorting Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 277 diff changeset	542 sorted2natural = ah.getReverse();
243 0e01f9182e16 External cache Nodeid<->int added, Revlog.RevisionMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 218 diff changeset	543 return this;
0e01f9182e16 External cache Nodeid<->int added, Revlog.RevisionMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 218 diff changeset	544 }
0e01f9182e16 External cache Nodeid<->int added, Revlog.RevisionMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 218 diff changeset	545
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	546 public Nodeid revision(int revisionIndex) {
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	547 return sequential[revisionIndex];
243 0e01f9182e16 External cache Nodeid<->int added, Revlog.RevisionMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 218 diff changeset	548 }
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	549 public int revisionIndex(Nodeid revision) {
274 9fb50c04f03c Use Nodeid.isNull check instead of NULL.equals Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 243 diff changeset	550 if (revision == null \|\| revision.isNull()) {
243 0e01f9182e16 External cache Nodeid<->int added, Revlog.RevisionMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 218 diff changeset	551 return BAD_REVISION;
0e01f9182e16 External cache Nodeid<->int added, Revlog.RevisionMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 218 diff changeset	552 }
0e01f9182e16 External cache Nodeid<->int added, Revlog.RevisionMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 218 diff changeset	553 int x = Arrays.binarySearch(sorted, revision);
0e01f9182e16 External cache Nodeid<->int added, Revlog.RevisionMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 218 diff changeset	554 if (x < 0) {
0e01f9182e16 External cache Nodeid<->int added, Revlog.RevisionMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 218 diff changeset	555 return BAD_REVISION;
0e01f9182e16 External cache Nodeid<->int added, Revlog.RevisionMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 218 diff changeset	556 }
307 2f2ab5c27f41 Collect sort reverse indexes along with array sorting Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 277 diff changeset	557 return sorted2natural[x]-1;
243 0e01f9182e16 External cache Nodeid<->int added, Revlog.RevisionMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 218 diff changeset	558 }
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	559 /**
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	560 * @deprecated use {@link #revisionIndex(Nodeid)} instead
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	561 */
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	562 @Deprecated
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	563 public int localRevision(Nodeid revision) {
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	564 return revisionIndex(revision);
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	565 }
243 0e01f9182e16 External cache Nodeid<->int added, Revlog.RevisionMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 218 diff changeset	566 }
0e01f9182e16 External cache Nodeid<->int added, Revlog.RevisionMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 218 diff changeset	567
277 74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	568 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	569 private Exception failure;
277 74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	570 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	571
277 74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	572 protected void setCancelSupport(CancelSupport cs) {
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	573 assert cancelSupport == null; // no reason to set it twice
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	574 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	575 }
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	576
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	577 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	578 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	579 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	580 }
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	581
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	582 public void checkFailed() throws HgException, IOException, 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	583 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	584 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	585 }
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	586 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	587 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	588 }
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	589 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	590 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	591 }
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	592 if (failure instanceof HgException) {
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	593 throw (HgException) 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	594 }
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	595 throw new HgBadStateException(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	596 }
277 74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	597
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	598 public void checkCancelled() throws CancelledException {
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	599 if (cancelSupport != null) {
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	600 cancelSupport.checkCancelled();
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	601 }
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	602 }
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	603 }
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	604
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	605 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	606 private final ByteChannel sink;
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	607 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	608 private final LogFacility logFacility;
277 74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	609
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	610 /**
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	611 * @param _sink - cannot be <code>null</code>
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	612 * @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	613 * @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	614 */
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	615 public ContentPipe(ByteChannel _sink, int seekOffset, LogFacility log) {
277 74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	616 assert _sink != null;
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	617 sink = _sink;
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	618 setCancelSupport(CancelSupport.Factory.get(_sink));
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	619 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	620 logFacility = log;
277 74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	621 }
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	622
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	623 protected void prepare(int revisionNumber, DataAccess da) throws HgException, IOException {
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	624 if (offset > 0) { // save few useless reset/rewind operations
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	625 da.seek(offset);
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	626 }
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	627 }
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	628
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	629 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	630 try {
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	631 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	632 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	633 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	634 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	635 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	636 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	637 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	638 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	639 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	640 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	641 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	642 }
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	643 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	644 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	645 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	646 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	647 } 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	648 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	649 }
277 74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	650 while (!da.isEmpty()) {
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	651 checkCancelled();
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	652 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	653 buf.flip(); // post: position == 0
277 74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	654 // 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	655
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	656 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	657 if ((consumed == 0 \|\| consumed != buf.position()) && logFacility != 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	658 logFacility.warn(getClass(), "Bad data sink when reading revision %d. Reported %d bytes consumed, byt actually read %d", revisionNumber, consumed, buf.position());
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	659 }
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	660 if (buf.position() == 0) {
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	661 throw new HgBadStateException("Bad sink implementation (consumes no bytes) results in endless loop");
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	662 }
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	663 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	664 progressSupport.worked(consumed);
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	665 }
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	666 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	667 } catch (IOException ex) {
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	668 recordFailure(ex);
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	669 } catch (CancelledException ex) {
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	670 recordFailure(ex);
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	671 } catch (HgException ex) {
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	672 recordFailure(ex);
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	673 }
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	674 }
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	675 }
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	676 }

Mercurial > jhg

annotate src/org/tmatesoft/hg/repo/Revlog.java @ 380:9517df1ef7ec