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

comparison src/org/tmatesoft/hg/repo/HgDataFile.java @ 689:5050ee565bd1

Issue 44: Renames/copies other than for the very first revision of a file are not recognized

author	Artem Tikhomirov <tikhomirov.artem@gmail.com>
date	Sat, 27 Jul 2013 22:06:14 +0200
parents	12a4f60ea972
children	7efabe0cddcf

comparison

equal deleted inserted replaced

-:1499139a600a
+:5050ee565bd1
 import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
 import java.util.Arrays;
 import org.tmatesoft.hg.core.HgChangesetFileSneaker;
+import org.tmatesoft.hg.core.HgFileRevision;
 import org.tmatesoft.hg.core.Nodeid;
 import org.tmatesoft.hg.internal.DataAccess;
 import org.tmatesoft.hg.internal.FileUtils;
 import org.tmatesoft.hg.internal.FilterByteChannel;
 import org.tmatesoft.hg.internal.FilterDataAccess;
 		int changelogRevision = getChangesetRevisionIndex(getRevisionIndex(nid));
 		return getRepo().getChangelog().getRevision(changelogRevision);
 	}
 	/**
-	 * Tells whether this file originates from another repository file
+	 * Tells whether first revision of this file originates from another repository file.
-	 * @return <code>true</code> if this file is a copy of another from the repository
+	 * This method is shorthand for {@link #isCopy(int) isCopy(0)} and it's advised to use {@link #isCopy(int)} instead.
+	 *
+	 * @return <code>true</code> if first revision of this file is a copy of some other from the repository
 	 * @throws HgRuntimeException subclass thereof to indicate issues with the library. <em>Runtime exception</em>
 	 */
 	public boolean isCopy() throws HgRuntimeException {
-		if (metadata == null || !metadata.checked(0)) {
+		return isCopy(0);
-			checkAndRecordMetadata(0);
+	}
-		}
-		if (!metadata.known(0)) {
+	/**
-			return false;
+	 * Get name of the file first revision of this one was copied from.
-		}
+	 * Note, it's better to use {@link #getCopySource(int)} instead.
-		return metadata.find(0, "copy") != null;
-	}
-	/**
-	 * Get name of the file this one was copied from.
 	 *
 	 * @return name of the file origin
 	 * @throws HgRuntimeException subclass thereof to indicate issues with the library. <em>Runtime exception</em>
 	 */
 	public Path getCopySourceName() throws HgRuntimeException {
 		}
 		throw new UnsupportedOperationException(); // XXX REVISIT, think over if Exception is good (clients would check isCopy() anyway, perhaps null is sufficient?)
 	}
 	/**
-	 *
+	 * Use {@link #getCopySource(int)} instead
 	 * @return revision this file was copied from
 	 * @throws HgRuntimeException subclass thereof to indicate issues with the library. <em>Runtime exception</em>
 	 */
 	public Nodeid getCopySourceRevision() throws HgRuntimeException {
 		if (isCopy()) {
 			return Nodeid.fromAscii(metadata.find(0, "copyrev")); // XXX reuse/cache Nodeid
 		}
 		throw new UnsupportedOperationException();
+	}
+	/**
+	 * Tell if specified file revision was created by copying or renaming another file
+	 *
+	 * @param fileRevisionIndex index of file revision to check
+	 * @return <code>true</code> if this revision originates (as a result of copy/rename) from another file
+	 * @throws HgRuntimeException subclass thereof to indicate issues with the library. <em>Runtime exception</em>
+	 * @since 1.2
+	 */
+	public boolean isCopy(int fileRevisionIndex) throws HgRuntimeException {
+		if (fileRevisionIndex == TIP) {
+			fileRevisionIndex = getLastRevision();
+		}
+		if (wrongRevisionIndex(fileRevisionIndex) || fileRevisionIndex == BAD_REVISION || fileRevisionIndex == WORKING_COPY || fileRevisionIndex == NO_REVISION) {
+			throw new HgInvalidRevisionException(fileRevisionIndex);
+		}
+		if (metadata == null || !metadata.checked(fileRevisionIndex)) {
+			checkAndRecordMetadata(fileRevisionIndex);
+		}
+		if (!metadata.known(fileRevisionIndex)) {
+			return false;
+		}
+		return metadata.find(fileRevisionIndex, "copy") != null;
+	}
+	/**
+	 * Find out which file and which revision of that file given revision originates from
+	 *
+	 * @param fileRevisionIndex file revision index of interest, it's assumed {@link #isCopy(int)} for the same revision is <code>true</code>
+	 * @return origin revision descriptor
+	 * @throws HgRuntimeException
+	 * @throws UnsupportedOperationException if specified revision is not a {@link #isCopy(int) copy} revision
+	 * @since 1.2
+	 */
+	public HgFileRevision getCopySource(int fileRevisionIndex) throws HgRuntimeException {
+		if (fileRevisionIndex == TIP) {
+			fileRevisionIndex = getLastRevision();
+		}
+		if (!isCopy(fileRevisionIndex)) {
+			throw new UnsupportedOperationException();
+		}
+		Path.Source ps = getRepo().getSessionContext().getPathFactory();
+		Path origin = ps.path(metadata.find(fileRevisionIndex, "copy"));
+		Nodeid originRev = Nodeid.fromAscii(metadata.find(fileRevisionIndex, "copyrev")); // XXX reuse/cache Nodeid
+		return new HgFileRevision(getRepo(), originRev, null, origin);
 	}
 	/**
 	 * Get file flags recorded in the manifest
 	 * @param fileRevisionIndex - revision local index, non-negative, or {@link HgRepository#TIP}.

Mercurial > hg4j

comparison src/org/tmatesoft/hg/repo/HgDataFile.java @ 689:5050ee565bd1