Package com._1c.g5.v8.dt.testing.compare

Class CompareWithTestPerformer

java.lang.Object

com._1c.g5.v8.dt.compare.git.AbstractCompareWithPerformer

com._1c.g5.v8.dt.testing.compare.CompareWithTestPerformer

public class CompareWithTestPerformer
extends AbstractCompareWithPerformer

Performs compare\merge with descriptor generated by AbstractCompareWithPerformer

Field Summary

Fields inherited from class com._1c.g5.v8.dt.compare.git.AbstractCompareWithPerformer

baseCommit, commitToCompareWith, comparisonManager, filePathConverter, headCommit, matchingStrategy, mergeObjectsContent, parseBslModuleStructure, pathToFilter, project, repository, revisionToCompareWith, v8ProjectManager

Constructor Summary

Constructors

Constructor

Description

CompareWithTestPerformer(org.eclipse.jgit.lib.Repository repository, String revisionToCompareWith, MatchingStrategy matchingStrategy, boolean mergeObjectsContent, boolean parseBslModuleStructure, org.eclipse.core.resources.IProject project, Path pathToFilter, String mergeSettingsFileName, IQualifiedNameFilePathConverter filePathConverter, IV8ProjectManager v8ProjectManager, IComparisonManager comparisonManager, TestingWorkspace testingWorkspace)

Creates a new instance with the given parameters.

Method Summary

Modifier and Type	Method	Description
CompareMergeProcessBatch	getBatch()	Get compare merge process batch.
ComparisonProcessHandle	getHandle()
boolean	isNothingToMerge()	If there are nothing to merge.
protected void	onNothingToCompare()	The callback method if there no changes to compare.
protected void	runComparison(CompareMergeProcessDescriptor descriptor)	Runs the comparison on the builded descriptor.
void	startMergeAndWait()	Starts merge and waits until it finish.

Methods inherited from class com._1c.g5.v8.dt.compare.git.AbstractCompareWithPerformer

perform

Methods inherited from class java.lang.Object

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

Constructor Detail

CompareWithTestPerformer

public CompareWithTestPerformer(org.eclipse.jgit.lib.Repository repository,
                                String revisionToCompareWith,
                                MatchingStrategy matchingStrategy,
                                boolean mergeObjectsContent,
                                boolean parseBslModuleStructure,
                                org.eclipse.core.resources.IProject project,
                                Path pathToFilter,
                                String mergeSettingsFileName,
                                IQualifiedNameFilePathConverter filePathConverter,
                                IV8ProjectManager v8ProjectManager,
                                IComparisonManager comparisonManager,
                                TestingWorkspace testingWorkspace)

Creates a new instance with the given parameters.

Parameters:

repository - the Git repository to run comparison on, cannot be null

revisionToCompareWith - the revision to compare with, may be commit hash, branch name or index revision GitCompareUtils.INDEX, cannot be null

matchingStrategy - the matching strategy, cannot be null

mergeObjectsContent - tells whether only objects content is to be merged

parseBslModuleStructure - tells whether to compare and merge a Bsl module with parsing module structure

project - the project to run Git 'Compare With' command on, cannot be null

pathToFilter - the absolute path in the project limiting search for changes on comparison or null to search all changes

mergeSettingsFileName - the merge settings file name, may be null

filePathConverter - the qualified name file path converter, cannot be null

v8ProjectManager - the V8 project manager, cannot be null

comparisonManager - the comparison process manager, cannot be null

testingWorkspace - testing workspace, cannot be null

See Also:

IComparisonProcessSettings

Method Detail

getBatch

public CompareMergeProcessBatch getBatch()

Get compare merge process batch.

Returns:

compare merge process batch.

getHandle

public ComparisonProcessHandle getHandle()

isNothingToMerge

public boolean isNothingToMerge()

If there are nothing to merge.

Returns:

true if there is nothing to merge, false otherwise

startMergeAndWait

public void startMergeAndWait()

Starts merge and waits until it finish.

onNothingToCompare

protected void onNothingToCompare()

Description copied from class: AbstractCompareWithPerformer

The callback method if there no changes to compare.

Specified by:

onNothingToCompare in class AbstractCompareWithPerformer

runComparison

protected void runComparison(CompareMergeProcessDescriptor descriptor)

Description copied from class: AbstractCompareWithPerformer

Runs the comparison on the builded descriptor.

Specified by:

runComparison in class AbstractCompareWithPerformer

Parameters:

descriptor - the compare/merge process descriptor, cannot be null