hg4j: src/org/tmatesoft/hg/core/HgLogCommand.java comparison

comparison src/org/tmatesoft/hg/core/HgLogCommand.java @ 522:2103388d4010 v1.1m2

Expose option to report changesets in reversed order

author	Artem Tikhomirov <tikhomirov.artem@gmail.com>
date	Wed, 26 Dec 2012 18:14:53 +0100
parents	1ee452f31187
children	2f9ed6bcefa2

comparison

equal deleted inserted replaced

-:59e555c85da0
+:2103388d4010
 import java.util.Set;
 import java.util.TreeSet;
 import org.tmatesoft.hg.internal.AdapterPlug;
 import org.tmatesoft.hg.internal.BatchRangeHelper;
-import org.tmatesoft.hg.internal.Experimental;
 import org.tmatesoft.hg.internal.IntMap;
 import org.tmatesoft.hg.internal.IntVector;
 import org.tmatesoft.hg.internal.Lifecycle;
 import org.tmatesoft.hg.internal.LifecycleProxy;
 import org.tmatesoft.hg.repo.HgChangelog;
 	 * Whether to track history of the selected file version (based on file revision
 	 * in working dir parent), follow ancestors only.
 	 * Note, 'hg log --follow' combines both #followHistory and #followAncestry
 	 */
 	private boolean followAncestry;
+	private HgIterateDirection iterateDirection = HgIterateDirection.OldToNew;
 	private ChangesetTransformer csetTransform;
 	private HgParentChildMap<HgChangelog> parentHelper;
 	public HgLogCommand(HgRepository hgRepo) {
 		repo = hgRepo;
 	 * Handy analog to {@link #file(Path, boolean, boolean)} when clients' paths come from filesystem and need conversion to repository's
 	 * @return <code>this</code> for convenience
 	 */
 	public HgLogCommand file(String file, boolean followCopyRename, boolean followFileAncestry) {
 		return file(Path.create(repo.getToRepoPathHelper().rewrite(file)), followCopyRename, followFileAncestry);
+	}
+	/**
+	 * Specifies order for changesets reported through #execute(...) methods.
+	 * By default, command reports changeset in their natural repository order, older first,
+	 * newer last (i.e. {@link HgIterateDirection#OldToNew}
+	 *
+	 * @param order {@link HgIterateDirection#NewToOld} to get newer revisions first
+	 * @return <code>this</code> for convenience
+	 */
+	public HgLogCommand order(HgIterateDirection order) {
+		iterateDirection = order;
+		return this;
 	}
 	/**
 	 * Similar to {@link #execute(HgChangesetHandler)}, collects and return result as a list.
 	 *
 			// transformer from (b), below, with alternative cset order or (b) transformer to hi-level csets.
 			FilteringInspector filterInsp = new FilteringInspector();
 			filterInsp.changesets(startRev, lastCset);
 			if (file == null) {
 				progressHelper.start(lastCset - startRev + 1);
-				if (iterateDirection == IterateDirection.FromOldToNew) {
+				if (iterateDirection == HgIterateDirection.OldToNew) {
 					filterInsp.delegateTo(csetTransform);
 					repo.getChangelog().range(startRev, lastCset, filterInsp);
 					csetTransform.checkFailure();
 				} else {
-					assert iterateDirection == IterateDirection.FromNewToOld;
+					assert iterateDirection == HgIterateDirection.NewToOld;
 					BatchRangeHelper brh = new BatchRangeHelper(startRev, lastCset, BATCH_SIZE, true);
 					BatchChangesetInspector batchInspector = new BatchChangesetInspector(Math.min(lastCset-startRev+1, BATCH_SIZE));
 					filterInsp.delegateTo(batchInspector);
 					while (brh.hasNext()) {
 						brh.next();
 					if (followAncestry) {
 						TreeBuildInspector treeBuilder = new TreeBuildInspector(followAncestry);
 						@SuppressWarnings("unused")
 						List<HistoryNode> fileAncestry = treeBuilder.go(fileNode, curRename.second());
 						int[] commitRevisions = narrowChangesetRange(treeBuilder.getCommitRevisions(), startRev, lastCset);
-						if (iterateDirection == IterateDirection.FromOldToNew) {
+						if (iterateDirection == HgIterateDirection.OldToNew) {
 							repo.getChangelog().range(filterInsp, commitRevisions);
 							csetTransform.checkFailure();
 						} else {
-							assert iterateDirection == IterateDirection.FromNewToOld;
+							assert iterateDirection == HgIterateDirection.NewToOld;
 							// visit one by one in the opposite direction
 							for (int i = commitRevisions.length-1; i >= 0; i--) {
 								int csetWithFileChange = commitRevisions[i];
 								repo.getChangelog().range(csetWithFileChange, csetWithFileChange, filterInsp);
 							}
 						}
 					} else {
 						// report complete file history (XXX may narrow range with [startRev, endRev], but need to go from file rev to link rev)
 						int fileStartRev = 0; //fileNode.getChangesetRevisionIndex(0) >= startRev
 						int fileEndRev = fileNode.getLastRevision();
-						if (iterateDirection == IterateDirection.FromOldToNew) {
+						if (iterateDirection == HgIterateDirection.OldToNew) {
 							fileNode.history(fileStartRev, fileEndRev, filterInsp);
 							csetTransform.checkFailure();
 						} else {
-							assert iterateDirection == IterateDirection.FromNewToOld;
+							assert iterateDirection == HgIterateDirection.NewToOld;
 							BatchRangeHelper brh = new BatchRangeHelper(fileStartRev, fileEndRev, BATCH_SIZE, true);
 							BatchChangesetInspector batchInspector = new BatchChangesetInspector(Math.min(fileEndRev-fileStartRev+1, BATCH_SIZE));
 							filterInsp.delegateTo(batchInspector);
 							while (brh.hasNext()) {
 								brh.next();
 					}
 					if (followRenames && withCopyHandler != null && nameIndex + 1 < fileRenamesSize) {
 						Pair<HgDataFile, Nodeid> nextRename = fileRenames.get(nameIndex+1);
 						HgFileRevision src, dst;
 						// A -> B
-						if (iterateDirection == IterateDirection.FromOldToNew) {
+						if (iterateDirection == HgIterateDirection.OldToNew) {
 							// curRename: A, nextRename: B
 							src = new HgFileRevision(fileNode, curRename.second(), null);
 							dst = new HgFileRevision(nextRename.first(), nextRename.first().getRevision(0), src.getPath());
 						} else {
-							assert iterateDirection == IterateDirection.FromNewToOld;
+							assert iterateDirection == HgIterateDirection.NewToOld;
 							// curRename: B, nextRename: A
 							src = new HgFileRevision(nextRename.first(), nextRename.second(), null);
 							dst = new HgFileRevision(fileNode, fileNode.getRevision(0), src.getPath());
 						}
 						withCopyHandler.copy(src, dst);
 			dispatcher.dispatchAllChanges();
 		} // for fileRenamesQueue;
 		progressHelper.done();
 	}
-	/**
-	 * DO NOT USE THIS METHOD, DEBUG PURPOSES ONLY!!!
-	 */
-	@Experimental(reason="Work in progress")
-	public HgLogCommand debugSwitch1() {
-		// FIXME can't expose iteration direction unless general iteration (changelog, not a file) supports it, too.
-		// however, need to test the code already there, hence this debug switch
-		if (iterateDirection == IterateDirection.FromOldToNew) {
-			iterateDirection = IterateDirection.FromNewToOld;
-		} else {
-			iterateDirection = IterateDirection.FromOldToNew;
-		}
-		return this;
-	}
-	private IterateDirection iterateDirection = IterateDirection.FromOldToNew;
 	private static class ReverseIterator<E> implements Iterator<E> {
 		private final ListIterator<E> listIterator;
 		public ReverseIterator(List<E> list) {
 			listIterator = list.listIterator(list.size());
 		while (fileNode.isCopy()) {
 			Path fp = fileNode.getCopySourceName();
 			Nodeid copyRev = fileNode.getCopySourceRevision();
 			fileNode = repo.getFileNode(fp);
 			Pair<HgDataFile, Nodeid> p = new Pair<HgDataFile, Nodeid>(fileNode, copyRev);
-			if (iterateDirection == IterateDirection.FromOldToNew) {
+			if (iterateDirection == HgIterateDirection.OldToNew) {
 				rv.addFirst(p);
 			} else {
-				assert iterateDirection == IterateDirection.FromNewToOld;
+				assert iterateDirection == HgIterateDirection.NewToOld;
 				rv.addLast(p);
 			}
 		};
 		return rv;
 	}
 		}
 		public void updateJunctionPoint(Pair<HgDataFile, Nodeid> curRename, Pair<HgDataFile, Nodeid> nextRename) {
 			// A (old) renamed to B(new).  A(0..k..n) -> B(0..m). If followAncestry, k == n
 			// curRename.second() points to A(k)
-			if (iterateDirection == IterateDirection.FromOldToNew) {
+			if (iterateDirection == HgIterateDirection.OldToNew) {
 				// looking at A chunk (curRename), nextRename points to B
 				HistoryNode junctionSrc = findJunctionPointInCurrentChunk(curRename.second()); // A(k)
 				HistoryNode junctionDestMock = treeBuildInspector.one(nextRename.first(), 0); // B(0)
 				// junstionDestMock is mock object, once we iterate next rename, there'd be different HistoryNode
 				// for B's first revision. This means we read it twice, but this seems to be reasonable
 				junctionSrc.bindChild(junctionDestMock);
 				// Save mock A(k) 1) not to keep whole A history in memory 2) Don't need it's parent and children once get to B
 				// moreover, children of original A(k) (junctionSrc) would list mock B(0) which is undesired once we iterate over real B
 				junctionNode = new HistoryNode(junctionSrc.changeset, junctionSrc.fileRevision, null, null);
 			} else {
-				assert iterateDirection == IterateDirection.FromNewToOld;
+				assert iterateDirection == HgIterateDirection.NewToOld;
 				// looking at B chunk (curRename), nextRename points at A
 				HistoryNode junctionDest = changeHistory.get(0); // B(0)
 				// prepare mock A(k)
 				HistoryNode junctionSrcMock = treeBuildInspector.one(nextRename.first(), nextRename.second()); // A(k)
 				// B(0) to list A(k) as its parent
 		}
 		public void connectWithLastJunctionPoint(Pair<HgDataFile, Nodeid> curRename, Pair<HgDataFile, Nodeid> prevRename, HgFileRenameHandlerMixin renameHandler) throws HgCallbackTargetException {
 			assert junctionNode != null;
 			// A renamed to B. A(0..k..n) -> B(0..m). If followAncestry: k == n
-			if (iterateDirection == IterateDirection.FromOldToNew) {
+			if (iterateDirection == HgIterateDirection.OldToNew) {
 				// forward, from old to new:
 				// changeHistory points to B
 				// Already reported: A(0)..A(n), A(k) is in junctionNode
 				// Shall connect histories: A(k).bind(B(0))
 				HistoryNode junctionDest = changeHistory.get(0); // B(0)
 					HgFileRevision copiedFrom = new HgFileRevision(prevRename.first(), junctionNode.fileRevision, null); // "A", A(k)
 					HgFileRevision copiedTo = new HgFileRevision(curRename.first(), junctionDest.fileRevision, copiedFrom.getPath()); // "B", B(0)
 					renameHandler.copy(copiedFrom, copiedTo);
 				}
 			} else {
-				assert iterateDirection == IterateDirection.FromNewToOld;
+				assert iterateDirection == HgIterateDirection.NewToOld;
 				// changeHistory points to A
 				// Already reported B(m), B(m-1)...B(0), B(0) is in junctionNode
 				// Shall connect histories A(k).bind(B(0))
 				// if followAncestry: A(k) is latest in changeHistory (k == n)
 				HistoryNode junctionSrc = findJunctionPointInCurrentChunk(curRename.second()); // A(k)
 		protected abstract void once(HistoryNode n) throws HgCallbackTargetException, CancelledException;
 		public void dispatchAllChanges() throws HgCallbackTargetException, CancelledException {
 			// XXX shall sort changeHistory according to changeset numbers?
 			Iterator<HistoryNode> it;
-			if (iterateDirection == IterateDirection.FromOldToNew) {
+			if (iterateDirection == HgIterateDirection.OldToNew) {
 				it = changeHistory.listIterator();
 			} else {
-				assert iterateDirection == IterateDirection.FromNewToOld;
+				assert iterateDirection == HgIterateDirection.NewToOld;
 				it = new ReverseIterator<HistoryNode>(changeHistory);
 			}
 			while(it.hasNext()) {
 				HistoryNode n = it.next();
 				once(n);
 			} else {
 				return repo.getChangelog().getRevision(changelogRevisionNumber);
 			}
 		}
 	}
-	private enum IterateDirection {
-		FromOldToNew, FromNewToOld
-	}
 }

Mercurial > hg4j

comparison src/org/tmatesoft/hg/core/HgLogCommand.java @ 522:2103388d4010 v1.1m2