Mercurial > jhg
annotate src/org/tmatesoft/hg/repo/HgDataFile.java @ 196:e2115da4cf6a
Pool objects to avoid memory polution with duplicates
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> | 
|---|---|
| date | Mon, 18 Apr 2011 18:04:24 +0200 | 
| parents | a5198b6487dc | 
| children | 41a778e3fd31 | 
| 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: 
5diff
changeset | 1 /* | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
56diff
changeset | 2 * Copyright (c) 2010-2011 TMate Software Ltd | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
56diff
changeset | 3 * | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
56diff
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: 
56diff
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: 
56diff
changeset | 6 * the Free Software Foundation; version 2 of the License. | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
56diff
changeset | 7 * | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
56diff
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: 
56diff
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: 
56diff
changeset | 10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
56diff
changeset | 11 * GNU General Public License for more details. | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
56diff
changeset | 12 * | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
56diff
changeset | 13 * For information on how to redistribute this software under | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
56diff
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: 
88diff
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: 
56diff
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 | 
| 148 
1a7a9a20e1f9
Exceptions, javadoc. Initial cancel and progress support
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
135diff
changeset | 19 import static org.tmatesoft.hg.repo.HgInternals.wrongLocalRevision; | 
| 
1a7a9a20e1f9
Exceptions, javadoc. Initial cancel and progress support
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
135diff
changeset | 20 import static org.tmatesoft.hg.repo.HgRepository.*; | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
56diff
changeset | 21 | 
| 157 
d5268ca7715b
Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com>diff
changeset | 22 import java.io.ByteArrayOutputStream; | 
| 148 
1a7a9a20e1f9
Exceptions, javadoc. Initial cancel and progress support
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
135diff
changeset | 23 import java.io.IOException; | 
| 115 
c0cc2535462c
Introduced channels to pipeline (and easily filter) data streams
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
102diff
changeset | 24 import java.nio.ByteBuffer; | 
| 78 
c25c5c348d1b
Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 25 import java.util.ArrayList; | 
| 
c25c5c348d1b
Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 26 import java.util.Collection; | 
| 79 
5f9635c01681
TreeMap are more effective when keys are unique
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
78diff
changeset | 27 import java.util.TreeMap; | 
| 78 
c25c5c348d1b
Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 28 | 
| 148 
1a7a9a20e1f9
Exceptions, javadoc. Initial cancel and progress support
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
135diff
changeset | 29 import org.tmatesoft.hg.core.HgDataStreamException; | 
| 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>diff
changeset | 30 import org.tmatesoft.hg.core.HgException; | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
56diff
changeset | 31 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>diff
changeset | 32 import org.tmatesoft.hg.internal.DataAccess; | 
| 121 
b1d6208fb517
Conditionally apply filters to file content
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
115diff
changeset | 33 import org.tmatesoft.hg.internal.FilterByteChannel; | 
| 77 
c677e1593919
Moved RevlogStream implementation into .internal
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
74diff
changeset | 34 import org.tmatesoft.hg.internal.RevlogStream; | 
| 115 
c0cc2535462c
Introduced channels to pipeline (and easily filter) data streams
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
102diff
changeset | 35 import org.tmatesoft.hg.util.ByteChannel; | 
| 148 
1a7a9a20e1f9
Exceptions, javadoc. Initial cancel and progress support
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
135diff
changeset | 36 import org.tmatesoft.hg.util.CancelledException; | 
| 133 
4a948ec83980
core.Path to util.Path as it's not Hg repo dependant
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
129diff
changeset | 37 import org.tmatesoft.hg.util.Path; | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
56diff
changeset | 38 | 
| 5 
fc265ddeab26
File content and non-effective, although working, patch application
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
3diff
changeset | 39 | 
| 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: 
5diff
changeset | 40 | 
| 2 
08db726a0fb7
Shaping out low-level Hg structures
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 41 /** | 
| 
08db726a0fb7
Shaping out low-level Hg structures
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 42 * ? name:HgFileNode? | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
56diff
changeset | 43 * | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
56diff
changeset | 44 * @author Artem Tikhomirov | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
56diff
changeset | 45 * @author TMate Software Ltd. | 
| 2 
08db726a0fb7
Shaping out low-level Hg structures
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 46 */ | 
| 
08db726a0fb7
Shaping out low-level Hg structures
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 47 public class HgDataFile extends Revlog { | 
| 
08db726a0fb7
Shaping out low-level Hg structures
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 48 | 
| 3 
24bb4f365164
Rudimentary log functionality with basic infrastructure is in place
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
2diff
changeset | 49 // absolute from repo root? | 
| 
24bb4f365164
Rudimentary log functionality with basic infrastructure is in place
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
2diff
changeset | 50 // slashes, unix-style? | 
| 
24bb4f365164
Rudimentary log functionality with basic infrastructure is in place
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
2diff
changeset | 51 // 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: 
56diff
changeset | 52 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: 
133diff
changeset | 53 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 | 54 | 
| 115 
c0cc2535462c
Introduced channels to pipeline (and easily filter) data streams
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
102diff
changeset | 55 /*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: 
17diff
changeset | 56 super(hgRepo, content); | 
| 115 
c0cc2535462c
Introduced channels to pipeline (and easily filter) data streams
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
102diff
changeset | 57 path = filePath; | 
| 3 
24bb4f365164
Rudimentary log functionality with basic infrastructure is in place
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
2diff
changeset | 58 } | 
| 115 
c0cc2535462c
Introduced channels to pipeline (and easily filter) data streams
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
102diff
changeset | 59 | 
| 
c0cc2535462c
Introduced channels to pipeline (and easily filter) data streams
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
102diff
changeset | 60 /*package-local*/HgDataFile(HgRepository hgRepo, Path filePath) { | 
| 
c0cc2535462c
Introduced channels to pipeline (and easily filter) data streams
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
102diff
changeset | 61 super(hgRepo); | 
| 
c0cc2535462c
Introduced channels to pipeline (and easily filter) data streams
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
102diff
changeset | 62 path = filePath; | 
| 
c0cc2535462c
Introduced channels to pipeline (and easily filter) data streams
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
102diff
changeset | 63 } | 
| 
c0cc2535462c
Introduced channels to pipeline (and easily filter) data streams
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
102diff
changeset | 64 | 
| 
c0cc2535462c
Introduced channels to pipeline (and easily filter) data streams
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
102diff
changeset | 65 // exists is not the best name possible. now it means no file with such name was ever known to the repo. | 
| 
c0cc2535462c
Introduced channels to pipeline (and easily filter) data streams
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
102diff
changeset | 66 // it might be confused with files existed before but lately removed. | 
| 3 
24bb4f365164
Rudimentary log functionality with basic infrastructure is in place
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
2diff
changeset | 67 public boolean exists() { | 
| 
24bb4f365164
Rudimentary log functionality with basic infrastructure is in place
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
2diff
changeset | 68 return content != null; // XXX need better impl | 
| 2 
08db726a0fb7
Shaping out low-level Hg structures
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 69 } | 
| 
08db726a0fb7
Shaping out low-level Hg structures
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 70 | 
| 77 
c677e1593919
Moved RevlogStream implementation into .internal
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
74diff
changeset | 71 // human-readable (i.e. "COPYING", not "store/data/_c_o_p_y_i_n_g.i") | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
56diff
changeset | 72 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>diff
changeset | 73 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 | 74 } | 
| 
08db726a0fb7
Shaping out low-level Hg structures
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 75 | 
| 22 
603806cd2dc6
Status of local working dir against non-tip base revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
21diff
changeset | 76 public int length(Nodeid nodeid) { | 
| 88 
61eedab3eb3e
Status between two revisions to recognize copy/rename
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
79diff
changeset | 77 return content.dataLength(getLocalRevision(nodeid)); | 
| 22 
603806cd2dc6
Status of local working dir against non-tip base revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
21diff
changeset | 78 } | 
| 
603806cd2dc6
Status of local working dir against non-tip base revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
21diff
changeset | 79 | 
| 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>diff
changeset | 80 public void workingCopy(ByteChannel sink) throws IOException, CancelledException { | 
| 
d5268ca7715b
Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com>diff
changeset | 81 throw HgRepository.notImplemented(); | 
| 2 
08db726a0fb7
Shaping out low-level Hg structures
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 82 } | 
| 115 
c0cc2535462c
Introduced channels to pipeline (and easily filter) data streams
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
102diff
changeset | 83 | 
| 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>diff
changeset | 84 // public void content(int revision, ByteChannel sink, boolean applyFilters) throws HgDataStreamException, IOException, CancelledException { | 
| 
d5268ca7715b
Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com>diff
changeset | 85 // byte[] content = content(revision); | 
| 
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>diff
changeset | 86 // final CancelSupport cancelSupport = CancelSupport.Factory.get(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>diff
changeset | 87 // final ProgressSupport progressSupport = ProgressSupport.Factory.get(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>diff
changeset | 88 // ByteBuffer buf = ByteBuffer.allocate(512); | 
| 
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>diff
changeset | 89 // int left = content.length; | 
| 
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>diff
changeset | 90 // progressSupport.start(left); | 
| 
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>diff
changeset | 91 // int offset = 0; | 
| 
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>diff
changeset | 92 // cancelSupport.checkCancelled(); | 
| 
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>diff
changeset | 93 // ByteChannel _sink = applyFilters ? new FilterByteChannel(sink, getRepo().getFiltersFromRepoToWorkingDir(getPath())) : 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>diff
changeset | 94 // do { | 
| 
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>diff
changeset | 95 // buf.put(content, offset, Math.min(left, buf.remaining())); | 
| 
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>diff
changeset | 96 // buf.flip(); | 
| 
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>diff
changeset | 97 // cancelSupport.checkCancelled(); | 
| 
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>diff
changeset | 98 // // XXX I may not rely on returned number of bytes but track change in buf position instead. | 
| 
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>diff
changeset | 99 // int consumed = _sink.write(buf); | 
| 
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>diff
changeset | 100 // buf.compact(); | 
| 
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>diff
changeset | 101 // offset += consumed; | 
| 
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>diff
changeset | 102 // left -= consumed; | 
| 
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>diff
changeset | 103 // progressSupport.worked(consumed); | 
| 
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>diff
changeset | 104 // } while (left > 0); | 
| 
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>diff
changeset | 105 // progressSupport.done(); // XXX shall specify whether #done() is invoked always or only if completed successfully. | 
| 
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>diff
changeset | 106 // } | 
| 
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>diff
changeset | 107 | 
| 
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>diff
changeset | 108 /*XXX not sure distinct method contentWithFilters() is the best way to do, perhaps, callers shall add filters themselves?*/ | 
| 
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>diff
changeset | 109 public void contentWithFilters(int revision, ByteChannel sink) throws HgDataStreamException, IOException, CancelledException { | 
| 
d5268ca7715b
Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com>diff
changeset | 110 content(revision, new FilterByteChannel(sink, getRepo().getFiltersFromRepoToWorkingDir(getPath()))); | 
| 115 
c0cc2535462c
Introduced channels to pipeline (and easily filter) data streams
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
102diff
changeset | 111 } | 
| 22 
603806cd2dc6
Status of local working dir against non-tip base revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
21diff
changeset | 112 | 
| 78 
c25c5c348d1b
Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 113 // for data files need to check heading of the file content for possible metadata | 
| 
c25c5c348d1b
Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 114 // @see http://mercurial.selenic.com/wiki/FileFormats#data.2BAC8- | 
| 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>diff
changeset | 115 public void content(int revision, ByteChannel sink) throws HgDataStreamException, IOException, CancelledException { | 
| 78 
c25c5c348d1b
Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 116 if (revision == TIP) { | 
| 135 
3959bffb14e9
explicit op name instead math op to get last rev number
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
134diff
changeset | 117 revision = getLastRevision(); | 
| 78 
c25c5c348d1b
Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 118 } | 
| 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>diff
changeset | 119 if (revision == WORKING_COPY) { | 
| 
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>diff
changeset | 120 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>diff
changeset | 121 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>diff
changeset | 122 } | 
| 
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>diff
changeset | 123 if (wrongLocalRevision(revision) || revision == BAD_REVISION) { | 
| 148 
1a7a9a20e1f9
Exceptions, javadoc. Initial cancel and progress support
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
135diff
changeset | 124 throw new IllegalArgumentException(String.valueOf(revision)); | 
| 
1a7a9a20e1f9
Exceptions, javadoc. Initial cancel and progress support
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
135diff
changeset | 125 } | 
| 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>diff
changeset | 126 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>diff
changeset | 127 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>diff
changeset | 128 } | 
| 134 
afac8ddc5dd2
Keep record if we tried and found no metadata for a given revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
133diff
changeset | 129 if (metadata == null) { | 
| 
afac8ddc5dd2
Keep record if we tried and found no metadata for a given revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
133diff
changeset | 130 metadata = new Metadata(); | 
| 
afac8ddc5dd2
Keep record if we tried and found no metadata for a given revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
133diff
changeset | 131 } | 
| 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>diff
changeset | 132 ContentPipe insp; | 
| 134 
afac8ddc5dd2
Keep record if we tried and found no metadata for a given revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
133diff
changeset | 133 if (metadata.none(revision)) { | 
| 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>diff
changeset | 134 insp = new ContentPipe(sink, 0); | 
| 
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>diff
changeset | 135 } else if (metadata.known(revision)) { | 
| 
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>diff
changeset | 136 insp = new ContentPipe(sink, metadata.dataOffset(revision)); | 
| 
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>diff
changeset | 137 } 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>diff
changeset | 138 // do not know if there's metadata | 
| 
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>diff
changeset | 139 insp = new MetadataContentPipe(sink, metadata); | 
| 78 
c25c5c348d1b
Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 140 } | 
| 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>diff
changeset | 141 insp.checkCancelled(); | 
| 
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>diff
changeset | 142 super.content.iterate(revision, revision, true, insp); | 
| 
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>diff
changeset | 143 try { | 
| 
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>diff
changeset | 144 insp.checkFailed(); | 
| 
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>diff
changeset | 145 } catch (HgDataStreamException ex) { | 
| 
d5268ca7715b
Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com>diff
changeset | 146 throw ex; | 
| 
d5268ca7715b
Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com>diff
changeset | 147 } catch (HgException ex) { | 
| 
d5268ca7715b
Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com>diff
changeset | 148 // shall not happen, unless we changed ContentPipe or its subclass | 
| 
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>diff
changeset | 149 throw new HgDataStreamException(ex.getClass().getName(), ex); | 
| 78 
c25c5c348d1b
Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 150 } | 
| 
c25c5c348d1b
Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 151 } | 
| 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>diff
changeset | 152 | 
| 129 
645829962785
core.Cset renamed to HgChangeset; repo.Changeset moved into HgChangelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
121diff
changeset | 153 public void history(HgChangelog.Inspector inspector) { | 
| 135 
3959bffb14e9
explicit op name instead math op to get last rev number
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
134diff
changeset | 154 history(0, getLastRevision(), inspector); | 
| 48 
e34f90b9ded1
Limit option for history/log
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
37diff
changeset | 155 } | 
| 
e34f90b9ded1
Limit option for history/log
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
37diff
changeset | 156 | 
| 129 
645829962785
core.Cset renamed to HgChangeset; repo.Changeset moved into HgChangelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
121diff
changeset | 157 public void history(int start, int end, HgChangelog.Inspector inspector) { | 
| 3 
24bb4f365164
Rudimentary log functionality with basic infrastructure is in place
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
2diff
changeset | 158 if (!exists()) { | 
| 
24bb4f365164
Rudimentary log functionality with basic infrastructure is in place
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
2diff
changeset | 159 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: 
2diff
changeset | 160 } | 
| 135 
3959bffb14e9
explicit op name instead math op to get last rev number
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
134diff
changeset | 161 final int last = getLastRevision(); | 
| 77 
c677e1593919
Moved RevlogStream implementation into .internal
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
74diff
changeset | 162 if (start < 0 || start > last) { | 
| 
c677e1593919
Moved RevlogStream implementation into .internal
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
74diff
changeset | 163 throw new IllegalArgumentException(); | 
| 
c677e1593919
Moved RevlogStream implementation into .internal
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
74diff
changeset | 164 } | 
| 
c677e1593919
Moved RevlogStream implementation into .internal
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
74diff
changeset | 165 if (end == TIP) { | 
| 
c677e1593919
Moved RevlogStream implementation into .internal
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
74diff
changeset | 166 end = last; | 
| 
c677e1593919
Moved RevlogStream implementation into .internal
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
74diff
changeset | 167 } else if (end < start || end > last) { | 
| 
c677e1593919
Moved RevlogStream implementation into .internal
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
74diff
changeset | 168 throw new IllegalArgumentException(); | 
| 
c677e1593919
Moved RevlogStream implementation into .internal
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
74diff
changeset | 169 } | 
| 48 
e34f90b9ded1
Limit option for history/log
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
37diff
changeset | 170 final int[] commitRevisions = new int[end - start + 1]; | 
| 77 
c677e1593919
Moved RevlogStream implementation into .internal
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
74diff
changeset | 171 RevlogStream.Inspector insp = new RevlogStream.Inspector() { | 
| 3 
24bb4f365164
Rudimentary log functionality with basic infrastructure is in place
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
2diff
changeset | 172 int count = 0; | 
| 
24bb4f365164
Rudimentary log functionality with basic infrastructure is in place
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
2diff
changeset | 173 | 
| 51 
9429c7bd1920
Try DataAccess to reach revision data instead of plain byte arrays
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
49diff
changeset | 174 public void next(int revisionNumber, int actualLen, int baseRevision, int linkRevision, int parent1Revision, int parent2Revision, byte[] nodeid, DataAccess data) { | 
| 3 
24bb4f365164
Rudimentary log functionality with basic infrastructure is in place
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
2diff
changeset | 175 commitRevisions[count++] = linkRevision; | 
| 
24bb4f365164
Rudimentary log functionality with basic infrastructure is in place
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
2diff
changeset | 176 } | 
| 
24bb4f365164
Rudimentary log functionality with basic infrastructure is in place
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
2diff
changeset | 177 }; | 
| 48 
e34f90b9ded1
Limit option for history/log
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
37diff
changeset | 178 content.iterate(start, end, false, insp); | 
| 3 
24bb4f365164
Rudimentary log functionality with basic infrastructure is in place
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
2diff
changeset | 179 getRepo().getChangelog().range(inspector, commitRevisions); | 
| 
24bb4f365164
Rudimentary log functionality with basic infrastructure is in place
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
2diff
changeset | 180 } | 
| 88 
61eedab3eb3e
Status between two revisions to recognize copy/rename
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
79diff
changeset | 181 | 
| 
61eedab3eb3e
Status between two revisions to recognize copy/rename
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
79diff
changeset | 182 // for a given local revision of the file, find out local revision in the changelog | 
| 
61eedab3eb3e
Status between two revisions to recognize copy/rename
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
79diff
changeset | 183 public int getChangesetLocalRevision(int revision) { | 
| 
61eedab3eb3e
Status between two revisions to recognize copy/rename
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
79diff
changeset | 184 return content.linkRevision(revision); | 
| 
61eedab3eb3e
Status between two revisions to recognize copy/rename
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
79diff
changeset | 185 } | 
| 
61eedab3eb3e
Status between two revisions to recognize copy/rename
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
79diff
changeset | 186 | 
| 
61eedab3eb3e
Status between two revisions to recognize copy/rename
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
79diff
changeset | 187 public Nodeid getChangesetRevision(Nodeid nid) { | 
| 
61eedab3eb3e
Status between two revisions to recognize copy/rename
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
79diff
changeset | 188 int changelogRevision = getChangesetLocalRevision(getLocalRevision(nid)); | 
| 
61eedab3eb3e
Status between two revisions to recognize copy/rename
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
79diff
changeset | 189 return getRepo().getChangelog().getRevision(changelogRevision); | 
| 
61eedab3eb3e
Status between two revisions to recognize copy/rename
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
79diff
changeset | 190 } | 
| 78 
c25c5c348d1b
Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 191 | 
| 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>diff
changeset | 192 public boolean isCopy() throws HgDataStreamException { | 
| 134 
afac8ddc5dd2
Keep record if we tried and found no metadata for a given revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
133diff
changeset | 193 if (metadata == null || !metadata.checked(0)) { | 
| 
afac8ddc5dd2
Keep record if we tried and found no metadata for a given revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
133diff
changeset | 194 // content() always initializes metadata. | 
| 163 
a5198b6487dc
Record reasons for slow status for future reference
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
158diff
changeset | 195 // FIXME this is expensive way to find out metadata, distinct RevlogStream.Iterator would be better. | 
| 
a5198b6487dc
Record reasons for slow status for future reference
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
158diff
changeset | 196 // Alternatively, may parameterize MetadataContentPipe to do prepare only. | 
| 
a5198b6487dc
Record reasons for slow status for future reference
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
158diff
changeset | 197 // For reference, when throwing CancelledException, hg status -A --rev 3:80 takes 70 ms | 
| 
a5198b6487dc
Record reasons for slow status for future reference
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
158diff
changeset | 198 // however, if we just consume buffer instead (buffer.position(buffer.limit()), same command takes ~320ms | 
| 
a5198b6487dc
Record reasons for slow status for future reference
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
158diff
changeset | 199 // (compared to command-line counterpart of 190ms) | 
| 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>diff
changeset | 200 try { | 
| 
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>diff
changeset | 201 content(0, new ByteChannel() { // No-op channel | 
| 163 
a5198b6487dc
Record reasons for slow status for future reference
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
158diff
changeset | 202 public int write(ByteBuffer buffer) throws IOException, CancelledException { | 
| 157 
d5268ca7715b
Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com>diff
changeset | 203 // pretend we consumed whole buffer | 
| 163 
a5198b6487dc
Record reasons for slow status for future reference
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
158diff
changeset | 204 // int rv = buffer.remaining(); | 
| 
a5198b6487dc
Record reasons for slow status for future reference
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
158diff
changeset | 205 // buffer.position(buffer.limit()); | 
| 
a5198b6487dc
Record reasons for slow status for future reference
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
158diff
changeset | 206 // return rv; | 
| 
a5198b6487dc
Record reasons for slow status for future reference
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
158diff
changeset | 207 throw new CancelledException(); | 
| 157 
d5268ca7715b
Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com>diff
changeset | 208 } | 
| 
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>diff
changeset | 209 }); | 
| 163 
a5198b6487dc
Record reasons for slow status for future reference
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
158diff
changeset | 210 } catch (CancelledException ex) { | 
| 
a5198b6487dc
Record reasons for slow status for future reference
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
158diff
changeset | 211 // it's ok, we did that | 
| 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>diff
changeset | 212 } catch (Exception ex) { | 
| 
d5268ca7715b
Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com>diff
changeset | 213 throw new HgDataStreamException("Can't initialize metadata", ex); | 
| 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: 
5diff
changeset | 214 } | 
| 78 
c25c5c348d1b
Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 215 } | 
| 134 
afac8ddc5dd2
Keep record if we tried and found no metadata for a given revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
133diff
changeset | 216 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: 
77diff
changeset | 217 return false; | 
| 
c25c5c348d1b
Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 218 } | 
| 
c25c5c348d1b
Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 219 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: 
77diff
changeset | 220 } | 
| 
c25c5c348d1b
Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 221 | 
| 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>diff
changeset | 222 public Path getCopySourceName() throws HgDataStreamException { | 
| 78 
c25c5c348d1b
Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 223 if (isCopy()) { | 
| 
c25c5c348d1b
Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 224 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: 
77diff
changeset | 225 } | 
| 
c25c5c348d1b
Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 226 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: 
77diff
changeset | 227 } | 
| 
c25c5c348d1b
Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 228 | 
| 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>diff
changeset | 229 public Nodeid getCopySourceRevision() throws HgDataStreamException { | 
| 78 
c25c5c348d1b
Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 230 if (isCopy()) { | 
| 
c25c5c348d1b
Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 231 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: 
77diff
changeset | 232 } | 
| 
c25c5c348d1b
Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 233 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: 
77diff
changeset | 234 } | 
| 88 
61eedab3eb3e
Status between two revisions to recognize copy/rename
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
79diff
changeset | 235 | 
| 
61eedab3eb3e
Status between two revisions to recognize copy/rename
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
79diff
changeset | 236 @Override | 
| 
61eedab3eb3e
Status between two revisions to recognize copy/rename
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
79diff
changeset | 237 public String toString() { | 
| 
61eedab3eb3e
Status between two revisions to recognize copy/rename
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
79diff
changeset | 238 StringBuilder sb = new StringBuilder(getClass().getSimpleName()); | 
| 
61eedab3eb3e
Status between two revisions to recognize copy/rename
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
79diff
changeset | 239 sb.append('('); | 
| 
61eedab3eb3e
Status between two revisions to recognize copy/rename
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
79diff
changeset | 240 sb.append(getPath()); | 
| 
61eedab3eb3e
Status between two revisions to recognize copy/rename
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
79diff
changeset | 241 sb.append(')'); | 
| 
61eedab3eb3e
Status between two revisions to recognize copy/rename
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
79diff
changeset | 242 return sb.toString(); | 
| 
61eedab3eb3e
Status between two revisions to recognize copy/rename
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
79diff
changeset | 243 } | 
| 78 
c25c5c348d1b
Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 244 | 
| 88 
61eedab3eb3e
Status between two revisions to recognize copy/rename
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
79diff
changeset | 245 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: 
77diff
changeset | 246 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: 
77diff
changeset | 247 private final int valueStart; | 
| 
c25c5c348d1b
Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 248 /*package-local*/MetadataEntry(String key, String value) { | 
| 
c25c5c348d1b
Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 249 entry = key + value; | 
| 
c25c5c348d1b
Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 250 valueStart = key.length(); | 
| 
c25c5c348d1b
Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 251 } | 
| 
c25c5c348d1b
Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 252 /*package-local*/boolean matchKey(String key) { | 
| 
c25c5c348d1b
Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 253 return key.length() == valueStart && entry.startsWith(key); | 
| 
c25c5c348d1b
Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 254 } | 
| 134 
afac8ddc5dd2
Keep record if we tried and found no metadata for a given revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
133diff
changeset | 255 // 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: 
133diff
changeset | 256 // public String key() { | 
| 
afac8ddc5dd2
Keep record if we tried and found no metadata for a given revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
133diff
changeset | 257 // 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: 
133diff
changeset | 258 // } | 
| 78 
c25c5c348d1b
Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 259 public String value() { | 
| 
c25c5c348d1b
Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 260 return entry.substring(valueStart); | 
| 
c25c5c348d1b
Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 261 } | 
| 
c25c5c348d1b
Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 262 } | 
| 
c25c5c348d1b
Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 263 | 
| 
c25c5c348d1b
Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 264 private static class Metadata { | 
| 
c25c5c348d1b
Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 265 // XXX sparse array needed | 
| 79 
5f9635c01681
TreeMap are more effective when keys are unique
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
78diff
changeset | 266 private final TreeMap<Integer, Integer> offsets = new TreeMap<Integer, Integer>(); | 
| 
5f9635c01681
TreeMap are more effective when keys are unique
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
78diff
changeset | 267 private final TreeMap<Integer, MetadataEntry[]> entries = new TreeMap<Integer, MetadataEntry[]>(); | 
| 134 
afac8ddc5dd2
Keep record if we tried and found no metadata for a given revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
133diff
changeset | 268 | 
| 
afac8ddc5dd2
Keep record if we tried and found no metadata for a given revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
133diff
changeset | 269 private final Integer NONE = new Integer(-1); // do not duplicate -1 integers at least within single file (don't want statics) | 
| 
afac8ddc5dd2
Keep record if we tried and found no metadata for a given revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
133diff
changeset | 270 | 
| 
afac8ddc5dd2
Keep record if we tried and found no metadata for a given revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
133diff
changeset | 271 // 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: 
77diff
changeset | 272 boolean known(int revision) { | 
| 134 
afac8ddc5dd2
Keep record if we tried and found no metadata for a given revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
133diff
changeset | 273 Integer i = offsets.get(revision); | 
| 
afac8ddc5dd2
Keep record if we tried and found no metadata for a given revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
133diff
changeset | 274 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: 
133diff
changeset | 275 } | 
| 
afac8ddc5dd2
Keep record if we tried and found no metadata for a given revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
133diff
changeset | 276 | 
| 
afac8ddc5dd2
Keep record if we tried and found no metadata for a given revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
133diff
changeset | 277 // 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: 
133diff
changeset | 278 public boolean checked(int revision) { | 
| 78 
c25c5c348d1b
Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 279 return offsets.containsKey(revision); | 
| 
c25c5c348d1b
Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 280 } | 
| 134 
afac8ddc5dd2
Keep record if we tried and found no metadata for a given revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
133diff
changeset | 281 | 
| 
afac8ddc5dd2
Keep record if we tried and found no metadata for a given revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
133diff
changeset | 282 // 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: 
133diff
changeset | 283 boolean none(int revision) { | 
| 
afac8ddc5dd2
Keep record if we tried and found no metadata for a given revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
133diff
changeset | 284 Integer i = offsets.get(revision); | 
| 
afac8ddc5dd2
Keep record if we tried and found no metadata for a given revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
133diff
changeset | 285 return i == NONE; | 
| 
afac8ddc5dd2
Keep record if we tried and found no metadata for a given revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
133diff
changeset | 286 } | 
| 
afac8ddc5dd2
Keep record if we tried and found no metadata for a given revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
133diff
changeset | 287 | 
| 
afac8ddc5dd2
Keep record if we tried and found no metadata for a given revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
133diff
changeset | 288 // 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: 
133diff
changeset | 289 void recordNone(int revision) { | 
| 
afac8ddc5dd2
Keep record if we tried and found no metadata for a given revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
133diff
changeset | 290 Integer i = offsets.get(revision); | 
| 
afac8ddc5dd2
Keep record if we tried and found no metadata for a given revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
133diff
changeset | 291 if (i == NONE) { | 
| 
afac8ddc5dd2
Keep record if we tried and found no metadata for a given revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
133diff
changeset | 292 return; // already there | 
| 
afac8ddc5dd2
Keep record if we tried and found no metadata for a given revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
133diff
changeset | 293 } | 
| 
afac8ddc5dd2
Keep record if we tried and found no metadata for a given revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
133diff
changeset | 294 if (i != null) { | 
| 
afac8ddc5dd2
Keep record if we tried and found no metadata for a given revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
133diff
changeset | 295 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: 
133diff
changeset | 296 } | 
| 
afac8ddc5dd2
Keep record if we tried and found no metadata for a given revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
133diff
changeset | 297 offsets.put(revision, NONE); | 
| 
afac8ddc5dd2
Keep record if we tried and found no metadata for a given revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
133diff
changeset | 298 } | 
| 
afac8ddc5dd2
Keep record if we tried and found no metadata for a given revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
133diff
changeset | 299 | 
| 78 
c25c5c348d1b
Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 300 // 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: 
77diff
changeset | 301 int dataOffset(int revision) { | 
| 
c25c5c348d1b
Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 302 return offsets.get(revision); | 
| 
c25c5c348d1b
Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 303 } | 
| 
c25c5c348d1b
Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 304 void add(int revision, int dataOffset, Collection<MetadataEntry> e) { | 
| 134 
afac8ddc5dd2
Keep record if we tried and found no metadata for a given revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
133diff
changeset | 305 assert !offsets.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: 
77diff
changeset | 306 offsets.put(revision, dataOffset); | 
| 
c25c5c348d1b
Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 307 entries.put(revision, e.toArray(new MetadataEntry[e.size()])); | 
| 
c25c5c348d1b
Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 308 } | 
| 
c25c5c348d1b
Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 309 String find(int revision, String key) { | 
| 
c25c5c348d1b
Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 310 for (MetadataEntry me : entries.get(revision)) { | 
| 
c25c5c348d1b
Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 311 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: 
77diff
changeset | 312 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: 
77diff
changeset | 313 } | 
| 
c25c5c348d1b
Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 314 } | 
| 
c25c5c348d1b
Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 315 return null; | 
| 
c25c5c348d1b
Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 316 } | 
| 
c25c5c348d1b
Skip metadata in the beginning of a file content. Parse metadata, recognize copies/renames
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 317 } | 
| 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>diff
changeset | 318 | 
| 
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>diff
changeset | 319 private static class MetadataContentPipe extends ContentPipe { | 
| 
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>diff
changeset | 320 | 
| 
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>diff
changeset | 321 private final Metadata metadata; | 
| 
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>diff
changeset | 322 | 
| 
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>diff
changeset | 323 public MetadataContentPipe(ByteChannel sink, Metadata _metadata) { | 
| 
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>diff
changeset | 324 super(sink, 0); | 
| 
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>diff
changeset | 325 metadata = _metadata; | 
| 
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>diff
changeset | 326 } | 
| 
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>diff
changeset | 327 | 
| 
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>diff
changeset | 328 @Override | 
| 
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>diff
changeset | 329 protected void prepare(int revisionNumber, DataAccess da) throws HgException, IOException { | 
| 158 
b413b16d10a5
Integer offsets and file length explictly, rather than casts throughout code. Inflater may benefit from total length hint, but shall calculate it by its own if needed
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
157diff
changeset | 330 final int daLength = da.length(); | 
| 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>diff
changeset | 331 if (daLength < 4 || da.readByte() != 1 || da.readByte() != 10) { | 
| 
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>diff
changeset | 332 metadata.recordNone(revisionNumber); | 
| 
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>diff
changeset | 333 da.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>diff
changeset | 334 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>diff
changeset | 335 } | 
| 
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>diff
changeset | 336 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>diff
changeset | 337 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>diff
changeset | 338 ArrayList<MetadataEntry> _metadata = new ArrayList<MetadataEntry>(); | 
| 
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>diff
changeset | 339 // 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>diff
changeset | 340 // 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>diff
changeset | 341 // (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>diff
changeset | 342 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>diff
changeset | 343 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>diff
changeset | 344 boolean byteOne = false; | 
| 
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>diff
changeset | 345 for (int i = 2; i < daLength; 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>diff
changeset | 346 byte b = da.readByte(); | 
| 
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>diff
changeset | 347 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>diff
changeset | 348 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>diff
changeset | 349 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>diff
changeset | 350 // XXX is it possible to have here incomplete key/value (i.e. if last pair didn't end with \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>diff
changeset | 351 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>diff
changeset | 352 } | 
| 
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>diff
changeset | 353 if (key == null || lastColon == -1 || i <= lastColon) { | 
| 
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>diff
changeset | 354 throw new IllegalStateException(); // FIXME log instead and record null key in the metadata. Ex just to fail fast during dev | 
| 
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>diff
changeset | 355 } | 
| 
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>diff
changeset | 356 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>diff
changeset | 357 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>diff
changeset | 358 _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>diff
changeset | 359 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>diff
changeset | 360 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>diff
changeset | 361 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>diff
changeset | 362 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>diff
changeset | 363 } | 
| 
d5268ca7715b
Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com>diff
changeset | 364 // byteOne has to be consumed up to this line, if not jet, consume it | 
| 
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>diff
changeset | 365 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>diff
changeset | 366 // 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>diff
changeset | 367 bos.write(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>diff
changeset | 368 // 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>diff
changeset | 369 byteOne = false; | 
| 
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>diff
changeset | 370 } | 
| 
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>diff
changeset | 371 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>diff
changeset | 372 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>diff
changeset | 373 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>diff
changeset | 374 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>diff
changeset | 375 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>diff
changeset | 376 } 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>diff
changeset | 377 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>diff
changeset | 378 } 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>diff
changeset | 379 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>diff
changeset | 380 } | 
| 
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>diff
changeset | 381 } | 
| 
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>diff
changeset | 382 _metadata.trimToSize(); | 
| 
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>diff
changeset | 383 metadata.add(revisionNumber, lastEntryStart, _metadata); | 
| 
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>diff
changeset | 384 if (da.isEmpty() || !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>diff
changeset | 385 throw new HgDataStreamException(String.format("Metadata for revision %d is not closed properly", revisionNumber), 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>diff
changeset | 386 } | 
| 
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>diff
changeset | 387 // da is in prepared state (i.e. we consumed all bytes up to metadata end). | 
| 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: 
5diff
changeset | 388 } | 
| 
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: 
5diff
changeset | 389 } | 
| 2 
08db726a0fb7
Shaping out low-level Hg structures
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 390 } | 
