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

comparison src/org/tmatesoft/hg/repo/HgWorkingCopyStatusCollector.java @ 456:909306e412e2

Refactor LogFacility and SessionContext, better API for both

author	Artem Tikhomirov <tikhomirov.artem@gmail.com>
date	Mon, 18 Jun 2012 16:54:00 +0200
parents	12f668401613
children	7bcfbc255f48

comparison

equal deleted inserted replaced

-:36fd1fd06492
+:909306e412e2
 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.util.LogFacility.Severity.*;
 import java.io.File;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.channels.ReadableByteChannel;
 import java.util.TreeSet;
 import org.tmatesoft.hg.core.Nodeid;
 import org.tmatesoft.hg.core.SessionContext;
 import org.tmatesoft.hg.internal.ByteArrayChannel;
-import org.tmatesoft.hg.internal.Experimental;
 import org.tmatesoft.hg.internal.FilterByteChannel;
 import org.tmatesoft.hg.internal.Internals;
 import org.tmatesoft.hg.internal.ManifestRevision;
 import org.tmatesoft.hg.internal.PathPool;
 import org.tmatesoft.hg.internal.PathScope;
 						} else {
 							inspector.clean(df.getPath());
 						}
 					}
 				} catch (HgRuntimeException ex) {
-					repo.getContext().getLog().warn(getClass(), ex, null);
+					repo.getContext().getLog().dump(getClass(), Warn, ex, null);
 					inspector.invalid(fname, ex);
 				}
 			}
 		} else if ((r = getDirstateImpl().checkAdded(fname)) != null) {
 			if (r.copySource() == null) {
 						inspector.clean(fname);
 					} else {
 						inspector.modified(fname);
 					}
 				} catch (HgRuntimeException ex) {
-					repo.getContext().getLog().warn(getClass(), ex, null);
+					repo.getContext().getLog().dump(getClass(), Warn, 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
 								exp = new String(data, max(0, x - 4), min(data.length - x, 20));
 							} else {
 								int offset = max(0, x - 4);
 								exp = new String(data, offset, min(data.length - offset, 20));
 							}
-							repo.getContext().getLog().debug(getClass(), "expected >>%s<< but got >>%s<<", exp, new String(xx));
+							repo.getContext().getLog().dump(getClass(), Debug, "expected >>%s<< but got >>%s<<", exp, new String(xx));
 						}
 						sameSoFar = false;
 						break;
 					}
 				}
 				}
 				// reset channel to read once again
 				try {
 					is.close();
 				} catch (IOException ex) {
-					repo.getContext().getLog().info(getClass(), ex, null);
+					repo.getContext().getLog().dump(getClass(), Info, ex, null);
 				}
 				is = f.newInputChannel();
 				fb.clear();
 			}
 			while (is.read(fb) != -1 && check.sameSoFar()) {
 				filters.write(fb);
 				fb.compact();
 			}
 			return check.ultimatelyTheSame();
 		} catch (CancelledException ex) {
-			repo.getContext().getLog().warn(getClass(), ex, "Unexpected cancellation");
+			repo.getContext().getLog().dump(getClass(), Warn, ex, "Unexpected cancellation");
 			return check.ultimatelyTheSame();
 		} catch (IOException ex) {
 			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);
+					repo.getContext().getLog().dump(getClass(), Info, ex, null);
 				}
 			}
 		}
 	}
 	 * @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()) {
 	 * (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

Mercurial > jhg

comparison src/org/tmatesoft/hg/repo/HgWorkingCopyStatusCollector.java @ 456:909306e412e2