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

comparison src/org/tmatesoft/hg/repo/HgWorkingCopyStatusCollector.java @ 285:6dbbc53fc46d

Use Path instead of plain String for manifest file names

author	Artem Tikhomirov <tikhomirov.artem@gmail.com>
date	Sat, 03 Sep 2011 21:46:13 +0200
parents	7232b94f2ae3
children	ed6b74a58c66

comparison

equal deleted inserted replaced

-:7232b94f2ae3
+:6dbbc53fc46d
 	public void walk(int baseRevision, HgStatusInspector inspector) {
 		if (HgInternals.wrongLocalRevision(baseRevision) || baseRevision == BAD_REVISION) {
 			throw new IllegalArgumentException(String.valueOf(baseRevision));
 		}
 		ManifestRevision collect = null; // non null indicates we compare against base revision
-		Set<String> baseRevFiles = Collections.emptySet(); // files from base revision not affected by status calculation
+		Set<Path> baseRevFiles = Collections.emptySet(); // files from base revision not affected by status calculation
 		if (baseRevision != TIP && baseRevision != WORKING_COPY) {
 			collect = getManifest(baseRevision);
-			baseRevFiles = new TreeSet<String>(collect.files());
+			baseRevFiles = new TreeSet<Path>(collect.files());
 		}
 		if (inspector instanceof HgStatusCollector.Record) {
 			HgStatusCollector sc = baseRevisionCollector == null ? new HgStatusCollector(repo) : baseRevisionCollector;
 			// nodeidAfterChange(dirstate's parent) doesn't make too much sense,
 			// because the change might be actually in working copy. Nevertheless,
 					} else {
 						inspector.removed(fname);
 					}
 					// do not report it as removed later
 					if (collect != null) {
-						baseRevFiles.remove(fname.toString());
+						baseRevFiles.remove(fname);
 					}
 				} else {
 					// chances are it was known in baseRevision. We may rely
 					// that later iteration over baseRevFiles leftovers would yield correct Removed,
 					// but it doesn't hurt to be explicit (provided we know fname *is* inScope of the FileIterator
-					if (collect != null && baseRevFiles.remove(fname.toString())) {
+					if (collect != null && baseRevFiles.remove(fname)) {
 						inspector.removed(fname);
 					} else {
 						// not sure I shall report such files (i.e. arbitrary name coming from FileIterator)
 						// as unknown. Command-line HG aborts "system can't find the file specified"
 						// in similar case (against wc), or just gives nothing if --change <rev> is specified.
 				// from baseRevFiles, it might need to be reported as removed as well (cmdline client does
 				// yield two statuses for the same file)
 			}
 		}
 		if (collect != null) {
-			for (String r : baseRevFiles) {
+			for (Path fromBase : baseRevFiles) {
-				final Path fromBase = getPathPool().path(r);
 				if (repoWalker.inScope(fromBase)) {
 					inspector.removed(fromBase);
 				}
 			}
 		}
 				// not removed from the repository = 'deleted'
 				inspector.missing(m);
 			} else {
 				// removed from the repo
 				// if we check against non-tip revision, do not report files that were added past that revision and now removed.
-				if (collect == null || baseRevFiles.contains(m.toString())) {
+				if (collect == null || baseRevFiles.contains(m)) {
 					inspector.removed(m);
 				}
 			}
 		}
 	}
 				inspector.modified(fname);
 			} else {
 				// size is the same or unknown, and, perhaps, different timestamp
 				// check actual content to avoid false modified files
 				HgDataFile df = repo.getFileNode(fname);
-				Nodeid rev = getDirstateParentManifest().nodeid(fname.toString());
+				Nodeid rev = getDirstateParentManifest().nodeid(fname);
 				if (!areTheSame(f, df, rev)) {
 					inspector.modified(df.getPath());
 				} else {
 					inspector.clean(df.getPath());
 				}
 	private static int getFileModificationTime(File f) {
 		return (int) (f.lastModified() / 1000);
 	}
 	// XXX refactor checkLocalStatus methods in more OO way
-	private void checkLocalStatusAgainstBaseRevision(Set<String> baseRevNames, ManifestRevision collect, int baseRevision, Path fname, File f, HgStatusInspector inspector) {
+	private void checkLocalStatusAgainstBaseRevision(Set<Path> baseRevNames, ManifestRevision collect, int baseRevision, Path fname, File f, HgStatusInspector inspector) {
 		// fname is in the dirstate, either Normal, Added, Removed or Merged
-		Nodeid nid1 = collect.nodeid(fname.toString());
+		Nodeid nid1 = collect.nodeid(fname);
-		String flags = collect.flags(fname.toString());
+		HgManifest.Flags flags = collect.flags(fname);
 		HgDirstate.Record r;
 		if (nid1 == null) {
 			// normal: added?
 			// added: not known at the time of baseRevision, shall report
 			// merged: was not known, report as added?
 					// FIXME report to a mediator, continue status collection
 				}
 			} else if ((r = getDirstate().checkAdded(fname)) != null) {
 				if (r.name2 != null && baseRevNames.contains(r.name2)) {
 					baseRevNames.remove(r.name2); // XXX surely I shall not report rename source as Removed?
-					inspector.copied(getPathPool().path(r.name2), fname);
+					inspector.copied(r.name2, fname);
 					return;
 				}
 				// fall-through, report as added
 			} else if (getDirstate().checkRemoved(fname) != null) {
 				// removed: removed file was not known at the time of baseRevision, and we should not report it as removed
 				return;
 			}
 			inspector.added(fname);
 		} else {
 			// was known; check whether clean or modified
-			Nodeid nidFromDirstate = getDirstateParentManifest().nodeid(fname.toString());
+			Nodeid nidFromDirstate = getDirstateParentManifest().nodeid(fname);
 			if ((r = getDirstate().checkNormal(fname)) != null && nid1.equals(nidFromDirstate)) {
 				// regular file, was the same up to WC initialization. Check if was modified since, and, if not, report right away
 				// same code as in #checkLocalStatusAgainstFile
 				final boolean timestampEqual = getFileModificationTime(f) == r.time, sizeEqual = r.size == f.length();
 				boolean handled = false;
 					// seems like flags have changed, no reason to check content further
 					inspector.modified(fname);
 					handled = true;
 				}
 				if (handled) {
-					baseRevNames.remove(fname.toString()); // consumed, processed, handled.
+					baseRevNames.remove(fname); // consumed, processed, handled.
 					return;
 				}
 				// otherwise, shall check actual content (size not the same, or unknown (-1 or -2), or timestamp is different,
 				// or nodeid in dirstate is different, but local change might have brought it back to baseRevision state)
 				// FALL THROUGH
 				if (areTheSame(f, fileNode, nid1)) {
 					inspector.clean(fname);
 				} else {
 					inspector.modified(fname);
 				}
-				baseRevNames.remove(fname.toString()); // consumed, processed, handled.
+				baseRevNames.remove(fname); // consumed, processed, handled.
 			} else if (getDirstate().checkRemoved(fname) != null) {
 				// was known, and now marked as removed, report it right away, do not rely on baseRevNames processing later
 				inspector.removed(fname);
-				baseRevNames.remove(fname.toString()); // consumed, processed, handled.
+				baseRevNames.remove(fname); // consumed, processed, handled.
 			}
 			// only those left in baseRevNames after processing are reported as removed
 		}
 		// TODO think over if content comparison may be done more effectively by e.g. calculating nodeid for a local file and comparing it with nodeid from manifest
 			ex.printStackTrace();
 		}
 		return false;
 	}
-	private static boolean todoCheckFlagsEqual(File f, String manifestFlags) {
+	private static boolean todoCheckFlagsEqual(File f, HgManifest.Flags originalManifestFlags) {
 		// FIXME implement
 		return true;
 	}
 	/**

Mercurial > hg4j

comparison src/org/tmatesoft/hg/repo/HgWorkingCopyStatusCollector.java @ 285:6dbbc53fc46d