]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 8573435) | patch
Add mergetool merge feature (execute external tool) 10/138410/38
authorAndre Bossert <andre.bossert@siemens.com>
Fri, 8 Mar 2019 21:31:34 +0000 (22:31 +0100)
committerAndrey Loskutov <loskutov@gmx.de>
Wed, 25 May 2022 11:52:04 +0000 (13:52 +0200)
commiteaf4d500b886a7e776f50bf53497fe463e714b25
tree740ac70c01372243cdbc8c902113ff144c8f3c2btree | snapshot
parent85734356351ec2df4067b2472a37f6d9bcbb7350commit | diff
Add mergetool merge feature (execute external tool)

see: https://git-scm.com/docs/git-mergetool

* implement mergetool merge function (execute external tool)
* add ExecutionResult and commandExecutionError to ToolException
* handle "base not present" case (empty or null base file path)
* handle deleted (rm) and modified (add) conflicts
* handle settings
 * keepBackup
 * keepTemporaries
 * writeToTemp

Bug: 356832
Change-Id: Id323c2fcb1c24d12ceb299801df8bac51a6d463f
Signed-off-by: Andre Bossert <andre.bossert@siemens.com>
12 files changed:
org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/DiffToolTest.java diff | blob | history
org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/ExternalToolTestCase.java [deleted file] blob | history
org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/MergeToolTest.java diff | blob | history
org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/ToolTestCase.java [new file with mode: 0644] blob
org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties diff | blob | history
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/DiffTool.java diff | blob | history
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/MergeTool.java diff | blob | history
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/internal/CLIText.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/CommandExecutor.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/FileElement.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/MergeTools.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/ToolException.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit