Add a test for org.eclipse.jgit.pgm.Tag

The test checks if an error is thrown when trying to create the same tag
for the second time.

Change-Id: I4ed2f6c997587f0ea23bd26a32fb64a2d48a980e
Signed-off-by: Chris Aniszczyk <zx@twitter.com>

diff --git a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/TagTest.java b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/TagTest.java
new file mode 100644 (file)
index 0000000..ab09db5
--- /dev/null
+++ b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/TagTest.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2012, Tomasz Zarna <tomasz.zarna@tasktop.com> 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.junit.Before;
+import org.junit.Test;
+
+public class TagTest extends CLIRepositoryTestCase {
+       private Git git;
+
+       @Override
+       @Before
+       public void setUp() throws Exception {
+               super.setUp();
+               git = new Git(db);
+               git.commit().setMessage("initial commit").call();
+       }
+
+       @Test
+       public void testTagTwice() throws Exception {
+               git.tag().setName("test").call();
+               writeTrashFile("file", "content");
+               git.add().addFilepattern("file").call();
+               git.commit().setMessage("commit").call();
+
+               assertEquals("fatal: tag 'test' already exists",
+                               execute("git tag test")[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 bf95ab34ab8becc734d1a0e6126ce52aeb4a3c90..6f5c8eb68581a5ccb6b155a4adde0365cf942b2d 100644 (file)
--- a/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties
+++ b/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties
@@ -150,6 +150,7 @@ statusNewFile=new file:
 statusRemoved=deleted:
 switchedToNewBranch=Switched to a new branch ''{0}''
 switchedToBranch=Switched to branch ''{0}''
+tagAlreadyExists=tag ''{0}'' already exists
 tagLabel=tag
 taggerInfo=Tagger: {0} <{1}>
 timeInMilliSeconds={0} ms

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 62d772de0fe766890e59473c9249007963167998..c1cac71cfa11441645eef0f00c083aaa59469a5b 100644 (file)
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CLIText.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CLIText.java
@@ -211,6 +211,7 @@ public class CLIText extends TranslationBundle {
        /***/ public String statusRemoved;
        /***/ public String switchedToNewBranch;
        /***/ public String switchedToBranch;
+       /***/ public String tagAlreadyExists;
        /***/ public String tagLabel;
        /***/ public String taggerInfo;
        /***/ public String timeInMilliSeconds;

diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Tag.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Tag.java
index 81143f6b86b7551ba736a6da2872fe67a8771b79..665b79dfa02499ac2b5bfad57994513038535e9f 100644 (file)
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Tag.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Tag.java
@@ -48,11 +48,13 @@
 
 package org.eclipse.jgit.pgm;
 
+import java.text.MessageFormat;
 import java.util.List;
 
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.api.ListTagCommand;
 import org.eclipse.jgit.api.TagCommand;
+import org.eclipse.jgit.api.errors.RefAlreadyExistsException;
 import org.eclipse.jgit.lib.ObjectId;
 import org.eclipse.jgit.lib.Ref;
 import org.eclipse.jgit.lib.Repository;
@@ -85,8 +87,12 @@ class Tag extends TextBuiltin {
                                RevWalk walk = new RevWalk(db);
                                command.setObjectId(walk.parseAny(object));
                        }
-
-                       command.call();
+                       try {
+                               command.call();
+                       } catch (RefAlreadyExistsException e) {
+                               throw die(MessageFormat.format(CLIText.get().tagAlreadyExists,
+                                               tagName));
+                       }
                } else {
                        ListTagCommand command = git.tagList();
                        List<Ref> list = command.call();

diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
index 8a0ce87ee1c513fe3e1f8d8020edae6387d9c58a..8018ab9baac746de85391c3f277ee2c8876b7cf4 100644 (file)
--- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
+++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
@@ -451,6 +451,7 @@ submoduleParentRemoteUrlInvalid=Cannot remove segment from remote url ''{0}''
 submodulesNotSupported=Submodules are not supported
 symlinkCannotBeWrittenAsTheLinkTarget=Symlink "{0}" cannot be written as the link target cannot be read from within Java.
 systemConfigFileInvalid=Systen wide config file {0} is invalid {1}
+tagAlreadyExists=tag ''{0}'' already exists
 tagNameInvalid=tag name {0} is invalid
 tagOnRepoWithoutHEADCurrentlyNotSupported=Tag on repository without HEAD currently not supported
 theFactoryMustNotBeNull=The factory must not be null

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/TagCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/TagCommand.java
index cef9e18349fb4bf8009860f81ce51773cc3530e6..8d887e354813c18ecbf556f2b56603f323b3c96c 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/TagCommand.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/TagCommand.java
@@ -50,6 +50,7 @@ import org.eclipse.jgit.api.errors.GitAPIException;
 import org.eclipse.jgit.api.errors.InvalidTagNameException;
 import org.eclipse.jgit.api.errors.JGitInternalException;
 import org.eclipse.jgit.api.errors.NoHeadException;
+import org.eclipse.jgit.api.errors.RefAlreadyExistsException;
 import org.eclipse.jgit.internal.JGitText;
 import org.eclipse.jgit.lib.Constants;
 import org.eclipse.jgit.lib.ObjectId;
@@ -151,6 +152,11 @@ public class TagCommand extends GitCommand<Ref> {
                                                throw new ConcurrentRefUpdateException(
                                                                JGitText.get().couldNotLockHEAD,
                                                                tagRef.getRef(), updateResult);
+                                       case REJECTED:
+                                               throw new RefAlreadyExistsException(
+                                                               MessageFormat.format(
+                                                                               JGitText.get().tagAlreadyExists,
+                                                                               newTag.toString()));
                                        default:
                                                throw new JGitInternalException(MessageFormat.format(
                                                                JGitText.get().updatingRefFailed, refName,

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
index ef4f3b441902cc3e104a65e5af1d61ca755f9ca7..f6c48c92c606260a6cee7ee783e6deb9eaefa98d 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
@@ -511,6 +511,7 @@ public class JGitText extends TranslationBundle {
        /***/ public String submoduleParentRemoteUrlInvalid;
        /***/ public String symlinkCannotBeWrittenAsTheLinkTarget;
        /***/ public String systemConfigFileInvalid;
+       /***/ public String tagAlreadyExists;
        /***/ public String tagNameInvalid;
        /***/ public String tagOnRepoWithoutHEADCurrentlyNotSupported;
        /***/ public String theFactoryMustNotBeNull;