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

comparison src/org/tmatesoft/hg/repo/HgWorkingCopyStatusCollector.java @ 398:c76c57f6b961

Merge fixed for issue 24 and issue 26 from smartgit3 branch

author	Artem Tikhomirov <tikhomirov.artem@gmail.com>
date	Thu, 23 Feb 2012 21:53:21 +0100
parents	5e95b0da26f2
children	866fc3b597a0

comparison

equal deleted inserted replaced

-:0ae53c32ecef
+:c76c57f6b961
 /*
-* Copyright (c) 2011 TMate Software Ltd
+* Copyright (c) 2011-2012 TMate Software Ltd
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; version 2 of the License.
 *
 import java.util.Collections;
 import java.util.NoSuchElementException;
 import java.util.Set;
 import java.util.TreeSet;
-import org.tmatesoft.hg.core.HgBadStateException;
 import org.tmatesoft.hg.core.HgException;
 import org.tmatesoft.hg.core.HgInvalidControlFileException;
+import org.tmatesoft.hg.core.HgInvalidFileException;
 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.ManifestRevision;
 			if (timestampEqual && sizeEqual) {
 				inspector.clean(fname);
 			} else if (!sizeEqual && r.size() >= 0) {
 				inspector.modified(fname);
 			} else {
-				// size is the same or unknown, and, perhaps, different timestamp
+				try {
-				// check actual content to avoid false modified files
+					// size is the same or unknown, and, perhaps, different timestamp
-				HgDataFile df = repo.getFileNode(fname);
+					// check actual content to avoid false modified files
-				if (!df.exists()) {
+					HgDataFile df = repo.getFileNode(fname);
-					String msg = String.format("File %s known as normal in dirstate (%d, %d), doesn't exist at %s", fname, r.modificationTime(), r.size(), repo.getStoragePath(df));
+					if (!df.exists()) {
-					throw new HgBadStateException(msg);
+						String msg = String.format("File %s known as normal in dirstate (%d, %d), doesn't exist at %s", fname, r.modificationTime(), r.size(), repo.getStoragePath(df));
-				}
+						throw new HgInvalidFileException(msg, null).setFileName(fname);
-				Nodeid rev = getDirstateParentManifest().nodeid(fname);
+					}
-				// rev might be null here if fname comes to dirstate as a result of a merge operation
+					Nodeid rev = getDirstateParentManifest().nodeid(fname);
-				// where one of the parents (first parent) had no fname file, but second parent had.
+					// rev might be null here if fname comes to dirstate as a result of a merge operation
-				// E.g. fork revision 3, revision 4 gets .hgtags, few modifications and merge(3,12)
+					// where one of the parents (first parent) had no fname file, but second parent had.
-				// see Issue 14 for details
+					// E.g. fork revision 3, revision 4 gets .hgtags, few modifications and merge(3,12)
-				if (rev == null || !areTheSame(f, df, rev)) {
+					// see Issue 14 for details
-					inspector.modified(df.getPath());
+					if (rev == null || !areTheSame(f, df, rev)) {
-				} else {
+						inspector.modified(df.getPath());
-					inspector.clean(df.getPath());
+					} else {
+						inspector.clean(df.getPath());
+					}
+				} catch (HgException ex) {
+					repo.getContext().getLog().warn(getClass(), ex, null);
+					inspector.invalid(fname, ex);
 				}
 			}
 		} else if ((r = getDirstateImpl().checkAdded(fname)) != null) {
 			if (r.copySource() == null) {
 				inspector.added(fname);
 				// 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 (r != null || (r = getDirstateImpl().checkMerged(fname)) != null || (r = getDirstateImpl().checkAdded(fname)) != null) {
-				// check actual content to see actual changes
+				try {
-				// when added - seems to be the case of a file added once again, hence need to check if content is different
+					// check actual content to see actual changes
-				// either clean or modified
+					// when added - seems to be the case of a file added once again, hence need to check if content is different
-				HgDataFile fileNode = repo.getFileNode(fname);
+					// either clean or modified
-				if (areTheSame(f, fileNode, nid1)) {
+					HgDataFile fileNode = repo.getFileNode(fname);
-					inspector.clean(fname);
+					if (areTheSame(f, fileNode, nid1)) {
-				} else {
+						inspector.clean(fname);
-					inspector.modified(fname);
+					} else {
+						inspector.modified(fname);
+					}
+				} catch (HgException ex) {
+					repo.getContext().getLog().warn(getClass(), ex, null);
+					inspector.invalid(fname, ex);
 				}
 				baseRevNames.remove(fname); // consumed, processed, handled.
 			} else if (getDirstateImpl().checkRemoved(fname) != null) {
 				// was known, and now marked as removed, report it right away, do not rely on baseRevNames processing later
 				inspector.removed(fname);
 		// changeset nodeid + hash(actual content) => entry (Nodeid) in the next Manifest
 		// then it's sufficient to check parents from dirstate, and if they do not match parents from file's baseRevision (non matching parents means different nodeids).
 		// The question is whether original Hg treats this case (same content, different parents and hence nodeids) as 'modified' or 'clean'
 	}
-	private boolean areTheSame(FileInfo f, HgDataFile dataFile, Nodeid revision) {
+	private boolean areTheSame(FileInfo f, HgDataFile dataFile, Nodeid revision) throws HgException {
 		// XXX consider adding HgDataDile.compare(File/byte[]/whatever) operation to optimize comparison
 		ByteArrayChannel bac = new ByteArrayChannel();
-		boolean ioFailed = false;
 		try {
 			int fileRevisionIndex = dataFile.getRevisionIndex(revision);
 			// need content with metadata striped off - although theoretically chances are metadata may be different,
 			// WC doesn't have it anyway
 			dataFile.content(fileRevisionIndex, bac);
 		} catch (CancelledException ex) {
 			// silently ignore - can't happen, ByteArrayChannel is not cancellable
-		} catch (HgException ex) {
+		}
-			repo.getContext().getLog().warn(getClass(), ex, null);
+		return areTheSame(f, bac.toArray(), dataFile.getPath());
-			ioFailed = true;
+	}
-		}
-		return !ioFailed && areTheSame(f, bac.toArray(), dataFile.getPath());
+	private boolean areTheSame(FileInfo f, final byte[] data, Path p) throws HgException {
-	}
-	private boolean areTheSame(FileInfo f, final byte[] data, Path p) {
 		ReadableByteChannel is = null;
 		class Check implements ByteChannel {
 			final boolean debug = repo.getContext().getLog().isDebug();
 			boolean sameSoFar = true;
 			int x = 0;
 			return check.ultimatelyTheSame();
 		} catch (CancelledException ex) {
 			repo.getContext().getLog().warn(getClass(), ex, "Unexpected cancellation");
 			return check.ultimatelyTheSame();
 		} catch (IOException ex) {
-			repo.getContext().getLog().warn(getClass(), ex, null);
+			throw new HgInvalidFileException("File comparison failed", ex).setFileName(p);
 		} finally {
 			if (is != null) {
 				try {
 					is.close();
 				} catch (IOException ex) {
 					repo.getContext().getLog().info(getClass(), ex, null);
 				}
 			}
 		}
-		return false;
 	}
 	private static boolean todoCheckFlagsEqual(FileInfo f, HgManifest.Flags originalManifestFlags) {
 		// FIXME implement
 		return true;

Mercurial > jhg

comparison src/org/tmatesoft/hg/repo/HgWorkingCopyStatusCollector.java @ 398:c76c57f6b961