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

annotate src/org/tmatesoft/hg/repo/HgStatusCollector.java @ 418:528b6780a8bd

A bit of FIXME cleanup (mostly degraded to TODO post 1.0), comments and javadoc

author	Artem Tikhomirov <tikhomirov.artem@gmail.com>
date	Thu, 22 Mar 2012 21:02:20 +0100
parents	866fc3b597a0
children	9c9c442b5f2e

rev	line source
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	1 /*
396 0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 367 diff changeset	2 * Copyright (c) 2011-2012 TMate Software Ltd
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	3 *
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 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: 68 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: 68 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: 68 diff changeset	7 *
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 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: 68 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: 68 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: 68 diff changeset	11 * GNU General Public License for more details.
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	12 *
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 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: 68 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: 94 diff changeset	15 * contact TMate Software at support@hg4j.com
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	16 */
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	17 package org.tmatesoft.hg.repo;
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	18
403 2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	19 import static org.tmatesoft.hg.repo.HgRepository.*;
68 0e499fed9b3d StatusCommand with tests. Extra constants to indicate common revision cases Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 64 diff changeset	20
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	21 import java.util.Collection;
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	22 import java.util.Collections;
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	23 import java.util.LinkedHashMap;
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	24 import java.util.LinkedList;
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	25 import java.util.List;
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	26 import java.util.Map;
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	27 import java.util.TreeSet;
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	28
285 6dbbc53fc46d Use Path instead of plain String for manifest file names Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 284 diff changeset	29 import org.tmatesoft.hg.core.HgBadStateException;
354 5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 320 diff changeset	30 import org.tmatesoft.hg.core.HgException;
5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 320 diff changeset	31 import org.tmatesoft.hg.core.HgInvalidControlFileException;
403 2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	32 import org.tmatesoft.hg.core.HgInvalidRevisionException;
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	33 import org.tmatesoft.hg.core.Nodeid;
281 81e9a3c9bafe Utilize IntMap when caching manifest revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 248 diff changeset	34 import org.tmatesoft.hg.internal.IntMap;
248 3fbfce107f94 Issue 8: Means to find out information about given file at specific changeset. Inner ManifestRevisionInspector got promoted to ManifestRevision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 229 diff changeset	35 import org.tmatesoft.hg.internal.ManifestRevision;
195 c9b305df0b89 Optimization: use ParentWalker to get changeset's parents, if possible. Do not keep duplicating nodeids and strings in manifest revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 157 diff changeset	36 import org.tmatesoft.hg.internal.Pool;
133 4a948ec83980 core.Path to util.Path as it's not Hg repo dependant Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 102 diff changeset	37 import org.tmatesoft.hg.util.Path;
93 d55d4eedfc57 Switch to Path instead of String in filenames returned by various status operations Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 90 diff changeset	38 import org.tmatesoft.hg.util.PathPool;
d55d4eedfc57 Switch to Path instead of String in filenames returned by various status operations Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 90 diff changeset	39 import org.tmatesoft.hg.util.PathRewrite;
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	40
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	41
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	42 /**
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	43 * RevisionWalker?
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	44 *
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	45 * @author Artem Tikhomirov
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	46 * @author TMate Software Ltd.
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	47 */
94 af1f3b78b918 StatusCollector renamed to HgStatusCollector Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 93 diff changeset	48 public class HgStatusCollector {
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	49
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	50 private final HgRepository repo;
281 81e9a3c9bafe Utilize IntMap when caching manifest revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 248 diff changeset	51 private final IntMap<ManifestRevision> cache; // sparse array, in fact
195 c9b305df0b89 Optimization: use ParentWalker to get changeset's parents, if possible. Do not keep duplicating nodeids and strings in manifest revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 157 diff changeset	52 // with cpython repository, ~70 000 changes, complete Log (direct out, no reverse) output
c9b305df0b89 Optimization: use ParentWalker to get changeset's parents, if possible. Do not keep duplicating nodeids and strings in manifest revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 157 diff changeset	53 // no cache limit, no nodeids and fname caching - OOME on changeset 1035
c9b305df0b89 Optimization: use ParentWalker to get changeset's parents, if possible. Do not keep duplicating nodeids and strings in manifest revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 157 diff changeset	54 // no cache limit, but with cached nodeids and filenames - 1730+
c9b305df0b89 Optimization: use ParentWalker to get changeset's parents, if possible. Do not keep duplicating nodeids and strings in manifest revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 157 diff changeset	55 // cache limit 100 - 19+ minutes to process 10000, and still working (too long, stopped)
197 3a7696fb457c Investigate optimization options to allow fast processing of huge repositories. Fix defect in StatusCollector that lead to wrong result comparing first revision to empty repo (-1 to 0), due to same TIP constant value Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 195 diff changeset	56 private final int cacheMaxSize = 50; // do not keep too much manifest revisions
93 d55d4eedfc57 Switch to Path instead of String in filenames returned by various status operations Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 90 diff changeset	57 private PathPool pathPool;
195 c9b305df0b89 Optimization: use ParentWalker to get changeset's parents, if possible. Do not keep duplicating nodeids and strings in manifest revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 157 diff changeset	58 private final Pool<Nodeid> cacheNodes;
285 6dbbc53fc46d Use Path instead of plain String for manifest file names Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 284 diff changeset	59 private final Pool<Path> cacheFilenames;
248 3fbfce107f94 Issue 8: Means to find out information about given file at specific changeset. Inner ManifestRevisionInspector got promoted to ManifestRevision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 229 diff changeset	60 private final ManifestRevision emptyFakeState;
229 1ec6b327a6ac Scope for status reworked: explicit files or a general matcher Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 226 diff changeset	61 private Path.Matcher scope = new Path.Matcher.Any();
195 c9b305df0b89 Optimization: use ParentWalker to get changeset's parents, if possible. Do not keep duplicating nodeids and strings in manifest revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 157 diff changeset	62
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	63
94 af1f3b78b918 StatusCollector renamed to HgStatusCollector Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 93 diff changeset	64 public HgStatusCollector(HgRepository hgRepo) {
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	65 this.repo = hgRepo;
281 81e9a3c9bafe Utilize IntMap when caching manifest revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 248 diff changeset	66 cache = new IntMap<ManifestRevision>(cacheMaxSize);
195 c9b305df0b89 Optimization: use ParentWalker to get changeset's parents, if possible. Do not keep duplicating nodeids and strings in manifest revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 157 diff changeset	67 cacheNodes = new Pool<Nodeid>();
285 6dbbc53fc46d Use Path instead of plain String for manifest file names Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 284 diff changeset	68 cacheFilenames = new Pool<Path>();
197 3a7696fb457c Investigate optimization options to allow fast processing of huge repositories. Fix defect in StatusCollector that lead to wrong result comparing first revision to empty repo (-1 to 0), due to same TIP constant value Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 195 diff changeset	69
284 7232b94f2ae3 HgDirstate shall operate with Path instead of String for file names. Use of Pair instead of array of unspecified length for parents. Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 282 diff changeset	70 emptyFakeState = createEmptyManifestRevision();
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	71 }
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	72
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 59 diff changeset	73 public HgRepository getRepo() {
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 59 diff changeset	74 return repo;
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 59 diff changeset	75 }
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 59 diff changeset	76
366 189dc6dc1c3e Use exceptions to expose errors reading mercurial data Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 360 diff changeset	77 private ManifestRevision get(int rev) throws HgInvalidControlFileException {
248 3fbfce107f94 Issue 8: Means to find out information about given file at specific changeset. Inner ManifestRevisionInspector got promoted to ManifestRevision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 229 diff changeset	78 ManifestRevision i = cache.get(rev);
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	79 if (i == null) {
405 866fc3b597a0 Add an explicit constant instead of -1 to indicate 'no revision' case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 403 diff changeset	80 if (rev == NO_REVISION) {
197 3a7696fb457c Investigate optimization options to allow fast processing of huge repositories. Fix defect in StatusCollector that lead to wrong result comparing first revision to empty repo (-1 to 0), due to same TIP constant value Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 195 diff changeset	81 return emptyFakeState;
3a7696fb457c Investigate optimization options to allow fast processing of huge repositories. Fix defect in StatusCollector that lead to wrong result comparing first revision to empty repo (-1 to 0), due to same TIP constant value Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 195 diff changeset	82 }
281 81e9a3c9bafe Utilize IntMap when caching manifest revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 248 diff changeset	83 ensureCacheSize();
248 3fbfce107f94 Issue 8: Means to find out information about given file at specific changeset. Inner ManifestRevisionInspector got promoted to ManifestRevision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 229 diff changeset	84 i = new ManifestRevision(cacheNodes, cacheFilenames);
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	85 cache.put(rev, i);
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	86 repo.getManifest().walk(rev, rev, i);
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	87 }
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	88 return i;
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	89 }
197 3a7696fb457c Investigate optimization options to allow fast processing of huge repositories. Fix defect in StatusCollector that lead to wrong result comparing first revision to empty repo (-1 to 0), due to same TIP constant value Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 195 diff changeset	90
3a7696fb457c Investigate optimization options to allow fast processing of huge repositories. Fix defect in StatusCollector that lead to wrong result comparing first revision to empty repo (-1 to 0), due to same TIP constant value Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 195 diff changeset	91 private boolean cached(int revision) {
405 866fc3b597a0 Add an explicit constant instead of -1 to indicate 'no revision' case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 403 diff changeset	92 return cache.containsKey(revision) \|\| revision == NO_REVISION;
197 3a7696fb457c Investigate optimization options to allow fast processing of huge repositories. Fix defect in StatusCollector that lead to wrong result comparing first revision to empty repo (-1 to 0), due to same TIP constant value Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 195 diff changeset	93 }
3a7696fb457c Investigate optimization options to allow fast processing of huge repositories. Fix defect in StatusCollector that lead to wrong result comparing first revision to empty repo (-1 to 0), due to same TIP constant value Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 195 diff changeset	94
281 81e9a3c9bafe Utilize IntMap when caching manifest revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 248 diff changeset	95 private void ensureCacheSize() {
81e9a3c9bafe Utilize IntMap when caching manifest revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 248 diff changeset	96 if (cache.size() > cacheMaxSize) {
81e9a3c9bafe Utilize IntMap when caching manifest revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 248 diff changeset	97 // assume usually we go from oldest to newest, hence remove oldest as most likely to be no longer necessary
81e9a3c9bafe Utilize IntMap when caching manifest revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 248 diff changeset	98 cache.removeFromStart(cache.size() - cacheMaxSize + 1 /* room for new element */);
81e9a3c9bafe Utilize IntMap when caching manifest revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 248 diff changeset	99 }
81e9a3c9bafe Utilize IntMap when caching manifest revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 248 diff changeset	100 }
81e9a3c9bafe Utilize IntMap when caching manifest revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 248 diff changeset	101
366 189dc6dc1c3e Use exceptions to expose errors reading mercurial data Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 360 diff changeset	102 private void initCacheRange(int minRev, int maxRev) throws HgInvalidControlFileException {
281 81e9a3c9bafe Utilize IntMap when caching manifest revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 248 diff changeset	103 ensureCacheSize();
302 a7a3395a519e Walk explicit revisions to avoid troubles with unnatural repositories Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 285 diff changeset	104 // In fact, walk(minRev, maxRev) doesn't imply
a7a3395a519e Walk explicit revisions to avoid troubles with unnatural repositories Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 285 diff changeset	105 // there would be maxRev-minRev+1 revisions visited. For example,
a7a3395a519e Walk explicit revisions to avoid troubles with unnatural repositories Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 285 diff changeset	106 // check cpython repo with 'hg log -r 22418:22420 --debug' and admire
a7a3395a519e Walk explicit revisions to avoid troubles with unnatural repositories Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 285 diff changeset	107 // manifest revisions 66650, 21683, 21684. Thus, innocent walk(22418,22420) results in 40k+ revisions and OOME
a7a3395a519e Walk explicit revisions to avoid troubles with unnatural repositories Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 285 diff changeset	108 // Instead, be explicit of what revisions are of interest
a7a3395a519e Walk explicit revisions to avoid troubles with unnatural repositories Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 285 diff changeset	109 assert minRev <= maxRev;
a7a3395a519e Walk explicit revisions to avoid troubles with unnatural repositories Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 285 diff changeset	110 int[] revisionsToCollect = new int[maxRev - minRev + 1];
a7a3395a519e Walk explicit revisions to avoid troubles with unnatural repositories Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 285 diff changeset	111 for (int x = minRev, i = 0; x <= maxRev; i++, x++) {
a7a3395a519e Walk explicit revisions to avoid troubles with unnatural repositories Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 285 diff changeset	112 revisionsToCollect[i] = x;
a7a3395a519e Walk explicit revisions to avoid troubles with unnatural repositories Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 285 diff changeset	113 }
a7a3395a519e Walk explicit revisions to avoid troubles with unnatural repositories Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 285 diff changeset	114 repo.getManifest().walk(new HgManifest.Inspector2() {
248 3fbfce107f94 Issue 8: Means to find out information about given file at specific changeset. Inner ManifestRevisionInspector got promoted to ManifestRevision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 229 diff changeset	115 private ManifestRevision delegate;
197 3a7696fb457c Investigate optimization options to allow fast processing of huge repositories. Fix defect in StatusCollector that lead to wrong result comparing first revision to empty repo (-1 to 0), due to same TIP constant value Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 195 diff changeset	116 private boolean cacheHit; // range may include revisions we already know about, do not re-create them
3a7696fb457c Investigate optimization options to allow fast processing of huge repositories. Fix defect in StatusCollector that lead to wrong result comparing first revision to empty repo (-1 to 0), due to same TIP constant value Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 195 diff changeset	117
222 373e07cd3991 Due to discrepancy in manifest and changelor indexes, wrong manifest revisions got cached and compared Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 221 diff changeset	118 public boolean begin(int manifestRevision, Nodeid nid, int changelogRevision) {
197 3a7696fb457c Investigate optimization options to allow fast processing of huge repositories. Fix defect in StatusCollector that lead to wrong result comparing first revision to empty repo (-1 to 0), due to same TIP constant value Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 195 diff changeset	119 assert delegate == null;
405 866fc3b597a0 Add an explicit constant instead of -1 to indicate 'no revision' case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 403 diff changeset	120 if (cache.containsKey(changelogRevision)) { // don't need to check emptyFakeState hit as revision never NO_REVISION here
197 3a7696fb457c Investigate optimization options to allow fast processing of huge repositories. Fix defect in StatusCollector that lead to wrong result comparing first revision to empty repo (-1 to 0), due to same TIP constant value Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 195 diff changeset	121 cacheHit = true;
3a7696fb457c Investigate optimization options to allow fast processing of huge repositories. Fix defect in StatusCollector that lead to wrong result comparing first revision to empty repo (-1 to 0), due to same TIP constant value Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 195 diff changeset	122 } else {
248 3fbfce107f94 Issue 8: Means to find out information about given file at specific changeset. Inner ManifestRevisionInspector got promoted to ManifestRevision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 229 diff changeset	123 cache.put(changelogRevision, delegate = new ManifestRevision(cacheNodes, cacheFilenames));
197 3a7696fb457c Investigate optimization options to allow fast processing of huge repositories. Fix defect in StatusCollector that lead to wrong result comparing first revision to empty repo (-1 to 0), due to same TIP constant value Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 195 diff changeset	124 // cache may grow bigger than max size here, but it's ok as present simplistic cache clearing mechanism may
3a7696fb457c Investigate optimization options to allow fast processing of huge repositories. Fix defect in StatusCollector that lead to wrong result comparing first revision to empty repo (-1 to 0), due to same TIP constant value Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 195 diff changeset	125 // otherwise remove entries we just added
222 373e07cd3991 Due to discrepancy in manifest and changelor indexes, wrong manifest revisions got cached and compared Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 221 diff changeset	126 delegate.begin(manifestRevision, nid, changelogRevision);
197 3a7696fb457c Investigate optimization options to allow fast processing of huge repositories. Fix defect in StatusCollector that lead to wrong result comparing first revision to empty repo (-1 to 0), due to same TIP constant value Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 195 diff changeset	127 cacheHit = false;
3a7696fb457c Investigate optimization options to allow fast processing of huge repositories. Fix defect in StatusCollector that lead to wrong result comparing first revision to empty repo (-1 to 0), due to same TIP constant value Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 195 diff changeset	128 }
3a7696fb457c Investigate optimization options to allow fast processing of huge repositories. Fix defect in StatusCollector that lead to wrong result comparing first revision to empty repo (-1 to 0), due to same TIP constant value Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 195 diff changeset	129 return true;
3a7696fb457c Investigate optimization options to allow fast processing of huge repositories. Fix defect in StatusCollector that lead to wrong result comparing first revision to empty repo (-1 to 0), due to same TIP constant value Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 195 diff changeset	130 }
3a7696fb457c Investigate optimization options to allow fast processing of huge repositories. Fix defect in StatusCollector that lead to wrong result comparing first revision to empty repo (-1 to 0), due to same TIP constant value Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 195 diff changeset	131
3a7696fb457c Investigate optimization options to allow fast processing of huge repositories. Fix defect in StatusCollector that lead to wrong result comparing first revision to empty repo (-1 to 0), due to same TIP constant value Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 195 diff changeset	132 public boolean next(Nodeid nid, String fname, String flags) {
285 6dbbc53fc46d Use Path instead of plain String for manifest file names Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 284 diff changeset	133 throw new HgBadStateException(HgManifest.Inspector2.class.getName());
6dbbc53fc46d Use Path instead of plain String for manifest file names Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 284 diff changeset	134 }
6dbbc53fc46d Use Path instead of plain String for manifest file names Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 284 diff changeset	135
6dbbc53fc46d Use Path instead of plain String for manifest file names Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 284 diff changeset	136 public boolean next(Nodeid nid, Path fname, HgManifest.Flags flags) {
197 3a7696fb457c Investigate optimization options to allow fast processing of huge repositories. Fix defect in StatusCollector that lead to wrong result comparing first revision to empty repo (-1 to 0), due to same TIP constant value Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 195 diff changeset	137 if (!cacheHit) {
3a7696fb457c Investigate optimization options to allow fast processing of huge repositories. Fix defect in StatusCollector that lead to wrong result comparing first revision to empty repo (-1 to 0), due to same TIP constant value Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 195 diff changeset	138 delegate.next(nid, fname, flags);
3a7696fb457c Investigate optimization options to allow fast processing of huge repositories. Fix defect in StatusCollector that lead to wrong result comparing first revision to empty repo (-1 to 0), due to same TIP constant value Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 195 diff changeset	139 }
3a7696fb457c Investigate optimization options to allow fast processing of huge repositories. Fix defect in StatusCollector that lead to wrong result comparing first revision to empty repo (-1 to 0), due to same TIP constant value Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 195 diff changeset	140 return true;
3a7696fb457c Investigate optimization options to allow fast processing of huge repositories. Fix defect in StatusCollector that lead to wrong result comparing first revision to empty repo (-1 to 0), due to same TIP constant value Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 195 diff changeset	141 }
3a7696fb457c Investigate optimization options to allow fast processing of huge repositories. Fix defect in StatusCollector that lead to wrong result comparing first revision to empty repo (-1 to 0), due to same TIP constant value Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 195 diff changeset	142
3a7696fb457c Investigate optimization options to allow fast processing of huge repositories. Fix defect in StatusCollector that lead to wrong result comparing first revision to empty repo (-1 to 0), due to same TIP constant value Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 195 diff changeset	143 public boolean end(int revision) {
3a7696fb457c Investigate optimization options to allow fast processing of huge repositories. Fix defect in StatusCollector that lead to wrong result comparing first revision to empty repo (-1 to 0), due to same TIP constant value Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 195 diff changeset	144 if (!cacheHit) {
3a7696fb457c Investigate optimization options to allow fast processing of huge repositories. Fix defect in StatusCollector that lead to wrong result comparing first revision to empty repo (-1 to 0), due to same TIP constant value Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 195 diff changeset	145 delegate.end(revision);
3a7696fb457c Investigate optimization options to allow fast processing of huge repositories. Fix defect in StatusCollector that lead to wrong result comparing first revision to empty repo (-1 to 0), due to same TIP constant value Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 195 diff changeset	146 }
3a7696fb457c Investigate optimization options to allow fast processing of huge repositories. Fix defect in StatusCollector that lead to wrong result comparing first revision to empty repo (-1 to 0), due to same TIP constant value Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 195 diff changeset	147 cacheHit = false;
3a7696fb457c Investigate optimization options to allow fast processing of huge repositories. Fix defect in StatusCollector that lead to wrong result comparing first revision to empty repo (-1 to 0), due to same TIP constant value Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 195 diff changeset	148 delegate = null;
3a7696fb457c Investigate optimization options to allow fast processing of huge repositories. Fix defect in StatusCollector that lead to wrong result comparing first revision to empty repo (-1 to 0), due to same TIP constant value Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 195 diff changeset	149 return true;
3a7696fb457c Investigate optimization options to allow fast processing of huge repositories. Fix defect in StatusCollector that lead to wrong result comparing first revision to empty repo (-1 to 0), due to same TIP constant value Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 195 diff changeset	150 }
302 a7a3395a519e Walk explicit revisions to avoid troubles with unnatural repositories Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 285 diff changeset	151 }, revisionsToCollect);
197 3a7696fb457c Investigate optimization options to allow fast processing of huge repositories. Fix defect in StatusCollector that lead to wrong result comparing first revision to empty repo (-1 to 0), due to same TIP constant value Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 195 diff changeset	152 }
56 576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 55 diff changeset	153
284 7232b94f2ae3 HgDirstate shall operate with Path instead of String for file names. Use of Pair instead of array of unspecified length for parents. Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 282 diff changeset	154 /package-local/ static ManifestRevision createEmptyManifestRevision() {
7232b94f2ae3 HgDirstate shall operate with Path instead of String for file names. Use of Pair instead of array of unspecified length for parents. Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 282 diff changeset	155 ManifestRevision fakeEmptyRev = new ManifestRevision(null, null);
405 866fc3b597a0 Add an explicit constant instead of -1 to indicate 'no revision' case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 403 diff changeset	156 fakeEmptyRev.begin(NO_REVISION, null, NO_REVISION);
866fc3b597a0 Add an explicit constant instead of -1 to indicate 'no revision' case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 403 diff changeset	157 fakeEmptyRev.end(NO_REVISION);
284 7232b94f2ae3 HgDirstate shall operate with Path instead of String for file names. Use of Pair instead of array of unspecified length for parents. Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 282 diff changeset	158 return fakeEmptyRev;
7232b94f2ae3 HgDirstate shall operate with Path instead of String for file names. Use of Pair instead of array of unspecified length for parents. Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 282 diff changeset	159 }
7232b94f2ae3 HgDirstate shall operate with Path instead of String for file names. Use of Pair instead of array of unspecified length for parents. Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 282 diff changeset	160
405 866fc3b597a0 Add an explicit constant instead of -1 to indicate 'no revision' case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 403 diff changeset	161 /**
866fc3b597a0 Add an explicit constant instead of -1 to indicate 'no revision' case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 403 diff changeset	162 * Access specific manifest revision
866fc3b597a0 Add an explicit constant instead of -1 to indicate 'no revision' case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 403 diff changeset	163 * @param rev
866fc3b597a0 Add an explicit constant instead of -1 to indicate 'no revision' case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 403 diff changeset	164 * @return
866fc3b597a0 Add an explicit constant instead of -1 to indicate 'no revision' case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 403 diff changeset	165 * @throws HgInvalidControlFileException
866fc3b597a0 Add an explicit constant instead of -1 to indicate 'no revision' case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 403 diff changeset	166 */
366 189dc6dc1c3e Use exceptions to expose errors reading mercurial data Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 360 diff changeset	167 /package-local/ ManifestRevision raw(int rev) throws HgInvalidControlFileException {
59 b771e94a4f7c Introduce Internals to keep LocalHgRepo casts and alike in a single place. WCSC optionally to reuse SC data Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 56 diff changeset	168 return get(rev);
b771e94a4f7c Introduce Internals to keep LocalHgRepo casts and alike in a single place. WCSC optionally to reuse SC data Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 56 diff changeset	169 }
93 d55d4eedfc57 Switch to Path instead of String in filenames returned by various status operations Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 90 diff changeset	170 /package-local/ PathPool getPathPool() {
d55d4eedfc57 Switch to Path instead of String in filenames returned by various status operations Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 90 diff changeset	171 if (pathPool == null) {
d55d4eedfc57 Switch to Path instead of String in filenames returned by various status operations Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 90 diff changeset	172 pathPool = new PathPool(new PathRewrite.Empty());
d55d4eedfc57 Switch to Path instead of String in filenames returned by various status operations Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 90 diff changeset	173 }
d55d4eedfc57 Switch to Path instead of String in filenames returned by various status operations Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 90 diff changeset	174 return pathPool;
d55d4eedfc57 Switch to Path instead of String in filenames returned by various status operations Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 90 diff changeset	175 }
d55d4eedfc57 Switch to Path instead of String in filenames returned by various status operations Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 90 diff changeset	176
142 37a34044e6bd More reasonable use of path normalizer and path.source Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 141 diff changeset	177 /**
37a34044e6bd More reasonable use of path normalizer and path.source Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 141 diff changeset	178 * Allows sharing of a common path cache
37a34044e6bd More reasonable use of path normalizer and path.source Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 141 diff changeset	179 */
93 d55d4eedfc57 Switch to Path instead of String in filenames returned by various status operations Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 90 diff changeset	180 public void setPathPool(PathPool pathPool) {
d55d4eedfc57 Switch to Path instead of String in filenames returned by various status operations Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 90 diff changeset	181 this.pathPool = pathPool;
d55d4eedfc57 Switch to Path instead of String in filenames returned by various status operations Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 90 diff changeset	182 }
229 1ec6b327a6ac Scope for status reworked: explicit files or a general matcher Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 226 diff changeset	183
1ec6b327a6ac Scope for status reworked: explicit files or a general matcher Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 226 diff changeset	184 /**
1ec6b327a6ac Scope for status reworked: explicit files or a general matcher Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 226 diff changeset	185 * Limit activity of the collector to certain sub-tree of the repository.
1ec6b327a6ac Scope for status reworked: explicit files or a general matcher Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 226 diff changeset	186 * @param scopeMatcher tells whether collector shall report specific path, can be <code>null</code>
1ec6b327a6ac Scope for status reworked: explicit files or a general matcher Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 226 diff changeset	187 */
1ec6b327a6ac Scope for status reworked: explicit files or a general matcher Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 226 diff changeset	188 public void setScope(Path.Matcher scopeMatcher) {
1ec6b327a6ac Scope for status reworked: explicit files or a general matcher Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 226 diff changeset	189 // do not assign null, ever
1ec6b327a6ac Scope for status reworked: explicit files or a general matcher Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 226 diff changeset	190 scope = scopeMatcher == null ? new Path.Matcher.Any() : scopeMatcher;
1ec6b327a6ac Scope for status reworked: explicit files or a general matcher Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 226 diff changeset	191 }
59 b771e94a4f7c Introduce Internals to keep LocalHgRepo casts and alike in a single place. WCSC optionally to reuse SC data Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 56 diff changeset	192
403 2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	193 /**
2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	194 * 'hg status --change REV' command counterpart.
2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	195 *
2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	196 * @throws HgInvalidRevisionException if argument specifies non-existent revision index
2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	197 * @throws HgInvalidControlFileException if access to revlog index/data entry failed
2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	198 */
2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	199 public void change(int revisionIndex, HgStatusInspector inspector) throws HgInvalidRevisionException, HgInvalidControlFileException {
405 866fc3b597a0 Add an explicit constant instead of -1 to indicate 'no revision' case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 403 diff changeset	200 int p;
866fc3b597a0 Add an explicit constant instead of -1 to indicate 'no revision' case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 403 diff changeset	201 if (revisionIndex == 0) {
866fc3b597a0 Add an explicit constant instead of -1 to indicate 'no revision' case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 403 diff changeset	202 p = NO_REVISION;
866fc3b597a0 Add an explicit constant instead of -1 to indicate 'no revision' case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 403 diff changeset	203 } else {
866fc3b597a0 Add an explicit constant instead of -1 to indicate 'no revision' case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 403 diff changeset	204 int[] parents = new int[2];
866fc3b597a0 Add an explicit constant instead of -1 to indicate 'no revision' case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 403 diff changeset	205 repo.getChangelog().parents(revisionIndex, parents, null, null);
866fc3b597a0 Add an explicit constant instead of -1 to indicate 'no revision' case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 403 diff changeset	206 // #parents call above is responsible for NO_REVISION
866fc3b597a0 Add an explicit constant instead of -1 to indicate 'no revision' case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 403 diff changeset	207 p = parents[0]; // hg --change alsways uses first parent, despite the fact there might be valid (-1, 18) pair of parents
866fc3b597a0 Add an explicit constant instead of -1 to indicate 'no revision' case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 403 diff changeset	208 }
866fc3b597a0 Add an explicit constant instead of -1 to indicate 'no revision' case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 403 diff changeset	209 walk(p, revisionIndex, inspector);
56 576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 55 diff changeset	210 }
197 3a7696fb457c Investigate optimization options to allow fast processing of huge repositories. Fix defect in StatusCollector that lead to wrong result comparing first revision to empty repo (-1 to 0), due to same TIP constant value Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 195 diff changeset	211
403 2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	212 /**
2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	213 * Parameters <b>rev1</b> and <b>rev2</b> are changelog revision indexes, shall not be the same. Argument order matters.
405 866fc3b597a0 Add an explicit constant instead of -1 to indicate 'no revision' case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 403 diff changeset	214 * Either rev1 or rev2 may be {@link HgRepository#NO_REVISION} to indicate comparison to empty repository
866fc3b597a0 Add an explicit constant instead of -1 to indicate 'no revision' case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 403 diff changeset	215 *
866fc3b597a0 Add an explicit constant instead of -1 to indicate 'no revision' case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 403 diff changeset	216 * FIXME cancellation (at least exception)?
403 2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	217 *
2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	218 * @param rev1 <em>from</em> changeset index, non-negative or {@link HgRepository#TIP}
2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	219 * @param rev2 <em>to</em> changeset index, non-negative or {@link HgRepository#TIP}
2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	220 * @param inspector callback for status information
2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	221 * @throws HgInvalidRevisionException if any argument specifies non-existent revision index
2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	222 * @throws IllegalArgumentException inspector other incorrect argument values
2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	223 * @throws HgInvalidControlFileException if access to revlog index/data entry failed
2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	224 */
2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	225 public void walk(int rev1, int rev2, HgStatusInspector inspector) throws HgInvalidRevisionException, HgInvalidControlFileException {
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	226 if (rev1 == rev2) {
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	227 throw new IllegalArgumentException();
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	228 }
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 59 diff changeset	229 if (inspector == null) {
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 59 diff changeset	230 throw new IllegalArgumentException();
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 59 diff changeset	231 }
403 2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	232 final int lastChangelogRevision = repo.getChangelog().getLastRevision();
68 0e499fed9b3d StatusCommand with tests. Extra constants to indicate common revision cases Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 64 diff changeset	233 if (rev1 == TIP) {
403 2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	234 rev1 = lastChangelogRevision;
68 0e499fed9b3d StatusCommand with tests. Extra constants to indicate common revision cases Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 64 diff changeset	235 }
0e499fed9b3d StatusCommand with tests. Extra constants to indicate common revision cases Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 64 diff changeset	236 if (rev2 == TIP) {
403 2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	237 rev2 = lastChangelogRevision;
2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	238 }
405 866fc3b597a0 Add an explicit constant instead of -1 to indicate 'no revision' case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 403 diff changeset	239 if (rev1 != NO_REVISION && (HgInternals.wrongRevisionIndex(rev1) \|\| rev1 == WORKING_COPY \|\| rev1 == BAD_REVISION \|\| rev1 > lastChangelogRevision)) {
403 2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	240 throw new HgInvalidRevisionException(rev1);
2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	241 }
405 866fc3b597a0 Add an explicit constant instead of -1 to indicate 'no revision' case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 403 diff changeset	242 if (rev2 != NO_REVISION && (HgInternals.wrongRevisionIndex(rev2) \|\| rev2 == WORKING_COPY \|\| rev2 == BAD_REVISION \|\| rev2 > lastChangelogRevision)) {
403 2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	243 throw new HgInvalidRevisionException(rev2);
68 0e499fed9b3d StatusCommand with tests. Extra constants to indicate common revision cases Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 64 diff changeset	244 }
282 e51dd9a14b6f Yet another WC status fix, where dirstate parent and base revision are treated right (dirstate parent other than tip and explicit baseRevision are not the same) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 281 diff changeset	245 if (inspector instanceof Record) {
e51dd9a14b6f Yet another WC status fix, where dirstate parent and base revision are treated right (dirstate parent other than tip and explicit baseRevision are not the same) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 281 diff changeset	246 ((Record) inspector).init(rev1, rev2, this);
e51dd9a14b6f Yet another WC status fix, where dirstate parent and base revision are treated right (dirstate parent other than tip and explicit baseRevision are not the same) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 281 diff changeset	247 }
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	248 // in fact, rev1 and rev2 are often next (or close) to each other,
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	249 // thus, we can optimize Manifest reads here (manifest.walk(rev1, rev2))
248 3fbfce107f94 Issue 8: Means to find out information about given file at specific changeset. Inner ManifestRevisionInspector got promoted to ManifestRevision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 229 diff changeset	250 ManifestRevision r1, r2 ;
197 3a7696fb457c Investigate optimization options to allow fast processing of huge repositories. Fix defect in StatusCollector that lead to wrong result comparing first revision to empty repo (-1 to 0), due to same TIP constant value Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 195 diff changeset	251 boolean need1 = !cached(rev1), need2 = !cached(rev2);
3a7696fb457c Investigate optimization options to allow fast processing of huge repositories. Fix defect in StatusCollector that lead to wrong result comparing first revision to empty repo (-1 to 0), due to same TIP constant value Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 195 diff changeset	252 if (need1 \|\| need2) {
3a7696fb457c Investigate optimization options to allow fast processing of huge repositories. Fix defect in StatusCollector that lead to wrong result comparing first revision to empty repo (-1 to 0), due to same TIP constant value Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 195 diff changeset	253 int minRev, maxRev;
3a7696fb457c Investigate optimization options to allow fast processing of huge repositories. Fix defect in StatusCollector that lead to wrong result comparing first revision to empty repo (-1 to 0), due to same TIP constant value Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 195 diff changeset	254 if (need1 && need2 && Math.abs(rev1 - rev2) < 5 /subjective equivalent of 'close enough'/) {
3a7696fb457c Investigate optimization options to allow fast processing of huge repositories. Fix defect in StatusCollector that lead to wrong result comparing first revision to empty repo (-1 to 0), due to same TIP constant value Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 195 diff changeset	255 minRev = rev1 < rev2 ? rev1 : rev2;
3a7696fb457c Investigate optimization options to allow fast processing of huge repositories. Fix defect in StatusCollector that lead to wrong result comparing first revision to empty repo (-1 to 0), due to same TIP constant value Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 195 diff changeset	256 maxRev = minRev == rev1 ? rev2 : rev1;
3a7696fb457c Investigate optimization options to allow fast processing of huge repositories. Fix defect in StatusCollector that lead to wrong result comparing first revision to empty repo (-1 to 0), due to same TIP constant value Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 195 diff changeset	257 if (minRev > 0) {
3a7696fb457c Investigate optimization options to allow fast processing of huge repositories. Fix defect in StatusCollector that lead to wrong result comparing first revision to empty repo (-1 to 0), due to same TIP constant value Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 195 diff changeset	258 minRev--; // expand range a bit
3a7696fb457c Investigate optimization options to allow fast processing of huge repositories. Fix defect in StatusCollector that lead to wrong result comparing first revision to empty repo (-1 to 0), due to same TIP constant value Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 195 diff changeset	259 }
3a7696fb457c Investigate optimization options to allow fast processing of huge repositories. Fix defect in StatusCollector that lead to wrong result comparing first revision to empty repo (-1 to 0), due to same TIP constant value Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 195 diff changeset	260 initCacheRange(minRev, maxRev);
3a7696fb457c Investigate optimization options to allow fast processing of huge repositories. Fix defect in StatusCollector that lead to wrong result comparing first revision to empty repo (-1 to 0), due to same TIP constant value Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 195 diff changeset	261 need1 = need2 = false;
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	262 }
197 3a7696fb457c Investigate optimization options to allow fast processing of huge repositories. Fix defect in StatusCollector that lead to wrong result comparing first revision to empty repo (-1 to 0), due to same TIP constant value Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 195 diff changeset	263 // either both unknown and far from each other, or just one of them.
3a7696fb457c Investigate optimization options to allow fast processing of huge repositories. Fix defect in StatusCollector that lead to wrong result comparing first revision to empty repo (-1 to 0), due to same TIP constant value Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 195 diff changeset	264 // read with neighbors to save potential subsequent calls for neighboring elements
3a7696fb457c Investigate optimization options to allow fast processing of huge repositories. Fix defect in StatusCollector that lead to wrong result comparing first revision to empty repo (-1 to 0), due to same TIP constant value Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 195 diff changeset	265 // XXX perhaps, if revlog.baseRevision is cheap, shall expand minRev up to baseRevision
3a7696fb457c Investigate optimization options to allow fast processing of huge repositories. Fix defect in StatusCollector that lead to wrong result comparing first revision to empty repo (-1 to 0), due to same TIP constant value Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 195 diff changeset	266 // which going to be read anyway
3a7696fb457c Investigate optimization options to allow fast processing of huge repositories. Fix defect in StatusCollector that lead to wrong result comparing first revision to empty repo (-1 to 0), due to same TIP constant value Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 195 diff changeset	267 if (need1) {
3a7696fb457c Investigate optimization options to allow fast processing of huge repositories. Fix defect in StatusCollector that lead to wrong result comparing first revision to empty repo (-1 to 0), due to same TIP constant value Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 195 diff changeset	268 minRev = rev1;
403 2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	269 maxRev = rev1 < lastChangelogRevision-5 ? rev1+5 : lastChangelogRevision;
197 3a7696fb457c Investigate optimization options to allow fast processing of huge repositories. Fix defect in StatusCollector that lead to wrong result comparing first revision to empty repo (-1 to 0), due to same TIP constant value Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 195 diff changeset	270 initCacheRange(minRev, maxRev);
3a7696fb457c Investigate optimization options to allow fast processing of huge repositories. Fix defect in StatusCollector that lead to wrong result comparing first revision to empty repo (-1 to 0), due to same TIP constant value Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 195 diff changeset	271 }
3a7696fb457c Investigate optimization options to allow fast processing of huge repositories. Fix defect in StatusCollector that lead to wrong result comparing first revision to empty repo (-1 to 0), due to same TIP constant value Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 195 diff changeset	272 if (need2) {
3a7696fb457c Investigate optimization options to allow fast processing of huge repositories. Fix defect in StatusCollector that lead to wrong result comparing first revision to empty repo (-1 to 0), due to same TIP constant value Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 195 diff changeset	273 minRev = rev2;
403 2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	274 maxRev = rev2 < lastChangelogRevision-5 ? rev2+5 : lastChangelogRevision;
197 3a7696fb457c Investigate optimization options to allow fast processing of huge repositories. Fix defect in StatusCollector that lead to wrong result comparing first revision to empty repo (-1 to 0), due to same TIP constant value Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 195 diff changeset	275 initCacheRange(minRev, maxRev);
3a7696fb457c Investigate optimization options to allow fast processing of huge repositories. Fix defect in StatusCollector that lead to wrong result comparing first revision to empty repo (-1 to 0), due to same TIP constant value Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 195 diff changeset	276 }
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	277 }
89 42bcb4bffd17 Refactored to simplify manifest collector Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 88 diff changeset	278 r1 = get(rev1);
42bcb4bffd17 Refactored to simplify manifest collector Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 88 diff changeset	279 r2 = get(rev2);
42bcb4bffd17 Refactored to simplify manifest collector Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 88 diff changeset	280
285 6dbbc53fc46d Use Path instead of plain String for manifest file names Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 284 diff changeset	281 TreeSet<Path> r1Files = new TreeSet<Path>(r1.files());
6dbbc53fc46d Use Path instead of plain String for manifest file names Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 284 diff changeset	282 for (Path r2fname : r2.files()) {
6dbbc53fc46d Use Path instead of plain String for manifest file names Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 284 diff changeset	283 if (!scope.accept(r2fname)) {
226 26ad7827a62d Support status query for a single file or a subdirectory of a repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 222 diff changeset	284 continue;
26ad7827a62d Support status query for a single file or a subdirectory of a repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 222 diff changeset	285 }
285 6dbbc53fc46d Use Path instead of plain String for manifest file names Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 284 diff changeset	286 if (r1Files.remove(r2fname)) {
6dbbc53fc46d Use Path instead of plain String for manifest file names Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 284 diff changeset	287 Nodeid nidR1 = r1.nodeid(r2fname);
6dbbc53fc46d Use Path instead of plain String for manifest file names Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 284 diff changeset	288 Nodeid nidR2 = r2.nodeid(r2fname);
6dbbc53fc46d Use Path instead of plain String for manifest file names Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 284 diff changeset	289 HgManifest.Flags flagsR1 = r1.flags(r2fname);
6dbbc53fc46d Use Path instead of plain String for manifest file names Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 284 diff changeset	290 HgManifest.Flags flagsR2 = r2.flags(r2fname);
6dbbc53fc46d Use Path instead of plain String for manifest file names Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 284 diff changeset	291 if (nidR1.equals(nidR2) && flagsR2 == flagsR1) {
6dbbc53fc46d Use Path instead of plain String for manifest file names Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 284 diff changeset	292 inspector.clean(r2fname);
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	293 } else {
285 6dbbc53fc46d Use Path instead of plain String for manifest file names Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 284 diff changeset	294 inspector.modified(r2fname);
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	295 }
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	296 } else {
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: 142 diff changeset	297 try {
285 6dbbc53fc46d Use Path instead of plain String for manifest file names Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 284 diff changeset	298 Path copyTarget = r2fname;
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: 142 diff changeset	299 Path copyOrigin = getOriginIfCopy(repo, copyTarget, r1Files, rev1);
d5268ca7715b Merged branch wrap-data-access into default 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: 142 diff changeset	300 if (copyOrigin != null) {
285 6dbbc53fc46d Use Path instead of plain String for manifest file names Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 284 diff changeset	301 inspector.copied(getPathPool().path(copyOrigin) /pipe through pool, just in case/, copyTarget);
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: 142 diff changeset	302 } 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: 142 diff changeset	303 inspector.added(copyTarget);
d5268ca7715b Merged branch wrap-data-access into default 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: 142 diff changeset	304 }
354 5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 320 diff changeset	305 } catch (HgException ex) {
360 150500515714 Report non-critical errors during status operation to handler/inspector Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 354 diff changeset	306 // record exception to a mediator and continue,
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: 142 diff changeset	307 // for a single file not to be irresolvable obstacle for a status operation
360 150500515714 Report non-critical errors during status operation to handler/inspector Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 354 diff changeset	308 inspector.invalid(r2fname, ex);
88 61eedab3eb3e Status between two revisions to recognize copy/rename Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 74 diff changeset	309 }
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	310 }
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	311 }
285 6dbbc53fc46d Use Path instead of plain String for manifest file names Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 284 diff changeset	312 for (Path r1fname : r1Files) {
6dbbc53fc46d Use Path instead of plain String for manifest file names Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 284 diff changeset	313 if (scope.accept(r1fname)) {
6dbbc53fc46d Use Path instead of plain String for manifest file names Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 284 diff changeset	314 inspector.removed(r1fname);
226 26ad7827a62d Support status query for a single file or a subdirectory of a repository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 222 diff changeset	315 }
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	316 }
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	317 }
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	318
403 2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	319 /**
2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	320 * Collects status between two revisions, changes from <b>rev1</b> up to <b>rev2</b>.
2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	321 *
2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	322 * @param rev1 <em>from</em> changeset index
2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	323 * @param rev2 <em>to</em> changeset index
2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	324 * @return information object that describes change between the revisions
2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	325 * @throws HgInvalidRevisionException if any argument specifies non-existent revision index
2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	326 * @throws HgInvalidControlFileException if access to revlog index/data entry failed
2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	327 */
2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	328 public Record status(int rev1, int rev2) throws HgInvalidRevisionException, HgInvalidControlFileException {
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	329 Record rv = new Record();
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	330 walk(rev1, rev2, rv);
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	331 return rv;
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	332 }
90 a95c700408a9 Correctly report copy/rename events for rev..working copy case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 89 diff changeset	333
396 0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 367 diff changeset	334 /package-local/static Path getOriginIfCopy(HgRepository hgRepo, Path fname, Collection<Path> originals, int originalChangelogRevision) throws HgException {
90 a95c700408a9 Correctly report copy/rename events for rev..working copy case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 89 diff changeset	335 HgDataFile df = hgRepo.getFileNode(fname);
320 678e326fd27c Issue 15: Exception accessing oddly named file from history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 316 diff changeset	336 if (!df.exists()) {
678e326fd27c Issue 15: Exception accessing oddly named file from history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 316 diff changeset	337 String msg = String.format("Didn't find file '%s' in the repo. Perhaps, bad storage name conversion?", fname);
396 0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 367 diff changeset	338 throw new HgException(msg).setFileName(fname).setRevisionIndex(originalChangelogRevision);
320 678e326fd27c Issue 15: Exception accessing oddly named file from history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 316 diff changeset	339 }
90 a95c700408a9 Correctly report copy/rename events for rev..working copy case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 89 diff changeset	340 while (df.isCopy()) {
a95c700408a9 Correctly report copy/rename events for rev..working copy case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 89 diff changeset	341 Path original = df.getCopySourceName();
285 6dbbc53fc46d Use Path instead of plain String for manifest file names Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 284 diff changeset	342 if (originals.contains(original)) {
90 a95c700408a9 Correctly report copy/rename events for rev..working copy case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 89 diff changeset	343 df = hgRepo.getFileNode(original);
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	344 int changelogRevision = df.getChangesetRevisionIndex(0);
90 a95c700408a9 Correctly report copy/rename events for rev..working copy case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 89 diff changeset	345 if (changelogRevision <= originalChangelogRevision) {
a95c700408a9 Correctly report copy/rename events for rev..working copy case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 89 diff changeset	346 // copy/rename source was known prior to rev1
a95c700408a9 Correctly report copy/rename events for rev..working copy case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 89 diff changeset	347 // (both r1Files.contains is true and original was created earlier than rev1)
a95c700408a9 Correctly report copy/rename events for rev..working copy case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 89 diff changeset	348 // without r1Files.contains changelogRevision <= rev1 won't suffice as the file
a95c700408a9 Correctly report copy/rename events for rev..working copy case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 89 diff changeset	349 // might get removed somewhere in between (changelogRevision < R < rev1)
141 8248aae33f7d Adopt FileIterator moving towards WCStatusCollector parameterizing. Improved path handling, move 'em around Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 135 diff changeset	350 return original;
90 a95c700408a9 Correctly report copy/rename events for rev..working copy case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 89 diff changeset	351 }
a95c700408a9 Correctly report copy/rename events for rev..working copy case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 89 diff changeset	352 break; // copy/rename done later
a95c700408a9 Correctly report copy/rename events for rev..working copy case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 89 diff changeset	353 }
a95c700408a9 Correctly report copy/rename events for rev..working copy case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 89 diff changeset	354 df = hgRepo.getFileNode(original); // try more steps away
a95c700408a9 Correctly report copy/rename events for rev..working copy case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 89 diff changeset	355 }
a95c700408a9 Correctly report copy/rename events for rev..working copy case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 89 diff changeset	356 return null;
a95c700408a9 Correctly report copy/rename events for rev..working copy case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 89 diff changeset	357 }
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	358
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	359 // XXX for r1..r2 status, only modified, added, removed (and perhaps, clean) make sense
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	360 // XXX Need to specify whether copy targets are in added or not (@see Inspector#copied above)
316 ee6b467c1a5f Supply HGFileRevision with copy information when possible, calculate it otherwise Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 303 diff changeset	361 /**
ee6b467c1a5f Supply HGFileRevision with copy information when possible, calculate it otherwise Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 303 diff changeset	362 * Straightforward {@link HgStatusInspector} implementation that collects all status values.
ee6b467c1a5f Supply HGFileRevision with copy information when possible, calculate it otherwise Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 303 diff changeset	363 *
ee6b467c1a5f Supply HGFileRevision with copy information when possible, calculate it otherwise Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 303 diff changeset	364 * <p>Naturally, {@link Record Records} originating from {@link HgStatusCollector} would report only <em>modified, added,
ee6b467c1a5f Supply HGFileRevision with copy information when possible, calculate it otherwise Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 303 diff changeset	365 * removed</em> and <em>clean</em> values, other are available only when using {@link Record} with {@link HgWorkingCopyStatusCollector}.
ee6b467c1a5f Supply HGFileRevision with copy information when possible, calculate it otherwise Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 303 diff changeset	366 *
ee6b467c1a5f Supply HGFileRevision with copy information when possible, calculate it otherwise Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 303 diff changeset	367 * <p>Note, this implementation records copied files as added, thus key values in {@link #getCopied()} map are subset of paths
ee6b467c1a5f Supply HGFileRevision with copy information when possible, calculate it otherwise Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 303 diff changeset	368 * from {@link #getAdded()}.
ee6b467c1a5f Supply HGFileRevision with copy information when possible, calculate it otherwise Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 303 diff changeset	369 */
93 d55d4eedfc57 Switch to Path instead of String in filenames returned by various status operations Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 90 diff changeset	370 public static class Record implements HgStatusInspector {
d55d4eedfc57 Switch to Path instead of String in filenames returned by various status operations Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 90 diff changeset	371 private List<Path> modified, added, removed, clean, missing, unknown, ignored;
d55d4eedfc57 Switch to Path instead of String in filenames returned by various status operations Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 90 diff changeset	372 private Map<Path, Path> copied;
360 150500515714 Report non-critical errors during status operation to handler/inspector Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 354 diff changeset	373 private Map<Path, Exception> failures;
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	374
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 59 diff changeset	375 private int startRev, endRev;
94 af1f3b78b918 StatusCollector renamed to HgStatusCollector Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 93 diff changeset	376 private HgStatusCollector statusHelper;
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 59 diff changeset	377
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 59 diff changeset	378 // XXX StatusCollector may additionally initialize Record instance to speed lookup of changed file revisions
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 59 diff changeset	379 // here I need access to ManifestRevisionInspector via #raw(). Perhaps, non-static class (to get
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 59 diff changeset	380 // implicit reference to StatusCollector) may be better?
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 59 diff changeset	381 // Since users may want to reuse Record instance we've once created (and initialized), we need to
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 59 diff changeset	382 // ensure functionality is correct for each/any call (#walk checks instanceof Record and fixes it up)
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 59 diff changeset	383 // Perhaps, distinct helper (sc.getRevisionHelper().nodeid(fname)) would be better, just not clear
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 59 diff changeset	384 // how to supply [start..end] values there easily
94 af1f3b78b918 StatusCollector renamed to HgStatusCollector Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 93 diff changeset	385 /package-local/void init(int startRevision, int endRevision, HgStatusCollector self) {
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 59 diff changeset	386 startRev = startRevision;
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 59 diff changeset	387 endRev = endRevision;
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 59 diff changeset	388 statusHelper = self;
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 59 diff changeset	389 }
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 59 diff changeset	390
366 189dc6dc1c3e Use exceptions to expose errors reading mercurial data Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 360 diff changeset	391 public Nodeid nodeidBeforeChange(Path fname) throws HgInvalidControlFileException {
68 0e499fed9b3d StatusCommand with tests. Extra constants to indicate common revision cases Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 64 diff changeset	392 if (statusHelper == null \|\| startRev == BAD_REVISION) {
0e499fed9b3d StatusCommand with tests. Extra constants to indicate common revision cases Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 64 diff changeset	393 return null;
0e499fed9b3d StatusCommand with tests. Extra constants to indicate common revision cases Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 64 diff changeset	394 }
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 59 diff changeset	395 if ((modified == null \|\| !modified.contains(fname)) && (removed == null \|\| !removed.contains(fname))) {
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 59 diff changeset	396 return null;
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 59 diff changeset	397 }
285 6dbbc53fc46d Use Path instead of plain String for manifest file names Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 284 diff changeset	398 return statusHelper.raw(startRev).nodeid(fname);
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 59 diff changeset	399 }
366 189dc6dc1c3e Use exceptions to expose errors reading mercurial data Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 360 diff changeset	400 public Nodeid nodeidAfterChange(Path fname) throws HgInvalidControlFileException {
68 0e499fed9b3d StatusCommand with tests. Extra constants to indicate common revision cases Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 64 diff changeset	401 if (statusHelper == null \|\| endRev == BAD_REVISION) {
0e499fed9b3d StatusCommand with tests. Extra constants to indicate common revision cases Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 64 diff changeset	402 return null;
0e499fed9b3d StatusCommand with tests. Extra constants to indicate common revision cases Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 64 diff changeset	403 }
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 59 diff changeset	404 if ((modified == null \|\| !modified.contains(fname)) && (added == null \|\| !added.contains(fname))) {
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 59 diff changeset	405 return null;
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 59 diff changeset	406 }
285 6dbbc53fc46d Use Path instead of plain String for manifest file names Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 284 diff changeset	407 return statusHelper.raw(endRev).nodeid(fname);
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 59 diff changeset	408 }
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 59 diff changeset	409
93 d55d4eedfc57 Switch to Path instead of String in filenames returned by various status operations Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 90 diff changeset	410 public List<Path> getModified() {
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	411 return proper(modified);
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	412 }
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	413
93 d55d4eedfc57 Switch to Path instead of String in filenames returned by various status operations Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 90 diff changeset	414 public List<Path> getAdded() {
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	415 return proper(added);
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	416 }
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	417
93 d55d4eedfc57 Switch to Path instead of String in filenames returned by various status operations Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 90 diff changeset	418 public List<Path> getRemoved() {
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	419 return proper(removed);
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	420 }
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	421
316 ee6b467c1a5f Supply HGFileRevision with copy information when possible, calculate it otherwise Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 303 diff changeset	422 /**
ee6b467c1a5f Supply HGFileRevision with copy information when possible, calculate it otherwise Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 303 diff changeset	423 * Map files from {@link #getAdded()} to their original filenames, if were copied/moved.
ee6b467c1a5f Supply HGFileRevision with copy information when possible, calculate it otherwise Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 303 diff changeset	424 */
93 d55d4eedfc57 Switch to Path instead of String in filenames returned by various status operations Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 90 diff changeset	425 public Map<Path,Path> getCopied() {
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	426 if (copied == null) {
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	427 return Collections.emptyMap();
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	428 }
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	429 return Collections.unmodifiableMap(copied);
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	430 }
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	431
93 d55d4eedfc57 Switch to Path instead of String in filenames returned by various status operations Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 90 diff changeset	432 public List<Path> getClean() {
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	433 return proper(clean);
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	434 }
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	435
93 d55d4eedfc57 Switch to Path instead of String in filenames returned by various status operations Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 90 diff changeset	436 public List<Path> getMissing() {
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	437 return proper(missing);
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	438 }
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	439
93 d55d4eedfc57 Switch to Path instead of String in filenames returned by various status operations Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 90 diff changeset	440 public List<Path> getUnknown() {
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	441 return proper(unknown);
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	442 }
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	443
93 d55d4eedfc57 Switch to Path instead of String in filenames returned by various status operations Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 90 diff changeset	444 public List<Path> getIgnored() {
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	445 return proper(ignored);
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	446 }
360 150500515714 Report non-critical errors during status operation to handler/inspector Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 354 diff changeset	447
150500515714 Report non-critical errors during status operation to handler/inspector Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 354 diff changeset	448 public Map<Path, Exception> getInvalid() {
150500515714 Report non-critical errors during status operation to handler/inspector Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 354 diff changeset	449 if (failures == null) {
150500515714 Report non-critical errors during status operation to handler/inspector Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 354 diff changeset	450 return Collections.emptyMap();
150500515714 Report non-critical errors during status operation to handler/inspector Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 354 diff changeset	451 }
150500515714 Report non-critical errors during status operation to handler/inspector Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 354 diff changeset	452 return Collections.unmodifiableMap(failures);
150500515714 Report non-critical errors during status operation to handler/inspector Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 354 diff changeset	453 }
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	454
316 ee6b467c1a5f Supply HGFileRevision with copy information when possible, calculate it otherwise Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 303 diff changeset	455 private static List<Path> proper(List<Path> l) {
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	456 if (l == null) {
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	457 return Collections.emptyList();
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	458 }
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	459 return Collections.unmodifiableList(l);
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	460 }
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	461
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	462 //
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	463 //
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	464
93 d55d4eedfc57 Switch to Path instead of String in filenames returned by various status operations Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 90 diff changeset	465 public void modified(Path fname) {
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	466 modified = doAdd(modified, fname);
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	467 }
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	468
93 d55d4eedfc57 Switch to Path instead of String in filenames returned by various status operations Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 90 diff changeset	469 public void added(Path fname) {
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	470 added = doAdd(added, fname);
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	471 }
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	472
93 d55d4eedfc57 Switch to Path instead of String in filenames returned by various status operations Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 90 diff changeset	473 public void copied(Path fnameOrigin, Path fnameAdded) {
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	474 if (copied == null) {
93 d55d4eedfc57 Switch to Path instead of String in filenames returned by various status operations Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 90 diff changeset	475 copied = new LinkedHashMap<Path, Path>();
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	476 }
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	477 added(fnameAdded);
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	478 copied.put(fnameAdded, fnameOrigin);
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	479 }
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	480
93 d55d4eedfc57 Switch to Path instead of String in filenames returned by various status operations Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 90 diff changeset	481 public void removed(Path fname) {
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	482 removed = doAdd(removed, fname);
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	483 }
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	484
93 d55d4eedfc57 Switch to Path instead of String in filenames returned by various status operations Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 90 diff changeset	485 public void clean(Path fname) {
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	486 clean = doAdd(clean, fname);
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	487 }
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	488
93 d55d4eedfc57 Switch to Path instead of String in filenames returned by various status operations Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 90 diff changeset	489 public void missing(Path fname) {
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	490 missing = doAdd(missing, fname);
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	491 }
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	492
93 d55d4eedfc57 Switch to Path instead of String in filenames returned by various status operations Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 90 diff changeset	493 public void unknown(Path fname) {
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	494 unknown = doAdd(unknown, fname);
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	495 }
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	496
93 d55d4eedfc57 Switch to Path instead of String in filenames returned by various status operations Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 90 diff changeset	497 public void ignored(Path fname) {
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	498 ignored = doAdd(ignored, fname);
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	499 }
360 150500515714 Report non-critical errors during status operation to handler/inspector Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 354 diff changeset	500
150500515714 Report non-critical errors during status operation to handler/inspector Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 354 diff changeset	501 public void invalid(Path fname, Exception ex) {
150500515714 Report non-critical errors during status operation to handler/inspector Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 354 diff changeset	502 if (failures == null) {
150500515714 Report non-critical errors during status operation to handler/inspector Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 354 diff changeset	503 failures = new LinkedHashMap<Path, Exception>();
150500515714 Report non-critical errors during status operation to handler/inspector Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 354 diff changeset	504 }
150500515714 Report non-critical errors during status operation to handler/inspector Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 354 diff changeset	505 failures.put(fname, ex);
150500515714 Report non-critical errors during status operation to handler/inspector Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 354 diff changeset	506 }
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	507
93 d55d4eedfc57 Switch to Path instead of String in filenames returned by various status operations Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 90 diff changeset	508 private static List<Path> doAdd(List<Path> l, Path p) {
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	509 if (l == null) {
93 d55d4eedfc57 Switch to Path instead of String in filenames returned by various status operations Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 90 diff changeset	510 l = new LinkedList<Path>();
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	511 }
93 d55d4eedfc57 Switch to Path instead of String in filenames returned by various status operations Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 90 diff changeset	512 l.add(p);
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	513 return l;
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	514 }
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	515 }
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	516
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	517 }

Mercurial > jhg

annotate src/org/tmatesoft/hg/repo/HgStatusCollector.java @ 418:528b6780a8bd