jhg: src/org/tmatesoft/hg/internal/RevlogStream.java comparison

comparison src/org/tmatesoft/hg/internal/RevlogStream.java @ 628:6526d8adbc0f

Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions

author	Artem Tikhomirov <tikhomirov.artem@gmail.com>
date	Wed, 22 May 2013 15:52:31 +0200
parents	99ad1e3a4e4d
children	1deea2f33218

comparison

equal deleted inserted replaced

-:5153eb73b18d
+:6526d8adbc0f
 import org.tmatesoft.hg.repo.HgInternals;
 import org.tmatesoft.hg.repo.HgInvalidControlFileException;
 import org.tmatesoft.hg.repo.HgInvalidRevisionException;
 import org.tmatesoft.hg.repo.HgInvalidStateException;
 import org.tmatesoft.hg.repo.HgRepository;
+import org.tmatesoft.hg.repo.HgRuntimeException;
 import org.tmatesoft.hg.util.Adaptable;
 /**
 * ? Single RevlogStream per file per repository with accessor to record access session (e.g. with back/forward operations),
 		// system data under store/data) and system-only revlogs (like changelog and manifest), there's no
 		// easy way to supply human-friendly name of the active file (independent from whether it's index of data)
 		return inline ? indexFile.getPath() : getDataFile().getPath();
 	}
-	public boolean isInlineData() {
+	public boolean isInlineData() throws HgInvalidControlFileException {
 		initOutline();
 		return inline;
 	}
-	public int revisionCount() {
+	public int revisionCount() throws HgInvalidControlFileException {
 		initOutline();
 		return baseRevisions.length;
 	}
 	/**
 	/**
 	 * @return value suitable for the corresponding field in the new revision's header, not physical offset in the file
 	 * (which is different in case of inline revlogs)
 	 */
-	public long newEntryOffset() {
+	public long newEntryOffset() throws HgInvalidControlFileException {
 		if (revisionCount() == 0) {
 			return 0;
 		}
 		DataAccess daIndex = getIndexStream(true);
 		int lastRev = revisionCount() - 1;
 		} finally {
 			daIndex.done();
 		}
 	}
-	// should be possible to use TIP, ALL, or -1, -2, -n notation of Hg
+	/**
-	// ? boolean needsNodeid
+	 * should be possible to use TIP, ALL, or -1, -2, -n notation of Hg
-	public void iterate(int start, int end, boolean needData, Inspector inspector) throws HgInvalidRevisionException, HgInvalidControlFileException {
+	 * ? boolean needsNodeid
+	 * @throws HgRuntimeException subclass thereof to indicate issues with the library. <em>Runtime exception</em>
+	 */
+	public void iterate(int start, int end, boolean needData, Inspector inspector) throws HgRuntimeException {
 		initOutline();
 		final int indexSize = revisionCount();
 		if (indexSize == 0) {
 			return;
 		}
 	 * Effective alternative to {@link #iterate(int, int, boolean, Inspector) batch read}, when only few selected
 	 * revisions are of interest.
 	 * @param sortedRevisions revisions to walk, in ascending order.
 	 * @param needData whether inspector needs access to header only
 	 * @param inspector callback to process entries
-	 */
+	 * @throws HgRuntimeException subclass thereof to indicate issues with the library. <em>Runtime exception</em>
-	public void iterate(int[] sortedRevisions, boolean needData, Inspector inspector) throws HgInvalidRevisionException, HgInvalidControlFileException /*REVISIT - too general exception*/ {
+	 */
+	public void iterate(int[] sortedRevisions, boolean needData, Inspector inspector) throws HgRuntimeException {
 		final int indexSize = revisionCount();
 		if (indexSize == 0 || sortedRevisions.length == 0) {
 			return;
 		}
 		if (sortedRevisions[0] > indexSize) {
 	 */
 	private int getIndexOffsetInt(int revisionIndex) {
 		return inline ? indexRecordOffset[revisionIndex] : revisionIndex * REVLOGV1_RECORD_SIZE;
 	}
-	private int checkRevisionIndex(int revisionIndex) throws HgInvalidRevisionException {
+	private int checkRevisionIndex(int revisionIndex) throws HgInvalidControlFileException, HgInvalidRevisionException {
 		final int last = revisionCount() - 1;
 		if (revisionIndex == TIP) {
 			revisionIndex = last;
 		}
 		if (revisionIndex < 0 || revisionIndex > last) {
 			}
 			return userDataAccess;
 		}
 		// may be invoked few times per instance life
-		public boolean range(int start, int end) throws IOException {
+		public boolean range(int start, int end) throws IOException, HgRuntimeException {
 			int i;
 			// it (i.e. replace with i >= start)
 			if (needData && (i = getBaseRevision(start)) < start) {
 				// if lastRevisionRead in [baseRevision(start), start)  can reuse lastUserData
 				// doesn't make sense to reuse if lastRevisionRead == start (too much to change in the cycle below).
 		 * @param parent2Revision index of second parent revision in this revlog, or {@link HgRepository#NO_REVISION}
 		 * @param nodeid 20-byte buffer, shared between invocations
 		 * @param data access to revision content of actualLen size, or <code>null</code> if no data has been requested with
 		 *        {@link RevlogStream#iterate(int[], boolean, Inspector)}
 		 */
-		void next(int revisionIndex, int actualLen, int baseRevision, int linkRevision, int parent1Revision, int parent2Revision, byte[/*20*/] nodeid, DataAccess data);
+		void next(int revisionIndex, int actualLen, int baseRevision, int linkRevision, int parent1Revision, int parent2Revision, byte[/*20*/] nodeid, DataAccess data) throws HgRuntimeException;
 	}
 	public interface Observer {
 		// notify observer of invalidate/reload event in the stream
 		public void reloaded(RevlogStream src);

Mercurial > jhg

comparison src/org/tmatesoft/hg/internal/RevlogStream.java @ 628:6526d8adbc0f