Merge "Add missing @since tags"
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 80f46cc..8ae51d7 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 enum Operation {
ABORT,
/**
* Starts processing steps
+ * @since 3.2
*/
PROCESS_STEPS;
}
@@ -1202,6 +1203,7 @@ public RebaseCommand runInteractively(InteractiveHandler handler) {
* @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 6df5ffd..aaa75d9 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 boolean isSuccessful() {
},
/**
* Stopped for editing in the context of an interactive rebase
+ *
+ * @since 3.2
*/
EDIT {
@Override
@@ -144,6 +146,7 @@ public boolean isSuccessful() {
/**
* 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 764725d..ef89a98 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 @@
/**
* 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 8db7566..cac67e1 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 @@
/**
* 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 8eeb1ea..3aa331c 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 @@
/**
* 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 7df538c..4a352e8 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 @@ private void writeHeadsFile(List<ObjectId> heads, String filename)
* <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 List<RebaseTodoLine> readRebaseTodo(String path,
* @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 45bf2db..7583846 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 @@ final HttpURLConnection httpOpen(URL u) throws IOException {
* @param u
* @return the connection
* @throws IOException
+ * @since 3.2
*/
protected HttpURLConnection httpOpen(String method, URL u)
throws IOException {