org.eclipse.jgit.api

Class RebaseCommandTest

java.lang.Object

org.eclipse.jgit.junit.LocalDiskRepositoryTestCase

org.eclipse.jgit.junit.RepositoryTestCase

org.eclipse.jgit.api.RebaseCommandTest

public class RebaseCommandTest
extends RepositoryTestCase

Field Summary

Fields

Modifier and Type	Field and Description
protected Git	git

Fields inherited from class org.eclipse.jgit.junit.RepositoryTestCase

db, trash

Fields inherited from class org.eclipse.jgit.junit.LocalDiskRepositoryTestCase

ASSUME_UNCHANGED, author, committer, CONTENT, CONTENT_ID, LENGTH, mockSystemReader, MOD_TIME, SMUDGE

Constructor Summary

Constructors

Constructor and Description
RebaseCommandTest()

Method Summary

Modifier and Type	Method and Description
void	setUp()
void	testAbortShouldAlsoAbortNonInteractiveRebaseWithRebaseApplyDir()
void	testAuthorScriptConverter()
void	testConflictFreeWithSingleFile()
void	testDetachedHead()
void	testEmptyRebaseTodo()
void	testFastForwardRebaseWithAutoStash()
void	testFastForwardRebaseWithModification()
void	testFastForwardWithMultipleCommits()
void	testFastForwardWithMultipleCommitsOnDifferentBranches()
void	testFastForwardWithNewFile()
void	testFilesAddedFromTwoBranches()
void	testInteractiveRebaseWithModificationShouldNotDeleteDataOnAbort()
void	testLeadingSpacesRebaseTodo()
void	testMergeFirstStopOnLastConflictAndSkip()
void	testOnlyCommentRebaseTodo()
void	testParseRewordCommand()
void	testParseSquashFixupSequenceCount()
void	testRebaseEndsIfLastStepIsEdit()
void	testRebaseInteractiveEdit()
void	testRebaseInteractiveFixupFirstCommitShouldFail()
void	testRebaseInteractiveFixupWithBlankLines()
void	testRebaseInteractiveMixedSquashAndFixup()
void	testRebaseInteractiveMultipleSquash()
void	testRebaseInteractiveReword()
void	testRebaseInteractiveSingleFixup()
void	testRebaseInteractiveSingleSquashAndModifyMessage()
void	testRebaseInteractiveSquashFirstCommitShouldFail()
void	testRebaseParentOntoHeadShouldBeUptoDate()
void	testRebasePreservingMerges1()
void	testRebasePreservingMerges2()
void	testRebasePreservingMergesWithUnrelatedSide1()
void	testRebasePreservingMergesWithUnrelatedSide2()
void	testRebaseShouldBeAbleToHandleEmptyLinesInRebaseTodoFile()
void	testRebaseShouldBeAbleToHandleLinesWithoutCommitMessageInRebaseTodoFile()
void	testRebaseShouldFixupInCaseOfConflict()
void	testRebaseShouldIgnoreMergeCommits() Create the following commits and then attempt to rebase topic onto master.
void	testRebaseShouldLeaveWorkspaceUntouchedWithUnstagedChangesConflict()
void	testRebaseShouldNotFailIfUserAddCommentLinesInPrepareSteps()
void	testRebaseShouldSquashInCaseOfConflict()
void	testRebaseShouldStopForEditInCaseOfConflict()
void	testRebaseShouldStopForRewordInCaseOfConflict()
void	testRebaseShouldTryToParseValidLineMarkedAsComment()
void	testRebaseTodoLineSetComment()
void	testRebaseWithAutoStash()
void	testRebaseWithAutoStashConflictOnApply()
void	testRebaseWithModificationShouldNotDeleteData()
void	testRebaseWithUncommittedDelete()
void	testRebaseWithUncommittedMasterChange()
void	testRebaseWithUncommittedMasterChangeBaseCommit()
void	testRebaseWithUncommittedMasterChangeOtherCommit()
void	testRebaseWithUncommittedTopicChange()
void	testRebaseWithUnstagedMasterChange()
void	testRebaseWithUnstagedMasterChangeBaseCommit()
void	testRebaseWithUnstagedMasterChangeOtherCommit()
void	testRebaseWithUnstagedTopicChange()
void	testRebaseWithUntrackedFile()
void	testRepositoryStateChecks()
void	testStopOnConflict()
void	testStopOnConflictAndAbortWithDetachedHEAD()
void	testStopOnConflictAndContinue()
void	testStopOnConflictAndContinueWithNoDeltaToMaster()
void	testStopOnConflictAndFailContinueIfFileIsDirty()
void	testStopOnConflictAndSkipNoConflict()
void	testStopOnConflictAndSkipWithConflict()
void	testStopOnConflictCommitAndContinue()
void	testStopOnConflictFileCreationAndDeletion()
void	testStopOnLastConflictAndContinue()
void	testStopOnLastConflictAndSkip()
void	testUnknownUpstream()
void	testUpToDate()

Methods inherited from class org.eclipse.jgit.junit.RepositoryTestCase

assertEqualsFile, check, checkFile, checkoutBranch, commitFile, copyFile, createBranch, createEntry, createEntry, createEntry, deleteTrashFile, fsTick, indexState, lookup, read, resetIndex, slashify, writeLink, writeTrashFile, writeTrashFile, writeTrashFiles

Methods inherited from class org.eclipse.jgit.junit.LocalDiskRepositoryTestCase

addRepoToClose, createBareRepository, createRepository, createTempDirectory, createTempFile, createUniqueTestGitDir, createWorkRepository, getCeilings, getTemporaryDirectory, indexState, read, recursiveDelete, runHook, tearDown, tick, write, write

Methods inherited from class java.lang.Object

clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait

Field Detail

git

protected Git git

Constructor Detail

RebaseCommandTest

public RebaseCommandTest()

Method Detail

setUp

public void setUp()
           throws Exception

Overrides:

setUp in class RepositoryTestCase

Throws:

Exception

testFastForwardWithNewFile

public void testFastForwardWithNewFile()
                                throws Exception

Throws:

Exception

testFastForwardWithMultipleCommits

public void testFastForwardWithMultipleCommits()
                                        throws Exception

Throws:

Exception

testRebaseShouldIgnoreMergeCommits

public void testRebaseShouldIgnoreMergeCommits()
                                        throws Exception

Create the following commits and then attempt to rebase topic onto master. This will serialize the branches.

 A - B (master)
   \
    C - D - F (topic)
     \      /
      E  -  (side)
 

into

 A - B - (master)  C' - D' - E' (topic')
   \
    C - D - F (topic)
     \      /
      E  -  (side)
 

Throws:

Exception

testRebasePreservingMerges1

public void testRebasePreservingMerges1()
                                 throws Exception

Throws:

Exception

testRebasePreservingMerges2

public void testRebasePreservingMerges2()
                                 throws Exception

Throws:

Exception

testRebasePreservingMergesWithUnrelatedSide1

public void testRebasePreservingMergesWithUnrelatedSide1()
                                                  throws Exception

Throws:

Exception

testRebasePreservingMergesWithUnrelatedSide2

public void testRebasePreservingMergesWithUnrelatedSide2()
                                                  throws Exception

Throws:

Exception

testRebaseParentOntoHeadShouldBeUptoDate

public void testRebaseParentOntoHeadShouldBeUptoDate()
                                              throws Exception

Throws:

Exception

testUpToDate

public void testUpToDate()
                  throws Exception

Throws:

Exception

testUnknownUpstream

public void testUnknownUpstream()
                         throws Exception

Throws:

Exception

testConflictFreeWithSingleFile

public void testConflictFreeWithSingleFile()
                                    throws Exception

Throws:

Exception

testDetachedHead

public void testDetachedHead()
                      throws Exception

Throws:

Exception

testFilesAddedFromTwoBranches

public void testFilesAddedFromTwoBranches()
                                   throws Exception

Throws:

Exception

testStopOnConflict

public void testStopOnConflict()
                        throws Exception

Throws:

Exception

testStopOnConflictAndAbortWithDetachedHEAD

public void testStopOnConflictAndAbortWithDetachedHEAD()
                                                throws Exception

Throws:

Exception

testStopOnConflictAndContinue

public void testStopOnConflictAndContinue()
                                   throws Exception

Throws:

Exception

testStopOnConflictAndContinueWithNoDeltaToMaster

public void testStopOnConflictAndContinueWithNoDeltaToMaster()
                                                      throws Exception

Throws:

Exception

testStopOnConflictAndFailContinueIfFileIsDirty

public void testStopOnConflictAndFailContinueIfFileIsDirty()
                                                    throws Exception

Throws:

Exception

testStopOnLastConflictAndContinue

public void testStopOnLastConflictAndContinue()
                                       throws Exception

Throws:

Exception

testStopOnLastConflictAndSkip

public void testStopOnLastConflictAndSkip()
                                   throws Exception

Throws:

Exception

testMergeFirstStopOnLastConflictAndSkip

public void testMergeFirstStopOnLastConflictAndSkip()
                                             throws Exception

Throws:

Exception

testStopOnConflictAndSkipNoConflict

public void testStopOnConflictAndSkipNoConflict()
                                         throws Exception

Throws:

Exception

testStopOnConflictAndSkipWithConflict

public void testStopOnConflictAndSkipWithConflict()
                                           throws Exception

Throws:

Exception

testStopOnConflictCommitAndContinue

public void testStopOnConflictCommitAndContinue()
                                         throws Exception

Throws:

Exception

testStopOnConflictFileCreationAndDeletion

public void testStopOnConflictFileCreationAndDeletion()
                                               throws Exception

Throws:

Exception

testAuthorScriptConverter

public void testAuthorScriptConverter()
                               throws Exception

Throws:

Exception

testRepositoryStateChecks

public void testRepositoryStateChecks()
                               throws Exception

Throws:

Exception

testRebaseWithUntrackedFile

public void testRebaseWithUntrackedFile()
                                 throws Exception

Throws:

Exception

testRebaseWithUnstagedTopicChange

public void testRebaseWithUnstagedTopicChange()
                                       throws Exception

Throws:

Exception

testRebaseWithUncommittedTopicChange

public void testRebaseWithUncommittedTopicChange()
                                          throws Exception

Throws:

Exception

testRebaseWithUnstagedMasterChange

public void testRebaseWithUnstagedMasterChange()
                                        throws Exception

Throws:

Exception

testRebaseWithUncommittedMasterChange

public void testRebaseWithUncommittedMasterChange()
                                           throws Exception

Throws:

Exception

testRebaseWithUnstagedMasterChangeBaseCommit

public void testRebaseWithUnstagedMasterChangeBaseCommit()
                                                  throws Exception

Throws:

Exception

testRebaseWithUncommittedMasterChangeBaseCommit

public void testRebaseWithUncommittedMasterChangeBaseCommit()
                                                     throws Exception

Throws:

Exception

testRebaseWithUnstagedMasterChangeOtherCommit

public void testRebaseWithUnstagedMasterChangeOtherCommit()
                                                   throws Exception

Throws:

Exception

testRebaseWithUncommittedMasterChangeOtherCommit

public void testRebaseWithUncommittedMasterChangeOtherCommit()
                                                      throws Exception

Throws:

Exception

testFastForwardRebaseWithModification

public void testFastForwardRebaseWithModification()
                                           throws Exception

Throws:

Exception

testRebaseWithModificationShouldNotDeleteData

public void testRebaseWithModificationShouldNotDeleteData()
                                                   throws Exception

Throws:

Exception

testRebaseWithUncommittedDelete

public void testRebaseWithUncommittedDelete()
                                     throws Exception

Throws:

Exception

testRebaseWithAutoStash

public void testRebaseWithAutoStash()
                             throws Exception

Throws:

Exception

testRebaseWithAutoStashConflictOnApply

public void testRebaseWithAutoStashConflictOnApply()
                                            throws Exception

Throws:

Exception

testFastForwardRebaseWithAutoStash

public void testFastForwardRebaseWithAutoStash()
                                        throws Exception

Throws:

Exception

testFastForwardWithMultipleCommitsOnDifferentBranches

public void testFastForwardWithMultipleCommitsOnDifferentBranches()
                                                           throws Exception

Throws:

Exception

testRebaseShouldLeaveWorkspaceUntouchedWithUnstagedChangesConflict

public void testRebaseShouldLeaveWorkspaceUntouchedWithUnstagedChangesConflict()
                                                                        throws Exception

Throws:

Exception

testAbortShouldAlsoAbortNonInteractiveRebaseWithRebaseApplyDir

public void testAbortShouldAlsoAbortNonInteractiveRebaseWithRebaseApplyDir()
                                                                    throws Exception

Throws:

Exception

testRebaseShouldBeAbleToHandleEmptyLinesInRebaseTodoFile

public void testRebaseShouldBeAbleToHandleEmptyLinesInRebaseTodoFile()
                                                              throws IOException

Throws:

IOException

testRebaseShouldBeAbleToHandleLinesWithoutCommitMessageInRebaseTodoFile

public void testRebaseShouldBeAbleToHandleLinesWithoutCommitMessageInRebaseTodoFile()
                                                                             throws IOException

Throws:

IOException

testRebaseShouldNotFailIfUserAddCommentLinesInPrepareSteps

public void testRebaseShouldNotFailIfUserAddCommentLinesInPrepareSteps()
                                                                throws Exception

Throws:

Exception

testParseRewordCommand

public void testParseRewordCommand()
                            throws Exception

Throws:

Exception

testEmptyRebaseTodo

public void testEmptyRebaseTodo()
                         throws Exception

Throws:

Exception

testOnlyCommentRebaseTodo

public void testOnlyCommentRebaseTodo()
                               throws Exception

Throws:

Exception

testLeadingSpacesRebaseTodo

public void testLeadingSpacesRebaseTodo()
                                 throws Exception

Throws:

Exception

testRebaseShouldTryToParseValidLineMarkedAsComment

public void testRebaseShouldTryToParseValidLineMarkedAsComment()
                                                        throws IOException

Throws:

IOException

testRebaseTodoLineSetComment

public void testRebaseTodoLineSetComment()
                                  throws Exception

Throws:

Exception

testRebaseInteractiveReword

public void testRebaseInteractiveReword()
                                 throws Exception

Throws:

Exception

testRebaseInteractiveEdit

public void testRebaseInteractiveEdit()
                               throws Exception

Throws:

Exception

testParseSquashFixupSequenceCount

public void testParseSquashFixupSequenceCount()

testRebaseInteractiveSingleSquashAndModifyMessage

public void testRebaseInteractiveSingleSquashAndModifyMessage()
                                                       throws Exception

Throws:

Exception

testRebaseInteractiveMultipleSquash

public void testRebaseInteractiveMultipleSquash()
                                         throws Exception

Throws:

Exception

testRebaseInteractiveMixedSquashAndFixup

public void testRebaseInteractiveMixedSquashAndFixup()
                                              throws Exception

Throws:

Exception

testRebaseInteractiveSingleFixup

public void testRebaseInteractiveSingleFixup()
                                      throws Exception

Throws:

Exception

testRebaseInteractiveFixupWithBlankLines

public void testRebaseInteractiveFixupWithBlankLines()
                                              throws Exception

Throws:

Exception

testRebaseInteractiveFixupFirstCommitShouldFail

public void testRebaseInteractiveFixupFirstCommitShouldFail()
                                                     throws Exception

Throws:

Exception

testRebaseInteractiveSquashFirstCommitShouldFail

public void testRebaseInteractiveSquashFirstCommitShouldFail()
                                                      throws Exception

Throws:

Exception

testRebaseEndsIfLastStepIsEdit

public void testRebaseEndsIfLastStepIsEdit()
                                    throws Exception

Throws:

Exception

testRebaseShouldStopForEditInCaseOfConflict

public void testRebaseShouldStopForEditInCaseOfConflict()
                                                 throws Exception

Throws:

Exception

testRebaseShouldStopForRewordInCaseOfConflict

public void testRebaseShouldStopForRewordInCaseOfConflict()
                                                   throws Exception

Throws:

Exception

testRebaseShouldSquashInCaseOfConflict

public void testRebaseShouldSquashInCaseOfConflict()
                                            throws Exception

Throws:

Exception

testRebaseShouldFixupInCaseOfConflict

public void testRebaseShouldFixupInCaseOfConflict()
                                           throws Exception

Throws:

Exception

testInteractiveRebaseWithModificationShouldNotDeleteDataOnAbort

public void testInteractiveRebaseWithModificationShouldNotDeleteDataOnAbort()
                                                                     throws Exception

Throws:

Exception