@@ -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) { |
@@ -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 |
@@ -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; |
@@ -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; |
@@ -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 { | |||
/** |
@@ -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) |
@@ -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 { |