12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788899091929394959697989910010110210310410510610710810911011111211311411511611711811912012112212312412512612712812913013113213313413513613713813914014114214314414514614714814915015115215315415515615715815916016116216316416516616716816917017117217317417517617717817918018118218318418518618718818919019119219319419519619719819920020120220320420520620720820921021121221321421521621721821922022122222322422522622722822923023123223323423523623723823924024124224324424524624724824925025125225325425525625725825926026126226326426526626726826927027127227327427527627727827928028128228328428528628728828929029129229329429529629729829930030130230330430530630730830931031131231331431531631731831932032132232332432532632732832933033133233333433533633733833934034134234334434534634734834935035135235335435535635735835936036136236336436536636736836937037137237337437537637737837938038138238338438538638738838939039139239339439539639739839940040140240340440540640740840941041141241341441541641741841942042142242342442542642742842943043143243343443543643743843944044144244344444544644744844945045145245345445545645745845946046146246346446546646746846947047147247347447547647747847948048148248348448548648748848949049149249349449549649749849950050150250350450550650750850951051151251351451551651751851952052152252352452552652752852953053153253353453553653753853954054154254354454554654754854955055155255355455555655755855956056156256356456556656756856957057157257357457557657757857958058158258358458558658758858959059159259359459559659759859960060160260360460560660760860961061161261361461561661761861962062162262362462562662762862963063163263363463563663763863964064164264364464564664764864965065165265365465565665765865966066166266366466566666766866967067167267367467567667767867968068168268368468568668768868969069169269369469569669769869970070170270370470570670770870971071171271371471571671771871972072172272372472572672772872973073173273373473573673773873974074174274374474574674774874975075175275375475575675775875976076176276376476576676776876977077177277377477577677777877978078178278378478578678778878979079179279379479579679779879980080180280380480580680780880981081181281381481581681781881982082182282382482582682782882983083183283383483583683783883984084184284384484584684784884985085185285385485585685785885986086186286386486586686786886987087187287387487587687787887988088188288388488588688788888989089189289389489589689789889990090190290390490590690790890991091191291391491591691791891992092192292392492592692792892993093193293393493593693793893994094194294394494594694794894995095195295395495595695795895996096196296396496596696796896997097197297397497597697797897998098198298398498598698798898999099199299399499599699799899910001001100210031004100510061007100810091010101110121013101410151016101710181019102010211022102310241025102610271028102910301031103210331034103510361037103810391040104110421043104410451046104710481049105010511052105310541055105610571058105910601061106210631064106510661067106810691070107110721073107410751076107710781079108010811082108310841085108610871088108910901091109210931094109510961097109810991100110111021103110411051106110711081109111011111112111311141115111611171118111911201121112211231124112511261127112811291130113111321133113411351136113711381139114011411142114311441145114611471148114911501151115211531154115511561157115811591160116111621163116411651166116711681169117011711172117311741175117611771178117911801181118211831184118511861187118811891190119111921193119411951196119711981199120012011202120312041205120612071208120912101211121212131214121512161217121812191220122112221223122412251226122712281229123012311232123312341235123612371238123912401241124212431244124512461247124812491250125112521253125412551256125712581259126012611262126312641265126612671268126912701271127212731274127512761277127812791280128112821283128412851286128712881289129012911292129312941295129612971298129913001301130213031304130513061307130813091310131113121313131413151316131713181319132013211322132313241325132613271328132913301331133213331334133513361337133813391340134113421343134413451346134713481349135013511352135313541355135613571358135913601361136213631364136513661367136813691370137113721373137413751376137713781379138013811382138313841385138613871388138913901391139213931394139513961397139813991400140114021403140414051406140714081409141014111412141314141415141614171418141914201421142214231424142514261427142814291430143114321433143414351436143714381439144014411442144314441445144614471448144914501451145214531454145514561457145814591460146114621463146414651466146714681469147014711472147314741475147614771478147914801481148214831484148514861487148814891490149114921493149414951496149714981499150015011502150315041505150615071508150915101511151215131514151515161517151815191520152115221523152415251526152715281529153015311532153315341535153615371538153915401541154215431544154515461547154815491550155115521553155415551556155715581559156015611562 |
- /*
- * Copyright (C) 2010, Stefan Lay <stefan.lay@sap.com>
- * Copyright (C) 2010-2012, Christian Halstrick <christian.halstrick@sap.com>
- * 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.api;
-
- import static org.junit.Assert.assertEquals;
- import static org.junit.Assert.assertFalse;
- import static org.junit.Assert.assertNull;
- import static org.junit.Assert.assertTrue;
- import static org.junit.Assert.fail;
-
- import java.io.File;
- import java.util.Iterator;
-
- import org.eclipse.jgit.api.MergeCommand.FastForwardMode;
- import org.eclipse.jgit.api.MergeResult.MergeStatus;
- import org.eclipse.jgit.api.errors.InvalidMergeHeadsException;
- import org.eclipse.jgit.junit.RepositoryTestCase;
- import org.eclipse.jgit.lib.Constants;
- import org.eclipse.jgit.lib.Ref;
- import org.eclipse.jgit.lib.RepositoryState;
- import org.eclipse.jgit.merge.MergeStrategy;
- import org.eclipse.jgit.merge.ResolveMerger.MergeFailureReason;
- import org.eclipse.jgit.revwalk.RevCommit;
- import org.eclipse.jgit.util.FS;
- import org.eclipse.jgit.util.FileUtils;
- import org.eclipse.jgit.util.GitDateFormatter;
- import org.eclipse.jgit.util.GitDateFormatter.Format;
- import org.junit.Before;
- import org.junit.Test;
- import org.junit.experimental.theories.DataPoints;
- import org.junit.experimental.theories.Theories;
- import org.junit.experimental.theories.Theory;
- import org.junit.runner.RunWith;
-
- @RunWith(Theories.class)
- public class MergeCommandTest extends RepositoryTestCase {
-
- public static @DataPoints
- MergeStrategy[] mergeStrategies = MergeStrategy.get();
-
- private GitDateFormatter dateFormatter;
-
- @Override
- @Before
- public void setUp() throws Exception {
- super.setUp();
- dateFormatter = new GitDateFormatter(Format.DEFAULT);
- }
-
- @Test
- public void testMergeInItself() throws Exception {
- Git git = new Git(db);
- git.commit().setMessage("initial commit").call();
-
- MergeResult result = git.merge().include(db.getRef(Constants.HEAD)).call();
- assertEquals(MergeResult.MergeStatus.ALREADY_UP_TO_DATE, result.getMergeStatus());
- // no reflog entry written by merge
- assertEquals("commit (initial): initial commit",
- db
- .getReflogReader(Constants.HEAD).getLastEntry().getComment());
- assertEquals("commit (initial): initial commit",
- db
- .getReflogReader(db.getBranch()).getLastEntry().getComment());
- }
-
- @Test
- public void testAlreadyUpToDate() throws Exception {
- Git git = new Git(db);
- RevCommit first = git.commit().setMessage("initial commit").call();
- createBranch(first, "refs/heads/branch1");
-
- RevCommit second = git.commit().setMessage("second commit").call();
- MergeResult result = git.merge().include(db.getRef("refs/heads/branch1")).call();
- assertEquals(MergeResult.MergeStatus.ALREADY_UP_TO_DATE, result.getMergeStatus());
- assertEquals(second, result.getNewHead());
- // no reflog entry written by merge
- assertEquals("commit: second commit", db
- .getReflogReader(Constants.HEAD).getLastEntry().getComment());
- assertEquals("commit: second commit", db
- .getReflogReader(db.getBranch()).getLastEntry().getComment());
- }
-
- @Test
- public void testFastForward() throws Exception {
- Git git = new Git(db);
- RevCommit first = git.commit().setMessage("initial commit").call();
- createBranch(first, "refs/heads/branch1");
-
- RevCommit second = git.commit().setMessage("second commit").call();
-
- checkoutBranch("refs/heads/branch1");
-
- MergeResult result = git.merge().include(db.getRef(Constants.MASTER)).call();
-
- assertEquals(MergeResult.MergeStatus.FAST_FORWARD, result.getMergeStatus());
- assertEquals(second, result.getNewHead());
- assertEquals("merge refs/heads/master: Fast-forward",
- db.getReflogReader(Constants.HEAD).getLastEntry().getComment());
- assertEquals("merge refs/heads/master: Fast-forward",
- db.getReflogReader(db.getBranch()).getLastEntry().getComment());
- }
-
- @Test
- public void testFastForwardNoCommit() throws Exception {
- Git git = new Git(db);
- RevCommit first = git.commit().setMessage("initial commit").call();
- createBranch(first, "refs/heads/branch1");
-
- RevCommit second = git.commit().setMessage("second commit").call();
-
- checkoutBranch("refs/heads/branch1");
-
- MergeResult result = git.merge().include(db.getRef(Constants.MASTER))
- .setCommit(false).call();
-
- assertEquals(MergeResult.MergeStatus.FAST_FORWARD,
- result.getMergeStatus());
- assertEquals(second, result.getNewHead());
- assertEquals("merge refs/heads/master: Fast-forward", db
- .getReflogReader(Constants.HEAD).getLastEntry().getComment());
- assertEquals("merge refs/heads/master: Fast-forward", db
- .getReflogReader(db.getBranch()).getLastEntry().getComment());
- }
-
- @Test
- public void testFastForwardWithFiles() throws Exception {
- Git git = new Git(db);
-
- writeTrashFile("file1", "file1");
- git.add().addFilepattern("file1").call();
- RevCommit first = git.commit().setMessage("initial commit").call();
-
- assertTrue(new File(db.getWorkTree(), "file1").exists());
- createBranch(first, "refs/heads/branch1");
-
- writeTrashFile("file2", "file2");
- git.add().addFilepattern("file2").call();
- RevCommit second = git.commit().setMessage("second commit").call();
- assertTrue(new File(db.getWorkTree(), "file2").exists());
-
- checkoutBranch("refs/heads/branch1");
- assertFalse(new File(db.getWorkTree(), "file2").exists());
-
- MergeResult result = git.merge().include(db.getRef(Constants.MASTER)).call();
-
- assertTrue(new File(db.getWorkTree(), "file1").exists());
- assertTrue(new File(db.getWorkTree(), "file2").exists());
- assertEquals(MergeResult.MergeStatus.FAST_FORWARD, result.getMergeStatus());
- assertEquals(second, result.getNewHead());
- assertEquals("merge refs/heads/master: Fast-forward",
- db.getReflogReader(Constants.HEAD).getLastEntry().getComment());
- assertEquals("merge refs/heads/master: Fast-forward",
- db.getReflogReader(db.getBranch()).getLastEntry().getComment());
- }
-
- @Test
- public void testMultipleHeads() throws Exception {
- Git git = new Git(db);
-
- writeTrashFile("file1", "file1");
- git.add().addFilepattern("file1").call();
- RevCommit first = git.commit().setMessage("initial commit").call();
- createBranch(first, "refs/heads/branch1");
-
- writeTrashFile("file2", "file2");
- git.add().addFilepattern("file2").call();
- RevCommit second = git.commit().setMessage("second commit").call();
-
- writeTrashFile("file3", "file3");
- git.add().addFilepattern("file3").call();
- git.commit().setMessage("third commit").call();
-
- checkoutBranch("refs/heads/branch1");
- assertFalse(new File(db.getWorkTree(), "file2").exists());
- assertFalse(new File(db.getWorkTree(), "file3").exists());
-
- MergeCommand merge = git.merge();
- merge.include(second.getId());
- merge.include(db.getRef(Constants.MASTER));
- try {
- merge.call();
- fail("Expected exception not thrown when merging multiple heads");
- } catch (InvalidMergeHeadsException e) {
- // expected this exception
- }
- }
-
- @Theory
- public void testMergeSuccessAllStrategies(MergeStrategy mergeStrategy)
- throws Exception {
- Git git = new Git(db);
-
- RevCommit first = git.commit().setMessage("first").call();
- createBranch(first, "refs/heads/side");
-
- writeTrashFile("a", "a");
- git.add().addFilepattern("a").call();
- git.commit().setMessage("second").call();
-
- checkoutBranch("refs/heads/side");
- writeTrashFile("b", "b");
- git.add().addFilepattern("b").call();
- git.commit().setMessage("third").call();
-
- MergeResult result = git.merge().setStrategy(mergeStrategy)
- .include(db.getRef(Constants.MASTER)).call();
- assertEquals(MergeStatus.MERGED, result.getMergeStatus());
- assertEquals(
- "merge refs/heads/master: Merge made by "
- + mergeStrategy.getName() + ".",
- db.getReflogReader(Constants.HEAD).getLastEntry().getComment());
- assertEquals(
- "merge refs/heads/master: Merge made by "
- + mergeStrategy.getName() + ".",
- db.getReflogReader(db.getBranch()).getLastEntry().getComment());
- }
-
- @Theory
- public void testMergeSuccessAllStrategiesNoCommit(
- MergeStrategy mergeStrategy) throws Exception {
- Git git = new Git(db);
-
- RevCommit first = git.commit().setMessage("first").call();
- createBranch(first, "refs/heads/side");
-
- writeTrashFile("a", "a");
- git.add().addFilepattern("a").call();
- git.commit().setMessage("second").call();
-
- checkoutBranch("refs/heads/side");
- writeTrashFile("b", "b");
- git.add().addFilepattern("b").call();
- RevCommit thirdCommit = git.commit().setMessage("third").call();
-
- MergeResult result = git.merge().setStrategy(mergeStrategy)
- .setCommit(false)
- .include(db.getRef(Constants.MASTER)).call();
- assertEquals(MergeStatus.MERGED_NOT_COMMITTED, result.getMergeStatus());
- assertEquals(db.getRef(Constants.HEAD).getTarget().getObjectId(),
- thirdCommit.getId());
- }
-
- @Test
- public void testContentMerge() throws Exception {
- Git git = new Git(db);
-
- writeTrashFile("a", "1\na\n3\n");
- writeTrashFile("b", "1\nb\n3\n");
- writeTrashFile("c/c/c", "1\nc\n3\n");
- git.add().addFilepattern("a").addFilepattern("b")
- .addFilepattern("c/c/c").call();
- RevCommit initialCommit = git.commit().setMessage("initial").call();
-
- createBranch(initialCommit, "refs/heads/side");
- checkoutBranch("refs/heads/side");
-
- writeTrashFile("a", "1\na(side)\n3\n");
- writeTrashFile("b", "1\nb(side)\n3\n");
- git.add().addFilepattern("a").addFilepattern("b").call();
- RevCommit secondCommit = git.commit().setMessage("side").call();
-
- assertEquals("1\nb(side)\n3\n", read(new File(db.getWorkTree(), "b")));
- checkoutBranch("refs/heads/master");
- assertEquals("1\nb\n3\n", read(new File(db.getWorkTree(), "b")));
-
- writeTrashFile("a", "1\na(main)\n3\n");
- writeTrashFile("c/c/c", "1\nc(main)\n3\n");
- git.add().addFilepattern("a").addFilepattern("c/c/c").call();
- git.commit().setMessage("main").call();
-
- MergeResult result = git.merge().include(secondCommit.getId())
- .setStrategy(MergeStrategy.RESOLVE).call();
- assertEquals(MergeStatus.CONFLICTING, result.getMergeStatus());
-
- assertEquals(
- "1\n<<<<<<< HEAD\na(main)\n=======\na(side)\n>>>>>>> 86503e7e397465588cc267b65d778538bffccb83\n3\n",
- read(new File(db.getWorkTree(), "a")));
- assertEquals("1\nb(side)\n3\n", read(new File(db.getWorkTree(), "b")));
- assertEquals("1\nc(main)\n3\n",
- read(new File(db.getWorkTree(), "c/c/c")));
-
- assertEquals(1, result.getConflicts().size());
- assertEquals(3, result.getConflicts().get("a")[0].length);
-
- assertEquals(RepositoryState.MERGING, db.getRepositoryState());
- }
-
- @Test
- public void testMergeTag() throws Exception {
- Git git = new Git(db);
-
- writeTrashFile("a", "a");
- git.add().addFilepattern("a").call();
- RevCommit initialCommit = git.commit().setMessage("initial").call();
-
- createBranch(initialCommit, "refs/heads/side");
- checkoutBranch("refs/heads/side");
-
- writeTrashFile("b", "b");
- git.add().addFilepattern("b").call();
- RevCommit secondCommit = git.commit().setMessage("side").call();
- Ref tag = git.tag().setAnnotated(true).setMessage("my tag 01")
- .setName("tag01").setObjectId(secondCommit).call();
-
- checkoutBranch("refs/heads/master");
-
- writeTrashFile("a", "a2");
- git.add().addFilepattern("a").call();
- git.commit().setMessage("main").call();
-
- MergeResult result = git.merge().include(tag).setStrategy(MergeStrategy.RESOLVE).call();
- assertEquals(MergeStatus.MERGED, result.getMergeStatus());
- }
-
- @Test
- public void testMergeMessage() throws Exception {
- Git git = new Git(db);
-
- writeTrashFile("a", "1\na\n3\n");
- git.add().addFilepattern("a").call();
- RevCommit initialCommit = git.commit().setMessage("initial").call();
-
- createBranch(initialCommit, "refs/heads/side");
- checkoutBranch("refs/heads/side");
-
- writeTrashFile("a", "1\na(side)\n3\n");
- git.add().addFilepattern("a").call();
- git.commit().setMessage("side").call();
-
- checkoutBranch("refs/heads/master");
-
- writeTrashFile("a", "1\na(main)\n3\n");
- git.add().addFilepattern("a").call();
- git.commit().setMessage("main").call();
-
- Ref sideBranch = db.getRef("side");
-
- git.merge().include(sideBranch)
- .setStrategy(MergeStrategy.RESOLVE).call();
-
- assertEquals("Merge branch 'side'\n\nConflicts:\n\ta\n",
- db.readMergeCommitMsg());
-
- }
-
- @Test
- public void testMergeNonVersionedPaths() throws Exception {
- Git git = new Git(db);
-
- writeTrashFile("a", "1\na\n3\n");
- writeTrashFile("b", "1\nb\n3\n");
- writeTrashFile("c/c/c", "1\nc\n3\n");
- git.add().addFilepattern("a").addFilepattern("b")
- .addFilepattern("c/c/c").call();
- RevCommit initialCommit = git.commit().setMessage("initial").call();
-
- createBranch(initialCommit, "refs/heads/side");
- checkoutBranch("refs/heads/side");
-
- writeTrashFile("a", "1\na(side)\n3\n");
- writeTrashFile("b", "1\nb(side)\n3\n");
- git.add().addFilepattern("a").addFilepattern("b").call();
- RevCommit secondCommit = git.commit().setMessage("side").call();
-
- assertEquals("1\nb(side)\n3\n", read(new File(db.getWorkTree(), "b")));
- checkoutBranch("refs/heads/master");
- assertEquals("1\nb\n3\n", read(new File(db.getWorkTree(), "b")));
-
- writeTrashFile("a", "1\na(main)\n3\n");
- writeTrashFile("c/c/c", "1\nc(main)\n3\n");
- git.add().addFilepattern("a").addFilepattern("c/c/c").call();
- git.commit().setMessage("main").call();
-
- writeTrashFile("d", "1\nd\n3\n");
- assertTrue(new File(db.getWorkTree(), "e").mkdir());
-
- MergeResult result = git.merge().include(secondCommit.getId())
- .setStrategy(MergeStrategy.RESOLVE).call();
- assertEquals(MergeStatus.CONFLICTING, result.getMergeStatus());
-
- assertEquals(
- "1\n<<<<<<< HEAD\na(main)\n=======\na(side)\n>>>>>>> 86503e7e397465588cc267b65d778538bffccb83\n3\n",
- read(new File(db.getWorkTree(), "a")));
- assertEquals("1\nb(side)\n3\n", read(new File(db.getWorkTree(), "b")));
- assertEquals("1\nc(main)\n3\n",
- read(new File(db.getWorkTree(), "c/c/c")));
- assertEquals("1\nd\n3\n", read(new File(db.getWorkTree(), "d")));
- File dir = new File(db.getWorkTree(), "e");
- assertTrue(dir.isDirectory());
-
- assertEquals(1, result.getConflicts().size());
- assertEquals(3, result.getConflicts().get("a")[0].length);
-
- assertEquals(RepositoryState.MERGING, db.getRepositoryState());
- }
-
- @Test
- public void testMultipleCreations() throws Exception {
- Git git = new Git(db);
-
- writeTrashFile("a", "1\na\n3\n");
- git.add().addFilepattern("a").call();
- RevCommit initialCommit = git.commit().setMessage("initial").call();
-
- createBranch(initialCommit, "refs/heads/side");
- checkoutBranch("refs/heads/side");
-
- writeTrashFile("b", "1\nb(side)\n3\n");
- git.add().addFilepattern("b").call();
- RevCommit secondCommit = git.commit().setMessage("side").call();
-
- checkoutBranch("refs/heads/master");
-
- writeTrashFile("b", "1\nb(main)\n3\n");
- git.add().addFilepattern("b").call();
- git.commit().setMessage("main").call();
-
- MergeResult result = git.merge().include(secondCommit.getId())
- .setStrategy(MergeStrategy.RESOLVE).call();
- assertEquals(MergeStatus.CONFLICTING, result.getMergeStatus());
- }
-
- @Test
- public void testMultipleCreationsSameContent() throws Exception {
- Git git = new Git(db);
-
- writeTrashFile("a", "1\na\n3\n");
- git.add().addFilepattern("a").call();
- RevCommit initialCommit = git.commit().setMessage("initial").call();
-
- createBranch(initialCommit, "refs/heads/side");
- checkoutBranch("refs/heads/side");
-
- writeTrashFile("b", "1\nb(1)\n3\n");
- git.add().addFilepattern("b").call();
- RevCommit secondCommit = git.commit().setMessage("side").call();
-
- checkoutBranch("refs/heads/master");
-
- writeTrashFile("b", "1\nb(1)\n3\n");
- git.add().addFilepattern("b").call();
- git.commit().setMessage("main").call();
-
- MergeResult result = git.merge().include(secondCommit.getId())
- .setStrategy(MergeStrategy.RESOLVE).call();
- assertEquals(MergeStatus.MERGED, result.getMergeStatus());
- assertEquals("1\nb(1)\n3\n", read(new File(db.getWorkTree(), "b")));
- assertEquals("merge " + secondCommit.getId().getName()
- + ": Merge made by resolve.", db
- .getReflogReader(Constants.HEAD)
- .getLastEntry().getComment());
- assertEquals("merge " + secondCommit.getId().getName()
- + ": Merge made by resolve.", db
- .getReflogReader(db.getBranch())
- .getLastEntry().getComment());
- }
-
- @Test
- public void testSuccessfulContentMerge() throws Exception {
- Git git = new Git(db);
-
- writeTrashFile("a", "1\na\n3\n");
- writeTrashFile("b", "1\nb\n3\n");
- writeTrashFile("c/c/c", "1\nc\n3\n");
- git.add().addFilepattern("a").addFilepattern("b")
- .addFilepattern("c/c/c").call();
- RevCommit initialCommit = git.commit().setMessage("initial").call();
-
- createBranch(initialCommit, "refs/heads/side");
- checkoutBranch("refs/heads/side");
-
- writeTrashFile("a", "1(side)\na\n3\n");
- writeTrashFile("b", "1\nb(side)\n3\n");
- git.add().addFilepattern("a").addFilepattern("b").call();
- RevCommit secondCommit = git.commit().setMessage("side").call();
-
- assertEquals("1\nb(side)\n3\n", read(new File(db.getWorkTree(), "b")));
- checkoutBranch("refs/heads/master");
- assertEquals("1\nb\n3\n", read(new File(db.getWorkTree(), "b")));
-
- writeTrashFile("a", "1\na\n3(main)\n");
- writeTrashFile("c/c/c", "1\nc(main)\n3\n");
- git.add().addFilepattern("a").addFilepattern("c/c/c").call();
- RevCommit thirdCommit = git.commit().setMessage("main").call();
-
- MergeResult result = git.merge().include(secondCommit.getId())
- .setStrategy(MergeStrategy.RESOLVE).call();
- assertEquals(MergeStatus.MERGED, result.getMergeStatus());
-
- assertEquals("1(side)\na\n3(main)\n", read(new File(db.getWorkTree(),
- "a")));
- assertEquals("1\nb(side)\n3\n", read(new File(db.getWorkTree(), "b")));
- assertEquals("1\nc(main)\n3\n", read(new File(db.getWorkTree(),
- "c/c/c")));
-
- assertEquals(null, result.getConflicts());
-
- assertEquals(2, result.getMergedCommits().length);
- assertEquals(thirdCommit, result.getMergedCommits()[0]);
- assertEquals(secondCommit, result.getMergedCommits()[1]);
-
- Iterator<RevCommit> it = git.log().call().iterator();
- RevCommit newHead = it.next();
- assertEquals(newHead, result.getNewHead());
- assertEquals(2, newHead.getParentCount());
- assertEquals(thirdCommit, newHead.getParent(0));
- assertEquals(secondCommit, newHead.getParent(1));
- assertEquals(
- "Merge commit '3fa334456d236a92db020289fe0bf481d91777b4'",
- newHead.getFullMessage());
- // @TODO fix me
- assertEquals(RepositoryState.SAFE, db.getRepositoryState());
- // test index state
- }
-
- @Test
- public void testSuccessfulContentMergeNoCommit() throws Exception {
- Git git = new Git(db);
-
- writeTrashFile("a", "1\na\n3\n");
- writeTrashFile("b", "1\nb\n3\n");
- writeTrashFile("c/c/c", "1\nc\n3\n");
- git.add().addFilepattern("a").addFilepattern("b")
- .addFilepattern("c/c/c").call();
- RevCommit initialCommit = git.commit().setMessage("initial").call();
-
- createBranch(initialCommit, "refs/heads/side");
- checkoutBranch("refs/heads/side");
-
- writeTrashFile("a", "1(side)\na\n3\n");
- writeTrashFile("b", "1\nb(side)\n3\n");
- git.add().addFilepattern("a").addFilepattern("b").call();
- RevCommit secondCommit = git.commit().setMessage("side").call();
-
- assertEquals("1\nb(side)\n3\n", read(new File(db.getWorkTree(), "b")));
- checkoutBranch("refs/heads/master");
- assertEquals("1\nb\n3\n", read(new File(db.getWorkTree(), "b")));
-
- writeTrashFile("a", "1\na\n3(main)\n");
- writeTrashFile("c/c/c", "1\nc(main)\n3\n");
- git.add().addFilepattern("a").addFilepattern("c/c/c").call();
- RevCommit thirdCommit = git.commit().setMessage("main").call();
-
- MergeResult result = git.merge().include(secondCommit.getId())
- .setCommit(false)
- .setStrategy(MergeStrategy.RESOLVE).call();
- assertEquals(MergeStatus.MERGED_NOT_COMMITTED, result.getMergeStatus());
- assertEquals(db.getRef(Constants.HEAD).getTarget().getObjectId(),
- thirdCommit.getId());
-
- assertEquals("1(side)\na\n3(main)\n", read(new File(db.getWorkTree(),
- "a")));
- assertEquals("1\nb(side)\n3\n", read(new File(db.getWorkTree(), "b")));
- assertEquals("1\nc(main)\n3\n",
- read(new File(db.getWorkTree(), "c/c/c")));
-
- assertEquals(null, result.getConflicts());
-
- assertEquals(2, result.getMergedCommits().length);
- assertEquals(thirdCommit, result.getMergedCommits()[0]);
- assertEquals(secondCommit, result.getMergedCommits()[1]);
- assertNull(result.getNewHead());
- assertEquals(RepositoryState.MERGING_RESOLVED, db.getRepositoryState());
- }
-
- @Test
- public void testSuccessfulContentMergeAndDirtyworkingTree()
- throws Exception {
- Git git = new Git(db);
-
- writeTrashFile("a", "1\na\n3\n");
- writeTrashFile("b", "1\nb\n3\n");
- writeTrashFile("d", "1\nd\n3\n");
- writeTrashFile("c/c/c", "1\nc\n3\n");
- git.add().addFilepattern("a").addFilepattern("b")
- .addFilepattern("c/c/c").addFilepattern("d").call();
- RevCommit initialCommit = git.commit().setMessage("initial").call();
-
- createBranch(initialCommit, "refs/heads/side");
- checkoutBranch("refs/heads/side");
-
- writeTrashFile("a", "1(side)\na\n3\n");
- writeTrashFile("b", "1\nb(side)\n3\n");
- git.add().addFilepattern("a").addFilepattern("b").call();
- RevCommit secondCommit = git.commit().setMessage("side").call();
-
- assertEquals("1\nb(side)\n3\n", read(new File(db.getWorkTree(), "b")));
- checkoutBranch("refs/heads/master");
- assertEquals("1\nb\n3\n", read(new File(db.getWorkTree(), "b")));
-
- writeTrashFile("a", "1\na\n3(main)\n");
- writeTrashFile("c/c/c", "1\nc(main)\n3\n");
- git.add().addFilepattern("a").addFilepattern("c/c/c").call();
- RevCommit thirdCommit = git.commit().setMessage("main").call();
-
- writeTrashFile("d", "--- dirty ---");
- MergeResult result = git.merge().include(secondCommit.getId())
- .setStrategy(MergeStrategy.RESOLVE).call();
- assertEquals(MergeStatus.MERGED, result.getMergeStatus());
-
- assertEquals("1(side)\na\n3(main)\n", read(new File(db.getWorkTree(),
- "a")));
- assertEquals("1\nb(side)\n3\n", read(new File(db.getWorkTree(), "b")));
- assertEquals("1\nc(main)\n3\n", read(new File(db.getWorkTree(),
- "c/c/c")));
- assertEquals("--- dirty ---", read(new File(db.getWorkTree(), "d")));
-
- assertEquals(null, result.getConflicts());
-
- assertEquals(2, result.getMergedCommits().length);
- assertEquals(thirdCommit, result.getMergedCommits()[0]);
- assertEquals(secondCommit, result.getMergedCommits()[1]);
-
- Iterator<RevCommit> it = git.log().call().iterator();
- RevCommit newHead = it.next();
- assertEquals(newHead, result.getNewHead());
- assertEquals(2, newHead.getParentCount());
- assertEquals(thirdCommit, newHead.getParent(0));
- assertEquals(secondCommit, newHead.getParent(1));
- assertEquals(
- "Merge commit '064d54d98a4cdb0fed1802a21c656bfda67fe879'",
- newHead.getFullMessage());
-
- assertEquals(RepositoryState.SAFE, db.getRepositoryState());
- }
-
- @Test
- public void testSingleDeletion() throws Exception {
- Git git = new Git(db);
-
- writeTrashFile("a", "1\na\n3\n");
- writeTrashFile("b", "1\nb\n3\n");
- writeTrashFile("d", "1\nd\n3\n");
- writeTrashFile("c/c/c", "1\nc\n3\n");
- git.add().addFilepattern("a").addFilepattern("b")
- .addFilepattern("c/c/c").addFilepattern("d").call();
- RevCommit initialCommit = git.commit().setMessage("initial").call();
-
- createBranch(initialCommit, "refs/heads/side");
- checkoutBranch("refs/heads/side");
-
- assertTrue(new File(db.getWorkTree(), "b").delete());
- git.add().addFilepattern("b").setUpdate(true).call();
- RevCommit secondCommit = git.commit().setMessage("side").call();
-
- assertFalse(new File(db.getWorkTree(), "b").exists());
- checkoutBranch("refs/heads/master");
- assertTrue(new File(db.getWorkTree(), "b").exists());
-
- writeTrashFile("a", "1\na\n3(main)\n");
- writeTrashFile("c/c/c", "1\nc(main)\n3\n");
- git.add().addFilepattern("a").addFilepattern("c/c/c").call();
- RevCommit thirdCommit = git.commit().setMessage("main").call();
-
- // We are merging a deletion into our branch
- MergeResult result = git.merge().include(secondCommit.getId())
- .setStrategy(MergeStrategy.RESOLVE).call();
- assertEquals(MergeStatus.MERGED, result.getMergeStatus());
-
- assertEquals("1\na\n3(main)\n", read(new File(db.getWorkTree(), "a")));
- assertFalse(new File(db.getWorkTree(), "b").exists());
- assertEquals("1\nc(main)\n3\n",
- read(new File(db.getWorkTree(), "c/c/c")));
- assertEquals("1\nd\n3\n", read(new File(db.getWorkTree(), "d")));
-
- // Do the opposite, be on a branch where we have deleted a file and
- // merge in a old commit where this file was not deleted
- checkoutBranch("refs/heads/side");
- assertFalse(new File(db.getWorkTree(), "b").exists());
-
- result = git.merge().include(thirdCommit.getId())
- .setStrategy(MergeStrategy.RESOLVE).call();
- assertEquals(MergeStatus.MERGED, result.getMergeStatus());
-
- assertEquals("1\na\n3(main)\n", read(new File(db.getWorkTree(), "a")));
- assertFalse(new File(db.getWorkTree(), "b").exists());
- assertEquals("1\nc(main)\n3\n",
- read(new File(db.getWorkTree(), "c/c/c")));
- assertEquals("1\nd\n3\n", read(new File(db.getWorkTree(), "d")));
- }
-
- @Test
- public void testMultipleDeletions() throws Exception {
- Git git = new Git(db);
-
- writeTrashFile("a", "1\na\n3\n");
- git.add().addFilepattern("a").call();
- RevCommit initialCommit = git.commit().setMessage("initial").call();
-
- createBranch(initialCommit, "refs/heads/side");
- checkoutBranch("refs/heads/side");
-
- assertTrue(new File(db.getWorkTree(), "a").delete());
- git.add().addFilepattern("a").setUpdate(true).call();
- RevCommit secondCommit = git.commit().setMessage("side").call();
-
- assertFalse(new File(db.getWorkTree(), "a").exists());
- checkoutBranch("refs/heads/master");
- assertTrue(new File(db.getWorkTree(), "a").exists());
-
- assertTrue(new File(db.getWorkTree(), "a").delete());
- git.add().addFilepattern("a").setUpdate(true).call();
- git.commit().setMessage("main").call();
-
- // We are merging a deletion into our branch
- MergeResult result = git.merge().include(secondCommit.getId())
- .setStrategy(MergeStrategy.RESOLVE).call();
- assertEquals(MergeStatus.MERGED, result.getMergeStatus());
- }
-
- @Test
- public void testDeletionAndConflict() throws Exception {
- Git git = new Git(db);
-
- writeTrashFile("a", "1\na\n3\n");
- writeTrashFile("b", "1\nb\n3\n");
- writeTrashFile("d", "1\nd\n3\n");
- writeTrashFile("c/c/c", "1\nc\n3\n");
- git.add().addFilepattern("a").addFilepattern("b")
- .addFilepattern("c/c/c").addFilepattern("d").call();
- RevCommit initialCommit = git.commit().setMessage("initial").call();
-
- createBranch(initialCommit, "refs/heads/side");
- checkoutBranch("refs/heads/side");
-
- assertTrue(new File(db.getWorkTree(), "b").delete());
- writeTrashFile("a", "1\na\n3(side)\n");
- git.add().addFilepattern("b").setUpdate(true).call();
- git.add().addFilepattern("a").setUpdate(true).call();
- RevCommit secondCommit = git.commit().setMessage("side").call();
-
- assertFalse(new File(db.getWorkTree(), "b").exists());
- checkoutBranch("refs/heads/master");
- assertTrue(new File(db.getWorkTree(), "b").exists());
-
- writeTrashFile("a", "1\na\n3(main)\n");
- writeTrashFile("c/c/c", "1\nc(main)\n3\n");
- git.add().addFilepattern("a").addFilepattern("c/c/c").call();
- git.commit().setMessage("main").call();
-
- // We are merging a deletion into our branch
- MergeResult result = git.merge().include(secondCommit.getId())
- .setStrategy(MergeStrategy.RESOLVE).call();
- assertEquals(MergeStatus.CONFLICTING, result.getMergeStatus());
-
- assertEquals(
- "1\na\n<<<<<<< HEAD\n3(main)\n=======\n3(side)\n>>>>>>> 54ffed45d62d252715fc20e41da92d44c48fb0ff\n",
- read(new File(db.getWorkTree(), "a")));
- assertFalse(new File(db.getWorkTree(), "b").exists());
- assertEquals("1\nc(main)\n3\n",
- read(new File(db.getWorkTree(), "c/c/c")));
- assertEquals("1\nd\n3\n", read(new File(db.getWorkTree(), "d")));
- }
-
- @Test
- public void testDeletionOnMasterConflict() throws Exception {
- Git git = new Git(db);
-
- writeTrashFile("a", "1\na\n3\n");
- writeTrashFile("b", "1\nb\n3\n");
- git.add().addFilepattern("a").addFilepattern("b").call();
- RevCommit initialCommit = git.commit().setMessage("initial").call();
-
- // create side branch and modify "a"
- createBranch(initialCommit, "refs/heads/side");
- checkoutBranch("refs/heads/side");
- writeTrashFile("a", "1\na(side)\n3\n");
- git.add().addFilepattern("a").call();
- RevCommit secondCommit = git.commit().setMessage("side").call();
-
- // delete a on master to generate conflict
- checkoutBranch("refs/heads/master");
- git.rm().addFilepattern("a").call();
- git.commit().setMessage("main").call();
-
- // merge side with master
- MergeResult result = git.merge().include(secondCommit.getId())
- .setStrategy(MergeStrategy.RESOLVE).call();
- assertEquals(MergeStatus.CONFLICTING, result.getMergeStatus());
-
- // result should be 'a' conflicting with workspace content from side
- assertTrue(new File(db.getWorkTree(), "a").exists());
- assertEquals("1\na(side)\n3\n", read(new File(db.getWorkTree(), "a")));
- assertEquals("1\nb\n3\n", read(new File(db.getWorkTree(), "b")));
- }
-
- @Test
- public void testDeletionOnSideConflict() throws Exception {
- Git git = new Git(db);
-
- writeTrashFile("a", "1\na\n3\n");
- writeTrashFile("b", "1\nb\n3\n");
- git.add().addFilepattern("a").addFilepattern("b").call();
- RevCommit initialCommit = git.commit().setMessage("initial").call();
-
- // create side branch and delete "a"
- createBranch(initialCommit, "refs/heads/side");
- checkoutBranch("refs/heads/side");
- git.rm().addFilepattern("a").call();
- RevCommit secondCommit = git.commit().setMessage("side").call();
-
- // update a on master to generate conflict
- checkoutBranch("refs/heads/master");
- writeTrashFile("a", "1\na(main)\n3\n");
- git.add().addFilepattern("a").call();
- git.commit().setMessage("main").call();
-
- // merge side with master
- MergeResult result = git.merge().include(secondCommit.getId())
- .setStrategy(MergeStrategy.RESOLVE).call();
- assertEquals(MergeStatus.CONFLICTING, result.getMergeStatus());
-
- assertTrue(new File(db.getWorkTree(), "a").exists());
- assertEquals("1\na(main)\n3\n", read(new File(db.getWorkTree(), "a")));
- assertEquals("1\nb\n3\n", read(new File(db.getWorkTree(), "b")));
-
- assertEquals(1, result.getConflicts().size());
- assertEquals(3, result.getConflicts().get("a")[0].length);
- }
-
- @Test
- public void testModifiedAndRenamed() throws Exception {
- // this test is essentially the same as testDeletionOnSideConflict,
- // however if once rename support is added this test should result in a
- // successful merge instead of a conflict
- Git git = new Git(db);
-
- writeTrashFile("x", "add x");
- git.add().addFilepattern("x").call();
- RevCommit initial = git.commit().setMessage("add x").call();
-
- createBranch(initial, "refs/heads/d1");
- createBranch(initial, "refs/heads/d2");
-
- // rename x to y on d1
- checkoutBranch("refs/heads/d1");
- new File(db.getWorkTree(), "x")
- .renameTo(new File(db.getWorkTree(), "y"));
- git.rm().addFilepattern("x").call();
- git.add().addFilepattern("y").call();
- RevCommit d1Commit = git.commit().setMessage("d1 rename x -> y").call();
-
- checkoutBranch("refs/heads/d2");
- writeTrashFile("x", "d2 change");
- git.add().addFilepattern("x").call();
- RevCommit d2Commit = git.commit().setMessage("d2 change in x").call();
-
- checkoutBranch("refs/heads/master");
- MergeResult d1Merge = git.merge().include(d1Commit).call();
- assertEquals(MergeResult.MergeStatus.FAST_FORWARD,
- d1Merge.getMergeStatus());
-
- MergeResult d2Merge = git.merge().include(d2Commit).call();
- assertEquals(MergeResult.MergeStatus.CONFLICTING,
- d2Merge.getMergeStatus());
- assertEquals(1, d2Merge.getConflicts().size());
- assertEquals(3, d2Merge.getConflicts().get("x")[0].length);
- }
-
- @Test
- public void testMergeFailingWithDirtyWorkingTree() throws Exception {
- Git git = new Git(db);
-
- writeTrashFile("a", "1\na\n3\n");
- writeTrashFile("b", "1\nb\n3\n");
- git.add().addFilepattern("a").addFilepattern("b").call();
- RevCommit initialCommit = git.commit().setMessage("initial").call();
-
- createBranch(initialCommit, "refs/heads/side");
- checkoutBranch("refs/heads/side");
-
- writeTrashFile("a", "1(side)\na\n3\n");
- writeTrashFile("b", "1\nb(side)\n3\n");
- git.add().addFilepattern("a").addFilepattern("b").call();
- RevCommit secondCommit = git.commit().setMessage("side").call();
-
- assertEquals("1\nb(side)\n3\n", read(new File(db.getWorkTree(), "b")));
- checkoutBranch("refs/heads/master");
- assertEquals("1\nb\n3\n", read(new File(db.getWorkTree(), "b")));
-
- writeTrashFile("a", "1\na\n3(main)\n");
- git.add().addFilepattern("a").call();
- git.commit().setMessage("main").call();
-
- writeTrashFile("a", "--- dirty ---");
- MergeResult result = git.merge().include(secondCommit.getId())
- .setStrategy(MergeStrategy.RESOLVE).call();
-
- assertEquals(MergeStatus.FAILED, result.getMergeStatus());
-
- assertEquals("--- dirty ---", read(new File(db.getWorkTree(), "a")));
- assertEquals("1\nb\n3\n", read(new File(db.getWorkTree(), "b")));
-
- assertEquals(null, result.getConflicts());
-
- assertEquals(RepositoryState.SAFE, db.getRepositoryState());
- }
-
- @Test
- public void testMergeConflictFileFolder() throws Exception {
- Git git = new Git(db);
-
- writeTrashFile("a", "1\na\n3\n");
- writeTrashFile("b", "1\nb\n3\n");
- git.add().addFilepattern("a").addFilepattern("b").call();
- RevCommit initialCommit = git.commit().setMessage("initial").call();
-
- createBranch(initialCommit, "refs/heads/side");
- checkoutBranch("refs/heads/side");
-
- writeTrashFile("c/c/c", "1\nc(side)\n3\n");
- writeTrashFile("d", "1\nd(side)\n3\n");
- git.add().addFilepattern("c/c/c").addFilepattern("d").call();
- RevCommit secondCommit = git.commit().setMessage("side").call();
-
- checkoutBranch("refs/heads/master");
-
- writeTrashFile("c", "1\nc(main)\n3\n");
- writeTrashFile("d/d/d", "1\nd(main)\n3\n");
- git.add().addFilepattern("c").addFilepattern("d/d/d").call();
- git.commit().setMessage("main").call();
-
- MergeResult result = git.merge().include(secondCommit.getId())
- .setStrategy(MergeStrategy.RESOLVE).call();
-
- assertEquals(MergeStatus.CONFLICTING, result.getMergeStatus());
-
- assertEquals("1\na\n3\n", read(new File(db.getWorkTree(), "a")));
- assertEquals("1\nb\n3\n", read(new File(db.getWorkTree(), "b")));
- assertEquals("1\nc(main)\n3\n", read(new File(db.getWorkTree(), "c")));
- assertEquals("1\nd(main)\n3\n", read(new File(db.getWorkTree(), "d/d/d")));
-
- assertEquals(null, result.getConflicts());
-
- assertEquals(RepositoryState.MERGING, db.getRepositoryState());
- }
-
- @Test
- public void testSuccessfulMergeFailsDueToDirtyIndex() throws Exception {
- Git git = new Git(db);
-
- File fileA = writeTrashFile("a", "a");
- RevCommit initialCommit = addAllAndCommit(git);
-
- // switch branch
- createBranch(initialCommit, "refs/heads/side");
- checkoutBranch("refs/heads/side");
- // modify file a
- write(fileA, "a(side)");
- writeTrashFile("b", "b");
- RevCommit sideCommit = addAllAndCommit(git);
-
- // switch branch
- checkoutBranch("refs/heads/master");
- writeTrashFile("c", "c");
- addAllAndCommit(git);
-
- // modify and add file a
- write(fileA, "a(modified)");
- git.add().addFilepattern("a").call();
- // do not commit
-
- // get current index state
- String indexState = indexState(CONTENT);
-
- // merge
- MergeResult result = git.merge().include(sideCommit.getId())
- .setStrategy(MergeStrategy.RESOLVE).call();
-
- checkMergeFailedResult(result, MergeFailureReason.DIRTY_INDEX,
- indexState, fileA);
- }
-
- @Test
- public void testConflictingMergeFailsDueToDirtyIndex() throws Exception {
- Git git = new Git(db);
-
- File fileA = writeTrashFile("a", "a");
- RevCommit initialCommit = addAllAndCommit(git);
-
- // switch branch
- createBranch(initialCommit, "refs/heads/side");
- checkoutBranch("refs/heads/side");
- // modify file a
- write(fileA, "a(side)");
- writeTrashFile("b", "b");
- RevCommit sideCommit = addAllAndCommit(git);
-
- // switch branch
- checkoutBranch("refs/heads/master");
- // modify file a - this will cause a conflict during merge
- write(fileA, "a(master)");
- writeTrashFile("c", "c");
- addAllAndCommit(git);
-
- // modify and add file a
- write(fileA, "a(modified)");
- git.add().addFilepattern("a").call();
- // do not commit
-
- // get current index state
- String indexState = indexState(CONTENT);
-
- // merge
- MergeResult result = git.merge().include(sideCommit.getId())
- .setStrategy(MergeStrategy.RESOLVE).call();
-
- checkMergeFailedResult(result, MergeFailureReason.DIRTY_INDEX,
- indexState, fileA);
- }
-
- @Test
- public void testSuccessfulMergeFailsDueToDirtyWorktree() throws Exception {
- Git git = new Git(db);
-
- File fileA = writeTrashFile("a", "a");
- RevCommit initialCommit = addAllAndCommit(git);
-
- // switch branch
- createBranch(initialCommit, "refs/heads/side");
- checkoutBranch("refs/heads/side");
- // modify file a
- write(fileA, "a(side)");
- writeTrashFile("b", "b");
- RevCommit sideCommit = addAllAndCommit(git);
-
- // switch branch
- checkoutBranch("refs/heads/master");
- writeTrashFile("c", "c");
- addAllAndCommit(git);
-
- // modify file a
- write(fileA, "a(modified)");
- // do not add and commit
-
- // get current index state
- String indexState = indexState(CONTENT);
-
- // merge
- MergeResult result = git.merge().include(sideCommit.getId())
- .setStrategy(MergeStrategy.RESOLVE).call();
-
- checkMergeFailedResult(result, MergeFailureReason.DIRTY_WORKTREE,
- indexState, fileA);
- }
-
- @Test
- public void testConflictingMergeFailsDueToDirtyWorktree() throws Exception {
- Git git = new Git(db);
-
- File fileA = writeTrashFile("a", "a");
- RevCommit initialCommit = addAllAndCommit(git);
-
- // switch branch
- createBranch(initialCommit, "refs/heads/side");
- checkoutBranch("refs/heads/side");
- // modify file a
- write(fileA, "a(side)");
- writeTrashFile("b", "b");
- RevCommit sideCommit = addAllAndCommit(git);
-
- // switch branch
- checkoutBranch("refs/heads/master");
- // modify file a - this will cause a conflict during merge
- write(fileA, "a(master)");
- writeTrashFile("c", "c");
- addAllAndCommit(git);
-
- // modify file a
- write(fileA, "a(modified)");
- // do not add and commit
-
- // get current index state
- String indexState = indexState(CONTENT);
-
- // merge
- MergeResult result = git.merge().include(sideCommit.getId())
- .setStrategy(MergeStrategy.RESOLVE).call();
-
- checkMergeFailedResult(result, MergeFailureReason.DIRTY_WORKTREE,
- indexState, fileA);
- }
-
- @Test
- public void testMergeRemovingFolders() throws Exception {
- File folder1 = new File(db.getWorkTree(), "folder1");
- File folder2 = new File(db.getWorkTree(), "folder2");
- FileUtils.mkdir(folder1);
- FileUtils.mkdir(folder2);
- File file = new File(folder1, "file1.txt");
- write(file, "folder1--file1.txt");
- file = new File(folder1, "file2.txt");
- write(file, "folder1--file2.txt");
- file = new File(folder2, "file1.txt");
- write(file, "folder--file1.txt");
- file = new File(folder2, "file2.txt");
- write(file, "folder2--file2.txt");
-
- Git git = new Git(db);
- git.add().addFilepattern(folder1.getName())
- .addFilepattern(folder2.getName()).call();
- RevCommit commit1 = git.commit().setMessage("adding folders").call();
-
- recursiveDelete(folder1);
- recursiveDelete(folder2);
- git.rm().addFilepattern("folder1/file1.txt")
- .addFilepattern("folder1/file2.txt")
- .addFilepattern("folder2/file1.txt")
- .addFilepattern("folder2/file2.txt").call();
- RevCommit commit2 = git.commit()
- .setMessage("removing folders on 'branch'").call();
-
- git.checkout().setName(commit1.name()).call();
-
- MergeResult result = git.merge().include(commit2.getId())
- .setStrategy(MergeStrategy.RESOLVE).call();
- assertEquals(MergeResult.MergeStatus.FAST_FORWARD,
- result.getMergeStatus());
- assertEquals(commit2, result.getNewHead());
- assertFalse(folder1.exists());
- assertFalse(folder2.exists());
- }
-
- @Test
- public void testMergeRemovingFoldersWithoutFastForward() throws Exception {
- File folder1 = new File(db.getWorkTree(), "folder1");
- File folder2 = new File(db.getWorkTree(), "folder2");
- FileUtils.mkdir(folder1);
- FileUtils.mkdir(folder2);
- File file = new File(folder1, "file1.txt");
- write(file, "folder1--file1.txt");
- file = new File(folder1, "file2.txt");
- write(file, "folder1--file2.txt");
- file = new File(folder2, "file1.txt");
- write(file, "folder--file1.txt");
- file = new File(folder2, "file2.txt");
- write(file, "folder2--file2.txt");
-
- Git git = new Git(db);
- git.add().addFilepattern(folder1.getName())
- .addFilepattern(folder2.getName()).call();
- RevCommit base = git.commit().setMessage("adding folders").call();
-
- recursiveDelete(folder1);
- recursiveDelete(folder2);
- git.rm().addFilepattern("folder1/file1.txt")
- .addFilepattern("folder1/file2.txt")
- .addFilepattern("folder2/file1.txt")
- .addFilepattern("folder2/file2.txt").call();
- RevCommit other = git.commit()
- .setMessage("removing folders on 'branch'").call();
-
- git.checkout().setName(base.name()).call();
-
- file = new File(folder2, "file3.txt");
- write(file, "folder2--file3.txt");
-
- git.add().addFilepattern(folder2.getName()).call();
- git.commit().setMessage("adding another file").call();
-
- MergeResult result = git.merge().include(other.getId())
- .setStrategy(MergeStrategy.RESOLVE).call();
-
- assertEquals(MergeResult.MergeStatus.MERGED,
- result.getMergeStatus());
- assertFalse(folder1.exists());
- }
-
- @Test
- public void testFileModeMerge() throws Exception {
- if (!FS.DETECTED.supportsExecute())
- return;
- // Only Java6
- Git git = new Git(db);
-
- writeTrashFile("mergeableMode", "a");
- setExecutable(git, "mergeableMode", false);
- writeTrashFile("conflictingModeWithBase", "a");
- setExecutable(git, "conflictingModeWithBase", false);
- RevCommit initialCommit = addAllAndCommit(git);
-
- // switch branch
- createBranch(initialCommit, "refs/heads/side");
- checkoutBranch("refs/heads/side");
- setExecutable(git, "mergeableMode", true);
- writeTrashFile("conflictingModeNoBase", "b");
- setExecutable(git, "conflictingModeNoBase", true);
- RevCommit sideCommit = addAllAndCommit(git);
-
- // switch branch
- createBranch(initialCommit, "refs/heads/side2");
- checkoutBranch("refs/heads/side2");
- setExecutable(git, "mergeableMode", false);
- assertFalse(new File(git.getRepository().getWorkTree(),
- "conflictingModeNoBase").exists());
- writeTrashFile("conflictingModeNoBase", "b");
- setExecutable(git, "conflictingModeNoBase", false);
- addAllAndCommit(git);
-
- // merge
- MergeResult result = git.merge().include(sideCommit.getId())
- .setStrategy(MergeStrategy.RESOLVE).call();
- assertEquals(MergeStatus.CONFLICTING, result.getMergeStatus());
- assertTrue(canExecute(git, "mergeableMode"));
- assertFalse(canExecute(git, "conflictingModeNoBase"));
- }
-
- @Test
- public void testFileModeMergeWithDirtyWorkTree() throws Exception {
- if (!FS.DETECTED.supportsExecute())
- return;
- // Only Java6 (or set x bit in index)
-
- Git git = new Git(db);
-
- writeTrashFile("mergeableButDirty", "a");
- setExecutable(git, "mergeableButDirty", false);
- RevCommit initialCommit = addAllAndCommit(git);
-
- // switch branch
- createBranch(initialCommit, "refs/heads/side");
- checkoutBranch("refs/heads/side");
- setExecutable(git, "mergeableButDirty", true);
- RevCommit sideCommit = addAllAndCommit(git);
-
- // switch branch
- createBranch(initialCommit, "refs/heads/side2");
- checkoutBranch("refs/heads/side2");
- setExecutable(git, "mergeableButDirty", false);
- addAllAndCommit(git);
-
- writeTrashFile("mergeableButDirty", "b");
-
- // merge
- MergeResult result = git.merge().include(sideCommit.getId())
- .setStrategy(MergeStrategy.RESOLVE).call();
- assertEquals(MergeStatus.FAILED, result.getMergeStatus());
- assertFalse(canExecute(git, "mergeableButDirty"));
- }
-
- @Test
- public void testSquashFastForward() throws Exception {
- Git git = new Git(db);
-
- writeTrashFile("file1", "file1");
- git.add().addFilepattern("file1").call();
- RevCommit first = git.commit().setMessage("initial commit").call();
-
- assertTrue(new File(db.getWorkTree(), "file1").exists());
- createBranch(first, "refs/heads/branch1");
- checkoutBranch("refs/heads/branch1");
-
- writeTrashFile("file2", "file2");
- git.add().addFilepattern("file2").call();
- RevCommit second = git.commit().setMessage("second commit").call();
- assertTrue(new File(db.getWorkTree(), "file2").exists());
-
- writeTrashFile("file3", "file3");
- git.add().addFilepattern("file3").call();
- RevCommit third = git.commit().setMessage("third commit").call();
- assertTrue(new File(db.getWorkTree(), "file3").exists());
-
- checkoutBranch("refs/heads/master");
- assertTrue(new File(db.getWorkTree(), "file1").exists());
- assertFalse(new File(db.getWorkTree(), "file2").exists());
- assertFalse(new File(db.getWorkTree(), "file3").exists());
-
- MergeResult result = git.merge().include(db.getRef("branch1"))
- .setSquash(true).call();
-
- assertTrue(new File(db.getWorkTree(), "file1").exists());
- assertTrue(new File(db.getWorkTree(), "file2").exists());
- assertTrue(new File(db.getWorkTree(), "file3").exists());
- assertEquals(MergeResult.MergeStatus.FAST_FORWARD_SQUASHED,
- result.getMergeStatus());
- assertEquals(first, result.getNewHead()); // HEAD didn't move
- assertEquals(first, db.resolve(Constants.HEAD + "^{commit}"));
-
- assertEquals(
- "Squashed commit of the following:\n\ncommit "
- + third.getName()
- + "\nAuthor: "
- + third.getAuthorIdent().getName()
- + " <"
- + third.getAuthorIdent().getEmailAddress()
- + ">\nDate: "
- + dateFormatter.formatDate(third
- .getAuthorIdent())
- + "\n\n\tthird commit\n\ncommit "
- + second.getName()
- + "\nAuthor: "
- + second.getAuthorIdent().getName()
- + " <"
- + second.getAuthorIdent().getEmailAddress()
- + ">\nDate: "
- + dateFormatter.formatDate(second
- .getAuthorIdent()) + "\n\n\tsecond commit\n",
- db.readSquashCommitMsg());
- assertNull(db.readMergeCommitMsg());
-
- Status stat = git.status().call();
- assertEquals(StatusCommandTest.set("file2", "file3"), stat.getAdded());
- }
-
- @Test
- public void testSquashMerge() throws Exception {
- Git git = new Git(db);
-
- writeTrashFile("file1", "file1");
- git.add().addFilepattern("file1").call();
- RevCommit first = git.commit().setMessage("initial commit").call();
-
- assertTrue(new File(db.getWorkTree(), "file1").exists());
- createBranch(first, "refs/heads/branch1");
-
- writeTrashFile("file2", "file2");
- git.add().addFilepattern("file2").call();
- RevCommit second = git.commit().setMessage("second commit").call();
- assertTrue(new File(db.getWorkTree(), "file2").exists());
-
- checkoutBranch("refs/heads/branch1");
-
- writeTrashFile("file3", "file3");
- git.add().addFilepattern("file3").call();
- RevCommit third = git.commit().setMessage("third commit").call();
- assertTrue(new File(db.getWorkTree(), "file3").exists());
-
- checkoutBranch("refs/heads/master");
- assertTrue(new File(db.getWorkTree(), "file1").exists());
- assertTrue(new File(db.getWorkTree(), "file2").exists());
- assertFalse(new File(db.getWorkTree(), "file3").exists());
-
- MergeResult result = git.merge().include(db.getRef("branch1"))
- .setSquash(true).call();
-
- assertTrue(new File(db.getWorkTree(), "file1").exists());
- assertTrue(new File(db.getWorkTree(), "file2").exists());
- assertTrue(new File(db.getWorkTree(), "file3").exists());
- assertEquals(MergeResult.MergeStatus.MERGED_SQUASHED,
- result.getMergeStatus());
- assertEquals(second, result.getNewHead()); // HEAD didn't move
- assertEquals(second, db.resolve(Constants.HEAD + "^{commit}"));
-
- assertEquals(
- "Squashed commit of the following:\n\ncommit "
- + third.getName()
- + "\nAuthor: "
- + third.getAuthorIdent().getName()
- + " <"
- + third.getAuthorIdent().getEmailAddress()
- + ">\nDate: "
- + dateFormatter.formatDate(third
- .getAuthorIdent()) + "\n\n\tthird commit\n",
- db.readSquashCommitMsg());
- assertNull(db.readMergeCommitMsg());
-
- Status stat = git.status().call();
- assertEquals(StatusCommandTest.set("file3"), stat.getAdded());
- }
-
- @Test
- public void testSquashMergeConflict() throws Exception {
- Git git = new Git(db);
-
- writeTrashFile("file1", "file1");
- git.add().addFilepattern("file1").call();
- RevCommit first = git.commit().setMessage("initial commit").call();
-
- assertTrue(new File(db.getWorkTree(), "file1").exists());
- createBranch(first, "refs/heads/branch1");
-
- writeTrashFile("file2", "master");
- git.add().addFilepattern("file2").call();
- RevCommit second = git.commit().setMessage("second commit").call();
- assertTrue(new File(db.getWorkTree(), "file2").exists());
-
- checkoutBranch("refs/heads/branch1");
-
- writeTrashFile("file2", "branch");
- git.add().addFilepattern("file2").call();
- RevCommit third = git.commit().setMessage("third commit").call();
- assertTrue(new File(db.getWorkTree(), "file2").exists());
-
- checkoutBranch("refs/heads/master");
- assertTrue(new File(db.getWorkTree(), "file1").exists());
- assertTrue(new File(db.getWorkTree(), "file2").exists());
-
- MergeResult result = git.merge().include(db.getRef("branch1"))
- .setSquash(true).call();
-
- assertTrue(new File(db.getWorkTree(), "file1").exists());
- assertTrue(new File(db.getWorkTree(), "file2").exists());
- assertEquals(MergeResult.MergeStatus.CONFLICTING,
- result.getMergeStatus());
- assertNull(result.getNewHead());
- assertEquals(second, db.resolve(Constants.HEAD + "^{commit}"));
-
- assertEquals(
- "Squashed commit of the following:\n\ncommit "
- + third.getName()
- + "\nAuthor: "
- + third.getAuthorIdent().getName()
- + " <"
- + third.getAuthorIdent().getEmailAddress()
- + ">\nDate: "
- + dateFormatter.formatDate(third
- .getAuthorIdent()) + "\n\n\tthird commit\n",
- db.readSquashCommitMsg());
- assertEquals("\nConflicts:\n\tfile2\n", db.readMergeCommitMsg());
-
- Status stat = git.status().call();
- assertEquals(StatusCommandTest.set("file2"), stat.getConflicting());
- }
-
- @Test
- public void testFastForwardOnly() throws Exception {
- Git git = new Git(db);
- RevCommit initialCommit = git.commit().setMessage("initial commit")
- .call();
- createBranch(initialCommit, "refs/heads/branch1");
- git.commit().setMessage("second commit").call();
- checkoutBranch("refs/heads/branch1");
-
- MergeCommand merge = git.merge();
- merge.setFastForward(FastForwardMode.FF_ONLY);
- merge.include(db.getRef(Constants.MASTER));
- MergeResult result = merge.call();
-
- assertEquals(MergeStatus.FAST_FORWARD, result.getMergeStatus());
- }
-
- @Test
- public void testNoFastForward() throws Exception {
- Git git = new Git(db);
- RevCommit initialCommit = git.commit().setMessage("initial commit")
- .call();
- createBranch(initialCommit, "refs/heads/branch1");
- git.commit().setMessage("second commit").call();
- checkoutBranch("refs/heads/branch1");
-
- MergeCommand merge = git.merge();
- merge.setFastForward(FastForwardMode.NO_FF);
- merge.include(db.getRef(Constants.MASTER));
- MergeResult result = merge.call();
-
- assertEquals(MergeStatus.MERGED, result.getMergeStatus());
- }
-
- @Test
- public void testNoFastForwardNoCommit() throws Exception {
- // given
- Git git = new Git(db);
- RevCommit initialCommit = git.commit().setMessage("initial commit")
- .call();
- createBranch(initialCommit, "refs/heads/branch1");
- RevCommit secondCommit = git.commit().setMessage("second commit")
- .call();
- checkoutBranch("refs/heads/branch1");
-
- // when
- MergeCommand merge = git.merge();
- merge.setFastForward(FastForwardMode.NO_FF);
- merge.include(db.getRef(Constants.MASTER));
- merge.setCommit(false);
- MergeResult result = merge.call();
-
- // then
- assertEquals(MergeStatus.MERGED_NOT_COMMITTED, result.getMergeStatus());
- assertEquals(2, result.getMergedCommits().length);
- assertEquals(initialCommit, result.getMergedCommits()[0]);
- assertEquals(secondCommit, result.getMergedCommits()[1]);
- assertNull(result.getNewHead());
- assertEquals(RepositoryState.MERGING_RESOLVED, db.getRepositoryState());
- }
-
- @Test
- public void testFastForwardOnlyNotPossible() throws Exception {
- Git git = new Git(db);
- RevCommit initialCommit = git.commit().setMessage("initial commit")
- .call();
- createBranch(initialCommit, "refs/heads/branch1");
- git.commit().setMessage("second commit").call();
- checkoutBranch("refs/heads/branch1");
- writeTrashFile("file1", "branch1");
- git.add().addFilepattern("file").call();
- git.commit().setMessage("second commit on branch1").call();
- MergeCommand merge = git.merge();
- merge.setFastForward(FastForwardMode.FF_ONLY);
- merge.include(db.getRef(Constants.MASTER));
- MergeResult result = merge.call();
-
- assertEquals(MergeStatus.ABORTED, result.getMergeStatus());
- }
- private static void setExecutable(Git git, String path, boolean executable) {
- FS.DETECTED.setExecute(
- new File(git.getRepository().getWorkTree(), path), executable);
- }
-
- private static boolean canExecute(Git git, String path) {
- return FS.DETECTED.canExecute(new File(git.getRepository()
- .getWorkTree(), path));
- }
-
- private static RevCommit addAllAndCommit(final Git git) throws Exception {
- git.add().addFilepattern(".").call();
- return git.commit().setMessage("message").call();
- }
-
- private void checkMergeFailedResult(final MergeResult result,
- final MergeFailureReason reason,
- final String indexState, final File fileA) throws Exception {
- assertEquals(MergeStatus.FAILED, result.getMergeStatus());
- assertEquals(reason, result.getFailingPaths().get("a"));
- assertEquals("a(modified)", read(fileA));
- assertFalse(new File(db.getWorkTree(), "b").exists());
- assertEquals("c", read(new File(db.getWorkTree(), "c")));
- assertEquals(indexState, indexState(CONTENT));
- assertEquals(null, result.getConflicts());
- assertEquals(RepositoryState.SAFE, db.getRepositoryState());
- }
- }
|