123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204 |
- /*
- * Copyright (C) 2009, Google Inc.
- * Copyright (C) 2008, Robin Rosenberg
- * 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.merge;
-
- import static org.junit.Assert.assertEquals;
- import static org.junit.Assert.assertFalse;
- import static org.junit.Assert.assertTrue;
-
- import org.eclipse.jgit.dircache.DirCache;
- import org.eclipse.jgit.dircache.DirCacheBuilder;
- import org.eclipse.jgit.junit.RepositoryTestCase;
- 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.treewalk.TreeWalk;
- import org.junit.Test;
-
- public class CherryPickTest extends RepositoryTestCase {
- @Test
- public void testPick() throws Exception {
- // B---O
- // \----P---T
- //
- // Cherry-pick "T" onto "O". This shouldn't introduce "p-fail", which
- // was created by "P", nor should it modify "a", which was done by "P".
- //
- final DirCache treeB = db.readDirCache();
- final DirCache treeO = db.readDirCache();
- final DirCache treeP = db.readDirCache();
- final DirCache treeT = db.readDirCache();
- {
- final DirCacheBuilder b = treeB.builder();
- final DirCacheBuilder o = treeO.builder();
- final DirCacheBuilder p = treeP.builder();
- final DirCacheBuilder t = treeT.builder();
-
- b.add(createEntry("a", FileMode.REGULAR_FILE));
-
- o.add(createEntry("a", FileMode.REGULAR_FILE));
- o.add(createEntry("o", FileMode.REGULAR_FILE));
-
- p.add(createEntry("a", FileMode.REGULAR_FILE, "q"));
- p.add(createEntry("p-fail", FileMode.REGULAR_FILE));
-
- t.add(createEntry("a", FileMode.REGULAR_FILE));
- t.add(createEntry("t", FileMode.REGULAR_FILE));
-
- b.finish();
- o.finish();
- p.finish();
- t.finish();
- }
-
- final ObjectInserter ow = db.newObjectInserter();
- final ObjectId B = commit(ow, treeB, new ObjectId[] {});
- final ObjectId O = commit(ow, treeO, new ObjectId[] { B });
- final ObjectId P = commit(ow, treeP, new ObjectId[] { B });
- final ObjectId T = commit(ow, treeT, new ObjectId[] { P });
-
- ThreeWayMerger twm = MergeStrategy.SIMPLE_TWO_WAY_IN_CORE.newMerger(db);
- twm.setBase(P);
- boolean merge = twm.merge(new ObjectId[] { O, T });
- assertTrue(merge);
-
- final TreeWalk tw = new TreeWalk(db);
- tw.setRecursive(true);
- tw.reset(twm.getResultTreeId());
-
- assertTrue(tw.next());
- assertEquals("a", tw.getPathString());
- assertCorrectId(treeO, tw);
-
- assertTrue(tw.next());
- assertEquals("o", tw.getPathString());
- assertCorrectId(treeO, tw);
-
- assertTrue(tw.next());
- assertEquals("t", tw.getPathString());
- assertCorrectId(treeT, tw);
-
- assertFalse(tw.next());
- }
-
- @Test
- public void testRevert() throws Exception {
- // B---P---T
- //
- // Revert P, this should result in a tree with a
- // from B and t from T as the change to a in P
- // and addition of t in P is reverted.
- //
- // We use the standard merge, but change the order
- // of the sources.
- //
- final DirCache treeB = db.readDirCache();
- final DirCache treeP = db.readDirCache();
- final DirCache treeT = db.readDirCache();
- {
- final DirCacheBuilder b = treeB.builder();
- final DirCacheBuilder p = treeP.builder();
- final DirCacheBuilder t = treeT.builder();
-
- b.add(createEntry("a", FileMode.REGULAR_FILE));
-
- p.add(createEntry("a", FileMode.REGULAR_FILE, "q"));
- p.add(createEntry("p-fail", FileMode.REGULAR_FILE));
-
- t.add(createEntry("a", FileMode.REGULAR_FILE, "q"));
- t.add(createEntry("p-fail", FileMode.REGULAR_FILE));
- t.add(createEntry("t", FileMode.REGULAR_FILE));
-
- b.finish();
- p.finish();
- t.finish();
- }
-
- final ObjectInserter ow = db.newObjectInserter();
- final ObjectId B = commit(ow, treeB, new ObjectId[] {});
- final ObjectId P = commit(ow, treeP, new ObjectId[] { B });
- final ObjectId T = commit(ow, treeT, new ObjectId[] { P });
-
- ThreeWayMerger twm = MergeStrategy.SIMPLE_TWO_WAY_IN_CORE.newMerger(db);
- twm.setBase(P);
- boolean merge = twm.merge(new ObjectId[] { B, T });
- assertTrue(merge);
-
- final TreeWalk tw = new TreeWalk(db);
- tw.setRecursive(true);
- tw.reset(twm.getResultTreeId());
-
- assertTrue(tw.next());
- assertEquals("a", tw.getPathString());
- assertCorrectId(treeB, tw);
-
- assertTrue(tw.next());
- assertEquals("t", tw.getPathString());
- assertCorrectId(treeT, tw);
-
- assertFalse(tw.next());
- }
-
- private static void assertCorrectId(final DirCache treeT, final TreeWalk tw) {
- assertEquals(treeT.getEntry(tw.getPathString()).getObjectId(), tw
- .getObjectId(0));
- }
-
- private static ObjectId commit(final ObjectInserter odi,
- final DirCache treeB,
- final ObjectId[] parentIds) throws Exception {
- final 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;
- }
- }
|