]> source.dussan.org Git - jgit.git/commit
Add filtering with help of DirCacheCheckout.getContent() 62/139262/42
authorAndre Bossert <andre.bossert@siemens.com>
Sun, 19 Jan 2020 19:54:17 +0000 (20:54 +0100)
committerAndrey Loskutov <loskutov@gmx.de>
Mon, 30 May 2022 11:28:32 +0000 (13:28 +0200)
commite81085944f1a039566f2972c863d189724988b46
treeb56edc0b3da0259178dd90c03755f0869c94e31e
parentd128c3112d76960c63a5b4df54246671c6ea5a33
Add filtering with help of DirCacheCheckout.getContent()

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

* refactoring of content (FileElement) handling
* now the temporary files are already filled with filtered content in
the calling classes (PGM), that can be used with EGit content too

TODO:
 * keep the temporaries when no change detected and the user answers no
to the question if the merge was successful

Bug: 356832
Change-Id: I86a0a052d059957d4d152c1bb94c262902c377d2
Signed-off-by: Andre Bossert <andre.bossert@siemens.com>
12 files changed:
org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/DiffToolTest.java
org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/ToolTestCase.java
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/DiffTool.java
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/MergeTool.java
org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/diffmergetool/ExternalDiffToolTest.java
org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/diffmergetool/ExternalMergeToolTest.java
org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/diffmergetool/ExternalToolTestCase.java
org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/DiffTools.java
org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/ExternalToolUtils.java [new file with mode: 0644]
org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/FileElement.java
org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/MergeTools.java
org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/ToolException.java