ABORT, | ABORT, | ||||
/** | /** | ||||
* Starts processing steps | * Starts processing steps | ||||
* @since 3.2 | |||||
*/ | */ | ||||
PROCESS_STEPS; | PROCESS_STEPS; | ||||
} | } | ||||
* @param stopAfterRebaseInteractiveInitialization | * @param stopAfterRebaseInteractiveInitialization | ||||
* if {@code true} the rebase stops after initialization | * if {@code true} the rebase stops after initialization | ||||
* @return this instance | * @return this instance | ||||
* @since 3.2 | |||||
*/ | */ | ||||
public RebaseCommand runInteractively(InteractiveHandler handler, | public RebaseCommand runInteractively(InteractiveHandler handler, | ||||
final boolean stopAfterRebaseInteractiveInitialization) { | final boolean stopAfterRebaseInteractiveInitialization) { |
}, | }, | ||||
/** | /** | ||||
* Stopped for editing in the context of an interactive rebase | * Stopped for editing in the context of an interactive rebase | ||||
* | |||||
* @since 3.2 | |||||
*/ | */ | ||||
EDIT { | EDIT { | ||||
@Override | @Override | ||||
/** | /** | ||||
* Interactive rebase has been prepared | * Interactive rebase has been prepared | ||||
* @since 3.2 | |||||
*/ | */ | ||||
INTERACTIVE_PREPARED { | INTERACTIVE_PREPARED { | ||||
@Override | @Override |
/** | /** | ||||
* Exception thrown if a rebase step is invalid. E.g., a rebase must not start | * Exception thrown if a rebase step is invalid. E.g., a rebase must not start | ||||
* with squash or fixup. | * with squash or fixup. | ||||
* | |||||
* @since 3.2 | |||||
*/ | */ | ||||
public class InvalidRebaseStepException extends GitAPIException { | public class InvalidRebaseStepException extends GitAPIException { | ||||
private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; |
/** | /** | ||||
* Offers methods to read and write files formatted like the git-rebase-todo | * Offers methods to read and write files formatted like the git-rebase-todo | ||||
* file | * file | ||||
* | |||||
* @since 3.2 | |||||
*/ | */ | ||||
public class RebaseTodoFile { | public class RebaseTodoFile { | ||||
private Repository repo; | private Repository repo; |
/** | /** | ||||
* Describes a single line in a file formatted like the git-rebase-todo file. | * Describes a single line in a file formatted like the git-rebase-todo file. | ||||
* | |||||
* @since 3.2 | |||||
*/ | */ | ||||
public class RebaseTodoLine { | public class RebaseTodoLine { | ||||
/** | /** |
* <code>true</code> if also comments should be reported | * <code>true</code> if also comments should be reported | ||||
* @return the list of steps | * @return the list of steps | ||||
* @throws IOException | * @throws IOException | ||||
* @since 3.2 | |||||
*/ | */ | ||||
public List<RebaseTodoLine> readRebaseTodo(String path, | public List<RebaseTodoLine> readRebaseTodo(String path, | ||||
boolean includeComments) | boolean includeComments) | ||||
* @param append | * @param append | ||||
* whether to append to an existing file or to write a new file | * whether to append to an existing file or to write a new file | ||||
* @throws IOException | * @throws IOException | ||||
* @since 3.2 | |||||
*/ | */ | ||||
public void writeRebaseTodoFile(String path, List<RebaseTodoLine> steps, | public void writeRebaseTodoFile(String path, List<RebaseTodoLine> steps, | ||||
boolean append) | boolean append) |
* @param u | * @param u | ||||
* @return the connection | * @return the connection | ||||
* @throws IOException | * @throws IOException | ||||
* @since 3.2 | |||||
*/ | */ | ||||
protected HttpURLConnection httpOpen(String method, URL u) | protected HttpURLConnection httpOpen(String method, URL u) | ||||
throws IOException { | throws IOException { |