]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: aec22e7) | patch
Support creating Mergers without a Repository 09/94409/7
authorDave Borowitz <dborowitz@google.com>
Fri, 31 Mar 2017 15:49:12 +0000 (11:49 -0400)
committerJonathan Nieder <jrn@google.com>
Wed, 5 Apr 2017 21:50:54 +0000 (17:50 -0400)
commit4c3e274588060d9ab2e05d7919f506789bcbbc0b
tree241e54a6bfdba3a7036c030d094e3da5a5b733datree | snapshot
parentaec22e74cf76d7b7ea53d526b908613eaeac5b55commit | diff
Support creating Mergers without a Repository

All that's really required to run a merge operation is a single
ObjectInserter, from which we can construct a RevWalk, plus a Config
that declares a diff algorithm. Provide some factory methods that don't
take Repository.

Change-Id: Ib884dce2528424b5bcbbbbfc043baec1886b9bbd
13 files changed:
org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/ResolveMergerTest.java diff | blob | history
org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/SimpleMergeTest.java diff | blob | history
org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeStrategy.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/merge/Merger.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/merge/RecursiveMerger.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategyOneSided.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategyRecursive.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategyResolve.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategySimpleTwoWayInCore.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/merge/ThreeWayMerger.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit