123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174 |
- /*
- * Copyright (C) 2009, Google Inc.
- * 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.assertNull;
- import static org.junit.Assert.fail;
-
- import org.eclipse.jgit.revwalk.filter.RevFilter;
- import org.eclipse.jgit.treewalk.filter.TreeFilter;
- import org.junit.Test;
-
- public class RevWalkMergeBaseTest extends RevWalkTestCase {
- @Test
- public void testNone() throws Exception {
- final RevCommit c1 = commit(commit(commit()));
- final RevCommit c2 = commit(commit(commit()));
-
- rw.setRevFilter(RevFilter.MERGE_BASE);
- markStart(c1);
- markStart(c2);
- assertNull(rw.next());
- }
-
- @Test
- public void testDisallowTreeFilter() throws Exception {
- final RevCommit c1 = commit();
- final RevCommit c2 = commit();
-
- rw.setRevFilter(RevFilter.MERGE_BASE);
- rw.setTreeFilter(TreeFilter.ANY_DIFF);
- markStart(c1);
- markStart(c2);
- try {
- assertNull(rw.next());
- fail("did not throw IllegalStateException");
- } catch (IllegalStateException ise) {
- // expected result
- }
- }
-
- @Test
- public void testSimple() throws Exception {
- final RevCommit a = commit();
- final RevCommit b = commit(a);
- final RevCommit c1 = commit(commit(commit(commit(commit(b)))));
- final RevCommit c2 = commit(commit(commit(commit(commit(b)))));
-
- rw.setRevFilter(RevFilter.MERGE_BASE);
- markStart(c1);
- markStart(c2);
- assertCommit(b, rw.next());
- assertNull(rw.next());
- }
-
- @Test
- public void testMultipleHeads_SameBase1() throws Exception {
- final RevCommit a = commit();
- final RevCommit b = commit(a);
- final RevCommit c1 = commit(commit(commit(commit(commit(b)))));
- final RevCommit c2 = commit(commit(commit(commit(commit(b)))));
- final RevCommit c3 = commit(commit(commit(b)));
-
- rw.setRevFilter(RevFilter.MERGE_BASE);
- markStart(c1);
- markStart(c2);
- markStart(c3);
- assertCommit(b, rw.next());
- assertNull(rw.next());
- }
-
- @Test
- public void testMultipleHeads_SameBase2() throws Exception {
- final RevCommit a = commit();
- final RevCommit b = commit(a);
- final RevCommit c = commit(b);
- final RevCommit d1 = commit(commit(commit(commit(commit(b)))));
- final RevCommit d2 = commit(commit(commit(commit(commit(c)))));
- final RevCommit d3 = commit(commit(commit(c)));
-
- rw.setRevFilter(RevFilter.MERGE_BASE);
- markStart(d1);
- markStart(d2);
- markStart(d3);
- assertCommit(b, rw.next());
- assertNull(rw.next());
- }
-
- @Test
- public void testCrissCross() throws Exception {
- // See http://marc.info/?l=git&m=111463358500362&w=2 for a nice
- // description of what this test is creating. We don't have a
- // clean merge base for d,e as they each merged the parents b,c
- // in different orders.
- //
- final RevCommit a = commit();
- final RevCommit b = commit(a);
- final RevCommit c = commit(a);
- final RevCommit d = commit(b, c);
- final RevCommit e = commit(c, b);
-
- rw.setRevFilter(RevFilter.MERGE_BASE);
- markStart(d);
- markStart(e);
- assertCommit(c, rw.next());
- assertCommit(b, rw.next());
- assertNull(rw.next());
- }
-
- @Test
- public void testInconsistentCommitTimes() throws Exception {
- // When commit times are inconsistent (a parent is younger than a child)
- // make sure that not both, parent and child, are reported as merge
- // base. In the following repo the merge base between C,D should be B.
- // But when A is younger than B the MergeBaseGenerator used to generate
- // A before it detected that B is also a merge base.
- //
- // +---C
- // / /
- // A---B---D
-
- final RevCommit a = commit(2);
- final RevCommit b = commit(-1, a);
- final RevCommit c = commit(2, b, a);
- final RevCommit d = commit(1, b);
-
- rw.setRevFilter(RevFilter.MERGE_BASE);
- markStart(d);
- markStart(c);
- assertCommit(b, rw.next());
- assertNull(rw.next());
- }
-
- }
|