public class RTEGitMergeCommandImpl extends Object implements RTEGitMergeCommand
RTEGitMergeCommand.MergeCompletionCallback
Constructor and Description |
---|
RTEGitMergeCommandImpl() |
Modifier and Type | Method and Description |
---|---|
org.eclipse.core.runtime.IStatus |
call() |
RTEGitMergeCommand |
setAutoCheckout(boolean status)
Automatically checkout target branch before merge
|
RTEGitMergeCommand |
setAutoCommit(boolean autoCommit)
Controls whether the merge command should automatically commit after a
successful merge.
|
RTEGitMergeCommand |
setAutoImport(boolean status)
Perform auto-import of affected project during compare/merge operation
Default value: disabled
|
RTEGitMergeCommand |
setClosureFilter(IClosureFilter filter)
Defines filter for closure operation.
|
RTEGitMergeCommand |
setClosureFilter(String filter)
Defines filter for closure operation.
|
RTEGitMergeCommand |
setCompletionCallback(RTEGitMergeCommand.MergeCompletionCallback callback)
Set callback which will be notified when merge operation is completed.
|
RTEGitMergeCommand |
setFastForwardMode(org.eclipse.jgit.api.MergeCommand.FastForwardMode mode)
Set fast-forward mode.
|
RTEGitMergeCommand |
setMergeType(MergeType type)
Set merge type.
|
RTEGitMergeCommand |
setPartialMode(boolean status)
Enables/disables partial mode.
|
RTEGitMergeCommand |
setProgressMonitor(org.eclipse.core.runtime.IProgressMonitor monitor)
Set progress monitor for current command
|
RTEGitMergeCommand |
setRepository(File repository)
Set path to existing Git repository
|
RTEGitMergeCommand |
setSource(String ref)
Set source branch/ref/commit for the merge
|
RTEGitMergeCommand |
setSquash(boolean status)
Enables/disables squash mode for merge.
|
RTEGitMergeCommand |
setTarget(String ref)
Set target branch/ref/commit for the merge.
|
String |
toString() |
public org.eclipse.core.runtime.IStatus call()
call
in interface RTAbstractCommand
public RTEGitMergeCommand setRepository(File repository)
RTEGitMergeCommand
setRepository
in interface RTEGitMergeCommand
repository
- - path to Git repository. Path may or may not include '.git' folder. Paths '/dir1/dir2/dir3' and '/dir1/dir2/dir3/.git' are considered the samepublic RTEGitMergeCommand setSource(String ref)
RTEGitMergeCommand
setSource
in interface RTEGitMergeCommand
ref
- - branch name, reference or commit idpublic RTEGitMergeCommand setTarget(String ref)
RTEGitMergeCommand
setTarget
in interface RTEGitMergeCommand
ref
- - branch name, reference or commit idpublic RTEGitMergeCommand setProgressMonitor(org.eclipse.core.runtime.IProgressMonitor monitor)
RTEGitMergeCommand
setProgressMonitor
in interface RTEGitMergeCommand
public RTEGitMergeCommand setMergeType(MergeType type)
RTEGitMergeCommand
setMergeType
in interface RTEGitMergeCommand
type
- - MergeType
public RTEGitMergeCommand setAutoImport(boolean status)
RTEGitMergeCommand
setAutoImport
in interface RTEGitMergeCommand
public RTEGitMergeCommand setPartialMode(boolean status)
RTEGitMergeCommand
Partial mode allows to save partially merged models and mark as conflicting only really conflicting files.
Default value: disabledsetPartialMode
in interface RTEGitMergeCommand
public RTEGitMergeCommand setAutoCheckout(boolean status)
RTEGitMergeCommand
setAutoCheckout
in interface RTEGitMergeCommand
public RTEGitMergeCommand setClosureFilter(String filter)
RTEGitMergeCommand
setClosureFilter
in interface RTEGitMergeCommand
filter
- - comma-separated list of paths. Each path may include '*' or '?' symbolspublic RTEGitMergeCommand setClosureFilter(IClosureFilter filter)
RTEGitMergeCommand
setClosureFilter
in interface RTEGitMergeCommand
filter
- - an object implementing IClosureFilter
interfacepublic RTEGitMergeCommand setSquash(boolean status)
RTEGitMergeCommand
setSquash
in interface RTEGitMergeCommand
public RTEGitMergeCommand setCompletionCallback(RTEGitMergeCommand.MergeCompletionCallback callback)
RTEGitMergeCommand
setCompletionCallback
in interface RTEGitMergeCommand
callback
- - RTEGitMergeCommand.MergeCompletionCallback
public RTEGitMergeCommand setFastForwardMode(org.eclipse.jgit.api.MergeCommand.FastForwardMode mode)
RTEGitMergeCommand
MergeCommand.FastForwardMode
for details.setFastForwardMode
in interface RTEGitMergeCommand
mode
- - MergeCommand.FastForwardMode
public RTEGitMergeCommand setAutoCommit(boolean autoCommit)
RTEGitMergeCommand
false
.setAutoCommit
in interface RTEGitMergeCommand