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

annotate src/org/tmatesoft/hg/repo/HgStatusCollector.java @ 321:ac38e75c9e8e

Clean unused imports

author	Artem Tikhomirov <tikhomirov.artem@gmail.com>
date	Fri, 30 Sep 2011 07:59:22 +0200
parents	678e326fd27c
children	5f9073eabf06

rev	line source
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	1 /*
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	2 * Copyright (c) 2011 TMate Software Ltd
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
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	19 import static org.tmatesoft.hg.repo.HgRepository.BAD_REVISION;
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	20 import static org.tmatesoft.hg.repo.HgRepository.TIP;
68 0e499fed9b3d StatusCommand with tests. Extra constants to indicate common revision cases Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 64 diff changeset	21
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	22 import java.util.Collection;
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	23 import java.util.Collections;
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	24 import java.util.LinkedHashMap;
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	25 import java.util.LinkedList;
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	26 import java.util.List;
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	27 import java.util.Map;
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	28 import java.util.TreeSet;
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	29
285 6dbbc53fc46d Use Path instead of plain String for manifest file names Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 284 diff changeset	30 import org.tmatesoft.hg.core.HgBadStateException;
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	31 import org.tmatesoft.hg.core.HgDataStreamException;
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	32 import org.tmatesoft.hg.core.Nodeid;
281 81e9a3c9bafe Utilize IntMap when caching manifest revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 248 diff changeset	33 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	34 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	35 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	36 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	37 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	38 import org.tmatesoft.hg.util.PathRewrite;
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	39
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	40
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	41 /**
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	42 * RevisionWalker?
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	43 *
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	44 * @author Artem Tikhomirov
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	45 * @author TMate Software Ltd.
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	46 */
94 af1f3b78b918 StatusCollector renamed to HgStatusCollector Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 93 diff changeset	47 public class HgStatusCollector {
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	48
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	49 private final HgRepository repo;
281 81e9a3c9bafe Utilize IntMap when caching manifest revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 248 diff changeset	50 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	51 // 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	52 // 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	53 // 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	54 // 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	55 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	56 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	57 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	58 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	59 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	60 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	61
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	62
94 af1f3b78b918 StatusCollector renamed to HgStatusCollector Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 93 diff changeset	63 public HgStatusCollector(HgRepository hgRepo) {
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	64 this.repo = hgRepo;
281 81e9a3c9bafe Utilize IntMap when caching manifest revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 248 diff changeset	65 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	66 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	67 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	68
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	69 emptyFakeState = createEmptyManifestRevision();
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	70 }
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	71
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 59 diff changeset	72 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	73 return repo;
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 59 diff changeset	74 }
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 59 diff changeset	75
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	76 private ManifestRevision get(int rev) {
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	77 ManifestRevision i = cache.get(rev);
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	78 if (i == null) {
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	79 if (rev == -1) {
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	80 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	81 }
281 81e9a3c9bafe Utilize IntMap when caching manifest revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 248 diff changeset	82 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	83 i = new ManifestRevision(cacheNodes, cacheFilenames);
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	84 cache.put(rev, i);
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	85 repo.getManifest().walk(rev, rev, i);
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	86 }
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	87 return i;
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	88 }
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	89
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 private boolean cached(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	91 return cache.containsKey(revision) \|\| revision == -1;
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	92 }
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
281 81e9a3c9bafe Utilize IntMap when caching manifest revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 248 diff changeset	94 private void ensureCacheSize() {
81e9a3c9bafe Utilize IntMap when caching manifest revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 248 diff changeset	95 if (cache.size() > cacheMaxSize) {
81e9a3c9bafe Utilize IntMap when caching manifest revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 248 diff changeset	96 // 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	97 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	98 }
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
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	101 private void initCacheRange(int minRev, int maxRev) {
281 81e9a3c9bafe Utilize IntMap when caching manifest revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 248 diff changeset	102 ensureCacheSize();
302 a7a3395a519e Walk explicit revisions to avoid troubles with unnatural repositories Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 285 diff changeset	103 // 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	104 // 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	105 // 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	106 // 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	107 // 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	108 assert minRev <= maxRev;
a7a3395a519e Walk explicit revisions to avoid troubles with unnatural repositories Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 285 diff changeset	109 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	110 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	111 revisionsToCollect[i] = x;
a7a3395a519e Walk explicit revisions to avoid troubles with unnatural repositories Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 285 diff changeset	112 }
a7a3395a519e Walk explicit revisions to avoid troubles with unnatural repositories Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 285 diff changeset	113 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	114 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	115 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	116
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	117 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	118 assert delegate == null;
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	119 if (cache.containsKey(changelogRevision)) { // don't need to check emptyFakeState hit as revision never -1 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	120 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	121 } 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	122 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	123 // 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	124 // 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	125 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	126 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	127 }
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 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	129 }
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 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	132 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	133 }
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 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	136 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	137 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	138 }
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 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	140 }
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 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	143 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	144 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	145 }
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 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	147 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	148 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	149 }
302 a7a3395a519e Walk explicit revisions to avoid troubles with unnatural repositories Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 285 diff changeset	150 }, 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	151 }
56 576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 55 diff changeset	152
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	153 /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	154 ManifestRevision fakeEmptyRev = new ManifestRevision(null, null);
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 fakeEmptyRev.begin(-1, null, -1);
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	156 fakeEmptyRev.end(-1);
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	157 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	158 }
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
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	160 /package-local/ ManifestRevision raw(int rev) {
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	161 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	162 }
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	163 /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	164 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	165 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	166 }
d55d4eedfc57 Switch to Path instead of String in filenames returned by various status operations Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 90 diff changeset	167 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	168 }
d55d4eedfc57 Switch to Path instead of String in filenames returned by various status operations Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 90 diff changeset	169
142 37a34044e6bd More reasonable use of path normalizer and path.source Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 141 diff changeset	170 /**
37a34044e6bd More reasonable use of path normalizer and path.source Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 141 diff changeset	171 * 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	172 */
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	173 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	174 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	175 }
229 1ec6b327a6ac Scope for status reworked: explicit files or a general matcher Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 226 diff changeset	176
1ec6b327a6ac Scope for status reworked: explicit files or a general matcher Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 226 diff changeset	177 /**
1ec6b327a6ac Scope for status reworked: explicit files or a general matcher Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 226 diff changeset	178 * 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	179 * @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	180 */
1ec6b327a6ac Scope for status reworked: explicit files or a general matcher Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 226 diff changeset	181 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	182 // 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	183 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	184 }
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	185
56 576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 55 diff changeset	186 // hg status --change <rev>
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	187 public void change(int rev, HgStatusInspector inspector) {
56 576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 55 diff changeset	188 int[] parents = new int[2];
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 55 diff changeset	189 repo.getChangelog().parents(rev, parents, null, null);
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 55 diff changeset	190 walk(parents[0], rev, inspector);
576d6e8a09f6 Analog of 'hg status --change' command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 55 diff changeset	191 }
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	192
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	193 // rev1 and rev2 are changelog revision numbers, argument order matters.
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	194 // Either rev1 or rev2 may be -1 to indicate comparison to empty repository (XXX this is due to use of
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	195 // parents in #change(), I believe. Perhaps, need a constant for this? Otherwise this hidden knowledge gets
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	196 // exposed to e.g. Record
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	197 public void walk(int rev1, int rev2, HgStatusInspector inspector) {
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	198 if (rev1 == rev2) {
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	199 throw new IllegalArgumentException();
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	200 }
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 59 diff changeset	201 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	202 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	203 }
218 047b1dec7a04 Issue 7: Correctly handle manifest and changelog with different number of (or non-matching) revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	204 final int lastManifestRevision = 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	205 if (rev1 == TIP) {
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	206 rev1 = lastManifestRevision;
68 0e499fed9b3d StatusCommand with tests. Extra constants to indicate common revision cases Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 64 diff changeset	207 }
0e499fed9b3d StatusCommand with tests. Extra constants to indicate common revision cases Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 64 diff changeset	208 if (rev2 == TIP) {
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	209 rev2 = lastManifestRevision;
68 0e499fed9b3d StatusCommand with tests. Extra constants to indicate common revision cases Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 64 diff changeset	210 }
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	211 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	212 ((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	213 }
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	214 // 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	215 // 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	216 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	217 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	218 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	219 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	220 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	221 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	222 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	223 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	224 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	225 }
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	226 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	227 need1 = need2 = false;
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	228 }
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	229 // 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	230 // 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	231 // 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	232 // 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	233 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	234 minRev = 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	235 maxRev = rev1 < lastManifestRevision-5 ? rev1+5 : lastManifestRevision;
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	236 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	237 }
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	238 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	239 minRev = 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	240 maxRev = rev2 < lastManifestRevision-5 ? rev2+5 : lastManifestRevision;
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	241 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	242 }
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	243 }
89 42bcb4bffd17 Refactored to simplify manifest collector Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 88 diff changeset	244 r1 = get(rev1);
42bcb4bffd17 Refactored to simplify manifest collector Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 88 diff changeset	245 r2 = get(rev2);
42bcb4bffd17 Refactored to simplify manifest collector Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 88 diff changeset	246
285 6dbbc53fc46d Use Path instead of plain String for manifest file names Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 284 diff changeset	247 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	248 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	249 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	250 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	251 }
285 6dbbc53fc46d Use Path instead of plain String for manifest file names Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 284 diff changeset	252 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	253 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	254 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	255 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	256 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	257 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	258 inspector.clean(r2fname);
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	259 } else {
285 6dbbc53fc46d Use Path instead of plain String for manifest file names Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 284 diff changeset	260 inspector.modified(r2fname);
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	261 }
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	262 } 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	263 try {
285 6dbbc53fc46d Use Path instead of plain String for manifest file names Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 284 diff changeset	264 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	265 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	266 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	267 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	268 } 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	269 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	270 }
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	271 } catch (HgDataStreamException ex) {
d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 142 diff changeset	272 ex.printStackTrace();
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	273 // FIXME perhaps, shall record this exception to dedicated mediator and continue
d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 142 diff changeset	274 // for a single file not to be irresolvable obstacle for a status operation
88 61eedab3eb3e Status between two revisions to recognize copy/rename Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 74 diff changeset	275 }
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	276 }
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	277 }
285 6dbbc53fc46d Use Path instead of plain String for manifest file names Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 284 diff changeset	278 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	279 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	280 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	281 }
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	282 }
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	283 }
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	284
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	285 public Record status(int rev1, int rev2) {
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	286 Record rv = new Record();
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	287 walk(rev1, rev2, rv);
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	288 return rv;
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	289 }
90 a95c700408a9 Correctly report copy/rename events for rev..working copy case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 89 diff changeset	290
285 6dbbc53fc46d Use Path instead of plain String for manifest file names Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 284 diff changeset	291 /package-local/static Path getOriginIfCopy(HgRepository hgRepo, Path fname, Collection<Path> originals, int originalChangelogRevision) throws HgDataStreamException {
90 a95c700408a9 Correctly report copy/rename events for rev..working copy case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 89 diff changeset	292 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	293 if (!df.exists()) {
678e326fd27c Issue 15: Exception accessing oddly named file from history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 316 diff changeset	294 String msg = String.format("Didn't find file '%s' in the repo. Perhaps, bad storage name conversion?", fname);
678e326fd27c Issue 15: Exception accessing oddly named file from history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 316 diff changeset	295 throw new HgDataStreamException(fname, msg, null).setRevisionNumber(originalChangelogRevision);
678e326fd27c Issue 15: Exception accessing oddly named file from history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 316 diff changeset	296 }
90 a95c700408a9 Correctly report copy/rename events for rev..working copy case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 89 diff changeset	297 while (df.isCopy()) {
a95c700408a9 Correctly report copy/rename events for rev..working copy case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 89 diff changeset	298 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	299 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	300 df = hgRepo.getFileNode(original);
a95c700408a9 Correctly report copy/rename events for rev..working copy case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 89 diff changeset	301 int changelogRevision = df.getChangesetLocalRevision(0);
a95c700408a9 Correctly report copy/rename events for rev..working copy case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 89 diff changeset	302 if (changelogRevision <= originalChangelogRevision) {
a95c700408a9 Correctly report copy/rename events for rev..working copy case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 89 diff changeset	303 // 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	304 // (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	305 // 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	306 // 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	307 return original;
90 a95c700408a9 Correctly report copy/rename events for rev..working copy case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 89 diff changeset	308 }
a95c700408a9 Correctly report copy/rename events for rev..working copy case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 89 diff changeset	309 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	310 }
a95c700408a9 Correctly report copy/rename events for rev..working copy case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 89 diff changeset	311 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	312 }
a95c700408a9 Correctly report copy/rename events for rev..working copy case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 89 diff changeset	313 return null;
a95c700408a9 Correctly report copy/rename events for rev..working copy case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 89 diff changeset	314 }
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	315
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	316 // 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	317 // 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	318 /**
ee6b467c1a5f Supply HGFileRevision with copy information when possible, calculate it otherwise Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 303 diff changeset	319 * 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	320 *
ee6b467c1a5f Supply HGFileRevision with copy information when possible, calculate it otherwise Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 303 diff changeset	321 * <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	322 * 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	323 *
ee6b467c1a5f Supply HGFileRevision with copy information when possible, calculate it otherwise Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 303 diff changeset	324 * <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	325 * from {@link #getAdded()}.
ee6b467c1a5f Supply HGFileRevision with copy information when possible, calculate it otherwise Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 303 diff changeset	326 */
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	327 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	328 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	329 private Map<Path, Path> copied;
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	330
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 59 diff changeset	331 private int startRev, endRev;
94 af1f3b78b918 StatusCollector renamed to HgStatusCollector Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 93 diff changeset	332 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	333
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 59 diff changeset	334 // 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	335 // 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	336 // 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	337 // 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	338 // 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	339 // 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	340 // how to supply [start..end] values there easily
94 af1f3b78b918 StatusCollector renamed to HgStatusCollector Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 93 diff changeset	341 /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	342 startRev = startRevision;
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 59 diff changeset	343 endRev = endRevision;
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 59 diff changeset	344 statusHelper = self;
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 59 diff changeset	345 }
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 59 diff changeset	346
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	347 public Nodeid nodeidBeforeChange(Path fname) {
68 0e499fed9b3d StatusCommand with tests. Extra constants to indicate common revision cases Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 64 diff changeset	348 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	349 return null;
0e499fed9b3d StatusCommand with tests. Extra constants to indicate common revision cases Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 64 diff changeset	350 }
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 59 diff changeset	351 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	352 return null;
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 59 diff changeset	353 }
285 6dbbc53fc46d Use Path instead of plain String for manifest file names Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 284 diff changeset	354 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	355 }
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	356 public Nodeid nodeidAfterChange(Path fname) {
68 0e499fed9b3d StatusCommand with tests. Extra constants to indicate common revision cases Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 64 diff changeset	357 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	358 return null;
0e499fed9b3d StatusCommand with tests. Extra constants to indicate common revision cases Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 64 diff changeset	359 }
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 59 diff changeset	360 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	361 return null;
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 59 diff changeset	362 }
285 6dbbc53fc46d Use Path instead of plain String for manifest file names Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 284 diff changeset	363 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	364 }
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 59 diff changeset	365
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	366 public List<Path> getModified() {
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	367 return proper(modified);
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	368 }
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 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 List<Path> getAdded() {
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	371 return proper(added);
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	372 }
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	373
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	374 public List<Path> getRemoved() {
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	375 return proper(removed);
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	376 }
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	377
316 ee6b467c1a5f Supply HGFileRevision with copy information when possible, calculate it otherwise Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 303 diff changeset	378 /**
ee6b467c1a5f Supply HGFileRevision with copy information when possible, calculate it otherwise Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 303 diff changeset	379 * 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	380 */
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	381 public Map<Path,Path> getCopied() {
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	382 if (copied == null) {
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	383 return Collections.emptyMap();
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	384 }
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	385 return Collections.unmodifiableMap(copied);
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	386 }
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	387
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	388 public List<Path> getClean() {
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	389 return proper(clean);
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	390 }
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	391
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	392 public List<Path> getMissing() {
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	393 return proper(missing);
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	394 }
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	395
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	396 public List<Path> getUnknown() {
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	397 return proper(unknown);
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	398 }
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	399
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	400 public List<Path> getIgnored() {
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	401 return proper(ignored);
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	402 }
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	403
316 ee6b467c1a5f Supply HGFileRevision with copy information when possible, calculate it otherwise Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 303 diff changeset	404 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	405 if (l == null) {
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	406 return Collections.emptyList();
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	407 }
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	408 return Collections.unmodifiableList(l);
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	409 }
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	410
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	411 //
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 void modified(Path fname) {
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	415 modified = doAdd(modified, fname);
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 void added(Path fname) {
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	419 added = doAdd(added, fname);
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
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	422 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	423 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	424 copied = new LinkedHashMap<Path, Path>();
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	425 }
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	426 added(fnameAdded);
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	427 copied.put(fnameAdded, fnameOrigin);
55 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
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	430 public void removed(Path fname) {
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	431 removed = doAdd(removed, fname);
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	432 }
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	433
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	434 public void clean(Path fname) {
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	435 clean = doAdd(clean, fname);
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	436 }
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	437
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	438 public void missing(Path fname) {
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	439 missing = doAdd(missing, fname);
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	440 }
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	441
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	442 public void unknown(Path fname) {
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	443 unknown = doAdd(unknown, fname);
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	444 }
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	445
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	446 public void ignored(Path fname) {
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	447 ignored = doAdd(ignored, fname);
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	448 }
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	449
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	450 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	451 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	452 l = new LinkedList<Path>();
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	453 }
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	454 l.add(p);
55 05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	455 return l;
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	456 }
05829a70b30b Status operation extracted into separate, cache-friendly class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	457 }
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 }

Mercurial > hg4j

annotate src/org/tmatesoft/hg/repo/HgStatusCollector.java @ 321:ac38e75c9e8e