Package com._1c.g5.v8.dt.compare.git
Class AbstractCompareCommitsPerformer
java.lang.Object
com._1c.g5.v8.dt.compare.git.AbstractCompareCommitsPerformer
- Direct Known Subclasses:
CompareCommitsPerformer
An abstract class that provides ability to compare two commits using the EDT comparison mechanism.
-
Field Summary
FieldsModifier and TypeFieldDescriptionprotected final IQualifiedNameFilePathConverter
the qualified name file path converterprotected final org.eclipse.jgit.revwalk.RevCommit
the main side commitprotected final MatchingStrategy
the matching strategyprotected final org.eclipse.jgit.revwalk.RevCommit
the other side commitprotected final boolean
tells whether to compare a Bsl module with parsing module structureprotected final Path
the path limiting search for changes on comparisonprotected final org.eclipse.jgit.lib.Repository
the Git repository -
Constructor Summary
ConstructorsModifierConstructorDescriptionprotected
AbstractCompareCommitsPerformer
(org.eclipse.jgit.lib.Repository repository, org.eclipse.jgit.revwalk.RevCommit mainCommit, org.eclipse.jgit.revwalk.RevCommit otherCommit, MatchingStrategy matchingStrategy, boolean parseBslModuleStructure, Path pathToFilter, IQualifiedNameFilePathConverter filePathConverter) Creates a new instance with the given parameters. -
Method Summary
Modifier and TypeMethodDescriptionprotected abstract void
The callback method if there no changes to compare.void
perform
(org.eclipse.core.runtime.IProgressMonitor monitor) Performs the 2-way comparison of the specified commits.protected abstract void
runComparison
(List<CompareMergeProcessDescriptor> descriptors) Runs the comparison on the builded descriptors.
-
Field Details
-
repository
protected final org.eclipse.jgit.lib.Repository repositorythe Git repository -
mainCommit
protected final org.eclipse.jgit.revwalk.RevCommit mainCommitthe main side commit -
otherCommit
protected final org.eclipse.jgit.revwalk.RevCommit otherCommitthe other side commit -
matchingStrategy
the matching strategy -
parseBslModuleStructure
protected final boolean parseBslModuleStructuretells whether to compare a Bsl module with parsing module structure -
pathToFilter
the path limiting search for changes on comparison -
filePathConverter
the qualified name file path converter
-
-
Constructor Details
-
AbstractCompareCommitsPerformer
protected AbstractCompareCommitsPerformer(org.eclipse.jgit.lib.Repository repository, org.eclipse.jgit.revwalk.RevCommit mainCommit, org.eclipse.jgit.revwalk.RevCommit otherCommit, MatchingStrategy matchingStrategy, boolean parseBslModuleStructure, Path pathToFilter, IQualifiedNameFilePathConverter filePathConverter) Creates a new instance with the given parameters.- Parameters:
repository
- the Git repository to run comparison on, cannot benull
mainCommit
- the main side commit to compare, cannot benull
otherCommit
- the other side commit to compare, cannot benull
matchingStrategy
- the matching strategy, cannot benull
parseBslModuleStructure
- tells whether to compare and merge a Bsl module with parsing module structurepathToFilter
- the absolute path in the Git repositorу limiting search for changes on comparison ornull
to search all changesfilePathConverter
- the qualified name file path converter, cannot benull
-
-
Method Details
-
perform
Performs the 2-way comparison of the specified commits.- Parameters:
monitor
- the progress monitor to indicate progress, may benull
- Throws:
IOException
- if failed to read the Git repository
-
onNothingToCompare
protected abstract void onNothingToCompare()The callback method if there no changes to compare. -
runComparison
Runs the comparison on the builded descriptors.- Parameters:
descriptors
- the compare/merge process descriptors, cannot benull
-