Andre Bossert ff77d412a9 Adapt diff- and merge tool code for PGM and EGit usage ... see: https://git-scm.com/docs/git-mergetool * DiffTools and MergeTools * store FS, gitDir and workTree for usage without git repository (for EGit preferences) * add getUserDefinedToolNames() and getPredefinedToolNames() * replace getToolNames() with getAllToolNames() that combines the two lists and put default tool name (diff.tool or merge.tool) as first element (for EGit preferences) * FileElement: refactoring of getFile() and friends to have midName (LOCAL, REMOTE etc.) always added to the temp file name (also for EGit) * FileElement: added directory attribute that is used in getFile() to return path with workDir as parent * DiffTool and MergeTool * added errw.flush(), because sometimes stderr is not printed in case of die() * print e.getMessage() always to stderr * Moved toolname and prompt logic into managers * Exported internal packages required for egit.ui Bug: 356832 Change-Id: I71e7f4dc362169a7612ca4f6546a021bc4b2b5f4 Signed-off-by: Andre Bossert <andre.bossert@siemens.com> Signed-off-by: Tim Neumann <Tim.Neumann@advantest.com>		2022-06-02 10:36:31 +02:00
..
.settings	Enable compiler option --release	2021-09-29 17:13:01 +02:00
META-INF	[pgm tests] Relax version constraints for hamcrest	2022-03-30 16:26:57 -04:00
src/org/eclipse/jgit	Update EDL 1.0 license headers to new short SPDX compliant format	2020-01-04 01:10:05 +01:00
tst/org/eclipse/jgit/pgm	Adapt diff- and merge tool code for PGM and EGit usage	2022-06-02 10:36:31 +02:00
.classpath	Bump minimum required Java version to 11	2021-09-29 17:12:12 +02:00
.gitignore	Allow to write tests with CLI syntax	2012-04-18 18:57:36 +02:00
.project	Allow to write tests with CLI syntax	2012-04-18 18:57:36 +02:00
BUILD	Bazel: Remove superfluous dependencies flagged by unused_deps	2020-05-22 17:48:19 +02:00
about.html	Allow to write tests with CLI syntax	2012-04-18 18:57:36 +02:00
build.properties	Add missing resources from source.. in build.properties	2013-10-30 17:42:38 +01:00
org.eclipse.jgit.pgm--All-Tests (Java11) (de).launch	Bump minimum required Java version to 11	2021-09-29 17:12:12 +02:00
org.eclipse.jgit.pgm--All-Tests (Java11).launch	Bump minimum required Java version to 11	2021-09-29 17:12:12 +02:00
org.eclipse.jgit.pgm--All-Tests.launch	Add the other test launchers as favorites	2013-06-16 23:33:29 +02:00
plugin.properties	Fix bundle localization of Apache SSH bundle	2019-06-21 17:54:06 +02:00
pom.xml	Prepare 6.2.0-SNAPSHOT builds	2022-03-03 10:49:58 +01:00