diff options
5 files changed, 99 insertions, 1 deletions
diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index 61007f98b2..7f6d75b47a 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -10,6 +10,7 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: org.eclipse.jgit.api;version="[2.1.0,2.2.0)", org.eclipse.jgit.junit;version="[2.1.0,2.2.0)", org.eclipse.jgit.lib;version="[2.1.0,2.2.0)", + org.eclipse.jgit.merge;version="[2.1.0,2.2.0)", org.eclipse.jgit.pgm;version="[2.1.0,2.2.0)", org.eclipse.jgit.pgm.opt;version="[2.1.0,2.2.0)", org.eclipse.jgit.revwalk;version="[2.1.0,2.2.0)", diff --git a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/MergeTest.java b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/MergeTest.java new file mode 100644 index 0000000000..b33fc0f44a --- /dev/null +++ b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/MergeTest.java @@ -0,0 +1,93 @@ +/* + * Copyright (C) 2012, IBM Corporation and others. + * 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.pgm; + +import static org.junit.Assert.assertEquals; + +import org.eclipse.jgit.api.Git; +import org.eclipse.jgit.lib.CLIRepositoryTestCase; +import org.eclipse.jgit.merge.MergeStrategy; +import org.junit.Before; +import org.junit.Test; + +public class MergeTest extends CLIRepositoryTestCase { + @Override + @Before + public void setUp() throws Exception { + super.setUp(); + new Git(db).commit().setMessage("initial commit").call(); + } + + @Test + public void testMergeSelf() throws Exception { + assertEquals("Already up-to-date.", execute("git merge master")[0]); + } + + @Test + public void testFastForward() throws Exception { + new Git(db).commit().setMessage("initial commit").call(); + new Git(db).branchCreate().setName("side").call(); + writeTrashFile("file", "master"); + new Git(db).add().addFilepattern("file").call(); + new Git(db).commit().setMessage("commit").call(); + new Git(db).checkout().setName("side").call(); + + assertEquals("Fast-forward", execute("git merge master")[0]); + } + + @Test + public void testMerge() throws Exception { + new Git(db).commit().setMessage("initial commit").call(); + new Git(db).branchCreate().setName("side").call(); + writeTrashFile("master", "content"); + new Git(db).add().addFilepattern("master").call(); + new Git(db).commit().setMessage("master commit").call(); + new Git(db).checkout().setName("side").call(); + writeTrashFile("side", "content"); + new Git(db).add().addFilepattern("side").call(); + new Git(db).commit().setMessage("side commit").call(); + + assertEquals("Merge made by the '" + MergeStrategy.RESOLVE.getName() + + "' strategy.", execute("git merge master")[0]); + } +} diff --git a/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties b/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties index 9fb0eba8fb..5e38c04bb5 100644 --- a/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties +++ b/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties @@ -7,6 +7,7 @@ N=N IPZillaPasswordPrompt=IPZilla Password alreadyOnBranch=Already on ''{0}'' +alreadyUpToDate=Already up-to-date. authorInfo=Author: {0} <{1}> averageMSPerRead=average {0} ms/read branchAlreadyExists=A branch named ''{0}'' already exists. @@ -64,7 +65,7 @@ lineFormat=# {0} listeningOn=Listening on {0} mergeConflict=CONFLICT(content): Merge conflict in {0} mergeFailed=Automatic merge failed; fix conflicts and then commit the result -mergeMadeBy=Merge made by {0} +mergeMadeBy=Merge made by the ''{0}'' strategy. metaVar_DAG=DAG metaVar_KEY=KEY metaVar_arg=ARG diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CLIText.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CLIText.java index ac83847233..a5756cec14 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CLIText.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CLIText.java @@ -74,6 +74,7 @@ public class CLIText extends TranslationBundle { /***/ public String IPZillaPasswordPrompt; /***/ public String alreadyOnBranch; + /***/ public String alreadyUpToDate; /***/ public String authorInfo; /***/ public String averageMSPerRead; /***/ public String branchAlreadyExists; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java index da0f8b868a..eee98d409d 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java @@ -87,6 +87,8 @@ class Merge extends TextBuiltin { switch (result.getMergeStatus()) { case ALREADY_UP_TO_DATE: + out.println(CLIText.get().alreadyUpToDate); + break; case FAST_FORWARD: outw.println(result.getMergeStatus().toString()); break; |