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

annotate src/org/tmatesoft/hg/repo/HgDataFile.java @ 467:51d682cf9cdc

Cleaned experimental tag and updated comments/javadoc

author	Artem Tikhomirov <tikhomirov.artem@gmail.com>
date	Fri, 22 Jun 2012 17:39:31 +0200
parents	909306e412e2
children	b3c16d1aede0

rev	line source
17 571e1b2cc3f7 Query file for its parents. Demo of recently added ignore and digest support from within cat cmd Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 5 diff changeset	1 /*
388 b015f3918120 Work on FIXME: correct HgDataFile#workingCopy with tests; BasicSessionContext with property override; platform-specific options to internals Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 383 diff changeset	2 * Copyright (c) 2010-2012 TMate Software Ltd
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 56 diff changeset	3 *
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 56 diff changeset	4 * This program is free software; you can redistribute it and/or modify
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 56 diff changeset	5 * it under the terms of the GNU General Public License as published by
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 56 diff changeset	6 * the Free Software Foundation; version 2 of the License.
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 56 diff changeset	7 *
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 56 diff changeset	8 * This program is distributed in the hope that it will be useful,
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 56 diff changeset	9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 56 diff changeset	10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 56 diff changeset	11 * GNU General Public License for more details.
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 56 diff changeset	12 *
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 56 diff changeset	13 * For information on how to redistribute this software under
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 56 diff changeset	14 * the terms of a license other than GNU General Public License
102 a3a2e5deb320 Updated contact address to support@hg4j.com Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 88 diff changeset	15 * contact TMate Software at support@hg4j.com
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	16 */
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 56 diff changeset	17 package org.tmatesoft.hg.repo;
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	18
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	19 import static org.tmatesoft.hg.repo.HgInternals.wrongRevisionIndex;
148 1a7a9a20e1f9 Exceptions, javadoc. Initial cancel and progress support Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 135 diff changeset	20 import static org.tmatesoft.hg.repo.HgRepository.*;
456 909306e412e2 Refactor LogFacility and SessionContext, better API for both Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 437 diff changeset	21 import static org.tmatesoft.hg.util.LogFacility.Severity.*;
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 56 diff changeset	22
157 d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 148 diff changeset	23 import java.io.ByteArrayOutputStream;
237 6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 233 diff changeset	24 import java.io.File;
6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 233 diff changeset	25 import java.io.FileInputStream;
148 1a7a9a20e1f9 Exceptions, javadoc. Initial cancel and progress support Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 135 diff changeset	26 import java.io.IOException;
115 c0cc2535462c Introduced channels to pipeline (and easily filter) data streams Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 102 diff changeset	27 import java.nio.ByteBuffer;
237 6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 233 diff changeset	28 import java.nio.channels.FileChannel;
78 c25c5c348d1b Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	29 import java.util.ArrayList;
240 29231022fec8 Do not expect file history to be ordered Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 237 diff changeset	30 import java.util.Arrays;
78 c25c5c348d1b Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	31 import java.util.Collection;
c25c5c348d1b Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	32
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	33 import org.tmatesoft.hg.core.HgChangesetFileSneaker;
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 56 diff changeset	34 import org.tmatesoft.hg.core.Nodeid;
157 d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 148 diff changeset	35 import org.tmatesoft.hg.internal.DataAccess;
121 b1d6208fb517 Conditionally apply filters to file content Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 115 diff changeset	36 import org.tmatesoft.hg.internal.FilterByteChannel;
277 74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 276 diff changeset	37 import org.tmatesoft.hg.internal.FilterDataAccess;
276 6355ecda1f08 Tailored Map implementation with int keys Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 275 diff changeset	38 import org.tmatesoft.hg.internal.IntMap;
420 6c22bdc0bdfd Respect long offsets in revlogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 417 diff changeset	39 import org.tmatesoft.hg.internal.Internals;
77 c677e1593919 Moved RevlogStream implementation into .internal Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 74 diff changeset	40 import org.tmatesoft.hg.internal.RevlogStream;
115 c0cc2535462c Introduced channels to pipeline (and easily filter) data streams Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 102 diff changeset	41 import org.tmatesoft.hg.util.ByteChannel;
237 6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 233 diff changeset	42 import org.tmatesoft.hg.util.CancelSupport;
148 1a7a9a20e1f9 Exceptions, javadoc. Initial cancel and progress support Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 135 diff changeset	43 import org.tmatesoft.hg.util.CancelledException;
388 b015f3918120 Work on FIXME: correct HgDataFile#workingCopy with tests; BasicSessionContext with property override; platform-specific options to internals Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 383 diff changeset	44 import org.tmatesoft.hg.util.LogFacility;
305 ae8d116f4ee2 Experimental code to build file history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 300 diff changeset	45 import org.tmatesoft.hg.util.Pair;
133 4a948ec83980 core.Path to util.Path as it's not Hg repo dependant Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 129 diff changeset	46 import org.tmatesoft.hg.util.Path;
237 6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 233 diff changeset	47 import org.tmatesoft.hg.util.ProgressSupport;
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 56 diff changeset	48
5 fc265ddeab26 File content and non-effective, although working, patch application Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 3 diff changeset	49
17 571e1b2cc3f7 Query file for its parents. Demo of recently added ignore and digest support from within cat cmd Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 5 diff changeset	50
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	51 /**
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	52 * Regular user data file stored in the repository.
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	53 *
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	54 * <p> Note, most methods accept index in the file's revision history, not that of changelog. Easy way to obtain
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	55 * changeset revision index from file's is to use {@link #getChangesetRevisionIndex(int)}. To obtain file's revision
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	56 * index for a given changeset, {@link HgManifest#getFileRevision(int, Path)} or {@link HgChangesetFileSneaker} may
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	57 * come handy.
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 56 diff changeset	58 *
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 56 diff changeset	59 * @author Artem Tikhomirov
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 56 diff changeset	60 * @author TMate Software Ltd.
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	61 */
426 063b0663495a HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 425 diff changeset	62 public final class HgDataFile extends Revlog {
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	63
3 24bb4f365164 Rudimentary log functionality with basic infrastructure is in place Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 2 diff changeset	64 // absolute from repo root?
24bb4f365164 Rudimentary log functionality with basic infrastructure is in place Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 2 diff changeset	65 // slashes, unix-style?
24bb4f365164 Rudimentary log functionality with basic infrastructure is in place Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 2 diff changeset	66 // repo location agnostic, just to give info to user, not to access real storage
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 56 diff changeset	67 private final Path path;
134 afac8ddc5dd2 Keep record if we tried and found no metadata for a given revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 133 diff changeset	68 private Metadata metadata; // get initialized on first access to file content.
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	69
115 c0cc2535462c Introduced channels to pipeline (and easily filter) data streams Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 102 diff changeset	70 /package-local/HgDataFile(HgRepository hgRepo, Path filePath, RevlogStream content) {
21 e929cecae4e1 Refactor to move revlog content to base class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 17 diff changeset	71 super(hgRepo, content);
115 c0cc2535462c Introduced channels to pipeline (and easily filter) data streams Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 102 diff changeset	72 path = filePath;
3 24bb4f365164 Rudimentary log functionality with basic infrastructure is in place Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 2 diff changeset	73 }
115 c0cc2535462c Introduced channels to pipeline (and easily filter) data streams Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 102 diff changeset	74
c0cc2535462c Introduced channels to pipeline (and easily filter) data streams Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 102 diff changeset	75 /package-local/HgDataFile(HgRepository hgRepo, Path filePath) {
c0cc2535462c Introduced channels to pipeline (and easily filter) data streams Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 102 diff changeset	76 super(hgRepo);
c0cc2535462c Introduced channels to pipeline (and easily filter) data streams Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 102 diff changeset	77 path = filePath;
c0cc2535462c Introduced channels to pipeline (and easily filter) data streams Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 102 diff changeset	78 }
c0cc2535462c Introduced channels to pipeline (and easily filter) data streams Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 102 diff changeset	79
c0cc2535462c Introduced channels to pipeline (and easily filter) data streams Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 102 diff changeset	80 // exists is not the best name possible. now it means no file with such name was ever known to the repo.
426 063b0663495a HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 425 diff changeset	81 // it might be confused with files existed before but lately removed. TODO HgFileNode.exists makes more sense.
063b0663495a HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 425 diff changeset	82 // or HgDataFile.known()
3 24bb4f365164 Rudimentary log functionality with basic infrastructure is in place Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 2 diff changeset	83 public boolean exists() {
24bb4f365164 Rudimentary log functionality with basic infrastructure is in place Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 2 diff changeset	84 return content != null; // XXX need better impl
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	85 }
08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	86
426 063b0663495a HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 425 diff changeset	87 /**
063b0663495a HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 425 diff changeset	88 * Human-readable file name, i.e. "COPYING", not "store/data/_c_o_p_y_i_n_g.i"
063b0663495a HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 425 diff changeset	89 */
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 56 diff changeset	90 public Path getPath() {
157 d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 148 diff changeset	91 return path; // hgRepo.backresolve(this) -> name? In this case, what about hashed long names?
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	92 }
08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	93
275 6d1804fe0ed7 Issue 10: Report file content length with respect of metadata. Respect dirstate parents for WC's status. Exceptions to keep useful attributes of the location Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 245 diff changeset	94 /**
416 d30083c80d52 Better names - non-confusing and aligned with the rest of API Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 415 diff changeset	95 * Handy shorthand for {@link #getLength(int) length(getRevisionIndex(nodeid))}
354 5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	96 *
5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	97 * @param nodeid revision of the file
5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	98 *
275 6d1804fe0ed7 Issue 10: Report file content length with respect of metadata. Respect dirstate parents for WC's status. Exceptions to keep useful attributes of the location Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 245 diff changeset	99 * @return size of the file content at the given revision
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	100 * @throws HgRuntimeException subclass thereof to indicate issues with the library. <em>Runtime exception</em>
275 6d1804fe0ed7 Issue 10: Report file content length with respect of metadata. Respect dirstate parents for WC's status. Exceptions to keep useful attributes of the location Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 245 diff changeset	101 */
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	102 public int getLength(Nodeid nodeid) throws HgRuntimeException {
396 0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 388 diff changeset	103 try {
416 d30083c80d52 Better names - non-confusing and aligned with the rest of API Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 415 diff changeset	104 return getLength(getRevisionIndex(nodeid));
396 0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 388 diff changeset	105 } catch (HgInvalidControlFileException ex) {
0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 388 diff changeset	106 throw ex.isRevisionSet() ? ex : ex.setRevision(nodeid);
0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 388 diff changeset	107 } catch (HgInvalidRevisionException ex) {
0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 388 diff changeset	108 throw ex.isRevisionSet() ? ex : ex.setRevision(nodeid);
0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 388 diff changeset	109 }
275 6d1804fe0ed7 Issue 10: Report file content length with respect of metadata. Respect dirstate parents for WC's status. Exceptions to keep useful attributes of the location Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 245 diff changeset	110 }
6d1804fe0ed7 Issue 10: Report file content length with respect of metadata. Respect dirstate parents for WC's status. Exceptions to keep useful attributes of the location Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 245 diff changeset	111
6d1804fe0ed7 Issue 10: Report file content length with respect of metadata. Respect dirstate parents for WC's status. Exceptions to keep useful attributes of the location Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 245 diff changeset	112 /**
368 8107b95f4280 Update Javadoc with 'revision index' Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 367 diff changeset	113 * @param fileRevisionIndex - revision local index, non-negative. From predefined constants, only {@link HgRepository#TIP} makes sense.
275 6d1804fe0ed7 Issue 10: Report file content length with respect of metadata. Respect dirstate parents for WC's status. Exceptions to keep useful attributes of the location Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 245 diff changeset	114 * @return size of the file content at the revision identified by local revision number.
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	115 * @throws HgRuntimeException subclass thereof to indicate issues with the library. <em>Runtime exception</em>
275 6d1804fe0ed7 Issue 10: Report file content length with respect of metadata. Respect dirstate parents for WC's status. Exceptions to keep useful attributes of the location Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 245 diff changeset	116 */
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	117 public int getLength(int fileRevisionIndex) throws HgRuntimeException {
401 a57a21aa4190 Support WORKING_COPY constant for dataFile.length() operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	118 if (wrongRevisionIndex(fileRevisionIndex) \|\| fileRevisionIndex == BAD_REVISION) {
a57a21aa4190 Support WORKING_COPY constant for dataFile.length() operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	119 throw new HgInvalidRevisionException(fileRevisionIndex);
a57a21aa4190 Support WORKING_COPY constant for dataFile.length() operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	120 }
a57a21aa4190 Support WORKING_COPY constant for dataFile.length() operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	121 if (fileRevisionIndex == TIP) {
a57a21aa4190 Support WORKING_COPY constant for dataFile.length() operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	122 fileRevisionIndex = getLastRevision();
a57a21aa4190 Support WORKING_COPY constant for dataFile.length() operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	123 } else if (fileRevisionIndex == WORKING_COPY) {
a57a21aa4190 Support WORKING_COPY constant for dataFile.length() operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	124 File f = getRepo().getFile(this);
a57a21aa4190 Support WORKING_COPY constant for dataFile.length() operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	125 if (f.exists()) {
420 6c22bdc0bdfd Respect long offsets in revlogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 417 diff changeset	126 // single revision can't be greater than 2^32, shall be safe to cast to int
6c22bdc0bdfd Respect long offsets in revlogs Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 417 diff changeset	127 return Internals.ltoi(f.length());
401 a57a21aa4190 Support WORKING_COPY constant for dataFile.length() operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	128 }
a57a21aa4190 Support WORKING_COPY constant for dataFile.length() operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	129 Nodeid fileRev = getWorkingCopyRevision();
a57a21aa4190 Support WORKING_COPY constant for dataFile.length() operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	130 if (fileRev == null) {
a57a21aa4190 Support WORKING_COPY constant for dataFile.length() operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	131 throw new HgInvalidRevisionException(String.format("File %s is not part of working copy", getPath()), null, fileRevisionIndex);
a57a21aa4190 Support WORKING_COPY constant for dataFile.length() operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	132 }
a57a21aa4190 Support WORKING_COPY constant for dataFile.length() operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	133 fileRevisionIndex = getRevisionIndex(fileRev);
a57a21aa4190 Support WORKING_COPY constant for dataFile.length() operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	134 }
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	135 if (metadata == null \|\| !metadata.checked(fileRevisionIndex)) {
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	136 checkAndRecordMetadata(fileRevisionIndex);
275 6d1804fe0ed7 Issue 10: Report file content length with respect of metadata. Respect dirstate parents for WC's status. Exceptions to keep useful attributes of the location Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 245 diff changeset	137 }
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	138 final int dataLen = content.dataLength(fileRevisionIndex);
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	139 if (metadata.known(fileRevisionIndex)) {
2fadf8695f8a Use 'revision index' instead of the vague 'local revision number' concept in the API Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 366 diff changeset	140 return dataLen - metadata.dataOffset(fileRevisionIndex);
275 6d1804fe0ed7 Issue 10: Report file content length with respect of metadata. Respect dirstate parents for WC's status. Exceptions to keep useful attributes of the location Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 245 diff changeset	141 }
6d1804fe0ed7 Issue 10: Report file content length with respect of metadata. Respect dirstate parents for WC's status. Exceptions to keep useful attributes of the location Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 245 diff changeset	142 return dataLen;
22 603806cd2dc6 Status of local working dir against non-tip base revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 21 diff changeset	143 }
416 d30083c80d52 Better names - non-confusing and aligned with the rest of API Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 415 diff changeset	144
d30083c80d52 Better names - non-confusing and aligned with the rest of API Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 415 diff changeset	145 /**
237 6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 233 diff changeset	146 * Reads content of the file from working directory. If file present in the working directory, its actual content without
6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 233 diff changeset	147 * any filters is supplied through the sink. If file does not exist in the working dir, this method provides content of a file
401 a57a21aa4190 Support WORKING_COPY constant for dataFile.length() operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	148 * as if it would be refreshed in the working copy, i.e. its corresponding revision (according to dirstate) is read from the
a57a21aa4190 Support WORKING_COPY constant for dataFile.length() operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	149 * repository, and filters repo -> working copy get applied.
a57a21aa4190 Support WORKING_COPY constant for dataFile.length() operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	150 *
a57a21aa4190 Support WORKING_COPY constant for dataFile.length() operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	151 * NOTE, if file is missing from the working directory and is not part of the dirstate (but otherwise legal repository file,
a57a21aa4190 Support WORKING_COPY constant for dataFile.length() operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	152 * e.g. from another branch), no content would be supplied.
237 6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 233 diff changeset	153 *
396 0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 388 diff changeset	154 * @param sink content consumer
380 9517df1ef7ec Comments/javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 368 diff changeset	155 * @throws CancelledException if execution of the operation was cancelled
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	156 * @throws HgRuntimeException subclass thereof to indicate issues with the library. <em>Runtime exception</em>
237 6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 233 diff changeset	157 */
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	158 public void workingCopy(ByteChannel sink) throws CancelledException, HgRuntimeException {
237 6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 233 diff changeset	159 File f = getRepo().getFile(this);
6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 233 diff changeset	160 if (f.exists()) {
6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 233 diff changeset	161 final CancelSupport cs = CancelSupport.Factory.get(sink);
6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 233 diff changeset	162 final ProgressSupport progress = ProgressSupport.Factory.get(sink);
6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 233 diff changeset	163 final long flength = f.length();
6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 233 diff changeset	164 final int bsize = (int) Math.min(flength, 32*1024);
6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 233 diff changeset	165 progress.start((int) (flength > Integer.MAX_VALUE ? flength >>> 15 /32 kb buf size/ : flength));
6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 233 diff changeset	166 ByteBuffer buf = ByteBuffer.allocate(bsize);
6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 233 diff changeset	167 FileChannel fc = null;
6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 233 diff changeset	168 try {
6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 233 diff changeset	169 fc = new FileInputStream(f).getChannel();
6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 233 diff changeset	170 while (fc.read(buf) != -1) {
6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 233 diff changeset	171 cs.checkCancelled();
6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 233 diff changeset	172 buf.flip();
6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 233 diff changeset	173 int consumed = sink.write(buf);
6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 233 diff changeset	174 progress.worked(flength > Integer.MAX_VALUE ? 1 : consumed);
6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 233 diff changeset	175 buf.compact();
6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 233 diff changeset	176 }
6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 233 diff changeset	177 } catch (IOException ex) {
396 0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 388 diff changeset	178 throw new HgInvalidFileException("Working copy read failed", ex, f);
237 6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 233 diff changeset	179 } finally {
6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 233 diff changeset	180 progress.done();
6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 233 diff changeset	181 if (fc != null) {
6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 233 diff changeset	182 try {
6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 233 diff changeset	183 fc.close();
6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 233 diff changeset	184 } catch (IOException ex) {
456 909306e412e2 Refactor LogFacility and SessionContext, better API for both Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 437 diff changeset	185 getRepo().getContext().getLog().dump(getClass(), Warn, ex, null);
237 6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 233 diff changeset	186 }
6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 233 diff changeset	187 }
6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 233 diff changeset	188 }
6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 233 diff changeset	189 } else {
401 a57a21aa4190 Support WORKING_COPY constant for dataFile.length() operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	190 Nodeid fileRev = getWorkingCopyRevision();
a57a21aa4190 Support WORKING_COPY constant for dataFile.length() operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	191 if (fileRev == null) {
a57a21aa4190 Support WORKING_COPY constant for dataFile.length() operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	192 // no content for this data file in the working copy - it is not part of the actual working state.
a57a21aa4190 Support WORKING_COPY constant for dataFile.length() operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	193 // XXX perhaps, shall report this to caller somehow, not silently pass no data?
388 b015f3918120 Work on FIXME: correct HgDataFile#workingCopy with tests; BasicSessionContext with property override; platform-specific options to internals Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 383 diff changeset	194 return;
b015f3918120 Work on FIXME: correct HgDataFile#workingCopy with tests; BasicSessionContext with property override; platform-specific options to internals Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 383 diff changeset	195 }
401 a57a21aa4190 Support WORKING_COPY constant for dataFile.length() operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	196 final int fileRevIndex = getRevisionIndex(fileRev);
a57a21aa4190 Support WORKING_COPY constant for dataFile.length() operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	197 contentWithFilters(fileRevIndex, sink);
a57a21aa4190 Support WORKING_COPY constant for dataFile.length() operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	198 }
a57a21aa4190 Support WORKING_COPY constant for dataFile.length() operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	199 }
a57a21aa4190 Support WORKING_COPY constant for dataFile.length() operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	200
a57a21aa4190 Support WORKING_COPY constant for dataFile.length() operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	201 /**
a57a21aa4190 Support WORKING_COPY constant for dataFile.length() operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	202 * @return file revision as recorded in repository manifest for dirstate parent, or <code>null</code> if no file revision can be found
a57a21aa4190 Support WORKING_COPY constant for dataFile.length() operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	203 */
a57a21aa4190 Support WORKING_COPY constant for dataFile.length() operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	204 private Nodeid getWorkingCopyRevision() throws HgInvalidControlFileException {
a57a21aa4190 Support WORKING_COPY constant for dataFile.length() operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	205 final Pair<Nodeid, Nodeid> wcParents = getRepo().getWorkingCopyParents();
a57a21aa4190 Support WORKING_COPY constant for dataFile.length() operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	206 Nodeid p = wcParents.first().isNull() ? wcParents.second() : wcParents.first();
a57a21aa4190 Support WORKING_COPY constant for dataFile.length() operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	207 final HgChangelog clog = getRepo().getChangelog();
a57a21aa4190 Support WORKING_COPY constant for dataFile.length() operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	208 final int csetRevIndex;
a57a21aa4190 Support WORKING_COPY constant for dataFile.length() operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	209 if (p.isNull()) {
a57a21aa4190 Support WORKING_COPY constant for dataFile.length() operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	210 // no dirstate parents
456 909306e412e2 Refactor LogFacility and SessionContext, better API for both Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 437 diff changeset	211 getRepo().getContext().getLog().dump(getClass(), Info, "No dirstate parents, resort to TIP", getPath());
401 a57a21aa4190 Support WORKING_COPY constant for dataFile.length() operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	212 // if it's a repository with no dirstate, use TIP then
a57a21aa4190 Support WORKING_COPY constant for dataFile.length() operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	213 csetRevIndex = clog.getLastRevision();
a57a21aa4190 Support WORKING_COPY constant for dataFile.length() operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	214 if (csetRevIndex == -1) {
a57a21aa4190 Support WORKING_COPY constant for dataFile.length() operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	215 // shall not happen provided there's .i for this data file (hence at least one cset)
a57a21aa4190 Support WORKING_COPY constant for dataFile.length() operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	216 // and perhaps exception is better here. However, null as "can't find" indication seems reasonable.
a57a21aa4190 Support WORKING_COPY constant for dataFile.length() operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	217 return null;
a57a21aa4190 Support WORKING_COPY constant for dataFile.length() operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	218 }
a57a21aa4190 Support WORKING_COPY constant for dataFile.length() operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	219 } else {
388 b015f3918120 Work on FIXME: correct HgDataFile#workingCopy with tests; BasicSessionContext with property override; platform-specific options to internals Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 383 diff changeset	220 // common case to avoid searching complete changelog for nodeid match
b015f3918120 Work on FIXME: correct HgDataFile#workingCopy with tests; BasicSessionContext with property override; platform-specific options to internals Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 383 diff changeset	221 final Nodeid tipRev = clog.getRevision(TIP);
b015f3918120 Work on FIXME: correct HgDataFile#workingCopy with tests; BasicSessionContext with property override; platform-specific options to internals Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 383 diff changeset	222 if (tipRev.equals(p)) {
b015f3918120 Work on FIXME: correct HgDataFile#workingCopy with tests; BasicSessionContext with property override; platform-specific options to internals Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 383 diff changeset	223 csetRevIndex = clog.getLastRevision();
b015f3918120 Work on FIXME: correct HgDataFile#workingCopy with tests; BasicSessionContext with property override; platform-specific options to internals Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 383 diff changeset	224 } else {
b015f3918120 Work on FIXME: correct HgDataFile#workingCopy with tests; BasicSessionContext with property override; platform-specific options to internals Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 383 diff changeset	225 // bad luck, need to search honestly
b015f3918120 Work on FIXME: correct HgDataFile#workingCopy with tests; BasicSessionContext with property override; platform-specific options to internals Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 383 diff changeset	226 csetRevIndex = getRepo().getChangelog().getRevisionIndex(p);
b015f3918120 Work on FIXME: correct HgDataFile#workingCopy with tests; BasicSessionContext with property override; platform-specific options to internals Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 383 diff changeset	227 }
237 6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 233 diff changeset	228 }
401 a57a21aa4190 Support WORKING_COPY constant for dataFile.length() operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	229 Nodeid fileRev = getRepo().getManifest().getFileRevision(csetRevIndex, getPath());
a57a21aa4190 Support WORKING_COPY constant for dataFile.length() operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	230 // it's possible for a file to be in working dir and have store/.i but to belong e.g. to a different
a57a21aa4190 Support WORKING_COPY constant for dataFile.length() operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	231 // branch than the one from dirstate. Thus it's possible to get null fileRev
a57a21aa4190 Support WORKING_COPY constant for dataFile.length() operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	232 // which would serve as an indication this data file is not part of working copy
a57a21aa4190 Support WORKING_COPY constant for dataFile.length() operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	233 return fileRev;
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	234 }
115 c0cc2535462c Introduced channels to pipeline (and easily filter) data streams Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 102 diff changeset	235
396 0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 388 diff changeset	236 /**
0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 388 diff changeset	237 * Access content of a file revision
0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 388 diff changeset	238 * XXX not sure distinct method contentWithFilters() is the best way to do, perhaps, callers shall add filters themselves?
0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 388 diff changeset	239 *
0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 388 diff changeset	240 * @param fileRevisionIndex - revision local index, non-negative. From predefined constants, {@link HgRepository#TIP} and {@link HgRepository#WORKING_COPY} make sense.
0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 388 diff changeset	241 * @param sink content consumer
0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 388 diff changeset	242 *
0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 388 diff changeset	243 * @throws CancelledException if execution of the operation was cancelled
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	244 * @throws HgRuntimeException subclass thereof to indicate issues with the library. <em>Runtime exception</em>
396 0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 388 diff changeset	245 */
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	246 public void contentWithFilters(int fileRevisionIndex, ByteChannel sink) throws CancelledException, HgRuntimeException {
396 0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 388 diff changeset	247 if (fileRevisionIndex == WORKING_COPY) {
237 6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 233 diff changeset	248 workingCopy(sink); // pass un-mangled sink
6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 233 diff changeset	249 } else {
396 0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 388 diff changeset	250 content(fileRevisionIndex, new FilterByteChannel(sink, getRepo().getFiltersFromRepoToWorkingDir(getPath())));
237 6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 233 diff changeset	251 }
115 c0cc2535462c Introduced channels to pipeline (and easily filter) data streams Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 102 diff changeset	252 }
22 603806cd2dc6 Status of local working dir against non-tip base revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 21 diff changeset	253
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	254 /**
396 0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 388 diff changeset	255 * Retrieve content of specific revision. Content is provided as is, without any filters (e.g. keywords, eol, etc.) applied.
0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 388 diff changeset	256 * For filtered content, use {@link #contentWithFilters(int, ByteChannel)}.
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	257 *
368 8107b95f4280 Update Javadoc with 'revision index' Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 367 diff changeset	258 * @param fileRevisionIndex - revision local index, non-negative. From predefined constants, {@link HgRepository#TIP} and {@link HgRepository#WORKING_COPY} make sense.
396 0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 388 diff changeset	259 * @param sink content consumer
0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 388 diff changeset	260 *
380 9517df1ef7ec Comments/javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 368 diff changeset	261 * @throws CancelledException if execution of the operation was cancelled
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	262 * @throws HgRuntimeException subclass thereof to indicate issues with the library. <em>Runtime exception</em>
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	263 */
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	264 public void content(int fileRevisionIndex, ByteChannel sink) throws CancelledException, HgRuntimeException {
367 2fadf8695f8a Use 'revision index' instead of the vague 'local revision number' concept in the API Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 366 diff changeset	265 // for data files need to check heading of the file content for possible metadata
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	266 // @see http://mercurial.selenic.com/wiki/FileFormats#data.2BAC8-
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	267 if (fileRevisionIndex == TIP) {
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	268 fileRevisionIndex = getLastRevision();
78 c25c5c348d1b Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	269 }
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	270 if (fileRevisionIndex == WORKING_COPY) {
237 6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 233 diff changeset	271 // sink is supposed to come into workingCopy without filters
6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 233 diff changeset	272 // thus we shall not get here (into #content) from #contentWithFilters(WC)
157 d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 148 diff changeset	273 workingCopy(sink);
d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 148 diff changeset	274 return;
d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 148 diff changeset	275 }
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	276 if (wrongRevisionIndex(fileRevisionIndex) \|\| fileRevisionIndex == BAD_REVISION) {
2fadf8695f8a Use 'revision index' instead of the vague 'local revision number' concept in the API Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 366 diff changeset	277 throw new HgInvalidRevisionException(fileRevisionIndex);
148 1a7a9a20e1f9 Exceptions, javadoc. Initial cancel and progress support Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 135 diff changeset	278 }
157 d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 148 diff changeset	279 if (sink == null) {
d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 148 diff changeset	280 throw new IllegalArgumentException();
d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 148 diff changeset	281 }
134 afac8ddc5dd2 Keep record if we tried and found no metadata for a given revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 133 diff changeset	282 if (metadata == null) {
afac8ddc5dd2 Keep record if we tried and found no metadata for a given revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 133 diff changeset	283 metadata = new Metadata();
afac8ddc5dd2 Keep record if we tried and found no metadata for a given revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 133 diff changeset	284 }
277 74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 276 diff changeset	285 ErrorHandlingInspector insp;
388 b015f3918120 Work on FIXME: correct HgDataFile#workingCopy with tests; BasicSessionContext with property override; platform-specific options to internals Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 383 diff changeset	286 final LogFacility lf = getRepo().getContext().getLog();
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	287 if (metadata.none(fileRevisionIndex)) {
388 b015f3918120 Work on FIXME: correct HgDataFile#workingCopy with tests; BasicSessionContext with property override; platform-specific options to internals Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 383 diff changeset	288 insp = new ContentPipe(sink, 0, lf);
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	289 } else if (metadata.known(fileRevisionIndex)) {
388 b015f3918120 Work on FIXME: correct HgDataFile#workingCopy with tests; BasicSessionContext with property override; platform-specific options to internals Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 383 diff changeset	290 insp = new ContentPipe(sink, metadata.dataOffset(fileRevisionIndex), lf);
157 d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 148 diff changeset	291 } else {
d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 148 diff changeset	292 // do not know if there's metadata
396 0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 388 diff changeset	293 insp = new MetadataInspector(metadata, lf, new ContentPipe(sink, 0, lf));
78 c25c5c348d1b Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	294 }
157 d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 148 diff changeset	295 insp.checkCancelled();
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	296 super.content.iterate(fileRevisionIndex, fileRevisionIndex, true, insp);
157 d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 148 diff changeset	297 try {
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	298 insp.checkFailed();
396 0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 388 diff changeset	299 } catch (HgInvalidControlFileException ex) {
0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 388 diff changeset	300 ex = ex.setFileName(getPath());
0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 388 diff changeset	301 throw ex.isRevisionIndexSet() ? ex : ex.setRevisionIndex(fileRevisionIndex);
237 6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 233 diff changeset	302 } catch (IOException ex) {
396 0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 388 diff changeset	303 HgInvalidControlFileException e = new HgInvalidControlFileException("Revision content access failed", ex, null);
0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 388 diff changeset	304 throw content.initWithIndexFile(e).setFileName(getPath()).setRevisionIndex(fileRevisionIndex);
78 c25c5c348d1b Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	305 }
c25c5c348d1b Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	306 }
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	307
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	308 /**
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	309 * Walk complete change history of the file.
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	310 * @param inspector callback to visit changesets
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	311 * @throws HgRuntimeException subclass thereof to indicate issues with the library. <em>Runtime exception</em>
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	312 */
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	313 public void history(HgChangelog.Inspector inspector) throws HgRuntimeException {
135 3959bffb14e9 explicit op name instead math op to get last rev number Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 134 diff changeset	314 history(0, getLastRevision(), inspector);
48 e34f90b9ded1 Limit option for history/log Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 37 diff changeset	315 }
e34f90b9ded1 Limit option for history/log Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 37 diff changeset	316
417 ccd7d25e5aea New and better name for HgFileInformer - HgChangesetFileSneaker. Explain (comments) ties between HgManifest, HgDataFile, HgChangesetFileSneaker and reasons for method placement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 416 diff changeset	317 /**
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	318 * Walk subset of the file's change history.
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	319 * @param start revision local index, inclusive; non-negative or {@link HgRepository#TIP}
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	320 * @param end revision local index, inclusive; non-negative or {@link HgRepository#TIP}
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	321 * @param inspector callback to visit changesets
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	322 * @throws HgRuntimeException subclass thereof to indicate issues with the library. <em>Runtime exception</em>
417 ccd7d25e5aea New and better name for HgFileInformer - HgChangesetFileSneaker. Explain (comments) ties between HgManifest, HgDataFile, HgChangesetFileSneaker and reasons for method placement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 416 diff changeset	323 */
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	324 public void history(int start, int end, HgChangelog.Inspector inspector) throws HgRuntimeException {
3 24bb4f365164 Rudimentary log functionality with basic infrastructure is in place Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 2 diff changeset	325 if (!exists()) {
24bb4f365164 Rudimentary log functionality with basic infrastructure is in place Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 2 diff changeset	326 throw new IllegalStateException("Can't get history of invalid repository file node");
24bb4f365164 Rudimentary log functionality with basic infrastructure is in place Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 2 diff changeset	327 }
135 3959bffb14e9 explicit op name instead math op to get last rev number Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 134 diff changeset	328 final int last = getLastRevision();
77 c677e1593919 Moved RevlogStream implementation into .internal Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 74 diff changeset	329 if (end == TIP) {
c677e1593919 Moved RevlogStream implementation into .internal Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 74 diff changeset	330 end = last;
c677e1593919 Moved RevlogStream implementation into .internal Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 74 diff changeset	331 }
300 650b45d290b1 Share range check code Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 295 diff changeset	332 if (start == TIP) {
650b45d290b1 Share range check code Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 295 diff changeset	333 start = last;
650b45d290b1 Share range check code Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 295 diff changeset	334 }
650b45d290b1 Share range check code Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 295 diff changeset	335 HgInternals.checkRevlogRange(start, end, last);
650b45d290b1 Share range check code Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 295 diff changeset	336
48 e34f90b9ded1 Limit option for history/log Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 37 diff changeset	337 final int[] commitRevisions = new int[end - start + 1];
242 ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 240 diff changeset	338 final boolean[] needsSorting = { false };
77 c677e1593919 Moved RevlogStream implementation into .internal Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 74 diff changeset	339 RevlogStream.Inspector insp = new RevlogStream.Inspector() {
3 24bb4f365164 Rudimentary log functionality with basic infrastructure is in place Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 2 diff changeset	340 int count = 0;
51 9429c7bd1920 Try DataAccess to reach revision data instead of plain byte arrays Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 49 diff changeset	341 public void next(int revisionNumber, int actualLen, int baseRevision, int linkRevision, int parent1Revision, int parent2Revision, byte[] nodeid, DataAccess data) {
242 ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 240 diff changeset	342 if (count > 0) {
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 240 diff changeset	343 if (commitRevisions[count -1] > linkRevision) {
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 240 diff changeset	344 needsSorting[0] = true;
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 240 diff changeset	345 }
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 240 diff changeset	346 }
3 24bb4f365164 Rudimentary log functionality with basic infrastructure is in place Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 2 diff changeset	347 commitRevisions[count++] = linkRevision;
24bb4f365164 Rudimentary log functionality with basic infrastructure is in place Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 2 diff changeset	348 }
24bb4f365164 Rudimentary log functionality with basic infrastructure is in place Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 2 diff changeset	349 };
48 e34f90b9ded1 Limit option for history/log Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 37 diff changeset	350 content.iterate(start, end, false, insp);
233 1d389c0cb0a5 Optimize file history walk not to iterat over whole changelog for sparse and distant revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 215 diff changeset	351 final HgChangelog changelog = getRepo().getChangelog();
242 ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 240 diff changeset	352 if (needsSorting[0]) {
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 240 diff changeset	353 // automatic tools (svnmerge?) produce unnatural file history
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 240 diff changeset	354 // (e.g. cpython/Lib/doctest.py, revision 164 points to cset 63509, 165 - to 38453)
ad6a046943be Improved reading of sparse revisions from a revlog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 240 diff changeset	355 Arrays.sort(commitRevisions);
233 1d389c0cb0a5 Optimize file history walk not to iterat over whole changelog for sparse and distant revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 215 diff changeset	356 }
245 2fb439375ddc Avoid sorting revision range twice Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 242 diff changeset	357 changelog.rangeInternal(inspector, commitRevisions);
3 24bb4f365164 Rudimentary log functionality with basic infrastructure is in place Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 2 diff changeset	358 }
88 61eedab3eb3e Status between two revisions to recognize copy/rename Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 79 diff changeset	359
354 5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	360 /**
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	361 * For a given revision of the file (identified with revision index), find out index of the corresponding changeset.
354 5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	362 *
5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	363 * @return changeset revision index
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	364 * @throws HgRuntimeException subclass thereof to indicate issues with the library. <em>Runtime exception</em>
354 5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	365 */
437 32184ddcf46d Better argument names Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 426 diff changeset	366 public int getChangesetRevisionIndex(int fileRevisionIndex) throws HgRuntimeException {
32184ddcf46d Better argument names Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 426 diff changeset	367 return content.linkRevision(fileRevisionIndex);
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	368 }
88 61eedab3eb3e Status between two revisions to recognize copy/rename Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 79 diff changeset	369
354 5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	370 /**
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	371 * Complements {@link #getChangesetRevisionIndex(int)} to get changeset revision that corresponds to supplied file revision
354 5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	372 *
5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	373 * @param nid revision of the file
5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	374 * @return changeset revision
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	375 * @throws HgRuntimeException subclass thereof to indicate issues with the library. <em>Runtime exception</em>
354 5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	376 */
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	377 public Nodeid getChangesetRevision(Nodeid nid) throws HgRuntimeException {
367 2fadf8695f8a Use 'revision index' instead of the vague 'local revision number' concept in the API Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 366 diff changeset	378 int changelogRevision = getChangesetRevisionIndex(getRevisionIndex(nid));
88 61eedab3eb3e Status between two revisions to recognize copy/rename Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 79 diff changeset	379 return getRepo().getChangelog().getRevision(changelogRevision);
61eedab3eb3e Status between two revisions to recognize copy/rename Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 79 diff changeset	380 }
78 c25c5c348d1b Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	381
354 5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	382 /**
396 0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 388 diff changeset	383 * Tells whether this file originates from another repository file
0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 388 diff changeset	384 * @return <code>true</code> if this file is a copy of another from the repository
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	385 * @throws HgRuntimeException subclass thereof to indicate issues with the library. <em>Runtime exception</em>
354 5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	386 */
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	387 public boolean isCopy() throws HgRuntimeException {
134 afac8ddc5dd2 Keep record if we tried and found no metadata for a given revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 133 diff changeset	388 if (metadata == null \|\| !metadata.checked(0)) {
275 6d1804fe0ed7 Issue 10: Report file content length with respect of metadata. Respect dirstate parents for WC's status. Exceptions to keep useful attributes of the location Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 245 diff changeset	389 checkAndRecordMetadata(0);
78 c25c5c348d1b Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	390 }
134 afac8ddc5dd2 Keep record if we tried and found no metadata for a given revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 133 diff changeset	391 if (!metadata.known(0)) {
78 c25c5c348d1b Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	392 return false;
c25c5c348d1b Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	393 }
c25c5c348d1b Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	394 return metadata.find(0, "copy") != null;
c25c5c348d1b Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	395 }
c25c5c348d1b Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	396
354 5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	397 /**
5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	398 * Get name of the file this one was copied from.
5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	399 *
5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	400 * @return name of the file origin
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	401 * @throws HgRuntimeException subclass thereof to indicate issues with the library. <em>Runtime exception</em>
354 5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 347 diff changeset	402 */
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	403 public Path getCopySourceName() throws HgRuntimeException {
78 c25c5c348d1b Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	404 if (isCopy()) {
c25c5c348d1b Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	405 return Path.create(metadata.find(0, "copy"));
c25c5c348d1b Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	406 }
c25c5c348d1b Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	407 throw new UnsupportedOperationException(); // XXX REVISIT, think over if Exception is good (clients would check isCopy() anyway, perhaps null is sufficient?)
c25c5c348d1b Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	408 }
c25c5c348d1b Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	409
415 ee8264d80747 Explicit constant for regular file flags, access to flags for a given file revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 401 diff changeset	410 /**
ee8264d80747 Explicit constant for regular file flags, access to flags for a given file revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 401 diff changeset	411 *
ee8264d80747 Explicit constant for regular file flags, access to flags for a given file revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 401 diff changeset	412 * @return revision this file was copied from
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	413 * @throws HgRuntimeException subclass thereof to indicate issues with the library. <em>Runtime exception</em>
415 ee8264d80747 Explicit constant for regular file flags, access to flags for a given file revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 401 diff changeset	414 */
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	415 public Nodeid getCopySourceRevision() throws HgRuntimeException {
78 c25c5c348d1b Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	416 if (isCopy()) {
c25c5c348d1b Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	417 return Nodeid.fromAscii(metadata.find(0, "copyrev")); // XXX reuse/cache Nodeid
c25c5c348d1b Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	418 }
c25c5c348d1b Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	419 throw new UnsupportedOperationException();
c25c5c348d1b Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	420 }
417 ccd7d25e5aea New and better name for HgFileInformer - HgChangesetFileSneaker. Explain (comments) ties between HgManifest, HgDataFile, HgChangesetFileSneaker and reasons for method placement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 416 diff changeset	421
415 ee8264d80747 Explicit constant for regular file flags, access to flags for a given file revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 401 diff changeset	422 /**
417 ccd7d25e5aea New and better name for HgFileInformer - HgChangesetFileSneaker. Explain (comments) ties between HgManifest, HgDataFile, HgChangesetFileSneaker and reasons for method placement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 416 diff changeset	423 * Get file flags recorded in the manifest
416 d30083c80d52 Better names - non-confusing and aligned with the rest of API Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 415 diff changeset	424 * @param fileRevisionIndex - revision local index, non-negative, or {@link HgRepository#TIP}.
417 ccd7d25e5aea New and better name for HgFileInformer - HgChangesetFileSneaker. Explain (comments) ties between HgManifest, HgDataFile, HgChangesetFileSneaker and reasons for method placement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 416 diff changeset	425 * @see HgManifest#getFileFlags(int, Path)
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	426 * @throws HgRuntimeException subclass thereof to indicate issues with the library. <em>Runtime exception</em>
415 ee8264d80747 Explicit constant for regular file flags, access to flags for a given file revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 401 diff changeset	427 */
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	428 public HgManifest.Flags getFlags(int fileRevisionIndex) throws HgRuntimeException {
415 ee8264d80747 Explicit constant for regular file flags, access to flags for a given file revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 401 diff changeset	429 int changesetRevIndex = getChangesetRevisionIndex(fileRevisionIndex);
417 ccd7d25e5aea New and better name for HgFileInformer - HgChangesetFileSneaker. Explain (comments) ties between HgManifest, HgDataFile, HgChangesetFileSneaker and reasons for method placement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 416 diff changeset	430 return getRepo().getManifest().getFileFlags(changesetRevIndex, getPath());
415 ee8264d80747 Explicit constant for regular file flags, access to flags for a given file revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 401 diff changeset	431 }
416 d30083c80d52 Better names - non-confusing and aligned with the rest of API Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 415 diff changeset	432
88 61eedab3eb3e Status between two revisions to recognize copy/rename Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 79 diff changeset	433 @Override
61eedab3eb3e Status between two revisions to recognize copy/rename Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 79 diff changeset	434 public String toString() {
61eedab3eb3e Status between two revisions to recognize copy/rename Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 79 diff changeset	435 StringBuilder sb = new StringBuilder(getClass().getSimpleName());
61eedab3eb3e Status between two revisions to recognize copy/rename Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 79 diff changeset	436 sb.append('(');
61eedab3eb3e Status between two revisions to recognize copy/rename Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 79 diff changeset	437 sb.append(getPath());
61eedab3eb3e Status between two revisions to recognize copy/rename Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 79 diff changeset	438 sb.append(')');
61eedab3eb3e Status between two revisions to recognize copy/rename Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 79 diff changeset	439 return sb.toString();
61eedab3eb3e Status between two revisions to recognize copy/rename Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 79 diff changeset	440 }
275 6d1804fe0ed7 Issue 10: Report file content length with respect of metadata. Respect dirstate parents for WC's status. Exceptions to keep useful attributes of the location Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 245 diff changeset	441
396 0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 388 diff changeset	442 private void checkAndRecordMetadata(int localRev) throws HgInvalidControlFileException {
275 6d1804fe0ed7 Issue 10: Report file content length with respect of metadata. Respect dirstate parents for WC's status. Exceptions to keep useful attributes of the location Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 245 diff changeset	443 // content() always initializes metadata.
401 a57a21aa4190 Support WORKING_COPY constant for dataFile.length() operation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	444 // TODO [post-1.0] this is expensive way to find out metadata, distinct RevlogStream.Iterator would be better.
275 6d1804fe0ed7 Issue 10: Report file content length with respect of metadata. Respect dirstate parents for WC's status. Exceptions to keep useful attributes of the location Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 245 diff changeset	445 // Alternatively, may parameterize MetadataContentPipe to do prepare only.
6d1804fe0ed7 Issue 10: Report file content length with respect of metadata. Respect dirstate parents for WC's status. Exceptions to keep useful attributes of the location Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 245 diff changeset	446 // For reference, when throwing CancelledException, hg status -A --rev 3:80 takes 70 ms
6d1804fe0ed7 Issue 10: Report file content length with respect of metadata. Respect dirstate parents for WC's status. Exceptions to keep useful attributes of the location Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 245 diff changeset	447 // however, if we just consume buffer instead (buffer.position(buffer.limit()), same command takes ~320ms
6d1804fe0ed7 Issue 10: Report file content length with respect of metadata. Respect dirstate parents for WC's status. Exceptions to keep useful attributes of the location Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 245 diff changeset	448 // (compared to command-line counterpart of 190ms)
6d1804fe0ed7 Issue 10: Report file content length with respect of metadata. Respect dirstate parents for WC's status. Exceptions to keep useful attributes of the location Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 245 diff changeset	449 try {
6d1804fe0ed7 Issue 10: Report file content length with respect of metadata. Respect dirstate parents for WC's status. Exceptions to keep useful attributes of the location Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 245 diff changeset	450 content(localRev, new ByteChannel() { // No-op channel
6d1804fe0ed7 Issue 10: Report file content length with respect of metadata. Respect dirstate parents for WC's status. Exceptions to keep useful attributes of the location Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 245 diff changeset	451 public int write(ByteBuffer buffer) throws IOException, CancelledException {
6d1804fe0ed7 Issue 10: Report file content length with respect of metadata. Respect dirstate parents for WC's status. Exceptions to keep useful attributes of the location Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 245 diff changeset	452 throw new CancelledException();
6d1804fe0ed7 Issue 10: Report file content length with respect of metadata. Respect dirstate parents for WC's status. Exceptions to keep useful attributes of the location Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 245 diff changeset	453 }
6d1804fe0ed7 Issue 10: Report file content length with respect of metadata. Respect dirstate parents for WC's status. Exceptions to keep useful attributes of the location Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 245 diff changeset	454 });
6d1804fe0ed7 Issue 10: Report file content length with respect of metadata. Respect dirstate parents for WC's status. Exceptions to keep useful attributes of the location Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 245 diff changeset	455 } catch (CancelledException ex) {
6d1804fe0ed7 Issue 10: Report file content length with respect of metadata. Respect dirstate parents for WC's status. Exceptions to keep useful attributes of the location Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 245 diff changeset	456 // it's ok, we did that
366 189dc6dc1c3e Use exceptions to expose errors reading mercurial data Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 355 diff changeset	457 } catch (HgInvalidControlFileException ex) {
396 0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 388 diff changeset	458 throw ex.isRevisionIndexSet() ? ex : ex.setRevisionIndex(localRev);
275 6d1804fe0ed7 Issue 10: Report file content length with respect of metadata. Respect dirstate parents for WC's status. Exceptions to keep useful attributes of the location Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 245 diff changeset	459 }
6d1804fe0ed7 Issue 10: Report file content length with respect of metadata. Respect dirstate parents for WC's status. Exceptions to keep useful attributes of the location Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 245 diff changeset	460 }
78 c25c5c348d1b Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	461
88 61eedab3eb3e Status between two revisions to recognize copy/rename Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 79 diff changeset	462 private static final class MetadataEntry {
78 c25c5c348d1b Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	463 private final String entry;
c25c5c348d1b Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	464 private final int valueStart;
388 b015f3918120 Work on FIXME: correct HgDataFile#workingCopy with tests; BasicSessionContext with property override; platform-specific options to internals Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 383 diff changeset	465
b015f3918120 Work on FIXME: correct HgDataFile#workingCopy with tests; BasicSessionContext with property override; platform-specific options to internals Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 383 diff changeset	466 // key may be null
78 c25c5c348d1b Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	467 /package-local/MetadataEntry(String key, String value) {
388 b015f3918120 Work on FIXME: correct HgDataFile#workingCopy with tests; BasicSessionContext with property override; platform-specific options to internals Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 383 diff changeset	468 if (key == null) {
b015f3918120 Work on FIXME: correct HgDataFile#workingCopy with tests; BasicSessionContext with property override; platform-specific options to internals Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 383 diff changeset	469 entry = value;
b015f3918120 Work on FIXME: correct HgDataFile#workingCopy with tests; BasicSessionContext with property override; platform-specific options to internals Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 383 diff changeset	470 valueStart = -1; // not 0 to tell between key == null and key == ""
b015f3918120 Work on FIXME: correct HgDataFile#workingCopy with tests; BasicSessionContext with property override; platform-specific options to internals Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 383 diff changeset	471 } else {
b015f3918120 Work on FIXME: correct HgDataFile#workingCopy with tests; BasicSessionContext with property override; platform-specific options to internals Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 383 diff changeset	472 entry = key + value;
b015f3918120 Work on FIXME: correct HgDataFile#workingCopy with tests; BasicSessionContext with property override; platform-specific options to internals Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 383 diff changeset	473 valueStart = key.length();
b015f3918120 Work on FIXME: correct HgDataFile#workingCopy with tests; BasicSessionContext with property override; platform-specific options to internals Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 383 diff changeset	474 }
78 c25c5c348d1b Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	475 }
c25c5c348d1b Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	476 /package-local/boolean matchKey(String key) {
388 b015f3918120 Work on FIXME: correct HgDataFile#workingCopy with tests; BasicSessionContext with property override; platform-specific options to internals Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 383 diff changeset	477 return key == null ? valueStart == -1 : key.length() == valueStart && entry.startsWith(key);
78 c25c5c348d1b Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	478 }
134 afac8ddc5dd2 Keep record if we tried and found no metadata for a given revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 133 diff changeset	479 // uncomment once/if needed
afac8ddc5dd2 Keep record if we tried and found no metadata for a given revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 133 diff changeset	480 // public String key() {
afac8ddc5dd2 Keep record if we tried and found no metadata for a given revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 133 diff changeset	481 // return entry.substring(0, valueStart);
afac8ddc5dd2 Keep record if we tried and found no metadata for a given revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 133 diff changeset	482 // }
78 c25c5c348d1b Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	483 public String value() {
388 b015f3918120 Work on FIXME: correct HgDataFile#workingCopy with tests; BasicSessionContext with property override; platform-specific options to internals Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 383 diff changeset	484 return valueStart == -1 ? entry : entry.substring(valueStart);
78 c25c5c348d1b Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	485 }
c25c5c348d1b Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	486 }
c25c5c348d1b Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	487
c25c5c348d1b Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	488 private static class Metadata {
276 6355ecda1f08 Tailored Map implementation with int keys Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 275 diff changeset	489 private static class Record {
6355ecda1f08 Tailored Map implementation with int keys Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 275 diff changeset	490 public final int offset;
6355ecda1f08 Tailored Map implementation with int keys Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 275 diff changeset	491 public final MetadataEntry[] entries;
6355ecda1f08 Tailored Map implementation with int keys Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 275 diff changeset	492
6355ecda1f08 Tailored Map implementation with int keys Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 275 diff changeset	493 public Record(int off, MetadataEntry[] entr) {
6355ecda1f08 Tailored Map implementation with int keys Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 275 diff changeset	494 offset = off;
6355ecda1f08 Tailored Map implementation with int keys Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 275 diff changeset	495 entries = entr;
6355ecda1f08 Tailored Map implementation with int keys Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 275 diff changeset	496 }
6355ecda1f08 Tailored Map implementation with int keys Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 275 diff changeset	497 }
78 c25c5c348d1b Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	498 // XXX sparse array needed
276 6355ecda1f08 Tailored Map implementation with int keys Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 275 diff changeset	499 private final IntMap<Record> entries = new IntMap<Record>(5);
134 afac8ddc5dd2 Keep record if we tried and found no metadata for a given revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 133 diff changeset	500
276 6355ecda1f08 Tailored Map implementation with int keys Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 275 diff changeset	501 private final Record NONE = new Record(-1, null); // don't want statics
134 afac8ddc5dd2 Keep record if we tried and found no metadata for a given revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 133 diff changeset	502
afac8ddc5dd2 Keep record if we tried and found no metadata for a given revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 133 diff changeset	503 // true when there's metadata for given revision
78 c25c5c348d1b Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	504 boolean known(int revision) {
276 6355ecda1f08 Tailored Map implementation with int keys Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 275 diff changeset	505 Record i = entries.get(revision);
134 afac8ddc5dd2 Keep record if we tried and found no metadata for a given revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 133 diff changeset	506 return i != null && NONE != i;
afac8ddc5dd2 Keep record if we tried and found no metadata for a given revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 133 diff changeset	507 }
afac8ddc5dd2 Keep record if we tried and found no metadata for a given revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 133 diff changeset	508
afac8ddc5dd2 Keep record if we tried and found no metadata for a given revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 133 diff changeset	509 // true when revision has been checked for metadata presence.
afac8ddc5dd2 Keep record if we tried and found no metadata for a given revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 133 diff changeset	510 public boolean checked(int revision) {
276 6355ecda1f08 Tailored Map implementation with int keys Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 275 diff changeset	511 return entries.containsKey(revision);
78 c25c5c348d1b Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	512 }
134 afac8ddc5dd2 Keep record if we tried and found no metadata for a given revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 133 diff changeset	513
afac8ddc5dd2 Keep record if we tried and found no metadata for a given revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 133 diff changeset	514 // true when revision has been checked and found not having any metadata
afac8ddc5dd2 Keep record if we tried and found no metadata for a given revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 133 diff changeset	515 boolean none(int revision) {
276 6355ecda1f08 Tailored Map implementation with int keys Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 275 diff changeset	516 Record i = entries.get(revision);
134 afac8ddc5dd2 Keep record if we tried and found no metadata for a given revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 133 diff changeset	517 return i == NONE;
afac8ddc5dd2 Keep record if we tried and found no metadata for a given revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 133 diff changeset	518 }
afac8ddc5dd2 Keep record if we tried and found no metadata for a given revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 133 diff changeset	519
afac8ddc5dd2 Keep record if we tried and found no metadata for a given revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 133 diff changeset	520 // mark revision as having no metadata.
afac8ddc5dd2 Keep record if we tried and found no metadata for a given revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 133 diff changeset	521 void recordNone(int revision) {
276 6355ecda1f08 Tailored Map implementation with int keys Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 275 diff changeset	522 Record i = entries.get(revision);
134 afac8ddc5dd2 Keep record if we tried and found no metadata for a given revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 133 diff changeset	523 if (i == NONE) {
afac8ddc5dd2 Keep record if we tried and found no metadata for a given revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 133 diff changeset	524 return; // already there
afac8ddc5dd2 Keep record if we tried and found no metadata for a given revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 133 diff changeset	525 }
afac8ddc5dd2 Keep record if we tried and found no metadata for a given revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 133 diff changeset	526 if (i != null) {
afac8ddc5dd2 Keep record if we tried and found no metadata for a given revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 133 diff changeset	527 throw new IllegalStateException(String.format("Trying to override Metadata state for revision %d (known offset: %d)", revision, i));
afac8ddc5dd2 Keep record if we tried and found no metadata for a given revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 133 diff changeset	528 }
276 6355ecda1f08 Tailored Map implementation with int keys Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 275 diff changeset	529 entries.put(revision, NONE);
134 afac8ddc5dd2 Keep record if we tried and found no metadata for a given revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 133 diff changeset	530 }
afac8ddc5dd2 Keep record if we tried and found no metadata for a given revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 133 diff changeset	531
78 c25c5c348d1b Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	532 // since this is internal class, callers are supposed to ensure arg correctness (i.e. ask known() before)
c25c5c348d1b Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	533 int dataOffset(int revision) {
276 6355ecda1f08 Tailored Map implementation with int keys Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 275 diff changeset	534 return entries.get(revision).offset;
78 c25c5c348d1b Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	535 }
c25c5c348d1b Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	536 void add(int revision, int dataOffset, Collection<MetadataEntry> e) {
276 6355ecda1f08 Tailored Map implementation with int keys Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 275 diff changeset	537 assert !entries.containsKey(revision);
6355ecda1f08 Tailored Map implementation with int keys Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 275 diff changeset	538 entries.put(revision, new Record(dataOffset, e.toArray(new MetadataEntry[e.size()])));
78 c25c5c348d1b Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	539 }
276 6355ecda1f08 Tailored Map implementation with int keys Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 275 diff changeset	540
78 c25c5c348d1b Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	541 String find(int revision, String key) {
276 6355ecda1f08 Tailored Map implementation with int keys Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 275 diff changeset	542 for (MetadataEntry me : entries.get(revision).entries) {
78 c25c5c348d1b Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	543 if (me.matchKey(key)) {
c25c5c348d1b Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	544 return me.value();
c25c5c348d1b Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	545 }
c25c5c348d1b Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	546 }
c25c5c348d1b Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	547 return null;
c25c5c348d1b Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	548 }
c25c5c348d1b Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	549 }
157 d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 148 diff changeset	550
277 74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 276 diff changeset	551 private static class MetadataInspector extends ErrorHandlingInspector implements RevlogStream.Inspector {
157 d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 148 diff changeset	552 private final Metadata metadata;
277 74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 276 diff changeset	553 private final RevlogStream.Inspector delegate;
388 b015f3918120 Work on FIXME: correct HgDataFile#workingCopy with tests; BasicSessionContext with property override; platform-specific options to internals Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 383 diff changeset	554 private final LogFacility log;
157 d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 148 diff changeset	555
396 0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 388 diff changeset	556 public MetadataInspector(Metadata _metadata, LogFacility logFacility, RevlogStream.Inspector chain) {
157 d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 148 diff changeset	557 metadata = _metadata;
388 b015f3918120 Work on FIXME: correct HgDataFile#workingCopy with tests; BasicSessionContext with property override; platform-specific options to internals Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 383 diff changeset	558 log = logFacility;
277 74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 276 diff changeset	559 delegate = chain;
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 276 diff changeset	560 setCancelSupport(CancelSupport.Factory.get(chain));
157 d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 148 diff changeset	561 }
d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 148 diff changeset	562
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	563 public void next(int revisionNumber, int actualLen, int baseRevision, int linkRevision, int parent1Revision, int parent2Revision, byte[] nodeid, DataAccess data) {
277 74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 276 diff changeset	564 try {
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 276 diff changeset	565 final int daLength = data.length();
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 276 diff changeset	566 if (daLength < 4 \|\| data.readByte() != 1 \|\| data.readByte() != 10) {
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 276 diff changeset	567 metadata.recordNone(revisionNumber);
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 276 diff changeset	568 data.reset();
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 276 diff changeset	569 } else {
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 276 diff changeset	570 ArrayList<MetadataEntry> _metadata = new ArrayList<MetadataEntry>();
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 276 diff changeset	571 int offset = parseMetadata(data, daLength, _metadata);
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 276 diff changeset	572 metadata.add(revisionNumber, offset, _metadata);
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 276 diff changeset	573 // da is in prepared state (i.e. we consumed all bytes up to metadata end).
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 276 diff changeset	574 // However, it's not safe to assume delegate won't call da.reset() for some reason,
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 276 diff changeset	575 // and we need to ensure predictable result.
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 276 diff changeset	576 data.reset();
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 276 diff changeset	577 data = new FilterDataAccess(data, offset, daLength - offset);
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 276 diff changeset	578 }
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 276 diff changeset	579 if (delegate != null) {
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 276 diff changeset	580 delegate.next(revisionNumber, actualLen, baseRevision, linkRevision, parent1Revision, parent2Revision, nodeid, data);
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 276 diff changeset	581 }
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 276 diff changeset	582 } catch (IOException ex) {
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 276 diff changeset	583 recordFailure(ex);
396 0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 388 diff changeset	584 } catch (HgInvalidControlFileException 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	585 // TODO RevlogStream, where this RevlogStream.Inspector goes, shall set File (as it's the only one having access to it)
396 0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 388 diff changeset	586 recordFailure(ex.isRevisionIndexSet() ? ex : ex.setRevisionIndex(revisionNumber));
157 d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 148 diff changeset	587 }
277 74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 276 diff changeset	588 }
74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 276 diff changeset	589
396 0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 388 diff changeset	590 private int parseMetadata(DataAccess data, final int daLength, ArrayList<MetadataEntry> _metadata) throws IOException, HgInvalidControlFileException {
157 d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 148 diff changeset	591 int lastEntryStart = 2;
d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 148 diff changeset	592 int lastColon = -1;
d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 148 diff changeset	593 // XXX in fact, need smth like ByteArrayBuilder, similar to StringBuilder,
d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 148 diff changeset	594 // which can't be used here because we can't convert bytes to chars as we read them
d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 148 diff changeset	595 // (there might be multi-byte encoding), and we need to collect all bytes before converting to string
d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 148 diff changeset	596 ByteArrayOutputStream bos = new ByteArrayOutputStream();
d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 148 diff changeset	597 String key = null, value = null;
d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 148 diff changeset	598 boolean byteOne = false;
323 4c7e3ba67213 Exception when analyzing metadata of an empty renamed file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	599 boolean metadataIsComplete = false;
157 d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 148 diff changeset	600 for (int i = 2; i < daLength; i++) {
277 74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 276 diff changeset	601 byte b = data.readByte();
157 d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 148 diff changeset	602 if (b == '\n') {
d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 148 diff changeset	603 if (byteOne) { // i.e. \n follows 1
d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 148 diff changeset	604 lastEntryStart = i+1;
323 4c7e3ba67213 Exception when analyzing metadata of an empty renamed file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	605 metadataIsComplete = true;
157 d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 148 diff changeset	606 // XXX is it possible to have here incomplete key/value (i.e. if last pair didn't end with \n)
323 4c7e3ba67213 Exception when analyzing metadata of an empty renamed file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	607 // if yes, need to set metadataIsComplete to true in that case as well
157 d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 148 diff changeset	608 break;
d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 148 diff changeset	609 }
d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 148 diff changeset	610 if (key == null \|\| lastColon == -1 \|\| i <= lastColon) {
456 909306e412e2 Refactor LogFacility and SessionContext, better API for both Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 437 diff changeset	611 log.dump(getClass(), Error, "Missing key in file revision metadata at index %d", i);
157 d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 148 diff changeset	612 }
d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 148 diff changeset	613 value = new String(bos.toByteArray()).trim();
d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 148 diff changeset	614 bos.reset();
d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 148 diff changeset	615 _metadata.add(new MetadataEntry(key, value));
d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 148 diff changeset	616 key = value = null;
d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 148 diff changeset	617 lastColon = -1;
d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 148 diff changeset	618 lastEntryStart = i+1;
d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 148 diff changeset	619 continue;
d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 148 diff changeset	620 }
277 74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 276 diff changeset	621 // byteOne has to be consumed up to this line, if not yet, consume it
157 d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 148 diff changeset	622 if (byteOne) {
d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 148 diff changeset	623 // insert 1 we've read on previous step into the byte builder
d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 148 diff changeset	624 bos.write(1);
277 74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 276 diff changeset	625 byteOne = false;
157 d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 148 diff changeset	626 // fall-through to consume current byte
d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 148 diff changeset	627 }
d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 148 diff changeset	628 if (b == (int) ':') {
d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 148 diff changeset	629 assert value == null;
d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 148 diff changeset	630 key = new String(bos.toByteArray());
d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 148 diff changeset	631 bos.reset();
d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 148 diff changeset	632 lastColon = i;
d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 148 diff changeset	633 } else if (b == 1) {
d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 148 diff changeset	634 byteOne = true;
d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 148 diff changeset	635 } else {
d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 148 diff changeset	636 bos.write(b);
d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 148 diff changeset	637 }
d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 148 diff changeset	638 }
323 4c7e3ba67213 Exception when analyzing metadata of an empty renamed file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	639 // data.isEmpty is not reliable, renamed files of size==0 keep only metadata
4c7e3ba67213 Exception when analyzing metadata of an empty renamed file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	640 if (!metadataIsComplete) {
4c7e3ba67213 Exception when analyzing metadata of an empty renamed file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	641 // XXX perhaps, worth a testcase (empty file, renamed, read or ask ifCopy
396 0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 388 diff changeset	642 throw new HgInvalidControlFileException("Metadata is not closed properly", null, null);
157 d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 51 148 diff changeset	643 }
277 74e7493a042a Favor delegation over generalization Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 276 diff changeset	644 return lastEntryStart;
17 571e1b2cc3f7 Query file for its parents. Demo of recently added ignore and digest support from within cat cmd Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 5 diff changeset	645 }
322 d68dcb3b5f49 Propagate command's CancelSupport to low-level API. CancelSupport from context got priority over one from command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	646
d68dcb3b5f49 Propagate command's CancelSupport to low-level API. CancelSupport from context got priority over one from command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	647 @Override
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	648 public void checkFailed() throws HgRuntimeException, IOException, CancelledException {
322 d68dcb3b5f49 Propagate command's CancelSupport to low-level API. CancelSupport from context got priority over one from command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	649 super.checkFailed();
d68dcb3b5f49 Propagate command's CancelSupport to low-level API. CancelSupport from context got priority over one from command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	650 if (delegate instanceof ErrorHandlingInspector) {
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	651 // TODO need to add ErrorDestination (ErrorTarget/Acceptor?) and pass it around (much like CancelSupport get passed)
322 d68dcb3b5f49 Propagate command's CancelSupport to low-level API. CancelSupport from context got priority over one from command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	652 // so that delegate would be able report its failures directly to caller without this hack
d68dcb3b5f49 Propagate command's CancelSupport to low-level API. CancelSupport from context got priority over one from command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	653 ((ErrorHandlingInspector) delegate).checkFailed();
d68dcb3b5f49 Propagate command's CancelSupport to low-level API. CancelSupport from context got priority over one from command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	654 }
d68dcb3b5f49 Propagate command's CancelSupport to low-level API. CancelSupport from context got priority over one from command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 317 diff changeset	655 }
17 571e1b2cc3f7 Query file for its parents. Demo of recently added ignore and digest support from within cat cmd Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 5 diff changeset	656 }
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	657 }

Mercurial > jhg

annotate src/org/tmatesoft/hg/repo/HgDataFile.java @ 467:51d682cf9cdc