hg4j: src/org/tmatesoft/hg/internal/RevlogStream.java annotate

annotate src/org/tmatesoft/hg/internal/RevlogStream.java @ 626:5afc7eedb3dd v1.1rc1

@since, TODOs. Tests: add 1 sec to deal with fs timestamp granularity on linux

author	Artem Tikhomirov <tikhomirov.artem@gmail.com>
date	Tue, 21 May 2013 19:30:12 +0200
parents	99ad1e3a4e4d
children	6526d8adbc0f

rev	line source
10 382cfe9463db Dirstate parsing. DataAccess refactored to allow reuse and control over constants Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 9 diff changeset	1 /*
530 0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 520 diff changeset	2 * Copyright (c) 2010-2013 TMate Software Ltd
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 52 diff changeset	3 *
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 52 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: 52 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: 52 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: 52 diff changeset	7 *
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 52 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: 52 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: 52 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: 52 diff changeset	11 * GNU General Public License for more details.
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 52 diff changeset	12 *
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 52 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: 52 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
0 dbd663faec1f Basic changelog parsing Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	16 */
77 c677e1593919 Moved RevlogStream implementation into .internal Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 74 diff changeset	17 package org.tmatesoft.hg.internal;
0 dbd663faec1f Basic changelog parsing 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: 52 diff changeset	20 import static org.tmatesoft.hg.repo.HgRepository.TIP;
530 0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 520 diff changeset	21 import static org.tmatesoft.hg.internal.Internals.REVLOGV1_RECORD_SIZE;
5 fc265ddeab26 File content and non-effective, although working, patch application Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 4 diff changeset	22
3 24bb4f365164 Rudimentary log functionality with basic infrastructure is in place Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 2 diff changeset	23 import java.io.File;
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 0 diff changeset	24 import java.io.IOException;
593 9619301a7bb9 Share last revision read between #iterate() invocations, to save revision rebuild efforts when few subsequent revisions are read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 585 diff changeset	25 import java.lang.ref.Reference;
9619301a7bb9 Share last revision read between #iterate() invocations, to save revision rebuild efforts when few subsequent revisions are read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 585 diff changeset	26 import java.lang.ref.ReferenceQueue;
9619301a7bb9 Share last revision read between #iterate() invocations, to save revision rebuild efforts when few subsequent revisions are read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 585 diff changeset	27 import java.lang.ref.SoftReference;
607 66f1cc23b906 Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 606 diff changeset	28 import java.util.ArrayList;
66f1cc23b906 Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 606 diff changeset	29 import java.util.List;
263 31f67be94e71 RevlogStream - reduce number of object instances, reuse when possible Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 258 diff changeset	30 import java.util.zip.Inflater;
0 dbd663faec1f Basic changelog parsing Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	31
617 65c01508f002 Rollback support for commands that modify repository. Strategy to keep complete copy of a file being changed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 608 diff changeset	32 import org.tmatesoft.hg.core.HgIOException;
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 52 diff changeset	33 import org.tmatesoft.hg.core.Nodeid;
300 650b45d290b1 Share range check code Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 297 diff changeset	34 import org.tmatesoft.hg.repo.HgInternals;
423 9c9c442b5f2e Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 420 diff changeset	35 import org.tmatesoft.hg.repo.HgInvalidControlFileException;
9c9c442b5f2e Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 420 diff changeset	36 import org.tmatesoft.hg.repo.HgInvalidRevisionException;
9c9c442b5f2e Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 420 diff changeset	37 import org.tmatesoft.hg.repo.HgInvalidStateException;
80 4222b04f34ee Follow history of a file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	38 import org.tmatesoft.hg.repo.HgRepository;
520 1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 440 diff changeset	39 import org.tmatesoft.hg.util.Adaptable;
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 52 diff changeset	40
10 382cfe9463db Dirstate parsing. DataAccess refactored to allow reuse and control over constants Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 9 diff changeset	41
0 dbd663faec1f Basic changelog parsing Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	42 /**
dbd663faec1f Basic changelog parsing Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	43 * ? Single RevlogStream per file per repository with accessor to record access session (e.g. with back/forward operations),
198 33a7d76f067b Performance optimization: reduce memory to keep revlog cached info Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	44 * or numerous RevlogStream with separate representation of the underlying data (cached, lazy ChunkStream)?
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 52 diff changeset	45 *
0 dbd663faec1f Basic changelog parsing Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	46 * @see http://mercurial.selenic.com/wiki/Revlog
dbd663faec1f Basic changelog parsing Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	47 * @see http://mercurial.selenic.com/wiki/RevlogNG
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 52 diff changeset	48 *
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 52 diff changeset	49 * @author Artem Tikhomirov
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 52 diff changeset	50 * @author TMate Software Ltd.
0 dbd663faec1f Basic changelog parsing Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	51 */
dbd663faec1f Basic changelog parsing Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	52 public class RevlogStream {
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 0 diff changeset	53
608 e1b29756f901 Clean, organize and resolve some TODOs and FIXMEs: minor refactorings and comments Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 607 diff changeset	54 static final int INLINEDATA = 1 << 16;
e1b29756f901 Clean, organize and resolve some TODOs and FIXMEs: minor refactorings and comments Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 607 diff changeset	55
198 33a7d76f067b Performance optimization: reduce memory to keep revlog cached info Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	56 /*
33a7d76f067b Performance optimization: reduce memory to keep revlog cached info Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	57 * makes sense for index with inline data only - actual offset of the record in the .i file (record entry + revision * record size))
33a7d76f067b Performance optimization: reduce memory to keep revlog cached info Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	58 *
33a7d76f067b Performance optimization: reduce memory to keep revlog cached info Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	59 * long[] in fact (there are 8-bytes field in the revlog)
33a7d76f067b Performance optimization: reduce memory to keep revlog cached info Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	60 * However, (a) DataAccess currently doesn't operate with long seek/length
33a7d76f067b Performance optimization: reduce memory to keep revlog cached info Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	61 * and, of greater significance, (b) files with inlined data are designated for smaller files,
33a7d76f067b Performance optimization: reduce memory to keep revlog cached info Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	62 * guess, about 130 Kb, and offset there won't ever break int capacity
33a7d76f067b Performance optimization: reduce memory to keep revlog cached info Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	63 */
33a7d76f067b Performance optimization: reduce memory to keep revlog cached info Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	64 private int[] indexRecordOffset;
33a7d76f067b Performance optimization: reduce memory to keep revlog cached info Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	65 private int[] baseRevisions;
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 0 diff changeset	66 private boolean inline = false;
3 24bb4f365164 Rudimentary log functionality with basic infrastructure is in place Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 2 diff changeset	67 private final File indexFile;
396 0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 377 diff changeset	68 private File dataFile;
608 e1b29756f901 Clean, organize and resolve some TODOs and FIXMEs: minor refactorings and comments Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 607 diff changeset	69 private final Internals repo;
593 9619301a7bb9 Share last revision read between #iterate() invocations, to save revision rebuild efforts when few subsequent revisions are read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 585 diff changeset	70 // keeps last complete revision we've read. Note, this cached revision doesn't help
9619301a7bb9 Share last revision read between #iterate() invocations, to save revision rebuild efforts when few subsequent revisions are read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 585 diff changeset	71 // for subsequent #iterate() calls with the same revision (Inspector needs more data than
9619301a7bb9 Share last revision read between #iterate() invocations, to save revision rebuild efforts when few subsequent revisions are read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 585 diff changeset	72 // we currently cache here, perhaps, we shall cache everything it wants to cover same
9619301a7bb9 Share last revision read between #iterate() invocations, to save revision rebuild efforts when few subsequent revisions are read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 585 diff changeset	73 // revision case as well). Now this helps when second #iterate() call is for a revision greater
9619301a7bb9 Share last revision read between #iterate() invocations, to save revision rebuild efforts when few subsequent revisions are read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 585 diff changeset	74 // than one from the first call, and both revisions got same base rev. It's often the case when
9619301a7bb9 Share last revision read between #iterate() invocations, to save revision rebuild efforts when few subsequent revisions are read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 585 diff changeset	75 // parents/children are analyzed.
9619301a7bb9 Share last revision read between #iterate() invocations, to save revision rebuild efforts when few subsequent revisions are read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 585 diff changeset	76 private SoftReference<CachedRevision> lastRevisionRead;
9619301a7bb9 Share last revision read between #iterate() invocations, to save revision rebuild efforts when few subsequent revisions are read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 585 diff changeset	77 private final ReferenceQueue<CachedRevision> lastRevisionQueue = new ReferenceQueue<CachedRevision>();
607 66f1cc23b906 Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 606 diff changeset	78 //
66f1cc23b906 Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 606 diff changeset	79 private final RevlogChangeMonitor changeTracker;
66f1cc23b906 Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 606 diff changeset	80 private List<Observer> observers;
66f1cc23b906 Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 606 diff changeset	81 private boolean shallDropDerivedCaches = false;
3 24bb4f365164 Rudimentary log functionality with basic infrastructure is in place Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 2 diff changeset	82
608 e1b29756f901 Clean, organize and resolve some TODOs and FIXMEs: minor refactorings and comments Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 607 diff changeset	83 public RevlogStream(Internals hgRepo, File indexFile) {
e1b29756f901 Clean, organize and resolve some TODOs and FIXMEs: minor refactorings and comments Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 607 diff changeset	84 repo = hgRepo;
3 24bb4f365164 Rudimentary log functionality with basic infrastructure is in place Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 2 diff changeset	85 this.indexFile = indexFile;
608 e1b29756f901 Clean, organize and resolve some TODOs and FIXMEs: minor refactorings and comments Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 607 diff changeset	86 changeTracker = repo.getRevlogTracker(indexFile);
3 24bb4f365164 Rudimentary log functionality with basic infrastructure is in place Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 2 diff changeset	87 }
621 99ad1e3a4e4d RevlogStream: be aware of existence (not HgDataFile), facilitate use of an added HgDataFile over a commit; Rollback: be more sensitive about file changes (file size is not enough: write/rollback leaves it intact); tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 617 diff changeset	88
99ad1e3a4e4d RevlogStream: be aware of existence (not HgDataFile), facilitate use of an added HgDataFile over a commit; Rollback: be more sensitive about file changes (file size is not enough: write/rollback leaves it intact); tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 617 diff changeset	89 public boolean exists() {
99ad1e3a4e4d RevlogStream: be aware of existence (not HgDataFile), facilitate use of an added HgDataFile over a commit; Rollback: be more sensitive about file changes (file size is not enough: write/rollback leaves it intact); tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 617 diff changeset	90 return indexFile.exists();
99ad1e3a4e4d RevlogStream: be aware of existence (not HgDataFile), facilitate use of an added HgDataFile over a commit; Rollback: be more sensitive about file changes (file size is not enough: write/rollback leaves it intact); tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 617 diff changeset	91 }
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 0 diff changeset	92
606 5daa42067e7c Avoid mmap files when only few bytes are to be read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 594 diff changeset	93 /**
5daa42067e7c Avoid mmap files when only few bytes are to be read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 594 diff changeset	94 * @param shortRead pass <code>true</code> to indicate intention to read few revisions only (as opposed to reading most of/complete revlog)
5daa42067e7c Avoid mmap files when only few bytes are to be read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 594 diff changeset	95 * @return never <code>null</code>, empty {@link DataAccess} if no stream is available
5daa42067e7c Avoid mmap files when only few bytes are to be read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 594 diff changeset	96 */
5daa42067e7c Avoid mmap files when only few bytes are to be read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 594 diff changeset	97 /package/ DataAccess getIndexStream(boolean shortRead) {
5daa42067e7c Avoid mmap files when only few bytes are to be read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 594 diff changeset	98 // shortRead hint helps to avoid mmap files when only
5daa42067e7c Avoid mmap files when only few bytes are to be read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 594 diff changeset	99 // few bytes are to be read (i.e. #dataLength())
608 e1b29756f901 Clean, organize and resolve some TODOs and FIXMEs: minor refactorings and comments Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 607 diff changeset	100 DataAccessProvider dataAccess = repo.getDataAccess();
606 5daa42067e7c Avoid mmap files when only few bytes are to be read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 594 diff changeset	101 return dataAccess.createReader(indexFile, shortRead);
0 dbd663faec1f Basic changelog parsing Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	102 }
dbd663faec1f Basic changelog parsing Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	103
9 d6d2a630f4a6 Access to underlaying file data wrapped into own Access object, implemented with FileChannel and ByteBuffer Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 6 diff changeset	104 /package/ DataAccess getDataStream() {
608 e1b29756f901 Clean, organize and resolve some TODOs and FIXMEs: minor refactorings and comments Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 607 diff changeset	105 DataAccessProvider dataAccess = repo.getDataAccess();
606 5daa42067e7c Avoid mmap files when only few bytes are to be read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 594 diff changeset	106 return dataAccess.createReader(getDataFile(), false);
534 243202f1bda5 Commit: refactor revision creation code from clone command to work separately, fit into existing library structure Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 530 diff changeset	107 }
243202f1bda5 Commit: refactor revision creation code from clone command to work separately, fit into existing library structure Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 530 diff changeset	108
617 65c01508f002 Rollback support for commands that modify repository. Strategy to keep complete copy of a file being changed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 608 diff changeset	109 /package/ DataSerializer getIndexStreamWriter(Transaction tr) throws HgIOException {
608 e1b29756f901 Clean, organize and resolve some TODOs and FIXMEs: minor refactorings and comments Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 607 diff changeset	110 DataAccessProvider dataAccess = repo.getDataAccess();
617 65c01508f002 Rollback support for commands that modify repository. Strategy to keep complete copy of a file being changed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 608 diff changeset	111 return dataAccess.createWriter(tr, indexFile, true);
534 243202f1bda5 Commit: refactor revision creation code from clone command to work separately, fit into existing library structure Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 530 diff changeset	112 }
243202f1bda5 Commit: refactor revision creation code from clone command to work separately, fit into existing library structure Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 530 diff changeset	113
617 65c01508f002 Rollback support for commands that modify repository. Strategy to keep complete copy of a file being changed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 608 diff changeset	114 /package/ DataSerializer getDataStreamWriter(Transaction tr) throws HgIOException {
608 e1b29756f901 Clean, organize and resolve some TODOs and FIXMEs: minor refactorings and comments Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 607 diff changeset	115 DataAccessProvider dataAccess = repo.getDataAccess();
617 65c01508f002 Rollback support for commands that modify repository. Strategy to keep complete copy of a file being changed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 608 diff changeset	116 return dataAccess.createWriter(tr, getDataFile(), true);
9 d6d2a630f4a6 Access to underlaying file data wrapped into own Access object, implemented with FileChannel and ByteBuffer Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 6 diff changeset	117 }
d6d2a630f4a6 Access to underlaying file data wrapped into own Access object, implemented with FileChannel and ByteBuffer Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 6 diff changeset	118
396 0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 377 diff changeset	119 /**
0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 377 diff changeset	120 * Constructs file object that corresponds to .d revlog counterpart.
0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 377 diff changeset	121 * Note, it's caller responsibility to ensure this file makes any sense (i.e. check {@link #inline} attribute)
0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 377 diff changeset	122 */
0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 377 diff changeset	123 private File getDataFile() {
0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 377 diff changeset	124 if (dataFile == null) {
0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 377 diff changeset	125 final String indexName = indexFile.getName();
0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 377 diff changeset	126 dataFile = new File(indexFile.getParentFile(), indexName.substring(0, indexName.length() - 1) + "d");
0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 377 diff changeset	127 }
0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 377 diff changeset	128 return dataFile;
0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 377 diff changeset	129 }
0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 377 diff changeset	130
0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 377 diff changeset	131 // initialize exception with the file where revlog structure information comes from
0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 377 diff changeset	132 public HgInvalidControlFileException initWithIndexFile(HgInvalidControlFileException ex) {
0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 377 diff changeset	133 return ex.setFile(indexFile);
0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 377 diff changeset	134 }
0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 377 diff changeset	135
0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 377 diff changeset	136 // initialize exception with the file where revlog data comes from
0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 377 diff changeset	137 public HgInvalidControlFileException initWithDataFile(HgInvalidControlFileException ex) {
0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 377 diff changeset	138 // exceptions are usually raised after read attepmt, hence inline shall be initialized
0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 377 diff changeset	139 // although honest approach is to call #initOutline() first
0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 377 diff changeset	140 return ex.setFile(inline ? indexFile : getDataFile());
0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 377 diff changeset	141 }
534 243202f1bda5 Commit: refactor revision creation code from clone command to work separately, fit into existing library structure Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 530 diff changeset	142
243202f1bda5 Commit: refactor revision creation code from clone command to work separately, fit into existing library structure Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 530 diff changeset	143 /package-private/String getDataFileName() {
243202f1bda5 Commit: refactor revision creation code from clone command to work separately, fit into existing library structure Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 530 diff changeset	144 // XXX a temporary solution to provide more info to fill in exceptions other than
243202f1bda5 Commit: refactor revision creation code from clone command to work separately, fit into existing library structure Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 530 diff changeset	145 // HgInvalidControlFileException (those benefit from initWith* methods above)
243202f1bda5 Commit: refactor revision creation code from clone command to work separately, fit into existing library structure Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 530 diff changeset	146 //
243202f1bda5 Commit: refactor revision creation code from clone command to work separately, fit into existing library structure Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 530 diff changeset	147 // Besides, since RevlogStream represents both revlogs with user data (those with WC representative and
243202f1bda5 Commit: refactor revision creation code from clone command to work separately, fit into existing library structure Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 530 diff changeset	148 // system data under store/data) and system-only revlogs (like changelog and manifest), there's no
243202f1bda5 Commit: refactor revision creation code from clone command to work separately, fit into existing library structure Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 530 diff changeset	149 // easy way to supply human-friendly name of the active file (independent from whether it's index of data)
243202f1bda5 Commit: refactor revision creation code from clone command to work separately, fit into existing library structure Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 530 diff changeset	150 return inline ? indexFile.getPath() : getDataFile().getPath();
243202f1bda5 Commit: refactor revision creation code from clone command to work separately, fit into existing library structure Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 530 diff changeset	151 }
396 0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 377 diff changeset	152
534 243202f1bda5 Commit: refactor revision creation code from clone command to work separately, fit into existing library structure Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 530 diff changeset	153 public boolean isInlineData() {
243202f1bda5 Commit: refactor revision creation code from clone command to work separately, fit into existing library structure Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 530 diff changeset	154 initOutline();
243202f1bda5 Commit: refactor revision creation code from clone command to work separately, fit into existing library structure Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 530 diff changeset	155 return inline;
243202f1bda5 Commit: refactor revision creation code from clone command to work separately, fit into existing library structure Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 530 diff changeset	156 }
396 0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 377 diff changeset	157
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 0 diff changeset	158 public int revisionCount() {
08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 0 diff changeset	159 initOutline();
198 33a7d76f067b Performance optimization: reduce memory to keep revlog cached info Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	160 return baseRevisions.length;
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 0 diff changeset	161 }
22 603806cd2dc6 Status of local working dir against non-tip base revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 10 diff changeset	162
295 981f9f50bb6c Issue 11: Error log facility. SessionContext to share common facilities Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 288 diff changeset	163 /**
354 5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	164 * @throws HgInvalidControlFileException if attempt to read index file failed
5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	165 * @throws HgInvalidRevisionException if revisionIndex argument doesn't represent a valid record in the revlog
295 981f9f50bb6c Issue 11: Error log facility. SessionContext to share common facilities Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 288 diff changeset	166 */
354 5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	167 public int dataLength(int revisionIndex) throws HgInvalidControlFileException, HgInvalidRevisionException {
22 603806cd2dc6 Status of local working dir against non-tip base revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 10 diff changeset	168 // XXX in fact, use of iterate() instead of this implementation may be quite reasonable.
603806cd2dc6 Status of local working dir against non-tip base revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 10 diff changeset	169 //
354 5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	170 revisionIndex = checkRevisionIndex(revisionIndex);
606 5daa42067e7c Avoid mmap files when only few bytes are to be read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 594 diff changeset	171 DataAccess daIndex = getIndexStream(true);
22 603806cd2dc6 Status of local working dir against non-tip base revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 10 diff changeset	172 try {
354 5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	173 int recordOffset = getIndexOffsetInt(revisionIndex);
22 603806cd2dc6 Status of local working dir against non-tip base revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 10 diff changeset	174 daIndex.seek(recordOffset + 12); // 6+2+4
603806cd2dc6 Status of local working dir against non-tip base revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 10 diff changeset	175 int actualLen = daIndex.readInt();
603806cd2dc6 Status of local working dir against non-tip base revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 10 diff changeset	176 return actualLen;
603806cd2dc6 Status of local working dir against non-tip base revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 10 diff changeset	177 } catch (IOException ex) {
440 299870249a28 Issue 30: bogus IOException for mmap file on linux Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 425 diff changeset	178 throw new HgInvalidControlFileException(null, ex, indexFile).setRevisionIndex(revisionIndex);
22 603806cd2dc6 Status of local working dir against non-tip base revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 10 diff changeset	179 } finally {
603806cd2dc6 Status of local working dir against non-tip base revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 10 diff changeset	180 daIndex.done();
603806cd2dc6 Status of local working dir against non-tip base revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 10 diff changeset	181 }
603806cd2dc6 Status of local working dir against non-tip base revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 10 diff changeset	182 }
603806cd2dc6 Status of local working dir against non-tip base revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 10 diff changeset	183
295 981f9f50bb6c Issue 11: Error log facility. SessionContext to share common facilities Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 288 diff changeset	184 /**
354 5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	185 * Read nodeid at given index
5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	186 *
5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	187 * @throws HgInvalidControlFileException if attempt to read index file failed
5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	188 * @throws HgInvalidRevisionException if revisionIndex argument doesn't represent a valid record in the revlog
295 981f9f50bb6c Issue 11: Error log facility. SessionContext to share common facilities Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 288 diff changeset	189 */
354 5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	190 public byte[] nodeid(int revisionIndex) throws HgInvalidControlFileException, HgInvalidRevisionException {
5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	191 revisionIndex = checkRevisionIndex(revisionIndex);
606 5daa42067e7c Avoid mmap files when only few bytes are to be read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 594 diff changeset	192 DataAccess daIndex = getIndexStream(true);
80 4222b04f34ee Follow history of a file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	193 try {
354 5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	194 int recordOffset = getIndexOffsetInt(revisionIndex);
80 4222b04f34ee Follow history of a file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	195 daIndex.seek(recordOffset + 32);
4222b04f34ee Follow history of a file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	196 byte[] rv = new byte[20];
4222b04f34ee Follow history of a file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	197 daIndex.readBytes(rv, 0, 20);
4222b04f34ee Follow history of a file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	198 return rv;
4222b04f34ee Follow history of a file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	199 } catch (IOException ex) {
440 299870249a28 Issue 30: bogus IOException for mmap file on linux Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 425 diff changeset	200 throw new HgInvalidControlFileException("Revision lookup failed", ex, indexFile).setRevisionIndex(revisionIndex);
80 4222b04f34ee Follow history of a file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	201 } finally {
88 61eedab3eb3e Status between two revisions to recognize copy/rename Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 80 diff changeset	202 daIndex.done();
61eedab3eb3e Status between two revisions to recognize copy/rename Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 80 diff changeset	203 }
61eedab3eb3e Status between two revisions to recognize copy/rename Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 80 diff changeset	204 }
295 981f9f50bb6c Issue 11: Error log facility. SessionContext to share common facilities Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 288 diff changeset	205
981f9f50bb6c Issue 11: Error log facility. SessionContext to share common facilities Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 288 diff changeset	206 /**
981f9f50bb6c Issue 11: Error log facility. SessionContext to share common facilities Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 288 diff changeset	207 * Get link field from the index record.
354 5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	208 *
5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	209 * @throws HgInvalidControlFileException if attempt to read index file failed
5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	210 * @throws HgInvalidRevisionException if revisionIndex argument doesn't represent a valid record in the revlog
295 981f9f50bb6c Issue 11: Error log facility. SessionContext to share common facilities Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 288 diff changeset	211 */
354 5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	212 public int linkRevision(int revisionIndex) throws HgInvalidControlFileException, HgInvalidRevisionException {
5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	213 revisionIndex = checkRevisionIndex(revisionIndex);
606 5daa42067e7c Avoid mmap files when only few bytes are to be read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 594 diff changeset	214 DataAccess daIndex = getIndexStream(true);
88 61eedab3eb3e Status between two revisions to recognize copy/rename Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 80 diff changeset	215 try {
354 5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	216 int recordOffset = getIndexOffsetInt(revisionIndex);
88 61eedab3eb3e Status between two revisions to recognize copy/rename Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 80 diff changeset	217 daIndex.seek(recordOffset + 20);
61eedab3eb3e Status between two revisions to recognize copy/rename Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 80 diff changeset	218 int linkRev = daIndex.readInt();
61eedab3eb3e Status between two revisions to recognize copy/rename Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 80 diff changeset	219 return linkRev;
61eedab3eb3e Status between two revisions to recognize copy/rename Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 80 diff changeset	220 } catch (IOException ex) {
440 299870249a28 Issue 30: bogus IOException for mmap file on linux Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 425 diff changeset	221 throw new HgInvalidControlFileException("Linked revision lookup failed", ex, indexFile).setRevisionIndex(revisionIndex);
88 61eedab3eb3e Status between two revisions to recognize copy/rename Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 80 diff changeset	222 } finally {
61eedab3eb3e Status between two revisions to recognize copy/rename Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 80 diff changeset	223 daIndex.done();
80 4222b04f34ee Follow history of a file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	224 }
4222b04f34ee Follow history of a file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	225 }
4222b04f34ee Follow history of a file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	226
585 b47ef0d2777b Access to base revision filed comes handy for debug sometimes Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 584 diff changeset	227 /**
b47ef0d2777b Access to base revision filed comes handy for debug sometimes Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 584 diff changeset	228 * Extract base revision field from the revlog
b47ef0d2777b Access to base revision filed comes handy for debug sometimes Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 584 diff changeset	229 *
b47ef0d2777b Access to base revision filed comes handy for debug sometimes Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 584 diff changeset	230 * @throws HgInvalidControlFileException if attempt to read index file failed
b47ef0d2777b Access to base revision filed comes handy for debug sometimes Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 584 diff changeset	231 * @throws HgInvalidRevisionException if revisionIndex argument doesn't represent a valid record in the revlog
b47ef0d2777b Access to base revision filed comes handy for debug sometimes Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 584 diff changeset	232 */
b47ef0d2777b Access to base revision filed comes handy for debug sometimes Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 584 diff changeset	233 public int baseRevision(int revisionIndex) throws HgInvalidControlFileException, HgInvalidRevisionException {
b47ef0d2777b Access to base revision filed comes handy for debug sometimes Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 584 diff changeset	234 revisionIndex = checkRevisionIndex(revisionIndex);
b47ef0d2777b Access to base revision filed comes handy for debug sometimes Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 584 diff changeset	235 return getBaseRevision(revisionIndex);
b47ef0d2777b Access to base revision filed comes handy for debug sometimes Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 584 diff changeset	236 }
b47ef0d2777b Access to base revision filed comes handy for debug sometimes Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 584 diff changeset	237
49 26e3eeaa3962 branch and user filtering for log operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 44 diff changeset	238 // Perhaps, RevlogStream should be limited to use of plain int revisions for access,
26e3eeaa3962 branch and user filtering for log operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 44 diff changeset	239 // while Nodeids should be kept on the level up, in Revlog. Guess, Revlog better keep
26e3eeaa3962 branch and user filtering for log operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 44 diff changeset	240 // map of nodeids, and once this comes true, we may get rid of this method.
80 4222b04f34ee Follow history of a file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	241 // Unlike its counterpart, {@link Revlog#getLocalRevisionNumber()}, doesn't fail with exception if node not found,
4222b04f34ee Follow history of a file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	242 /**
4222b04f34ee Follow history of a file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	243 * @return integer in [0..revisionCount()) or {@link HgRepository#BAD_REVISION} if not found
354 5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	244 * @throws HgInvalidControlFileException if attempt to read index file failed
80 4222b04f34ee Follow history of a file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	245 */
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	246 public int findRevisionIndex(Nodeid nodeid) throws HgInvalidControlFileException {
22 603806cd2dc6 Status of local working dir against non-tip base revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 10 diff changeset	247 // XXX this one may be implemented with iterate() once there's mechanism to stop iterations
603806cd2dc6 Status of local working dir against non-tip base revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 10 diff changeset	248 final int indexSize = revisionCount();
606 5daa42067e7c Avoid mmap files when only few bytes are to be read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 594 diff changeset	249 DataAccess daIndex = getIndexStream(false);
22 603806cd2dc6 Status of local working dir against non-tip base revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 10 diff changeset	250 try {
24 d4fdd1845b3f Nodeid with array of exactly 20 bytes Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 22 diff changeset	251 byte[] nodeidBuf = new byte[20];
22 603806cd2dc6 Status of local working dir against non-tip base revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 10 diff changeset	252 for (int i = 0; i < indexSize; i++) {
603806cd2dc6 Status of local working dir against non-tip base revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 10 diff changeset	253 daIndex.skip(8);
603806cd2dc6 Status of local working dir against non-tip base revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 10 diff changeset	254 int compressedLen = daIndex.readInt();
603806cd2dc6 Status of local working dir against non-tip base revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 10 diff changeset	255 daIndex.skip(20);
24 d4fdd1845b3f Nodeid with array of exactly 20 bytes Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 22 diff changeset	256 daIndex.readBytes(nodeidBuf, 0, 20);
d4fdd1845b3f Nodeid with array of exactly 20 bytes Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 22 diff changeset	257 if (nodeid.equalsTo(nodeidBuf)) {
22 603806cd2dc6 Status of local working dir against non-tip base revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 10 diff changeset	258 return i;
603806cd2dc6 Status of local working dir against non-tip base revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 10 diff changeset	259 }
603806cd2dc6 Status of local working dir against non-tip base revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 10 diff changeset	260 daIndex.skip(inline ? 12 + compressedLen : 12);
603806cd2dc6 Status of local working dir against non-tip base revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 10 diff changeset	261 }
603806cd2dc6 Status of local working dir against non-tip base revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 10 diff changeset	262 } catch (IOException ex) {
440 299870249a28 Issue 30: bogus IOException for mmap file on linux Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 425 diff changeset	263 throw new HgInvalidControlFileException("Revision lookup failed", ex, indexFile).setRevision(nodeid);
22 603806cd2dc6 Status of local working dir against non-tip base revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 10 diff changeset	264 } finally {
603806cd2dc6 Status of local working dir against non-tip base revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 10 diff changeset	265 daIndex.done();
603806cd2dc6 Status of local working dir against non-tip base revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 10 diff changeset	266 }
80 4222b04f34ee Follow history of a file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	267 return BAD_REVISION;
22 603806cd2dc6 Status of local working dir against non-tip base revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 10 diff changeset	268 }
538 dd4f6311af52 Commit: first working version Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 534 diff changeset	269
539 9edfd5a223b8 Commit: handle empty repository case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 538 diff changeset	270 /**
9edfd5a223b8 Commit: handle empty repository case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 538 diff changeset	271 * @return value suitable for the corresponding field in the new revision's header, not physical offset in the file
9edfd5a223b8 Commit: handle empty repository case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 538 diff changeset	272 * (which is different in case of inline revlogs)
9edfd5a223b8 Commit: handle empty repository case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 538 diff changeset	273 */
538 dd4f6311af52 Commit: first working version Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 534 diff changeset	274 public long newEntryOffset() {
dd4f6311af52 Commit: first working version Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 534 diff changeset	275 if (revisionCount() == 0) {
dd4f6311af52 Commit: first working version Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 534 diff changeset	276 return 0;
dd4f6311af52 Commit: first working version Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 534 diff changeset	277 }
606 5daa42067e7c Avoid mmap files when only few bytes are to be read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 594 diff changeset	278 DataAccess daIndex = getIndexStream(true);
538 dd4f6311af52 Commit: first working version Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 534 diff changeset	279 int lastRev = revisionCount() - 1;
dd4f6311af52 Commit: first working version Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 534 diff changeset	280 try {
dd4f6311af52 Commit: first working version Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 534 diff changeset	281 int recordOffset = getIndexOffsetInt(lastRev);
dd4f6311af52 Commit: first working version Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 534 diff changeset	282 daIndex.seek(recordOffset);
dd4f6311af52 Commit: first working version Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 534 diff changeset	283 long value = daIndex.readLong();
dd4f6311af52 Commit: first working version Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 534 diff changeset	284 value = value >>> 16;
dd4f6311af52 Commit: first working version Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 534 diff changeset	285 int compressedLen = daIndex.readInt();
dd4f6311af52 Commit: first working version Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 534 diff changeset	286 return lastRev == 0 ? compressedLen : value + compressedLen;
dd4f6311af52 Commit: first working version Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 534 diff changeset	287 } catch (IOException ex) {
dd4f6311af52 Commit: first working version Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 534 diff changeset	288 throw new HgInvalidControlFileException("Linked revision lookup failed", ex, indexFile).setRevisionIndex(lastRev);
dd4f6311af52 Commit: first working version Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 534 diff changeset	289 } finally {
dd4f6311af52 Commit: first working version Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 534 diff changeset	290 daIndex.done();
dd4f6311af52 Commit: first working version Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 534 diff changeset	291 }
dd4f6311af52 Commit: first working version Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 534 diff changeset	292 }
dd4f6311af52 Commit: first working version Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 534 diff changeset	293
3 24bb4f365164 Rudimentary log functionality with basic infrastructure is in place Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 2 diff changeset	294 // should be possible to use TIP, ALL, or -1, -2, -n notation of Hg
24bb4f365164 Rudimentary log functionality with basic infrastructure is in place Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 2 diff changeset	295 // ? boolean needsNodeid
423 9c9c442b5f2e Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 420 diff changeset	296 public void iterate(int start, int end, boolean needData, Inspector inspector) throws HgInvalidRevisionException, HgInvalidControlFileException {
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 0 diff changeset	297 initOutline();
198 33a7d76f067b Performance optimization: reduce memory to keep revlog cached info Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	298 final int indexSize = revisionCount();
3 24bb4f365164 Rudimentary log functionality with basic infrastructure is in place Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 2 diff changeset	299 if (indexSize == 0) {
24bb4f365164 Rudimentary log functionality with basic infrastructure is in place Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 2 diff changeset	300 return;
24bb4f365164 Rudimentary log functionality with basic infrastructure is in place Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 2 diff changeset	301 }
5 fc265ddeab26 File content and non-effective, although working, patch application Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 4 diff changeset	302 if (end == TIP) {
3 24bb4f365164 Rudimentary log functionality with basic infrastructure is in place Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 2 diff changeset	303 end = indexSize - 1;
24bb4f365164 Rudimentary log functionality with basic infrastructure is in place Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 2 diff changeset	304 }
5 fc265ddeab26 File content and non-effective, although working, patch application Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 4 diff changeset	305 if (start == TIP) {
fc265ddeab26 File content and non-effective, although working, patch application Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 4 diff changeset	306 start = indexSize - 1;
fc265ddeab26 File content and non-effective, although working, patch application Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 4 diff changeset	307 }
300 650b45d290b1 Share range check code Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 297 diff changeset	308 HgInternals.checkRevlogRange(start, end, indexSize-1);
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 0 diff changeset	309 // XXX may cache [start .. end] from index with a single read (pre-read)
08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 0 diff changeset	310
608 e1b29756f901 Clean, organize and resolve some TODOs and FIXMEs: minor refactorings and comments Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 607 diff changeset	311 ReaderN1 r = new ReaderN1(needData, inspector, repo.shallMergePatches());
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 0 diff changeset	312 try {
593 9619301a7bb9 Share last revision read between #iterate() invocations, to save revision rebuild efforts when few subsequent revisions are read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 585 diff changeset	313 r.start(end - start + 1, getLastRevisionRead());
242 ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	314 r.range(start, end);
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	315 } catch (IOException ex) {
366 189dc6dc1c3e Use exceptions to expose errors reading mercurial data Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 354 diff changeset	316 throw new HgInvalidControlFileException(String.format("Failed reading [%d..%d]", start, end), ex, indexFile);
242 ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	317 } finally {
593 9619301a7bb9 Share last revision read between #iterate() invocations, to save revision rebuild efforts when few subsequent revisions are read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 585 diff changeset	318 CachedRevision cr = r.finish();
9619301a7bb9 Share last revision read between #iterate() invocations, to save revision rebuild efforts when few subsequent revisions are read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 585 diff changeset	319 setLastRevisionRead(cr);
242 ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	320 }
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	321 }
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	322
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	323 /**
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	324 * Effective alternative to {@link #iterate(int, int, boolean, Inspector) batch read}, when only few selected
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	325 * revisions are of interest.
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	326 * @param sortedRevisions revisions to walk, in ascending order.
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	327 * @param needData whether inspector needs access to header only
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	328 * @param inspector callback to process entries
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	329 */
366 189dc6dc1c3e Use exceptions to expose errors reading mercurial data Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 354 diff changeset	330 public void iterate(int[] sortedRevisions, boolean needData, Inspector inspector) throws HgInvalidRevisionException, HgInvalidControlFileException /REVISIT - too general exception/ {
242 ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	331 final int indexSize = revisionCount();
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	332 if (indexSize == 0 \|\| sortedRevisions.length == 0) {
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	333 return;
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	334 }
347 8da7ade36c57 Add specific IAE subclass to handle wrong (e.g. outdated after rollback) revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 329 diff changeset	335 if (sortedRevisions[0] > indexSize) {
8da7ade36c57 Add specific IAE subclass to handle wrong (e.g. outdated after rollback) revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 329 diff changeset	336 throw new HgInvalidRevisionException(String.format("Can't iterate [%d, %d] in range [0..%d]", sortedRevisions[0], sortedRevisions[sortedRevisions.length - 1], indexSize), null, sortedRevisions[0]);
8da7ade36c57 Add specific IAE subclass to handle wrong (e.g. outdated after rollback) revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 329 diff changeset	337 }
8da7ade36c57 Add specific IAE subclass to handle wrong (e.g. outdated after rollback) revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 329 diff changeset	338 if (sortedRevisions[sortedRevisions.length - 1] > indexSize) {
8da7ade36c57 Add specific IAE subclass to handle wrong (e.g. outdated after rollback) revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 329 diff changeset	339 throw new HgInvalidRevisionException(String.format("Can't iterate [%d, %d] in range [0..%d]", sortedRevisions[0], sortedRevisions[sortedRevisions.length - 1], indexSize), null, sortedRevisions[sortedRevisions.length - 1]);
242 ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	340 }
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	341
608 e1b29756f901 Clean, organize and resolve some TODOs and FIXMEs: minor refactorings and comments Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 607 diff changeset	342 ReaderN1 r = new ReaderN1(needData, inspector, repo.shallMergePatches());
242 ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	343 try {
594 cc7b0c4dc993 Cache only in-memory revision representations Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 593 diff changeset	344 r.start(sortedRevisions.length, getLastRevisionRead());
242 ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	345 for (int i = 0; i < sortedRevisions.length; ) {
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	346 int x = i;
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	347 i++;
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	348 while (i < sortedRevisions.length) {
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	349 if (sortedRevisions[i] == sortedRevisions[i-1] + 1) {
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	350 i++;
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 0 diff changeset	351 } else {
217 e39cf474ef94 Experimental support to mix-in start and end events for inspectors. Additionally, Lifecycle may serve as iteration control Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 202 diff changeset	352 break;
e39cf474ef94 Experimental support to mix-in start and end events for inspectors. Additionally, Lifecycle may serve as iteration control Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 202 diff changeset	353 }
e39cf474ef94 Experimental support to mix-in start and end events for inspectors. Additionally, Lifecycle may serve as iteration control Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 202 diff changeset	354 }
242 ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	355 // commitRevisions[x..i-1] are sequential
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	356 if (!r.range(sortedRevisions[x], sortedRevisions[i-1])) {
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	357 return;
51 9429c7bd1920 Try DataAccess to reach revision data instead of plain byte arrays Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	358 }
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 0 diff changeset	359 }
08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 0 diff changeset	360 } catch (IOException ex) {
366 189dc6dc1c3e Use exceptions to expose errors reading mercurial data Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 354 diff changeset	361 final int c = sortedRevisions.length;
608 e1b29756f901 Clean, organize and resolve some TODOs and FIXMEs: minor refactorings and comments Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 607 diff changeset	362 throw new HgInvalidControlFileException(String.format("Failed reading %d revisions in [%d; %d]", c, sortedRevisions[0], sortedRevisions[c-1]), ex, indexFile);
3 24bb4f365164 Rudimentary log functionality with basic infrastructure is in place Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 2 diff changeset	363 } finally {
593 9619301a7bb9 Share last revision read between #iterate() invocations, to save revision rebuild efforts when few subsequent revisions are read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 585 diff changeset	364 CachedRevision cr = r.finish();
9619301a7bb9 Share last revision read between #iterate() invocations, to save revision rebuild efforts when few subsequent revisions are read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 585 diff changeset	365 setLastRevisionRead(cr);
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 0 diff changeset	366 }
08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 0 diff changeset	367 }
607 66f1cc23b906 Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 606 diff changeset	368
66f1cc23b906 Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 606 diff changeset	369 public void attach(Observer listener) {
66f1cc23b906 Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 606 diff changeset	370 assert listener != null;
66f1cc23b906 Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 606 diff changeset	371 if (observers == null) {
66f1cc23b906 Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 606 diff changeset	372 observers = new ArrayList<Observer>(3);
66f1cc23b906 Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 606 diff changeset	373 }
66f1cc23b906 Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 606 diff changeset	374 observers.add(listener);
66f1cc23b906 Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 606 diff changeset	375 }
66f1cc23b906 Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 606 diff changeset	376
66f1cc23b906 Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 606 diff changeset	377 public void detach(Observer listener) {
66f1cc23b906 Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 606 diff changeset	378 assert listener != null;
66f1cc23b906 Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 606 diff changeset	379 if (observers != null) {
66f1cc23b906 Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 606 diff changeset	380 observers.remove(listener);
66f1cc23b906 Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 606 diff changeset	381 }
66f1cc23b906 Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 606 diff changeset	382 }
66f1cc23b906 Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 606 diff changeset	383
66f1cc23b906 Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 606 diff changeset	384 /*
66f1cc23b906 Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 606 diff changeset	385 * Note, this method IS NOT a replacement for Observer. It has to be invoked when the validity of any
66f1cc23b906 Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 606 diff changeset	386 * cache built using revision information is in doubt, but it provides reasonable value only till the
66f1cc23b906 Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 606 diff changeset	387 * first initOutline() to be invoked, i.e. in [change..revlog read operation] time frame. If your code
66f1cc23b906 Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 606 diff changeset	388 * accesses cached information without any prior explicit read operation, you shall consult this method
66f1cc23b906 Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 606 diff changeset	389 * if next read operation would in fact bring changed content.
66f1cc23b906 Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 606 diff changeset	390 * Observer is needed in addition to this method because any revlog read operation (e.g. Revlog#getLastRevision)
66f1cc23b906 Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 606 diff changeset	391 * would clear shallDropDerivedCaches(), and if code relies only on this method to clear its derived caches,
66f1cc23b906 Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 606 diff changeset	392 * it would miss the update.
66f1cc23b906 Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 606 diff changeset	393 */
66f1cc23b906 Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 606 diff changeset	394 public boolean shallDropDerivedCaches() {
66f1cc23b906 Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 606 diff changeset	395 if (shallDropDerivedCaches) {
66f1cc23b906 Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 606 diff changeset	396 return shallDropDerivedCaches;
66f1cc23b906 Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 606 diff changeset	397 }
66f1cc23b906 Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 606 diff changeset	398 return shallDropDerivedCaches = changeTracker.hasChanged(indexFile);
66f1cc23b906 Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 606 diff changeset	399 }
198 33a7d76f067b Performance optimization: reduce memory to keep revlog cached info Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	400
539 9edfd5a223b8 Commit: handle empty repository case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 538 diff changeset	401 void revisionAdded(int revisionIndex, Nodeid revision, int baseRevisionIndex, long revisionOffset) throws HgInvalidControlFileException {
607 66f1cc23b906 Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 606 diff changeset	402 shallDropDerivedCaches = true;
539 9edfd5a223b8 Commit: handle empty repository case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 538 diff changeset	403 if (!outlineCached()) {
9edfd5a223b8 Commit: handle empty repository case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 538 diff changeset	404 return;
9edfd5a223b8 Commit: handle empty repository case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 538 diff changeset	405 }
9edfd5a223b8 Commit: handle empty repository case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 538 diff changeset	406 if (baseRevisions.length != revisionIndex) {
9edfd5a223b8 Commit: handle empty repository case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 538 diff changeset	407 throw new HgInvalidControlFileException(String.format("New entry's index shall be %d, not %d", baseRevisions.length, revisionIndex), null, indexFile);
9edfd5a223b8 Commit: handle empty repository case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 538 diff changeset	408 }
9edfd5a223b8 Commit: handle empty repository case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 538 diff changeset	409 if (baseRevisionIndex < 0 \|\| baseRevisionIndex > baseRevisions.length) {
9edfd5a223b8 Commit: handle empty repository case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 538 diff changeset	410 // baseRevisionIndex MAY be == to baseRevisions.length, it's when new revision is based on itself
9edfd5a223b8 Commit: handle empty repository case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 538 diff changeset	411 throw new HgInvalidControlFileException(String.format("Base revision index %d doesn't fit [0..%d] range", baseRevisionIndex, baseRevisions.length), null, indexFile);
9edfd5a223b8 Commit: handle empty repository case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 538 diff changeset	412 }
9edfd5a223b8 Commit: handle empty repository case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 538 diff changeset	413 assert revision != null;
9edfd5a223b8 Commit: handle empty repository case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 538 diff changeset	414 assert !revision.isNull();
621 99ad1e3a4e4d RevlogStream: be aware of existence (not HgDataFile), facilitate use of an added HgDataFile over a commit; Rollback: be more sensitive about file changes (file size is not enough: write/rollback leaves it intact); tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 617 diff changeset	415 // next effort doesn't seem to be of any value at least in case of regular commit
99ad1e3a4e4d RevlogStream: be aware of existence (not HgDataFile), facilitate use of an added HgDataFile over a commit; Rollback: be more sensitive about file changes (file size is not enough: write/rollback leaves it intact); tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 617 diff changeset	416 // as the next call to #initOutline would recognize the file change and reload complete revlog anyway
99ad1e3a4e4d RevlogStream: be aware of existence (not HgDataFile), facilitate use of an added HgDataFile over a commit; Rollback: be more sensitive about file changes (file size is not enough: write/rollback leaves it intact); tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 617 diff changeset	417 // OTOH, there might be transaction strategy that doesn't update the file until its completion,
99ad1e3a4e4d RevlogStream: be aware of existence (not HgDataFile), facilitate use of an added HgDataFile over a commit; Rollback: be more sensitive about file changes (file size is not enough: write/rollback leaves it intact); tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 617 diff changeset	418 // while it's handy to know new revisions meanwhile.
539 9edfd5a223b8 Commit: handle empty repository case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 538 diff changeset	419 int[] baseRevisionsCopy = new int[baseRevisions.length + 1];
9edfd5a223b8 Commit: handle empty repository case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 538 diff changeset	420 System.arraycopy(baseRevisions, 0, baseRevisionsCopy, 0, baseRevisions.length);
9edfd5a223b8 Commit: handle empty repository case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 538 diff changeset	421 baseRevisionsCopy[baseRevisions.length] = baseRevisionIndex;
9edfd5a223b8 Commit: handle empty repository case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 538 diff changeset	422 baseRevisions = baseRevisionsCopy;
9edfd5a223b8 Commit: handle empty repository case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 538 diff changeset	423 if (inline && indexRecordOffset != null) {
9edfd5a223b8 Commit: handle empty repository case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 538 diff changeset	424 assert indexRecordOffset.length == revisionIndex;
9edfd5a223b8 Commit: handle empty repository case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 538 diff changeset	425 int[] indexRecordOffsetCopy = new int[indexRecordOffset.length + 1];
559 6ca3d0c5b4bc Commit: tests and fixes for defects discovered Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 539 diff changeset	426 System.arraycopy(indexRecordOffset, 0, indexRecordOffsetCopy, 0, indexRecordOffset.length);
539 9edfd5a223b8 Commit: handle empty repository case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 538 diff changeset	427 indexRecordOffsetCopy[indexRecordOffset.length] = offsetFieldToInlineFileOffset(revisionOffset, revisionIndex);
9edfd5a223b8 Commit: handle empty repository case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 538 diff changeset	428 indexRecordOffset = indexRecordOffsetCopy;
9edfd5a223b8 Commit: handle empty repository case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 538 diff changeset	429 }
9edfd5a223b8 Commit: handle empty repository case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 538 diff changeset	430 }
9edfd5a223b8 Commit: handle empty repository case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 538 diff changeset	431
198 33a7d76f067b Performance optimization: reduce memory to keep revlog cached info Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	432 private int getBaseRevision(int revision) {
33a7d76f067b Performance optimization: reduce memory to keep revlog cached info Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	433 return baseRevisions[revision];
33a7d76f067b Performance optimization: reduce memory to keep revlog cached info Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	434 }
33a7d76f067b Performance optimization: reduce memory to keep revlog cached info Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	435
33a7d76f067b Performance optimization: reduce memory to keep revlog cached info Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	436 /**
354 5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	437 * @param revisionIndex shall be valid index, [0..baseRevisions.length-1].
5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	438 * It's advised to use {@link #checkRevisionIndex(int)} to ensure argument is correct.
198 33a7d76f067b Performance optimization: reduce memory to keep revlog cached info Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	439 * @return offset of the revision's record in the index (.i) stream
33a7d76f067b Performance optimization: reduce memory to keep revlog cached info Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	440 */
354 5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	441 private int getIndexOffsetInt(int revisionIndex) {
5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	442 return inline ? indexRecordOffset[revisionIndex] : revisionIndex * REVLOGV1_RECORD_SIZE;
5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	443 }
5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	444
5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	445 private int checkRevisionIndex(int revisionIndex) throws HgInvalidRevisionException {
5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	446 final int last = revisionCount() - 1;
5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	447 if (revisionIndex == TIP) {
5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	448 revisionIndex = last;
5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	449 }
5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	450 if (revisionIndex < 0 \|\| revisionIndex > last) {
5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	451 throw new HgInvalidRevisionException(revisionIndex).setRevisionIndex(revisionIndex, 0, last);
5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	452 }
5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	453 return revisionIndex;
198 33a7d76f067b Performance optimization: reduce memory to keep revlog cached info Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	454 }
539 9edfd5a223b8 Commit: handle empty repository case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 538 diff changeset	455
9edfd5a223b8 Commit: handle empty repository case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 538 diff changeset	456 private boolean outlineCached() {
9edfd5a223b8 Commit: handle empty repository case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 538 diff changeset	457 return baseRevisions != null && baseRevisions.length > 0;
9edfd5a223b8 Commit: handle empty repository case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 538 diff changeset	458 }
9edfd5a223b8 Commit: handle empty repository case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 538 diff changeset	459
584 ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	460 // translate 6-byte offset field value to physical file offset for inline revlogs
539 9edfd5a223b8 Commit: handle empty repository case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 538 diff changeset	461 // DOESN'T MAKE SENSE if revlog with data is separate
9edfd5a223b8 Commit: handle empty repository case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 538 diff changeset	462 private static int offsetFieldToInlineFileOffset(long offset, int recordIndex) throws HgInvalidStateException {
9edfd5a223b8 Commit: handle empty repository case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 538 diff changeset	463 int o = Internals.ltoi(offset);
9edfd5a223b8 Commit: handle empty repository case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 538 diff changeset	464 if (o != offset) {
9edfd5a223b8 Commit: handle empty repository case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 538 diff changeset	465 // just in case, can't happen, ever, unless HG (or some other bad tool) produces index file
9edfd5a223b8 Commit: handle empty repository case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 538 diff changeset	466 // with inlined data of size greater than 2 Gb.
9edfd5a223b8 Commit: handle empty repository case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 538 diff changeset	467 throw new HgInvalidStateException("Data too big, offset didn't fit to sizeof(int)");
9edfd5a223b8 Commit: handle empty repository case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 538 diff changeset	468 }
9edfd5a223b8 Commit: handle empty repository case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 538 diff changeset	469 return o + REVLOGV1_RECORD_SIZE * recordIndex;
9edfd5a223b8 Commit: handle empty repository case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 538 diff changeset	470 }
198 33a7d76f067b Performance optimization: reduce memory to keep revlog cached info Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	471
607 66f1cc23b906 Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 606 diff changeset	472 // every access to index revlog goes after this method only.
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 423 diff changeset	473 private void initOutline() throws HgInvalidControlFileException {
607 66f1cc23b906 Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 606 diff changeset	474 // true to send out 'drop-your-caches' event after outline has been built
66f1cc23b906 Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 606 diff changeset	475 final boolean notifyReload;
539 9edfd5a223b8 Commit: handle empty repository case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 538 diff changeset	476 if (outlineCached()) {
607 66f1cc23b906 Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 606 diff changeset	477 if (!changeTracker.hasChanged(indexFile)) {
66f1cc23b906 Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 606 diff changeset	478 return;
66f1cc23b906 Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 606 diff changeset	479 }
66f1cc23b906 Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 606 diff changeset	480 notifyReload = true;
66f1cc23b906 Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 606 diff changeset	481 } else {
66f1cc23b906 Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 606 diff changeset	482 // no cached outline - inital read, do not send any reload/invalidate notifications
66f1cc23b906 Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 606 diff changeset	483 notifyReload = false;
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 0 diff changeset	484 }
607 66f1cc23b906 Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 606 diff changeset	485 changeTracker.touch(indexFile);
606 5daa42067e7c Avoid mmap files when only few bytes are to be read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 594 diff changeset	486 DataAccess da = getIndexStream(false);
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 0 diff changeset	487 try {
202 706bcc7cfee4 Basic test for HgIncomingCommand. Fix RepositoryComparator for cases when whole repository is unknown. Respect freshly initialized (empty) repositories in general. Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 198 diff changeset	488 if (da.isEmpty()) {
706bcc7cfee4 Basic test for HgIncomingCommand. Fix RepositoryComparator for cases when whole repository is unknown. Respect freshly initialized (empty) repositories in general. Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 198 diff changeset	489 // do not fail with exception if stream is empty, it's likely intentional
706bcc7cfee4 Basic test for HgIncomingCommand. Fix RepositoryComparator for cases when whole repository is unknown. Respect freshly initialized (empty) repositories in general. Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 198 diff changeset	490 baseRevisions = new int[0];
539 9edfd5a223b8 Commit: handle empty repository case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 538 diff changeset	491 // empty revlog, likely to be populated, indicate we start with a single file
9edfd5a223b8 Commit: handle empty repository case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 538 diff changeset	492 inline = true;
202 706bcc7cfee4 Basic test for HgIncomingCommand. Fix RepositoryComparator for cases when whole repository is unknown. Respect freshly initialized (empty) repositories in general. Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 198 diff changeset	493 return;
706bcc7cfee4 Basic test for HgIncomingCommand. Fix RepositoryComparator for cases when whole repository is unknown. Respect freshly initialized (empty) repositories in general. Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 198 diff changeset	494 }
9 d6d2a630f4a6 Access to underlaying file data wrapped into own Access object, implemented with FileChannel and ByteBuffer Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 6 diff changeset	495 int versionField = da.readInt();
170 71ddbf8603e8 Initial clone: populate given directory from a bundle. Everything but remote server access is there, albeit prototype code style Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 158 diff changeset	496 da.readInt(); // just to skip next 4 bytes of offset + flags
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 0 diff changeset	497 inline = (versionField & INLINEDATA) != 0;
288 b11f6a08f748 Avoid boxing int values and list resizes on revlog read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 280 diff changeset	498 IntVector resBases, resOffsets = null;
420 6c22bdc0bdfd Respect long offsets in revlogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 398 diff changeset	499 int entryCountGuess = Internals.ltoi(da.longLength() / REVLOGV1_RECORD_SIZE);
288 b11f6a08f748 Avoid boxing int values and list resizes on revlog read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 280 diff changeset	500 if (inline) {
b11f6a08f748 Avoid boxing int values and list resizes on revlog read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 280 diff changeset	501 entryCountGuess >>>= 2; // pure guess, assume useful data takes 3/4 of total space
b11f6a08f748 Avoid boxing int values and list resizes on revlog read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 280 diff changeset	502 resOffsets = new IntVector(entryCountGuess, 5000);
b11f6a08f748 Avoid boxing int values and list resizes on revlog read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 280 diff changeset	503 }
b11f6a08f748 Avoid boxing int values and list resizes on revlog read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 280 diff changeset	504 resBases = new IntVector(entryCountGuess, 5000);
b11f6a08f748 Avoid boxing int values and list resizes on revlog read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 280 diff changeset	505
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 0 diff changeset	506 long offset = 0; // first offset is always 0, thus Hg uses it for other purposes
9 d6d2a630f4a6 Access to underlaying file data wrapped into own Access object, implemented with FileChannel and ByteBuffer Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 6 diff changeset	507 while(true) {
d6d2a630f4a6 Access to underlaying file data wrapped into own Access object, implemented with FileChannel and ByteBuffer Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 6 diff changeset	508 int compressedLen = da.readInt();
5 fc265ddeab26 File content and non-effective, although working, patch application Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 4 diff changeset	509 // 8+4 = 12 bytes total read here
49 26e3eeaa3962 branch and user filtering for log operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 44 diff changeset	510 @SuppressWarnings("unused")
9 d6d2a630f4a6 Access to underlaying file data wrapped into own Access object, implemented with FileChannel and ByteBuffer Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 6 diff changeset	511 int actualLen = da.readInt();
d6d2a630f4a6 Access to underlaying file data wrapped into own Access object, implemented with FileChannel and ByteBuffer Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 6 diff changeset	512 int baseRevision = da.readInt();
5 fc265ddeab26 File content and non-effective, although working, patch application Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 4 diff changeset	513 // 12 + 8 = 20 bytes read here
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 0 diff changeset	514 // int linkRevision = di.readInt();
08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 0 diff changeset	515 // int parent1Revision = di.readInt();
08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 0 diff changeset	516 // int parent2Revision = di.readInt();
08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 0 diff changeset	517 // byte[] nodeid = new byte[32];
198 33a7d76f067b Performance optimization: reduce memory to keep revlog cached info Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	518 resBases.add(baseRevision);
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 0 diff changeset	519 if (inline) {
539 9edfd5a223b8 Commit: handle empty repository case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 538 diff changeset	520 int o = offsetFieldToInlineFileOffset(offset, resOffsets.size());
9edfd5a223b8 Commit: handle empty repository case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 538 diff changeset	521 resOffsets.add(o);
9 d6d2a630f4a6 Access to underlaying file data wrapped into own Access object, implemented with FileChannel and ByteBuffer Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 6 diff changeset	522 da.skip(3*4 + 32 + compressedLen); // Check: 44 (skip) + 20 (read) = 64 (total RevlogNG record size)
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 0 diff changeset	523 } else {
9 d6d2a630f4a6 Access to underlaying file data wrapped into own Access object, implemented with FileChannel and ByteBuffer Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 6 diff changeset	524 da.skip(3*4 + 32);
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 0 diff changeset	525 }
10 382cfe9463db Dirstate parsing. DataAccess refactored to allow reuse and control over constants Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 9 diff changeset	526 if (da.isEmpty()) {
9 d6d2a630f4a6 Access to underlaying file data wrapped into own Access object, implemented with FileChannel and ByteBuffer Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 6 diff changeset	527 // fine, done then
288 b11f6a08f748 Avoid boxing int values and list resizes on revlog read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 280 diff changeset	528 baseRevisions = resBases.toArray(true);
198 33a7d76f067b Performance optimization: reduce memory to keep revlog cached info Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	529 if (inline) {
288 b11f6a08f748 Avoid boxing int values and list resizes on revlog read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 280 diff changeset	530 indexRecordOffset = resOffsets.toArray(true);
198 33a7d76f067b Performance optimization: reduce memory to keep revlog cached info Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	531 }
9 d6d2a630f4a6 Access to underlaying file data wrapped into own Access object, implemented with FileChannel and ByteBuffer Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 6 diff changeset	532 break;
10 382cfe9463db Dirstate parsing. DataAccess refactored to allow reuse and control over constants Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 9 diff changeset	533 } else {
382cfe9463db Dirstate parsing. DataAccess refactored to allow reuse and control over constants Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 9 diff changeset	534 // start reading next record
382cfe9463db Dirstate parsing. DataAccess refactored to allow reuse and control over constants Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 9 diff changeset	535 long l = da.readLong();
382cfe9463db Dirstate parsing. DataAccess refactored to allow reuse and control over constants Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 9 diff changeset	536 offset = l >>> 16;
9 d6d2a630f4a6 Access to underlaying file data wrapped into own Access object, implemented with FileChannel and ByteBuffer Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 6 diff changeset	537 }
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 0 diff changeset	538 }
08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 0 diff changeset	539 } catch (IOException ex) {
423 9c9c442b5f2e Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 420 diff changeset	540 throw new HgInvalidControlFileException("Failed to analyze revlog index", ex, indexFile);
9 d6d2a630f4a6 Access to underlaying file data wrapped into own Access object, implemented with FileChannel and ByteBuffer Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 6 diff changeset	541 } finally {
d6d2a630f4a6 Access to underlaying file data wrapped into own Access object, implemented with FileChannel and ByteBuffer Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 6 diff changeset	542 da.done();
607 66f1cc23b906 Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 606 diff changeset	543 if (notifyReload && observers != null) {
66f1cc23b906 Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 606 diff changeset	544 for (Observer l : observers) {
66f1cc23b906 Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 606 diff changeset	545 l.reloaded(this);
66f1cc23b906 Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 606 diff changeset	546 }
66f1cc23b906 Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 606 diff changeset	547 shallDropDerivedCaches = false;
66f1cc23b906 Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 606 diff changeset	548 }
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 0 diff changeset	549 }
3 24bb4f365164 Rudimentary log functionality with basic infrastructure is in place Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 2 diff changeset	550 }
24bb4f365164 Rudimentary log functionality with basic infrastructure is in place Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 2 diff changeset	551
593 9619301a7bb9 Share last revision read between #iterate() invocations, to save revision rebuild efforts when few subsequent revisions are read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 585 diff changeset	552 private CachedRevision getLastRevisionRead() {
9619301a7bb9 Share last revision read between #iterate() invocations, to save revision rebuild efforts when few subsequent revisions are read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 585 diff changeset	553 return lastRevisionRead == null ? null : lastRevisionRead.get();
9619301a7bb9 Share last revision read between #iterate() invocations, to save revision rebuild efforts when few subsequent revisions are read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 585 diff changeset	554 }
9619301a7bb9 Share last revision read between #iterate() invocations, to save revision rebuild efforts when few subsequent revisions are read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 585 diff changeset	555
9619301a7bb9 Share last revision read between #iterate() invocations, to save revision rebuild efforts when few subsequent revisions are read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 585 diff changeset	556 private void setLastRevisionRead(CachedRevision cr) {
9619301a7bb9 Share last revision read between #iterate() invocations, to save revision rebuild efforts when few subsequent revisions are read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 585 diff changeset	557 // done() for lastRevisionRead.userData has been called by ReaderN1 once
9619301a7bb9 Share last revision read between #iterate() invocations, to save revision rebuild efforts when few subsequent revisions are read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 585 diff changeset	558 // it noticed unsuitable DataAccess.
9619301a7bb9 Share last revision read between #iterate() invocations, to save revision rebuild efforts when few subsequent revisions are read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 585 diff changeset	559 // Now, done() for any CachedRevision cleared by GC:
9619301a7bb9 Share last revision read between #iterate() invocations, to save revision rebuild efforts when few subsequent revisions are read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 585 diff changeset	560 for (Reference<? extends CachedRevision> r; (r = lastRevisionQueue.poll()) != null;) {
9619301a7bb9 Share last revision read between #iterate() invocations, to save revision rebuild efforts when few subsequent revisions are read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 585 diff changeset	561 CachedRevision toClean = r.get();
9619301a7bb9 Share last revision read between #iterate() invocations, to save revision rebuild efforts when few subsequent revisions are read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 585 diff changeset	562 if (toClean != null && toClean.userData != null) {
9619301a7bb9 Share last revision read between #iterate() invocations, to save revision rebuild efforts when few subsequent revisions are read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 585 diff changeset	563 toClean.userData.done();
9619301a7bb9 Share last revision read between #iterate() invocations, to save revision rebuild efforts when few subsequent revisions are read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 585 diff changeset	564 }
9619301a7bb9 Share last revision read between #iterate() invocations, to save revision rebuild efforts when few subsequent revisions are read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 585 diff changeset	565 }
9619301a7bb9 Share last revision read between #iterate() invocations, to save revision rebuild efforts when few subsequent revisions are read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 585 diff changeset	566 if (cr != null) {
9619301a7bb9 Share last revision read between #iterate() invocations, to save revision rebuild efforts when few subsequent revisions are read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 585 diff changeset	567 lastRevisionRead = new SoftReference<CachedRevision>(cr, lastRevisionQueue);
9619301a7bb9 Share last revision read between #iterate() invocations, to save revision rebuild efforts when few subsequent revisions are read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 585 diff changeset	568 } else {
9619301a7bb9 Share last revision read between #iterate() invocations, to save revision rebuild efforts when few subsequent revisions are read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 585 diff changeset	569 lastRevisionRead = null;
9619301a7bb9 Share last revision read between #iterate() invocations, to save revision rebuild efforts when few subsequent revisions are read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 585 diff changeset	570 }
9619301a7bb9 Share last revision read between #iterate() invocations, to save revision rebuild efforts when few subsequent revisions are read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 585 diff changeset	571 }
9619301a7bb9 Share last revision read between #iterate() invocations, to save revision rebuild efforts when few subsequent revisions are read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 585 diff changeset	572
9619301a7bb9 Share last revision read between #iterate() invocations, to save revision rebuild efforts when few subsequent revisions are read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 585 diff changeset	573 final static class CachedRevision {
9619301a7bb9 Share last revision read between #iterate() invocations, to save revision rebuild efforts when few subsequent revisions are read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 585 diff changeset	574 final int revision;
9619301a7bb9 Share last revision read between #iterate() invocations, to save revision rebuild efforts when few subsequent revisions are read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 585 diff changeset	575 final DataAccess userData;
9619301a7bb9 Share last revision read between #iterate() invocations, to save revision rebuild efforts when few subsequent revisions are read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 585 diff changeset	576
9619301a7bb9 Share last revision read between #iterate() invocations, to save revision rebuild efforts when few subsequent revisions are read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 585 diff changeset	577 public CachedRevision(int lastRevisionRead, DataAccess lastUserData) {
9619301a7bb9 Share last revision read between #iterate() invocations, to save revision rebuild efforts when few subsequent revisions are read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 585 diff changeset	578 revision = lastRevisionRead;
9619301a7bb9 Share last revision read between #iterate() invocations, to save revision rebuild efforts when few subsequent revisions are read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 585 diff changeset	579 userData = lastUserData;
9619301a7bb9 Share last revision read between #iterate() invocations, to save revision rebuild efforts when few subsequent revisions are read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 585 diff changeset	580 }
9619301a7bb9 Share last revision read between #iterate() invocations, to save revision rebuild efforts when few subsequent revisions are read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 585 diff changeset	581 }
9619301a7bb9 Share last revision read between #iterate() invocations, to save revision rebuild efforts when few subsequent revisions are read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 585 diff changeset	582
242 ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	583 /**
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	584 * operation with single file open/close and multiple diverse reads.
366 189dc6dc1c3e Use exceptions to expose errors reading mercurial data Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 354 diff changeset	585 * XXX initOutline might need similar extraction to keep N1 format knowledge
242 ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	586 */
584 ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	587 final class ReaderN1 {
242 ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	588 private final Inspector inspector;
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	589 private final boolean needData;
584 ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	590 private final boolean mergePatches;
242 ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	591 private DataAccess daIndex = null, daData = null;
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	592 private Lifecycle.BasicCallback cb = null;
520 1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 440 diff changeset	593 private Lifecycle lifecycleListener = null;
242 ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	594 private int lastRevisionRead = BAD_REVISION;
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	595 private DataAccess lastUserData;
584 ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	596 //
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	597 // next are transient values, for range() use only
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	598 private final Inflater inflater = new Inflater();
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	599 // can share buffer between instances of InflaterDataAccess as I never read any two of them in parallel
608 e1b29756f901 Clean, organize and resolve some TODOs and FIXMEs: minor refactorings and comments Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 607 diff changeset	600 private final byte[] inflaterBuffer = new byte[10 * 1024]; // TODO [post-1.1] consider using DAP.DEFAULT_FILE_BUFFER
584 ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	601 private final byte[] nodeidBuf = new byte[20];
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	602 // revlog record fields
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	603 private long offset;
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	604 @SuppressWarnings("unused")
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	605 private int flags;
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	606 private int compressedLen;
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	607 private int actualLen;
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	608 private int baseRevision;
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	609 private int linkRevision;
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	610 private int parent1Revision;
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	611 private int parent2Revision;
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	612
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	613 public ReaderN1(boolean dataRequested, Inspector insp, boolean usePatchMerge) {
242 ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	614 assert insp != null;
584 ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	615 needData = dataRequested;
242 ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	616 inspector = insp;
584 ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	617 mergePatches = usePatchMerge;
242 ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	618 }
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	619
593 9619301a7bb9 Share last revision read between #iterate() invocations, to save revision rebuild efforts when few subsequent revisions are read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 585 diff changeset	620 public void start(int totalWork, CachedRevision cachedRevision) {
606 5daa42067e7c Avoid mmap files when only few bytes are to be read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 594 diff changeset	621 daIndex = getIndexStream(totalWork <= 10);
242 ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	622 if (needData && !inline) {
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	623 daData = getDataStream();
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	624 }
520 1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 440 diff changeset	625 lifecycleListener = Adaptable.Factory.getAdapter(inspector, Lifecycle.class, null);
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 440 diff changeset	626 if (lifecycleListener != null) {
242 ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	627 cb = new Lifecycle.BasicCallback();
520 1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 440 diff changeset	628 lifecycleListener.start(totalWork, cb, cb);
242 ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	629 }
593 9619301a7bb9 Share last revision read between #iterate() invocations, to save revision rebuild efforts when few subsequent revisions are read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 585 diff changeset	630 if (needData && cachedRevision != null) {
9619301a7bb9 Share last revision read between #iterate() invocations, to save revision rebuild efforts when few subsequent revisions are read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 585 diff changeset	631 lastUserData = cachedRevision.userData;
9619301a7bb9 Share last revision read between #iterate() invocations, to save revision rebuild efforts when few subsequent revisions are read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 585 diff changeset	632 lastRevisionRead = cachedRevision.revision;
9619301a7bb9 Share last revision read between #iterate() invocations, to save revision rebuild efforts when few subsequent revisions are read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 585 diff changeset	633 assert lastUserData != null;
9619301a7bb9 Share last revision read between #iterate() invocations, to save revision rebuild efforts when few subsequent revisions are read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 585 diff changeset	634 }
242 ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	635 }
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	636
520 1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 440 diff changeset	637 // invoked only once per instance
593 9619301a7bb9 Share last revision read between #iterate() invocations, to save revision rebuild efforts when few subsequent revisions are read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 585 diff changeset	638 public CachedRevision finish() {
9619301a7bb9 Share last revision read between #iterate() invocations, to save revision rebuild efforts when few subsequent revisions are read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 585 diff changeset	639 CachedRevision rv = null;
242 ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	640 if (lastUserData != null) {
594 cc7b0c4dc993 Cache only in-memory revision representations Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 593 diff changeset	641 if (lastUserData instanceof ByteArrayDataAccess) {
cc7b0c4dc993 Cache only in-memory revision representations Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 593 diff changeset	642 // it's safe to cache only in-memory revision texts,
cc7b0c4dc993 Cache only in-memory revision representations Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 593 diff changeset	643 // if lastUserData is merely a filter over file stream,
cc7b0c4dc993 Cache only in-memory revision representations Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 593 diff changeset	644 // we'd need to keep file open, and this is bad.
cc7b0c4dc993 Cache only in-memory revision representations Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 593 diff changeset	645 // XXX perhaps, wrap any DataAccess.byteArray into
cc7b0c4dc993 Cache only in-memory revision representations Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 593 diff changeset	646 // ByteArrayDataAccess?
cc7b0c4dc993 Cache only in-memory revision representations Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 593 diff changeset	647 rv = new CachedRevision(lastRevisionRead, lastUserData);
cc7b0c4dc993 Cache only in-memory revision representations Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 593 diff changeset	648 } else {
cc7b0c4dc993 Cache only in-memory revision representations Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 593 diff changeset	649 lastUserData.done();
cc7b0c4dc993 Cache only in-memory revision representations Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 593 diff changeset	650 }
242 ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	651 lastUserData = null;
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	652 }
520 1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 440 diff changeset	653 if (lifecycleListener != null) {
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 440 diff changeset	654 lifecycleListener.finish(cb);
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 440 diff changeset	655 lifecycleListener = null;
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 440 diff changeset	656 cb = null;
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 440 diff changeset	657
242 ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	658 }
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	659 daIndex.done();
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	660 if (daData != null) {
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	661 daData.done();
520 1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 440 diff changeset	662 daData = null;
242 ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	663 }
593 9619301a7bb9 Share last revision read between #iterate() invocations, to save revision rebuild efforts when few subsequent revisions are read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 585 diff changeset	664 return rv;
242 ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	665 }
584 ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	666
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	667 private void readHeaderRecord(int i) throws IOException {
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	668 if (inline && needData) {
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	669 // inspector reading data (though FilterDataAccess) may have affected index position
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	670 daIndex.seek(getIndexOffsetInt(i));
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	671 }
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	672 long l = daIndex.readLong(); // 0
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	673 offset = i == 0 ? 0 : (l >>> 16);
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	674 flags = (int) (l & 0x0FFFF);
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	675 compressedLen = daIndex.readInt(); // +8
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	676 actualLen = daIndex.readInt(); // +12
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	677 baseRevision = daIndex.readInt(); // +16
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	678 linkRevision = daIndex.readInt(); // +20
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	679 parent1Revision = daIndex.readInt();
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	680 parent2Revision = daIndex.readInt();
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	681 // Hg has 32 bytes here, uses 20 for nodeid, and keeps 12 last bytes empty
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	682 daIndex.readBytes(nodeidBuf, 0, 20); // +32
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	683 daIndex.skip(12);
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	684 }
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	685
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	686 private boolean isPatch(int i) {
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	687 return baseRevision != i; // the only way I found to tell if it's a patch
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	688 }
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	689
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	690 private DataAccess getStoredData(int i) throws IOException {
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	691 DataAccess userDataAccess = null;
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	692 DataAccess streamDataAccess;
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	693 long streamOffset;
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	694 if (inline) {
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	695 streamOffset = getIndexOffsetInt(i) + REVLOGV1_RECORD_SIZE;
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	696 streamDataAccess = daIndex;
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	697 // don't need to do seek as it's actual position in the index stream, but it's safe to seek, just in case
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	698 daIndex.longSeek(streamOffset);
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	699 } else {
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	700 streamOffset = offset;
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	701 streamDataAccess = daData;
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	702 daData.longSeek(streamOffset);
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	703 }
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	704 if (streamDataAccess.isEmpty() \|\| compressedLen == 0) {
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	705 userDataAccess = new DataAccess(); // empty
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	706 } else {
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	707 final byte firstByte = streamDataAccess.readByte();
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	708 if (firstByte == 0x78 /* 'x' */) {
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	709 inflater.reset();
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	710 userDataAccess = new InflaterDataAccess(streamDataAccess, streamOffset, compressedLen, isPatch(i) ? -1 : actualLen, inflater, inflaterBuffer);
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	711 } else if (firstByte == 0x75 /* 'u' */) {
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	712 userDataAccess = new FilterDataAccess(streamDataAccess, streamOffset+1, compressedLen-1);
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	713 } else {
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	714 // XXX Python impl in fact throws exception when there's not 'x', 'u' or '0' but I don't see reason not to return data as is
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	715 //
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	716 // although firstByte is already read from the streamDataAccess, FilterDataAccess#readByte would seek to
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	717 // initial offset before first attempt to read a byte
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	718 userDataAccess = new FilterDataAccess(streamDataAccess, streamOffset, compressedLen);
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	719 }
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	720 }
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	721 return userDataAccess;
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	722 }
263 31f67be94e71 RevlogStream - reduce number of object instances, reuse when possible Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 258 diff changeset	723
520 1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 440 diff changeset	724 // may be invoked few times per instance life
423 9c9c442b5f2e Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 420 diff changeset	725 public boolean range(int start, int end) throws IOException {
242 ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	726 int i;
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	727 // it (i.e. replace with i >= start)
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	728 if (needData && (i = getBaseRevision(start)) < start) {
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	729 // if lastRevisionRead in [baseRevision(start), start) can reuse lastUserData
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	730 // doesn't make sense to reuse if lastRevisionRead == start (too much to change in the cycle below).
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	731 if (lastRevisionRead != BAD_REVISION && i <= lastRevisionRead && lastRevisionRead < start) {
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	732 i = lastRevisionRead + 1; // start with first not-yet-read revision
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	733 } else {
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	734 if (lastUserData != null) {
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	735 lastUserData.done();
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	736 lastUserData = null;
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	737 }
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	738 }
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	739 } else {
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	740 // don't need to clean lastUserData as it's always null when !needData
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	741 i = start;
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	742 }
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	743
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	744 daIndex.seek(getIndexOffsetInt(i));
258 e5776067b3b8 Reduce number of objects instantiated on revlog read Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 243 diff changeset	745 //
584 ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	746 // reuse instance, do not normalize it as patches from the stream are unlikely to need it
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	747 final Patch patch = new Patch(false);
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	748 //
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	749 if (needData && mergePatches && start-i > 2) {
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	750 // i+1 == start just reads lastUserData, i+2 == start applies one patch - not worth dedicated effort
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	751 Patch ultimatePatch = new Patch(true);
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	752 for ( ; i < start; i++) {
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	753 readHeaderRecord(i);
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	754 DataAccess userDataAccess = getStoredData(i);
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	755 if (lastUserData == null) {
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	756 assert !isPatch(i);
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	757 lastUserData = userDataAccess;
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	758 } else {
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	759 assert isPatch(i); // i < start and i == getBaseRevision()
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	760 patch.read(userDataAccess);
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	761 userDataAccess.done();
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	762 // I assume empty patches are applied ok
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	763 ultimatePatch = ultimatePatch.apply(patch);
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	764 patch.clear();
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	765 }
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	766 }
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	767 lastUserData.reset();
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	768 byte[] userData = ultimatePatch.apply(lastUserData, actualLen);
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	769 ultimatePatch.clear();
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	770 lastUserData.done();
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	771 lastUserData = new ByteArrayDataAccess(userData);
ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	772 }
263 31f67be94e71 RevlogStream - reduce number of object instances, reuse when possible Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 258 diff changeset	773 //
242 ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	774
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	775 for (; i <= end; i++ ) {
584 ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	776 readHeaderRecord(i);
242 ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	777 DataAccess userDataAccess = null;
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	778 if (needData) {
584 ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	779 userDataAccess = getStoredData(i);
397 5e95b0da26f2 Issue 24: IAE, Underflow in FilterDataAccess. Issue 26:UnsupportedOperationException when patching empty base revision. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 377 diff changeset	780 // userDataAccess is revision content, either complete revision, patch of a previous content, or an empty patch
584 ed243b668502 Conditionally enable effective patch merge alternative for revlog reading Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	781 if (isPatch(i)) {
242 ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	782 // this is a patch
397 5e95b0da26f2 Issue 24: IAE, Underflow in FilterDataAccess. Issue 26:UnsupportedOperationException when patching empty base revision. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 377 diff changeset	783 if (userDataAccess.isEmpty()) {
5e95b0da26f2 Issue 24: IAE, Underflow in FilterDataAccess. Issue 26:UnsupportedOperationException when patching empty base revision. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 377 diff changeset	784 // Issue 22, empty patch to an empty base revision
5e95b0da26f2 Issue 24: IAE, Underflow in FilterDataAccess. Issue 26:UnsupportedOperationException when patching empty base revision. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 377 diff changeset	785 // Issue 24, empty patch to non-empty base revision
5e95b0da26f2 Issue 24: IAE, Underflow in FilterDataAccess. Issue 26:UnsupportedOperationException when patching empty base revision. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 377 diff changeset	786 // empty patch modifies nothing, use content of a previous revision (shall present - it's a patch here)
5e95b0da26f2 Issue 24: IAE, Underflow in FilterDataAccess. Issue 26:UnsupportedOperationException when patching empty base revision. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 377 diff changeset	787 //
5e95b0da26f2 Issue 24: IAE, Underflow in FilterDataAccess. Issue 26:UnsupportedOperationException when patching empty base revision. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 377 diff changeset	788 assert lastUserData.length() == actualLen; // with no patch, data size shall be the same
5e95b0da26f2 Issue 24: IAE, Underflow in FilterDataAccess. Issue 26:UnsupportedOperationException when patching empty base revision. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 377 diff changeset	789 userDataAccess = lastUserData;
5e95b0da26f2 Issue 24: IAE, Underflow in FilterDataAccess. Issue 26:UnsupportedOperationException when patching empty base revision. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 377 diff changeset	790 } else {
5e95b0da26f2 Issue 24: IAE, Underflow in FilterDataAccess. Issue 26:UnsupportedOperationException when patching empty base revision. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 377 diff changeset	791 patch.read(userDataAccess);
5e95b0da26f2 Issue 24: IAE, Underflow in FilterDataAccess. Issue 26:UnsupportedOperationException when patching empty base revision. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 377 diff changeset	792 userDataAccess.done();
5e95b0da26f2 Issue 24: IAE, Underflow in FilterDataAccess. Issue 26:UnsupportedOperationException when patching empty base revision. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 377 diff changeset	793 //
5e95b0da26f2 Issue 24: IAE, Underflow in FilterDataAccess. Issue 26:UnsupportedOperationException when patching empty base revision. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 377 diff changeset	794 // it shall be reset at the end of prev iteration, when it got assigned from userDataAccess
5e95b0da26f2 Issue 24: IAE, Underflow in FilterDataAccess. Issue 26:UnsupportedOperationException when patching empty base revision. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 377 diff changeset	795 // however, actual userDataAccess and lastUserData may share Inflater object, which needs to be reset
5e95b0da26f2 Issue 24: IAE, Underflow in FilterDataAccess. Issue 26:UnsupportedOperationException when patching empty base revision. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 377 diff changeset	796 // Alternatively, userDataAccess.done() above may be responsible to reset Inflater (if it's InflaterDataAccess)
5e95b0da26f2 Issue 24: IAE, Underflow in FilterDataAccess. Issue 26:UnsupportedOperationException when patching empty base revision. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 377 diff changeset	797 lastUserData.reset();
5e95b0da26f2 Issue 24: IAE, Underflow in FilterDataAccess. Issue 26:UnsupportedOperationException when patching empty base revision. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 377 diff changeset	798 // final long startMeasuring = System.currentTimeMillis(); // TIMING
5e95b0da26f2 Issue 24: IAE, Underflow in FilterDataAccess. Issue 26:UnsupportedOperationException when patching empty base revision. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 377 diff changeset	799 byte[] userData = patch.apply(lastUserData, actualLen);
5e95b0da26f2 Issue 24: IAE, Underflow in FilterDataAccess. Issue 26:UnsupportedOperationException when patching empty base revision. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 377 diff changeset	800 // applyTime += (System.currentTimeMillis() - startMeasuring); // TIMING
5e95b0da26f2 Issue 24: IAE, Underflow in FilterDataAccess. Issue 26:UnsupportedOperationException when patching empty base revision. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 377 diff changeset	801 patch.clear(); // do not keep any reference, allow byte[] data to be gc'd
5e95b0da26f2 Issue 24: IAE, Underflow in FilterDataAccess. Issue 26:UnsupportedOperationException when patching empty base revision. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 377 diff changeset	802 userDataAccess = new ByteArrayDataAccess(userData);
5e95b0da26f2 Issue 24: IAE, Underflow in FilterDataAccess. Issue 26:UnsupportedOperationException when patching empty base revision. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 377 diff changeset	803 }
242 ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	804 }
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	805 } else {
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	806 if (inline) {
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	807 daIndex.skip(compressedLen);
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	808 }
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	809 }
329 694ebabb5cb3 Refactor revlog patch mechanism, towards patch merging Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 300 diff changeset	810 if (i >= start) {
264 6bb5e7ed051a Optimize memory usage (reduce number of objects instantiated) when pooling file names and nodeids during manifest parsing Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 263 diff changeset	811 // final long startMeasuring = System.currentTimeMillis(); // TIMING
242 ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	812 inspector.next(i, actualLen, baseRevision, linkRevision, parent1Revision, parent2Revision, nodeidBuf, userDataAccess);
264 6bb5e7ed051a Optimize memory usage (reduce number of objects instantiated) when pooling file names and nodeids during manifest parsing Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 263 diff changeset	813 // inspectorTime += (System.currentTimeMillis() - startMeasuring); // TIMING
242 ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	814 }
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	815 if (cb != null) {
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	816 if (cb.isStopped()) {
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	817 return false;
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	818 }
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	819 }
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	820 if (userDataAccess != null) {
263 31f67be94e71 RevlogStream - reduce number of object instances, reuse when possible Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 258 diff changeset	821 userDataAccess.reset(); // not sure this is necessary here, as lastUserData would get reset anyway before next use.
242 ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	822 }
397 5e95b0da26f2 Issue 24: IAE, Underflow in FilterDataAccess. Issue 26:UnsupportedOperationException when patching empty base revision. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 377 diff changeset	823 if (lastUserData != null && lastUserData != userDataAccess /* empty patch case, reuse of recent data in actual revision */) {
5e95b0da26f2 Issue 24: IAE, Underflow in FilterDataAccess. Issue 26:UnsupportedOperationException when patching empty base revision. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 377 diff changeset	824 // release lastUserData only if we didn't reuse it in actual revision due to empty patch:
5e95b0da26f2 Issue 24: IAE, Underflow in FilterDataAccess. Issue 26:UnsupportedOperationException when patching empty base revision. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 377 diff changeset	825 // empty patch means we have previous revision and didn't alter it with a patch, hence use lastUserData for userDataAccess above
263 31f67be94e71 RevlogStream - reduce number of object instances, reuse when possible Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 258 diff changeset	826 lastUserData.done();
31f67be94e71 RevlogStream - reduce number of object instances, reuse when possible Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 258 diff changeset	827 }
31f67be94e71 RevlogStream - reduce number of object instances, reuse when possible Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 258 diff changeset	828 lastUserData = userDataAccess;
242 ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	829 }
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	830 lastRevisionRead = end;
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	831 return true;
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	832 }
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	833 }
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	834
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 223 diff changeset	835
77 c677e1593919 Moved RevlogStream implementation into .internal Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 74 diff changeset	836 public interface Inspector {
608 e1b29756f901 Clean, organize and resolve some TODOs and FIXMEs: minor refactorings and comments Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 607 diff changeset	837 /**
e1b29756f901 Clean, organize and resolve some TODOs and FIXMEs: minor refactorings and comments Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 607 diff changeset	838 * XXX boolean retVal to indicate whether to continue?
e1b29756f901 Clean, organize and resolve some TODOs and FIXMEs: minor refactorings and comments Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 607 diff changeset	839 *
e1b29756f901 Clean, organize and resolve some TODOs and FIXMEs: minor refactorings and comments Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 607 diff changeset	840 * Implementers shall not invoke DataAccess.done(), it's accomplished by #iterate at appropriate moment
e1b29756f901 Clean, organize and resolve some TODOs and FIXMEs: minor refactorings and comments Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 607 diff changeset	841 *
e1b29756f901 Clean, organize and resolve some TODOs and FIXMEs: minor refactorings and comments Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 607 diff changeset	842 * @param revisionIndex absolute index of revision in revlog being iterated
e1b29756f901 Clean, organize and resolve some TODOs and FIXMEs: minor refactorings and comments Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 607 diff changeset	843 * @param actualLen length of the user data at this revision
e1b29756f901 Clean, organize and resolve some TODOs and FIXMEs: minor refactorings and comments Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 607 diff changeset	844 * @param baseRevision last revision known to hold complete revision (other hold patches).
e1b29756f901 Clean, organize and resolve some TODOs and FIXMEs: minor refactorings and comments Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 607 diff changeset	845 * if baseRevision != revisionIndex, data for this revision is a result of a sequence of patches
e1b29756f901 Clean, organize and resolve some TODOs and FIXMEs: minor refactorings and comments Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 607 diff changeset	846 * @param linkRevision index of corresponding changeset revision
e1b29756f901 Clean, organize and resolve some TODOs and FIXMEs: minor refactorings and comments Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 607 diff changeset	847 * @param parent1Revision index of first parent revision in this revlog, or {@link HgRepository#NO_REVISION}
e1b29756f901 Clean, organize and resolve some TODOs and FIXMEs: minor refactorings and comments Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 607 diff changeset	848 * @param parent2Revision index of second parent revision in this revlog, or {@link HgRepository#NO_REVISION}
e1b29756f901 Clean, organize and resolve some TODOs and FIXMEs: minor refactorings and comments Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 607 diff changeset	849 * @param nodeid 20-byte buffer, shared between invocations
e1b29756f901 Clean, organize and resolve some TODOs and FIXMEs: minor refactorings and comments Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 607 diff changeset	850 * @param data access to revision content of actualLen size, or <code>null</code> if no data has been requested with
e1b29756f901 Clean, organize and resolve some TODOs and FIXMEs: minor refactorings and comments Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 607 diff changeset	851 * {@link RevlogStream#iterate(int[], boolean, Inspector)}
e1b29756f901 Clean, organize and resolve some TODOs and FIXMEs: minor refactorings and comments Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 607 diff changeset	852 */
423 9c9c442b5f2e Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 420 diff changeset	853 void next(int revisionIndex, int actualLen, int baseRevision, int linkRevision, int parent1Revision, int parent2Revision, byte[/20/] nodeid, DataAccess data);
3 24bb4f365164 Rudimentary log functionality with basic infrastructure is in place Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 2 diff changeset	854 }
539 9edfd5a223b8 Commit: handle empty repository case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 538 diff changeset	855
607 66f1cc23b906 Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 606 diff changeset	856 public interface Observer {
66f1cc23b906 Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 606 diff changeset	857 // notify observer of invalidate/reload event in the stream
66f1cc23b906 Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 606 diff changeset	858 public void reloaded(RevlogStream src);
66f1cc23b906 Refresh revlogs if a change to a file has been detected; do not force reload of the whole repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 606 diff changeset	859 }
0 dbd663faec1f Basic changelog parsing Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	860 }

Mercurial > hg4j

annotate src/org/tmatesoft/hg/internal/RevlogStream.java @ 626:5afc7eedb3dd v1.1rc1