summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2013-11-12 18:09:02 -0500
committerGerrit Code Review @ Eclipse.org <gerrit@eclipse.org>2013-11-12 18:09:02 -0500
commit05f308af4823d95a01c2b9bc1e2564ad1a128cb3 (patch)
treec7389c5ac8994a7849a70c81806f6de714ef4efd
parentb41b5d723e4d52f00de4dd54e41175ab1c2af2b7 (diff)
parent7cae3881181ae8b5156eb8cc9b933f6539feb137 (diff)
downloadjgit-05f308af4823d95a01c2b9bc1e2564ad1a128cb3.tar.gz
jgit-05f308af4823d95a01c2b9bc1e2564ad1a128cb3.zip
Merge "Add missing @since tags"
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java2
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseResult.java3
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/api/errors/InvalidRebaseStepException.java2
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/lib/RebaseTodoFile.java2
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/lib/RebaseTodoLine.java2
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java2
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportHttp.java1
7 files changed, 14 insertions, 0 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java
index 80f46ccf5a..8ae51d74ce 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java
@@ -180,6 +180,7 @@ public class RebaseCommand extends GitCommand<RebaseResult> {
ABORT,
/**
* Starts processing steps
+ * @since 3.2
*/
PROCESS_STEPS;
}
@@ -1202,6 +1203,7 @@ public class RebaseCommand extends GitCommand<RebaseResult> {
* @param stopAfterRebaseInteractiveInitialization
* if {@code true} the rebase stops after initialization
* @return this instance
+ * @since 3.2
*/
public RebaseCommand runInteractively(InteractiveHandler handler,
final boolean stopAfterRebaseInteractiveInitialization) {
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseResult.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseResult.java
index 6df5ffdd1d..aaa75d9b88 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseResult.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseResult.java
@@ -86,6 +86,8 @@ public class RebaseResult {
},
/**
* Stopped for editing in the context of an interactive rebase
+ *
+ * @since 3.2
*/
EDIT {
@Override
@@ -144,6 +146,7 @@ public class RebaseResult {
/**
* Interactive rebase has been prepared
+ * @since 3.2
*/
INTERACTIVE_PREPARED {
@Override
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/errors/InvalidRebaseStepException.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/errors/InvalidRebaseStepException.java
index 764725dcbb..ef89a98c9c 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/errors/InvalidRebaseStepException.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/errors/InvalidRebaseStepException.java
@@ -40,6 +40,8 @@ package org.eclipse.jgit.api.errors;
/**
* Exception thrown if a rebase step is invalid. E.g., a rebase must not start
* with squash or fixup.
+ *
+ * @since 3.2
*/
public class InvalidRebaseStepException extends GitAPIException {
private static final long serialVersionUID = 1L;
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/RebaseTodoFile.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/RebaseTodoFile.java
index 8db75662a2..cac67e11e9 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/RebaseTodoFile.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/RebaseTodoFile.java
@@ -58,6 +58,8 @@ import org.eclipse.jgit.util.RawParseUtils;
/**
* Offers methods to read and write files formatted like the git-rebase-todo
* file
+ *
+ * @since 3.2
*/
public class RebaseTodoFile {
private Repository repo;
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/RebaseTodoLine.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/RebaseTodoLine.java
index 8eeb1ea890..3aa331c72c 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/RebaseTodoLine.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/RebaseTodoLine.java
@@ -50,6 +50,8 @@ import org.eclipse.jgit.internal.JGitText;
/**
* Describes a single line in a file formatted like the git-rebase-todo file.
+ *
+ * @since 3.2
*/
public class RebaseTodoLine {
/**
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java
index 7df538cedd..4a352e8b69 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java
@@ -1575,6 +1575,7 @@ public abstract class Repository {
* <code>true</code> if also comments should be reported
* @return the list of steps
* @throws IOException
+ * @since 3.2
*/
public List<RebaseTodoLine> readRebaseTodo(String path,
boolean includeComments)
@@ -1593,6 +1594,7 @@ public abstract class Repository {
* @param append
* whether to append to an existing file or to write a new file
* @throws IOException
+ * @since 3.2
*/
public void writeRebaseTodoFile(String path, List<RebaseTodoLine> steps,
boolean append)
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportHttp.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportHttp.java
index 45bf2db47e..75838466f3 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportHttp.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportHttp.java
@@ -511,6 +511,7 @@ public class TransportHttp extends HttpTransport implements WalkTransport,
* @param u
* @return the connection
* @throws IOException
+ * @since 3.2
*/
protected HttpURLConnection httpOpen(String method, URL u)
throws IOException {