Browse Source
RevWalk does not currently provide a --first-parent equivalent and the feature has been requested. Add a field to the RevWalk class to specify whether walks should traverse first parents only. Modify Generator implementations to support the feature. Change-Id: I4a9a0d5767f82141dcf6d08659d7cb77c585fae4 Signed-off-by: Dave Borowitz <dborowitz@google.com> Signed-off-by: Alex Spradlin <alexaspradlin@google.com>stable-5.5
Dave Borowitz
6 years ago
committed by
Jonathan Nieder
20 changed files with 490 additions and 32 deletions
@ -0,0 +1,338 @@
|
||||
/* |
||||
* Copyright (C) 2019, Google LLC. |
||||
* and other copyright owners as documented in the project's IP log. |
||||
* |
||||
* This program and the accompanying materials are made available |
||||
* under the terms of the Eclipse Distribution License v1.0 which |
||||
* accompanies this distribution, is reproduced below, and is |
||||
* available at http://www.eclipse.org/org/documents/edl-v10.php
|
||||
* |
||||
* All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or |
||||
* without modification, are permitted provided that the following |
||||
* conditions are met: |
||||
* |
||||
* - Redistributions of source code must retain the above copyright |
||||
* notice, this list of conditions and the following disclaimer. |
||||
* |
||||
* - Redistributions in binary form must reproduce the above |
||||
* copyright notice, this list of conditions and the following |
||||
* disclaimer in the documentation and/or other materials provided |
||||
* with the distribution. |
||||
* |
||||
* - Neither the name of the Eclipse Foundation, Inc. nor the |
||||
* names of its contributors may be used to endorse or promote |
||||
* products derived from this software without specific prior |
||||
* written permission. |
||||
* |
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND |
||||
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, |
||||
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR |
||||
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER |
||||
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, |
||||
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF |
||||
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
||||
*/ |
||||
|
||||
package org.eclipse.jgit.revwalk; |
||||
|
||||
import static org.junit.Assert.assertEquals; |
||||
import static org.junit.Assert.assertNull; |
||||
|
||||
import org.eclipse.jgit.revwalk.filter.MessageRevFilter; |
||||
import org.eclipse.jgit.revwalk.filter.RevFilter; |
||||
import org.junit.Test; |
||||
|
||||
public class FirstParentRevWalkTest extends RevWalkTestCase { |
||||
@Test |
||||
public void testStringOfPearls() throws Exception { |
||||
RevCommit a = commit(); |
||||
RevCommit b = commit(a); |
||||
RevCommit c = commit(b); |
||||
|
||||
rw.reset(); |
||||
rw.setFirstParent(true); |
||||
markStart(c); |
||||
assertCommit(c, rw.next()); |
||||
assertCommit(b, rw.next()); |
||||
assertCommit(a, rw.next()); |
||||
assertNull(rw.next()); |
||||
} |
||||
|
||||
@Test |
||||
public void testSideBranch() throws Exception { |
||||
RevCommit a = commit(); |
||||
RevCommit b1 = commit(a); |
||||
RevCommit b2 = commit(a); |
||||
RevCommit c1 = commit(b1); |
||||
RevCommit c2 = commit(b2); |
||||
RevCommit d = commit(c1, c2); |
||||
|
||||
rw.reset(); |
||||
rw.setFirstParent(true); |
||||
markStart(d); |
||||
assertCommit(d, rw.next()); |
||||
assertCommit(c1, rw.next()); |
||||
assertCommit(b1, rw.next()); |
||||
assertCommit(a, rw.next()); |
||||
assertNull(rw.next()); |
||||
} |
||||
|
||||
@Test |
||||
public void testSecondParentAncestorOfFirstParent() throws Exception { |
||||
RevCommit a = commit(); |
||||
RevCommit b = commit(a); |
||||
RevCommit c = commit(b, a); |
||||
|
||||
rw.reset(); |
||||
rw.setFirstParent(true); |
||||
markStart(c); |
||||
assertCommit(c, rw.next()); |
||||
assertCommit(b, rw.next()); |
||||
assertCommit(a, rw.next()); |
||||
assertNull(rw.next()); |
||||
} |
||||
|
||||
@Test |
||||
public void testFirstParentMultipleOccurrences() throws Exception { |
||||
RevCommit a = commit(); |
||||
RevCommit b = commit(a); |
||||
RevCommit c = commit(b); |
||||
RevCommit d = commit(b); |
||||
|
||||
rw.reset(); |
||||
rw.setFirstParent(true); |
||||
markStart(c); |
||||
markStart(d); |
||||
assertCommit(d, rw.next()); |
||||
assertCommit(c, rw.next()); |
||||
assertCommit(b, rw.next()); |
||||
assertCommit(a, rw.next()); |
||||
assertNull(rw.next()); |
||||
} |
||||
|
||||
@Test |
||||
public void testReachableAlongFirstAndLaterParents() throws Exception { |
||||
RevCommit a = commit(); |
||||
RevCommit b1 = commit(a); |
||||
RevCommit b2 = commit(a); |
||||
RevCommit b3 = commit(a); |
||||
RevCommit c = commit(b1, b2); |
||||
RevCommit d = commit(b2, b3); |
||||
|
||||
rw.reset(); |
||||
rw.setFirstParent(true); |
||||
markStart(c); |
||||
markStart(d); |
||||
assertCommit(d, rw.next()); |
||||
assertCommit(c, rw.next()); |
||||
// b3 is only reachable from c's second parent.
|
||||
// b2 is reachable from c's second parent but d's first parent.
|
||||
assertCommit(b2, rw.next()); |
||||
assertCommit(b1, rw.next()); |
||||
assertCommit(a, rw.next()); |
||||
assertNull(rw.next()); |
||||
} |
||||
|
||||
@Test |
||||
public void testStartCommitReachableOnlyFromLaterParents() |
||||
throws Exception { |
||||
RevCommit a = commit(); |
||||
RevCommit b1 = commit(a); |
||||
RevCommit b2 = commit(a); |
||||
RevCommit c = commit(b1, b2); |
||||
|
||||
rw.reset(); |
||||
rw.setFirstParent(true); |
||||
markStart(c); |
||||
markStart(b2); |
||||
assertCommit(c, rw.next()); |
||||
// b2 is only reachable from second parent, but is itself a start
|
||||
// commit.
|
||||
assertCommit(b2, rw.next()); |
||||
assertCommit(b1, rw.next()); |
||||
assertCommit(a, rw.next()); |
||||
assertNull(rw.next()); |
||||
} |
||||
|
||||
@Test |
||||
public void testRevFilter() throws Exception { |
||||
RevCommit a = commit(); |
||||
RevCommit b1 = commitBuilder().parent(a).message("commit b1").create(); |
||||
RevCommit b2 = commitBuilder().parent(a).message("commit b2").create(); |
||||
RevCommit c = commit(b1, b2); |
||||
|
||||
rw.reset(); |
||||
rw.setFirstParent(true); |
||||
rw.setRevFilter(MessageRevFilter.create("commit b")); |
||||
rw.markStart(c); |
||||
assertCommit(b1, rw.next()); |
||||
assertNull(rw.next()); |
||||
} |
||||
|
||||
@Test |
||||
public void testTopoSort() throws Exception { |
||||
RevCommit a = commit(); |
||||
RevCommit b1 = commit(a); |
||||
RevCommit b2 = commit(a); |
||||
RevCommit c = commit(b1, b2); |
||||
|
||||
rw.reset(); |
||||
rw.sort(RevSort.TOPO); |
||||
rw.setFirstParent(true); |
||||
markStart(c); |
||||
assertCommit(c, rw.next()); |
||||
assertCommit(b1, rw.next()); |
||||
assertCommit(a, rw.next()); |
||||
assertNull(rw.next()); |
||||
} |
||||
|
||||
@Test |
||||
public void testCommitTimeSort() throws Exception { |
||||
RevCommit a = commit(); |
||||
RevCommit b1 = commit(a); |
||||
RevCommit b2 = commit(a); |
||||
RevCommit c = commit(b1, b2); |
||||
|
||||
rw.reset(); |
||||
rw.sort(RevSort.COMMIT_TIME_DESC); |
||||
rw.setFirstParent(true); |
||||
markStart(c); |
||||
assertCommit(c, rw.next()); |
||||
assertCommit(b1, rw.next()); |
||||
assertCommit(a, rw.next()); |
||||
assertNull(rw.next()); |
||||
} |
||||
|
||||
@Test |
||||
public void testReverseSort() throws Exception { |
||||
RevCommit a = commit(); |
||||
RevCommit b1 = commit(a); |
||||
RevCommit b2 = commit(a); |
||||
RevCommit c = commit(b1, b2); |
||||
|
||||
rw.reset(); |
||||
rw.sort(RevSort.REVERSE); |
||||
rw.setFirstParent(true); |
||||
markStart(c); |
||||
assertCommit(a, rw.next()); |
||||
assertCommit(b1, rw.next()); |
||||
assertCommit(c, rw.next()); |
||||
assertNull(rw.next()); |
||||
} |
||||
|
||||
@Test |
||||
public void testBoundarySort() throws Exception { |
||||
RevCommit a = commit(); |
||||
RevCommit b = commit(a); |
||||
RevCommit c1 = commit(b); |
||||
RevCommit c2 = commit(b); |
||||
RevCommit d = commit(c1, c2); |
||||
|
||||
rw.reset(); |
||||
rw.sort(RevSort.BOUNDARY); |
||||
rw.setFirstParent(true); |
||||
markStart(d); |
||||
markUninteresting(a); |
||||
assertCommit(d, rw.next()); |
||||
assertCommit(c1, rw.next()); |
||||
assertCommit(b, rw.next()); |
||||
assertCommit(a, rw.next()); |
||||
assertNull(rw.next()); |
||||
} |
||||
|
||||
@Test |
||||
public void testFirstParentOfFirstParentMarkedUninteresting() |
||||
throws Exception { |
||||
RevCommit a = commit(); |
||||
RevCommit b1 = commit(a); |
||||
RevCommit b2 = commit(a); |
||||
RevCommit c1 = commit(b1); |
||||
RevCommit c2 = commit(b2); |
||||
RevCommit d = commit(c1, c2); |
||||
|
||||
rw.reset(); |
||||
rw.setFirstParent(true); |
||||
markStart(d); |
||||
markUninteresting(b1); |
||||
assertCommit(d, rw.next()); |
||||
assertCommit(c1, rw.next()); |
||||
assertNull(rw.next()); |
||||
} |
||||
|
||||
@Test |
||||
public void testFirstParentMarkedUninteresting() throws Exception { |
||||
RevCommit a = commit(); |
||||
RevCommit b1 = commit(a); |
||||
RevCommit b2 = commit(a); |
||||
RevCommit c = commit(b1, b2); |
||||
|
||||
rw.reset(); |
||||
rw.setFirstParent(true); |
||||
markStart(c); |
||||
markUninteresting(b1); |
||||
assertCommit(c, rw.next()); |
||||
assertNull(rw.next()); |
||||
} |
||||
|
||||
@Test |
||||
public void testDepthWalk() throws Exception { |
||||
RevCommit a = commit(); |
||||
RevCommit b1 = commit(a); |
||||
RevCommit b2 = commit(a); |
||||
RevCommit c = commit(b1, b2); |
||||
|
||||
try (DepthWalk.RevWalk dw = new DepthWalk.RevWalk(db, 1)) { |
||||
dw.setFirstParent(true); |
||||
dw.markRoot(dw.parseCommit(c)); |
||||
dw.markStart(dw.parseCommit(c)); |
||||
assertEquals(c, dw.next()); |
||||
assertEquals(b1, dw.next()); |
||||
assertNull(dw.next()); |
||||
} |
||||
} |
||||
|
||||
@Test |
||||
public void testDoNotRewriteParents() throws Exception { |
||||
RevCommit a = commit(); |
||||
RevCommit b1 = commit(a); |
||||
RevCommit b2 = commit(a); |
||||
RevCommit c = commit(b1, b2); |
||||
|
||||
rw.reset(); |
||||
rw.setFirstParent(true); |
||||
rw.setRewriteParents(false); |
||||
markStart(c); |
||||
assertCommit(c, rw.next()); |
||||
assertCommit(b1, rw.next()); |
||||
assertCommit(a, rw.next()); |
||||
assertNull(rw.next()); |
||||
} |
||||
|
||||
@Test(expected = IllegalStateException.class) |
||||
public void testMarkStartBeforeSetFirstParent() throws Exception { |
||||
RevCommit a = commit(); |
||||
|
||||
rw.reset(); |
||||
markStart(a); |
||||
rw.setFirstParent(true); |
||||
} |
||||
|
||||
@Test(expected = IllegalStateException.class) |
||||
public void testMergeBaseWithFirstParentNotAllowed() throws Exception { |
||||
RevCommit a = commit(); |
||||
|
||||
rw.reset(); |
||||
rw.setFirstParent(true); |
||||
rw.setRevFilter(RevFilter.MERGE_BASE); |
||||
markStart(a); |
||||
assertNull(rw.next()); |
||||
} |
||||
} |
Loading…
Reference in new issue