jhg: src/org/tmatesoft/hg/repo/HgWorkingCopyStatusCollector.java comparison

comparison src/org/tmatesoft/hg/repo/HgWorkingCopyStatusCollector.java @ 229:1ec6b327a6ac

Scope for status reworked: explicit files or a general matcher

author	Artem Tikhomirov <tikhomirov.artem@gmail.com>
date	Tue, 31 May 2011 05:23:07 +0200
parents	26ad7827a62d
children	6e1373b54e9b

comparison

equal deleted inserted replaced

-:fffe4f882248
+:1ec6b327a6ac
 package org.tmatesoft.hg.repo;
 import static java.lang.Math.max;
 import static java.lang.Math.min;
 import static org.tmatesoft.hg.repo.HgRepository.*;
-import static org.tmatesoft.hg.repo.HgRepository.BAD_REVISION;
-import static org.tmatesoft.hg.repo.HgRepository.TIP;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.NoSuchElementException;
 import java.util.Set;
 import java.util.TreeSet;
 import org.tmatesoft.hg.core.HgException;
 import org.tmatesoft.hg.core.Nodeid;
 import org.tmatesoft.hg.internal.ByteArrayChannel;
 import org.tmatesoft.hg.internal.Experimental;
 import org.tmatesoft.hg.internal.FilterByteChannel;
-import org.tmatesoft.hg.internal.RelativePathRewrite;
+import org.tmatesoft.hg.internal.PathScope;
 import org.tmatesoft.hg.repo.HgStatusCollector.ManifestRevisionInspector;
 import org.tmatesoft.hg.util.ByteChannel;
 import org.tmatesoft.hg.util.CancelledException;
 import org.tmatesoft.hg.util.FileIterator;
 import org.tmatesoft.hg.util.FileWalker;
 	private HgDirstate dirstate;
 	private HgStatusCollector baseRevisionCollector;
 	private PathPool pathPool;
 	public HgWorkingCopyStatusCollector(HgRepository hgRepo) {
-		this(hgRepo, hgRepo.createWorkingDirWalker());
+		this(hgRepo, new HgInternals(hgRepo).createWorkingDirWalker(null));
 	}
-	HgWorkingCopyStatusCollector(HgRepository hgRepo, FileIterator hgRepoWalker) {
+	// FIXME document cons
+	public HgWorkingCopyStatusCollector(HgRepository hgRepo, FileIterator hgRepoWalker) {
 		repo = hgRepo;
 		repoWalker = hgRepoWalker;
 	}
 	/**
 		final PathPool pp = getPathPool();
 		while (repoWalker.hasNext()) {
 			repoWalker.next();
 			Path fname = pp.path(repoWalker.name());
 			File f = repoWalker.file();
-			assert f.isFile();
 			if (!f.exists()) {
 				// file coming from iterator doesn't exist.
 				if (knownEntries.remove(fname.toString())) {
 					if (getDirstate().checkRemoved(fname) == null) {
 						inspector.missing(fname);
 						inspector.unknown(fname);
 					}
 				}
 				continue;
 			}
+			assert f.isFile();
 			if (knownEntries.remove(fname.toString())) {
 				// tracked file.
 				// modified, added, removed, clean
 				if (collect != null) { // need to check against base revision, not FS file
 					checkLocalStatusAgainstBaseRevision(baseRevFiles, collect, baseRevision, fname, f, inspector);
 	private static String todoGenerateFlags(Path fname) {
 		// FIXME implement
 		return null;
 	}
-	@Experimental(reason="There's intention to support status query with multiple files/dirs, API might get changed")
+	/**
-	public static HgWorkingCopyStatusCollector create(HgRepository hgRepo, Path file) {
+	 * Configure status collector to consider only subset of a working copy tree. Tries to be as effective as possible, and to
-		FileIterator fi = file.isDirectory() ? new DirFileIterator(hgRepo, file) : new FileListIterator(hgRepo.getRepositoryRoot().getParentFile(), file);
+	 * traverse only relevant part of working copy on the filesystem.
+	 *
+	 * @param hgRepo repository
+	 * @param paths repository-relative files and/or directories. Directories are processed recursively.
+	 *
+	 * @return new instance of {@link HgWorkingCopyStatusCollector}, ready to {@link #walk(int, HgStatusInspector) walk} associated working copy
+	 */
+	@Experimental(reason="Provisional API")
+	public static HgWorkingCopyStatusCollector create(HgRepository hgRepo, Path... paths) {
+		ArrayList<Path> f = new ArrayList<Path>(5);
+		ArrayList<Path> d = new ArrayList<Path>(5);
+		for (Path p : paths) {
+			if (p.isDirectory()) {
+				d.add(p);
+			} else {
+				f.add(p);
+			}
+		}
+//		final Path[] dirs = f.toArray(new Path[d.size()]);
+		if (d.isEmpty()) {
+			final Path[] files = f.toArray(new Path[f.size()]);
+			FileIterator fi = new FileListIterator(hgRepo.getRepositoryRoot().getParentFile(), files);
+			return new HgWorkingCopyStatusCollector(hgRepo, fi);
+		}
+		//
+		//FileIterator fi = file.isDirectory() ? new DirFileIterator(hgRepo, file) : new FileListIterator(, file);
+		FileIterator fi = new HgInternals(hgRepo).createWorkingDirWalker(new PathScope(true, paths));
 		return new HgWorkingCopyStatusCollector(hgRepo, fi);
+	}
+	/**
+	 * Configure collector object to calculate status for matching files only.
+	 * This method may be less effective than explicit list of files as it iterates over whole repository
+	 * (thus supplied matcher doesn't need to care if directories to files in question are also in scope,
+	 * see {@link FileWalker#FileWalker(File, Path.Source, Path.Matcher)})
+	 *
+	 * @return new instance of {@link HgWorkingCopyStatusCollector}, ready to {@link #walk(int, HgStatusInspector) walk} associated working copy
+	 */
+	@Experimental(reason="Provisional API. May add boolean strict argument for those who write smart matchers that can be used in FileWalker")
+	public static HgWorkingCopyStatusCollector create(HgRepository hgRepo, Path.Matcher scope) {
+		FileIterator w = new HgInternals(hgRepo).createWorkingDirWalker(null);
+		FileIterator wf = (scope == null || scope instanceof Path.Matcher.Any) ? w : new FileIteratorFilter(w, scope);
+		// the reason I need to iterate over full repo and apply filter is that I have no idea whatsoever about
+		// patterns in the scope. I.e. if scope lists a file (PathGlobMatcher("a/b/c.txt")), FileWalker won't get deep
+		// to the file unless matcher would also explicitly include "a/", "a/b/" in scope. Since I can't rely
+		// users would write robust matchers, and I don't see a decent way to enforce that (i.e. factory to produce
+		// correct matcher from Path is much like what PathScope does, and can be accessed directly with #create(repo, Path...)
+		// method above/
+		return new HgWorkingCopyStatusCollector(hgRepo, wf);
 	}
 	private static class FileListIterator implements FileIterator {
 		private final File dir;
 		private final Path[] paths;
 			}
 			return false;
 		}
 	}
-	private static class DirFileIterator implements FileIterator {
+	private static class FileIteratorFilter implements FileIterator {
-		private final Path dirOfInterest;
+		private final Path.Matcher filter;
-		private final FileWalker walker;
+		private final FileIterator walker;
+		private boolean didNext = false;
-		public DirFileIterator(HgRepository hgRepo, Path directory) {
-			dirOfInterest = directory;
+		public FileIteratorFilter(FileIterator fileWalker, Path.Matcher filterMatcher) {
-			File dir = hgRepo.getRepositoryRoot().getParentFile();
+			assert fileWalker != null;
-			Path.Source pathSrc = new Path.SimpleSource(new PathRewrite.Composite(new RelativePathRewrite(dir), hgRepo.getToRepoPathHelper()));
+			assert filterMatcher != null;
-			walker = new FileWalker(new File(dir, directory.toString()), pathSrc);
+			filter = filterMatcher;
+			walker = fileWalker;
 		}
 		public void reset() {
 			walker.reset();
 		}
 		public boolean hasNext() {
-			return walker.hasNext();
+			while (walker.hasNext()) {
+				walker.next();
+				if (filter.accept(walker.name())) {
+					didNext = true;
+					return true;
+				}
+			}
+			return false;
 		}
 		public void next() {
-			walker.next();
+			if (didNext) {
+				didNext = false;
+			} else {
+				if (!hasNext()) {
+					throw new NoSuchElementException();
+				}
+			}
 		}
 		public Path name() {
 			return walker.name();
 		}
 		public File file() {
 			return walker.file();
 		}
 		public boolean inScope(Path file) {
-			return file.toString().startsWith(dirOfInterest.toString());
+			return filter.accept(file);
 		}
 	}
 }

Mercurial > jhg

comparison src/org/tmatesoft/hg/repo/HgWorkingCopyStatusCollector.java @ 229:1ec6b327a6ac