123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317 |
- /*
- * Copyright (C) 2009-2010, Google Inc. and others
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Distribution License v. 1.0 which is available at
- * https://www.eclipse.org/org/documents/edl-v10.php.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
- package org.eclipse.jgit.revwalk;
-
- import static org.junit.Assert.assertEquals;
- import static org.junit.Assert.assertNull;
- import static org.junit.Assert.assertTrue;
- import static org.junit.Assert.fail;
-
- import org.eclipse.jgit.internal.JGitText;
- import org.junit.Test;
-
- public class RevWalkSortTest extends RevWalkTestCase {
- @Test
- public void testSort_Default() throws Exception {
- final RevCommit a = commit();
- final RevCommit b = commit(1, a);
- final RevCommit c = commit(1, b);
- final RevCommit d = commit(1, 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 testSort_COMMIT_TIME_DESC() throws Exception {
- final RevCommit a = commit();
- final RevCommit b = commit(a);
- final RevCommit c = commit(b);
- final RevCommit d = commit(c);
-
- rw.sort(RevSort.COMMIT_TIME_DESC);
- markStart(d);
- assertCommit(d, rw.next());
- assertCommit(c, rw.next());
- assertCommit(b, rw.next());
- assertCommit(a, rw.next());
- assertNull(rw.next());
- }
-
- @Test
- public void testSort_REVERSE() throws Exception {
- final RevCommit a = commit();
- final RevCommit b = commit(a);
- final RevCommit c = commit(b);
- final RevCommit d = commit(c);
-
- rw.sort(RevSort.REVERSE);
- markStart(d);
- assertCommit(a, rw.next());
- assertCommit(b, rw.next());
- assertCommit(c, rw.next());
- assertCommit(d, rw.next());
- assertNull(rw.next());
- }
-
- @Test
- public void testSort_COMMIT_TIME_DESC_OutOfOrder1() throws Exception {
- // Despite being out of order time-wise, a strand-of-pearls must
- // still maintain topological order.
- //
- final RevCommit a = commit();
- final RevCommit b = commit(a);
- final RevCommit c = commit(-5, b);
- final RevCommit d = commit(10, c);
- assertTrue(parseBody(a).getCommitTime() < parseBody(d).getCommitTime());
- assertTrue(parseBody(c).getCommitTime() < parseBody(b).getCommitTime());
-
- rw.sort(RevSort.COMMIT_TIME_DESC);
- markStart(d);
- assertCommit(d, rw.next());
- assertCommit(c, rw.next());
- assertCommit(b, rw.next());
- assertCommit(a, rw.next());
- assertNull(rw.next());
- }
-
- @Test
- public void testSort_COMMIT_TIME_DESC_OutOfOrder2() throws Exception {
- // c1 is back dated before its parent.
- //
- final RevCommit a = commit();
- final RevCommit b = commit(a);
- final RevCommit c1 = commit(-5, b);
- final RevCommit c2 = commit(10, b);
- final RevCommit d = commit(c1, c2);
-
- rw.sort(RevSort.COMMIT_TIME_DESC);
- markStart(d);
- assertCommit(d, rw.next());
- assertCommit(c2, rw.next());
- assertCommit(b, rw.next());
- assertCommit(a, rw.next());
- assertCommit(c1, rw.next());
- assertNull(rw.next());
- }
-
- @Test
- public void testSort_TOPO() throws Exception {
- // c1 is back dated before its parent.
- //
- final RevCommit a = commit();
- final RevCommit b = commit(a);
- final RevCommit c1 = commit(-5, b);
- final RevCommit c2 = commit(10, b);
- final RevCommit d = commit(c1, c2);
-
- rw.sort(RevSort.TOPO);
- markStart(d);
- assertCommit(d, rw.next());
- assertCommit(c2, rw.next());
- assertCommit(c1, rw.next());
- assertCommit(b, rw.next());
- assertCommit(a, rw.next());
- assertNull(rw.next());
- }
-
- @Test
- public void testSort_TOPO_REVERSE() throws Exception {
- // c1 is back dated before its parent.
- //
- final RevCommit a = commit();
- final RevCommit b = commit(a);
- final RevCommit c1 = commit(-5, b);
- final RevCommit c2 = commit(10, b);
- final RevCommit d = commit(c1, c2);
-
- rw.sort(RevSort.TOPO);
- rw.sort(RevSort.REVERSE, true);
- markStart(d);
- assertCommit(a, rw.next());
- assertCommit(b, rw.next());
- assertCommit(c1, rw.next());
- assertCommit(c2, rw.next());
- assertCommit(d, rw.next());
- assertNull(rw.next());
- }
-
- @Test
- public void testSort_TOPO_NON_INTERMIX() throws Exception {
- // c1 is back dated before its parent.
- //
- final RevCommit a = commit();
- final RevCommit b = commit(a);
- final RevCommit c1 = commit(-5, b);
- final RevCommit c2 = commit(10, b);
- final RevCommit d = commit(c1, c2);
-
- rw.sort(RevSort.TOPO_KEEP_BRANCH_TOGETHER);
- markStart(d);
- assertCommit(d, rw.next());
- assertCommit(c2, rw.next());
- assertCommit(c1, rw.next());
- assertCommit(b, rw.next());
- assertCommit(a, rw.next());
- assertNull(rw.next());
- }
-
- @Test
- public void testSort_TOPO_NON_INTERMIX_OutOfOrderCommitTimes()
- throws Exception {
- // b is committed before c2 in a different line of history.
- //
- final RevCommit a = commit();
- final RevCommit c1 = commit(a);
- final RevCommit b = commit(a);
- final RevCommit c2 = commit(c1);
- final RevCommit d = commit(b, c2);
-
- rw.sort(RevSort.TOPO_KEEP_BRANCH_TOGETHER);
- markStart(d);
- assertCommit(d, rw.next());
- assertCommit(c2, rw.next());
- assertCommit(c1, rw.next());
- assertCommit(b, rw.next());
- assertCommit(a, rw.next());
- assertNull(rw.next());
- }
-
- @Test
- public void testSort_TOPO_NON_INTERMIX_MultipleLinesOfHistory()
- throws Exception {
- final RevCommit a1 = commit();
- final RevCommit b1 = commit(a1);
- final RevCommit a2 = commit(a1, b1);
- final RevCommit b2 = commit(b1);
- final RevCommit b3 = commit(b1);
- final RevCommit a3 = commit(a2, b2);
- final RevCommit a4 = commit(a3, b3);
-
- rw.sort(RevSort.TOPO_KEEP_BRANCH_TOGETHER);
- markStart(a4);
- assertCommit(a4, rw.next());
- assertCommit(b3, rw.next());
- assertCommit(a3, rw.next());
- assertCommit(b2, rw.next());
- assertCommit(a2, rw.next());
- assertCommit(b1, rw.next());
- assertCommit(a1, rw.next());
- assertNull(rw.next());
- }
-
- @Test
- public void testSort_TOPO_NON_INTERMIX_REVERSE() throws Exception {
- // c1 is back dated before its parent.
- //
- final RevCommit a = commit();
- final RevCommit b = commit(a);
- final RevCommit c1 = commit(-5, b);
- final RevCommit c2 = commit(10, b);
- final RevCommit d = commit(c1, c2);
-
- rw.sort(RevSort.TOPO_KEEP_BRANCH_TOGETHER);
- rw.sort(RevSort.REVERSE, true);
- markStart(d);
- assertCommit(a, rw.next());
- assertCommit(b, rw.next());
- assertCommit(c1, rw.next());
- assertCommit(c2, rw.next());
- assertCommit(d, rw.next());
- assertNull(rw.next());
- }
-
- @Test
- public void testSort_TOPO_NON_INTERMIX_REVERSE_MultipleLinesOfHistory()
- throws Exception {
- final RevCommit a1 = commit();
- final RevCommit b1 = commit(a1);
- final RevCommit a2 = commit(a1, b1);
- final RevCommit b2 = commit(b1);
- final RevCommit b3 = commit(b1);
- final RevCommit a3 = commit(a2, b2);
- final RevCommit a4 = commit(a3, b3);
-
- rw.sort(RevSort.TOPO_KEEP_BRANCH_TOGETHER);
- rw.sort(RevSort.REVERSE, true);
- markStart(a4);
- assertCommit(a1, rw.next());
- assertCommit(b1, rw.next());
- assertCommit(a2, rw.next());
- assertCommit(b2, rw.next());
- assertCommit(a3, rw.next());
- assertCommit(b3, rw.next());
- assertCommit(a4, rw.next());
- assertNull(rw.next());
- }
-
- @Test
- public void testSort_TOPO_NON_INTERMIX_ParentOfMultipleStartChildren()
- throws Exception {
- final RevCommit a = commit();
- final RevCommit b = commit(a);
- final RevCommit c = commit(a);
- final RevCommit d1 = commit(a);
- final RevCommit d2 = commit(d1);
- final RevCommit e = commit(a);
-
- rw.sort(RevSort.TOPO_KEEP_BRANCH_TOGETHER);
- markStart(b);
- markStart(c);
- markStart(d2);
- markStart(e);
- assertCommit(e, rw.next());
- assertCommit(d2, rw.next());
- assertCommit(d1, rw.next());
- assertCommit(c, rw.next());
- assertCommit(b, rw.next());
- assertCommit(a, rw.next());
- assertNull(rw.next());
- }
-
- @Test
- public void testSort_TOPO_NON_INTERMIX_Uninteresting() throws Exception {
- final RevCommit a1 = commit();
- final RevCommit a2 = commit(a1);
- final RevCommit a3 = commit(a2);
- final RevCommit b = commit(a1);
- final RevCommit a4 = commit(a3, b);
-
- rw.sort(RevSort.TOPO_KEEP_BRANCH_TOGETHER);
- markStart(a4);
- markUninteresting(a2);
- assertCommit(a4, rw.next());
- assertCommit(b, rw.next());
- assertCommit(a3, rw.next());
- assertNull(rw.next());
- }
-
- @Test
- public void testSort_TOPO_NON_INTERMIX_and_TOPO_throws() throws Exception {
- final RevCommit a = commit();
-
- rw.sort(RevSort.TOPO_KEEP_BRANCH_TOGETHER);
- rw.sort(RevSort.TOPO, true);
- markStart(a);
- try {
- rw.next();
- fail("did not throw IllegalStateException");
- } catch (IllegalStateException e) {
- assertEquals(
- JGitText.get().cannotCombineTopoSortWithTopoNonIntermixSort,
- e.getMessage());
- }
- }
- }
|