--- a/src/org/tmatesoft/hg/repo/HgDirstate.java	Mon Sep 12 14:11:45 2011 +0200
+++ b/src/org/tmatesoft/hg/repo/HgDirstate.java	Wed Sep 14 01:52:41 2011 +0200
@@ -42,7 +42,11 @@
  * @author Artem Tikhomirov
  * @author TMate Software Ltd.
  */
-class HgDirstate /* XXX RepoChangeListener */{
+public final class HgDirstate /* XXX RepoChangeListener */{
+	
+	public enum EntryKind {
+		Normal, Added, Removed, Merged, // order is being used in code of this class, don't change unless any use is checked
+	}
 
 	private final HgRepository repo;
 	private final File dirstateFile;
@@ -54,7 +58,7 @@
 	private Pair<Nodeid, Nodeid> parents;
 	private String currentBranch;
 	
-	public HgDirstate(HgRepository hgRepo, File dirstate, PathPool pathPool) {
+	/*package-local*/ HgDirstate(HgRepository hgRepo, File dirstate, PathPool pathPool) {
 		repo = hgRepo;
 		dirstateFile = dirstate; // XXX decide whether file names shall be kept local to reader (see #branches()) or passed from outside
 		this.pathPool = pathPool;
@@ -126,7 +130,7 @@
 	}
 	
 	/**
-	 * @return array of length 2 with working copy parents, non null.
+	 * @return pair of working copy parents, with {@link Nodeid#NULL} for missing values.
 	 */
 	public Pair<Nodeid,Nodeid> parents() {
 		if (parents == null) {
@@ -138,7 +142,7 @@
 	/**
 	 * @return pair of parents, both {@link Nodeid#NULL} if dirstate is not available
 	 */
-	public static Pair<Nodeid, Nodeid> readParents(HgRepository repo, File dirstateFile) {
+	/*package-local*/ static Pair<Nodeid, Nodeid> readParents(HgRepository repo, File dirstateFile) {
 		// do not read whole dirstate if all we need is WC parent information
 		if (dirstateFile == null || !dirstateFile.exists()) {
 			return new Pair<Nodeid,Nodeid>(NULL, NULL);
@@ -157,10 +161,10 @@
 	}
 	
 	/**
-	 * XXX is it really proper place for the method?
 	 * @return branch associated with the working directory
 	 */
 	public String branch() {
+		// XXX is it really proper place for the method?
 		if (currentBranch == null) {
 			currentBranch = readBranch(repo);
 		}
@@ -171,7 +175,7 @@
 	 * XXX is it really proper place for the method?
 	 * @return branch associated with the working directory
 	 */
-	public static String readBranch(HgRepository repo) {
+	/*package-local*/ static String readBranch(HgRepository repo) {
 		String branch = HgRepository.DEFAULT_BRANCH_NAME;
 		File branchFile = new File(repo.getRepositoryRoot(), "branch");
 		if (branchFile.exists()) {
@@ -193,7 +197,9 @@
 
 	// new, modifiable collection
 	/*package-local*/ TreeSet<Path> all() {
-		read();
+		if (normal == null) {
+			read();
+		}
 		TreeSet<Path> rv = new TreeSet<Path>();
 		@SuppressWarnings("unchecked")
 		Map<Path, Record>[] all = new Map[] { normal, added, removed, merged };
@@ -239,16 +245,33 @@
 		}
 	}
 	
-	/*package-local*/ static class Record {
-		final int mode;
-		// it seems Dirstate keeps local file size (i.e. that with any filters already applied). 
+	public void walk(Inspector inspector) {
+		if (normal == null) {
+			read();
+		}
+		@SuppressWarnings("unchecked")
+		Map<Path, Record>[] all = new Map[] { normal, added, removed, merged };
+		for (int i = 0; i < all.length; i++) {
+			EntryKind k = EntryKind.values()[i];
+			for (Record r : all[i].values()) {
+				if (!inspector.next(k, r)) {
+					return;
+				}
+			}
+		}
+	}
+
+	public interface Inspector {
+		boolean next(EntryKind kind, Record entry);
+	}
+
+	public static final class Record {
+		private final int mode, size, time;
+		// Dirstate keeps local file size (i.e. that with any filters already applied). 
 		// Thus, can't compare directly to HgDataFile.length()
-		final int size; 
-		final int time;
-		final Path name1;
-		final Path name2;
+		private final Path name1, name2;
 
-		public Record(int fmode, int fsize, int ftime, Path name1, Path name2) {
+		/*package-local*/ Record(int fmode, int fsize, int ftime, Path name1, Path name2) {
 			mode = fmode;
 			size = fsize;
 			time = ftime;
@@ -256,5 +279,24 @@
 			this.name2 = name2;
 			
 		}
+
+		public Path name() {
+			return name1;
+		}
+
+		/**
+		 * @return non-<code>null</code> for copy/move
+		 */
+		public Path copySource() {
+			return name2;
+		}
+
+		public int modificationTime() {
+			return time;
+		}
+
+		public int size() {
+			return size;
+		}
 	}
 }