123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386 |
- /*
- * Copyright (C) 2009, Google Inc.
- * Copyright (C) 2008, Robin Rosenberg 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.merge;
-
- import static org.junit.Assert.assertEquals;
- import static org.junit.Assert.assertFalse;
- import static org.junit.Assert.assertTrue;
-
- import java.io.IOException;
-
- import org.eclipse.jgit.dircache.DirCache;
- import org.eclipse.jgit.dircache.DirCacheBuilder;
- import org.eclipse.jgit.lib.CommitBuilder;
- import org.eclipse.jgit.lib.FileMode;
- import org.eclipse.jgit.lib.ObjectId;
- import org.eclipse.jgit.lib.ObjectInserter;
- import org.eclipse.jgit.lib.PersonIdent;
- import org.eclipse.jgit.test.resources.SampleDataRepositoryTestCase;
- import org.eclipse.jgit.treewalk.TreeWalk;
- import org.junit.Test;
-
- public class SimpleMergeTest extends SampleDataRepositoryTestCase {
-
- @Test
- public void testOurs() throws IOException {
- Merger ourMerger = MergeStrategy.OURS.newMerger(db);
- boolean merge = ourMerger.merge(new ObjectId[] { db.resolve("a"), db.resolve("c") });
- assertTrue(merge);
- assertEquals(db.resolve("a^{tree}"), ourMerger.getResultTreeId());
- }
-
- @Test
- public void testOurs_noRepo() throws IOException {
- try (ObjectInserter ins = db.newObjectInserter()) {
- Merger ourMerger = MergeStrategy.OURS.newMerger(ins, db.getConfig());
- boolean merge = ourMerger.merge(new ObjectId[] { db.resolve("a"), db.resolve("c") });
- assertTrue(merge);
- assertEquals(db.resolve("a^{tree}"), ourMerger.getResultTreeId());
- }
- }
-
- @Test
- public void testTheirs() throws IOException {
- Merger ourMerger = MergeStrategy.THEIRS.newMerger(db);
- boolean merge = ourMerger.merge(new ObjectId[] { db.resolve("a"), db.resolve("c") });
- assertTrue(merge);
- assertEquals(db.resolve("c^{tree}"), ourMerger.getResultTreeId());
- }
-
- @Test
- public void testTheirs_noRepo() throws IOException {
- try (ObjectInserter ins = db.newObjectInserter()) {
- Merger ourMerger = MergeStrategy.THEIRS.newMerger(db);
- boolean merge = ourMerger.merge(new ObjectId[] { db.resolve("a"), db.resolve("c") });
- assertTrue(merge);
- assertEquals(db.resolve("c^{tree}"), ourMerger.getResultTreeId());
- }
- }
-
- @Test
- public void testTrivialTwoWay() throws IOException {
- Merger ourMerger = MergeStrategy.SIMPLE_TWO_WAY_IN_CORE.newMerger(db);
- boolean merge = ourMerger.merge(new ObjectId[] { db.resolve("a"), db.resolve("c") });
- assertTrue(merge);
- assertEquals("02ba32d3649e510002c21651936b7077aa75ffa9",ourMerger.getResultTreeId().name());
- }
-
- @Test
- public void testTrivialTwoWay_disjointhistories() throws IOException {
- Merger ourMerger = MergeStrategy.SIMPLE_TWO_WAY_IN_CORE.newMerger(db);
- boolean merge = ourMerger.merge(new ObjectId[] { db.resolve("a"), db.resolve("c~4") });
- assertTrue(merge);
- assertEquals("86265c33b19b2be71bdd7b8cb95823f2743d03a8",ourMerger.getResultTreeId().name());
- }
-
- @Test
- public void testTrivialTwoWay_ok() throws IOException {
- Merger ourMerger = MergeStrategy.SIMPLE_TWO_WAY_IN_CORE.newMerger(db);
- boolean merge = ourMerger.merge(new ObjectId[] { db.resolve("a^0^0^0"), db.resolve("a^0^0^1") });
- assertTrue(merge);
- assertEquals(db.resolve("a^0^0^{tree}"), ourMerger.getResultTreeId());
- }
-
- @Test
- public void testTrivialTwoWay_noRepo() throws IOException {
- try (ObjectInserter ins = db.newObjectInserter()) {
- Merger ourMerger = MergeStrategy.SIMPLE_TWO_WAY_IN_CORE.newMerger(ins, db.getConfig());
- boolean merge = ourMerger.merge(new ObjectId[] { db.resolve("a^0^0^0"), db.resolve("a^0^0^1") });
- assertTrue(merge);
- assertEquals(db.resolve("a^0^0^{tree}"), ourMerger.getResultTreeId());
- }
- }
-
- @Test
- public void testTrivialTwoWay_conflict() throws IOException {
- Merger ourMerger = MergeStrategy.SIMPLE_TWO_WAY_IN_CORE.newMerger(db);
- boolean merge = ourMerger.merge(new ObjectId[] { db.resolve("f"), db.resolve("g") });
- assertFalse(merge);
- }
-
- @Test
- public void testTrivialTwoWay_validSubtreeSort() throws Exception {
- DirCache treeB = db.readDirCache();
- DirCache treeO = db.readDirCache();
- DirCache treeT = db.readDirCache();
-
- DirCacheBuilder bTreeBuilder = treeB.builder();
- DirCacheBuilder oTreeBuilder = treeO.builder();
- DirCacheBuilder tTreeBuilder = treeT.builder();
-
- bTreeBuilder.add(createEntry("libelf-po/a", FileMode.REGULAR_FILE));
- bTreeBuilder.add(createEntry("libelf/c", FileMode.REGULAR_FILE));
-
- oTreeBuilder.add(createEntry("Makefile", FileMode.REGULAR_FILE));
- oTreeBuilder.add(createEntry("libelf-po/a", FileMode.REGULAR_FILE));
- oTreeBuilder.add(createEntry("libelf/c", FileMode.REGULAR_FILE));
-
- tTreeBuilder.add(createEntry("libelf-po/a", FileMode.REGULAR_FILE));
- tTreeBuilder
- .add(createEntry("libelf/c", FileMode.REGULAR_FILE, "blah"));
-
- bTreeBuilder.finish();
- oTreeBuilder.finish();
- tTreeBuilder.finish();
-
- ObjectInserter ow = db.newObjectInserter();
- ObjectId b = commit(ow, treeB, new ObjectId[] {});
- ObjectId o = commit(ow, treeO, new ObjectId[] { b });
- ObjectId t = commit(ow, treeT, new ObjectId[] { b });
-
- Merger ourMerger = MergeStrategy.SIMPLE_TWO_WAY_IN_CORE.newMerger(db);
- boolean merge = ourMerger.merge(new ObjectId[] { o, t });
- assertTrue(merge);
-
- try (TreeWalk tw = new TreeWalk(db)) {
- tw.setRecursive(true);
- tw.reset(ourMerger.getResultTreeId());
-
- assertTrue(tw.next());
- assertEquals("Makefile", tw.getPathString());
- assertCorrectId(treeO, tw);
-
- assertTrue(tw.next());
- assertEquals("libelf-po/a", tw.getPathString());
- assertCorrectId(treeO, tw);
-
- assertTrue(tw.next());
- assertEquals("libelf/c", tw.getPathString());
- assertCorrectId(treeT, tw);
-
- assertFalse(tw.next());
- }
- }
-
- @Test
- public void testTrivialTwoWay_concurrentSubtreeChange() throws Exception {
- DirCache treeB = db.readDirCache();
- DirCache treeO = db.readDirCache();
- DirCache treeT = db.readDirCache();
-
- DirCacheBuilder bTreeBuilder = treeB.builder();
- DirCacheBuilder oTreeBuilder = treeO.builder();
- DirCacheBuilder tTreeBuilder = treeT.builder();
-
- bTreeBuilder.add(createEntry("d/o", FileMode.REGULAR_FILE));
- bTreeBuilder.add(createEntry("d/t", FileMode.REGULAR_FILE));
-
- oTreeBuilder.add(createEntry("d/o", FileMode.REGULAR_FILE, "o !"));
- oTreeBuilder.add(createEntry("d/t", FileMode.REGULAR_FILE));
-
- tTreeBuilder.add(createEntry("d/o", FileMode.REGULAR_FILE));
- tTreeBuilder.add(createEntry("d/t", FileMode.REGULAR_FILE, "t !"));
-
- bTreeBuilder.finish();
- oTreeBuilder.finish();
- tTreeBuilder.finish();
-
- ObjectInserter ow = db.newObjectInserter();
- ObjectId b = commit(ow, treeB, new ObjectId[] {});
- ObjectId o = commit(ow, treeO, new ObjectId[] { b });
- ObjectId t = commit(ow, treeT, new ObjectId[] { b });
-
- Merger ourMerger = MergeStrategy.SIMPLE_TWO_WAY_IN_CORE.newMerger(db);
- boolean merge = ourMerger.merge(new ObjectId[] { o, t });
- assertTrue(merge);
-
- try (TreeWalk tw = new TreeWalk(db)) {
- tw.setRecursive(true);
- tw.reset(ourMerger.getResultTreeId());
-
- assertTrue(tw.next());
- assertEquals("d/o", tw.getPathString());
- assertCorrectId(treeO, tw);
-
- assertTrue(tw.next());
- assertEquals("d/t", tw.getPathString());
- assertCorrectId(treeT, tw);
-
- assertFalse(tw.next());
- }
- }
-
- @Test
- public void testTrivialTwoWay_conflictSubtreeChange() throws Exception {
- DirCache treeB = db.readDirCache();
- DirCache treeO = db.readDirCache();
- DirCache treeT = db.readDirCache();
-
- DirCacheBuilder bTreeBuilder = treeB.builder();
- DirCacheBuilder oTreeBuilder = treeO.builder();
- DirCacheBuilder tTreeBuilder = treeT.builder();
-
- bTreeBuilder.add(createEntry("d/o", FileMode.REGULAR_FILE));
- bTreeBuilder.add(createEntry("d/t", FileMode.REGULAR_FILE));
-
- oTreeBuilder.add(createEntry("d/o", FileMode.REGULAR_FILE));
- oTreeBuilder.add(createEntry("d/t", FileMode.REGULAR_FILE, "o !"));
-
- tTreeBuilder.add(createEntry("d/o", FileMode.REGULAR_FILE, "t !"));
- tTreeBuilder.add(createEntry("d/t", FileMode.REGULAR_FILE, "t !"));
-
- bTreeBuilder.finish();
- oTreeBuilder.finish();
- tTreeBuilder.finish();
-
- ObjectInserter ow = db.newObjectInserter();
- ObjectId b = commit(ow, treeB, new ObjectId[] {});
- ObjectId o = commit(ow, treeO, new ObjectId[] { b });
- ObjectId t = commit(ow, treeT, new ObjectId[] { b });
-
- Merger ourMerger = MergeStrategy.SIMPLE_TWO_WAY_IN_CORE.newMerger(db);
- boolean merge = ourMerger.merge(new ObjectId[] { o, t });
- assertFalse(merge);
- }
-
- @Test
- public void testTrivialTwoWay_leftDFconflict1() throws Exception {
- DirCache treeB = db.readDirCache();
- DirCache treeO = db.readDirCache();
- DirCache treeT = db.readDirCache();
-
- DirCacheBuilder bTreeBuilder = treeB.builder();
- DirCacheBuilder oTreeBuilder = treeO.builder();
- DirCacheBuilder tTreeBuilder = treeT.builder();
-
- bTreeBuilder.add(createEntry("d/o", FileMode.REGULAR_FILE));
- bTreeBuilder.add(createEntry("d/t", FileMode.REGULAR_FILE));
-
- oTreeBuilder.add(createEntry("d", FileMode.REGULAR_FILE));
-
- tTreeBuilder.add(createEntry("d/o", FileMode.REGULAR_FILE));
- tTreeBuilder.add(createEntry("d/t", FileMode.REGULAR_FILE, "t !"));
-
- bTreeBuilder.finish();
- oTreeBuilder.finish();
- tTreeBuilder.finish();
-
- ObjectInserter ow = db.newObjectInserter();
- ObjectId b = commit(ow, treeB, new ObjectId[] {});
- ObjectId o = commit(ow, treeO, new ObjectId[] { b });
- ObjectId t = commit(ow, treeT, new ObjectId[] { b });
-
- Merger ourMerger = MergeStrategy.SIMPLE_TWO_WAY_IN_CORE.newMerger(db);
- boolean merge = ourMerger.merge(new ObjectId[] { o, t });
- assertFalse(merge);
- }
-
- @Test
- public void testTrivialTwoWay_rightDFconflict1() throws Exception {
- DirCache treeB = db.readDirCache();
- DirCache treeO = db.readDirCache();
- DirCache treeT = db.readDirCache();
-
- DirCacheBuilder bTreeBuilder = treeB.builder();
- DirCacheBuilder oTreeBuilder = treeO.builder();
- DirCacheBuilder tTreeBuilder = treeT.builder();
-
- bTreeBuilder.add(createEntry("d/o", FileMode.REGULAR_FILE));
- bTreeBuilder.add(createEntry("d/t", FileMode.REGULAR_FILE));
-
- oTreeBuilder.add(createEntry("d/o", FileMode.REGULAR_FILE));
- oTreeBuilder.add(createEntry("d/t", FileMode.REGULAR_FILE, "o !"));
-
- tTreeBuilder.add(createEntry("d", FileMode.REGULAR_FILE));
-
- bTreeBuilder.finish();
- oTreeBuilder.finish();
- tTreeBuilder.finish();
-
- ObjectInserter ow = db.newObjectInserter();
- ObjectId b = commit(ow, treeB, new ObjectId[] {});
- ObjectId o = commit(ow, treeO, new ObjectId[] { b });
- ObjectId t = commit(ow, treeT, new ObjectId[] { b });
-
- Merger ourMerger = MergeStrategy.SIMPLE_TWO_WAY_IN_CORE.newMerger(db);
- boolean merge = ourMerger.merge(new ObjectId[] { o, t });
- assertFalse(merge);
- }
-
- @Test
- public void testTrivialTwoWay_leftDFconflict2() throws Exception {
- DirCache treeB = db.readDirCache();
- DirCache treeO = db.readDirCache();
- DirCache treeT = db.readDirCache();
-
- DirCacheBuilder bTreeBuilder = treeB.builder();
- DirCacheBuilder oTreeBuilder = treeO.builder();
- DirCacheBuilder tTreeBuilder = treeT.builder();
-
- bTreeBuilder.add(createEntry("d", FileMode.REGULAR_FILE));
-
- oTreeBuilder.add(createEntry("d", FileMode.REGULAR_FILE, "o !"));
-
- tTreeBuilder.add(createEntry("d/o", FileMode.REGULAR_FILE));
-
- bTreeBuilder.finish();
- oTreeBuilder.finish();
- tTreeBuilder.finish();
-
- ObjectInserter ow = db.newObjectInserter();
- ObjectId b = commit(ow, treeB, new ObjectId[] {});
- ObjectId o = commit(ow, treeO, new ObjectId[] { b });
- ObjectId t = commit(ow, treeT, new ObjectId[] { b });
-
- Merger ourMerger = MergeStrategy.SIMPLE_TWO_WAY_IN_CORE.newMerger(db);
- boolean merge = ourMerger.merge(new ObjectId[] { o, t });
- assertFalse(merge);
- }
-
- @Test
- public void testTrivialTwoWay_rightDFconflict2() throws Exception {
- DirCache treeB = db.readDirCache();
- DirCache treeO = db.readDirCache();
- DirCache treeT = db.readDirCache();
-
- DirCacheBuilder bTreeBuilder = treeB.builder();
- DirCacheBuilder oTreeBuilder = treeO.builder();
- DirCacheBuilder tTreeBuilder = treeT.builder();
-
- bTreeBuilder.add(createEntry("d", FileMode.REGULAR_FILE));
-
- oTreeBuilder.add(createEntry("d/o", FileMode.REGULAR_FILE));
-
- tTreeBuilder.add(createEntry("d", FileMode.REGULAR_FILE, "t !"));
-
- bTreeBuilder.finish();
- oTreeBuilder.finish();
- tTreeBuilder.finish();
-
- ObjectInserter ow = db.newObjectInserter();
- ObjectId b = commit(ow, treeB, new ObjectId[] {});
- ObjectId o = commit(ow, treeO, new ObjectId[] { b });
- ObjectId t = commit(ow, treeT, new ObjectId[] { b });
-
- Merger ourMerger = MergeStrategy.SIMPLE_TWO_WAY_IN_CORE.newMerger(db);
- boolean merge = ourMerger.merge(new ObjectId[] { o, t });
- assertFalse(merge);
- }
-
- private static void assertCorrectId(DirCache treeT, TreeWalk tw) {
- assertEquals(treeT.getEntry(tw.getPathString()).getObjectId(), tw
- .getObjectId(0));
- }
-
- private static ObjectId commit(ObjectInserter odi, DirCache treeB,
- ObjectId[] parentIds) throws Exception {
- CommitBuilder c = new CommitBuilder();
- c.setTreeId(treeB.writeTree(odi));
- c.setAuthor(new PersonIdent("A U Thor", "a.u.thor", 1L, 0));
- c.setCommitter(c.getAuthor());
- c.setParentIds(parentIds);
- c.setMessage("Tree " + c.getTreeId().name());
- ObjectId id = odi.insert(c);
- odi.flush();
- return id;
- }
- }
|