Package com._1c.g5.v8.dt.testing.compare
Class GitCompareMergeTester
- java.lang.Object
-
- com._1c.g5.v8.dt.testing.compare.GitCompareMergeTester
-
public class GitCompareMergeTester extends Object
Runs compare/merge on Git commits.
-
-
Constructor Summary
Constructors Constructor Description GitCompareMergeTester()
-
Method Summary
All Methods Instance Methods Concrete Methods Modifier and Type Method Description void
compareAndMergeTwoCommits(Path repoPath, String mainCommitId, String otherCommitId, Supplier<IV8Project> v8ProjectSupplier, ICompareMergeResultChecker resultChecker)
Runs comparison and merging of two specified commits in the given repository.
-
-
-
Method Detail
-
compareAndMergeTwoCommits
public void compareAndMergeTwoCommits(Path repoPath, String mainCommitId, String otherCommitId, Supplier<IV8Project> v8ProjectSupplier, ICompareMergeResultChecker resultChecker) throws Exception
Runs comparison and merging of two specified commits in the given repository. Note, that for successful comparison and merging it is also required to provide actual V8 project to be merged built on the main commit Id. The provided supplier can build the project at the moment of calling because it is called just after switching to the main commit Id.- Parameters:
repoPath
- the path to the repository, cannot benull
mainCommitId
- the main commit Id, cannot benull
or emptyotherCommitId
- the other commit Id, cannot benull
or emptyv8ProjectSupplier
- the supplier of v8 project built on the main commit Id, cannot benull
resultChecker
- the external checker of compare/merge results, cannot benull
- Throws:
Exception
- if some problem occurred
-
-