aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.pgm.test
Commit message (Collapse)AuthorAgeFilesLines
* Prepare 6.7.0-SNAPSHOT buildsMatthias Sohn2023-08-302-2/+2
| | | | Change-Id: I49751232464e70b7d1dc3292a9f36b7a7015e44f
* JGit v6.7.0.202308301100-rc1v6.7.0.202308301100-rc1Matthias Sohn2023-08-302-2/+2
| | | | | Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: I712a9f6830364ed404d03f3a145c055906273544
* Prepare 6.7.0-SNAPSHOT buildsMatthias Sohn2023-08-032-2/+2
| | | | Change-Id: I936d2d9106a1e3b7a98ec89fec8ae8a92ec765f2
* JGit v6.7.0.202308011830-m2v6.7.0.202308011830-m2Matthias Sohn2023-08-022-2/+2
| | | | | Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: I255a979e9f48f60a251ef7b74ced3f720f012706
* Prepare 6.7.0-SNAPSHOT buildsMatthias Sohn2023-05-242-21/+21
| | | | Change-Id: I50ff7ee31046cfc29a087c8963be3deae24b1c9c
* Merge branch 'stable-6.5'Matthias Sohn2023-04-281-0/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-6.5: [bazel] Move ToolTestCase to src folder (6.2) GcConcurrentTest: @Ignore flaky testInterruptGc Fix CommitTemplateConfigTest Fix after_open config and Snapshotting RefDir tests to work with bazel [bazel] Skip ConfigTest#testCommitTemplatePathInHomeDirecory Demote severity of some error prone bug patterns to warnings Parse pull.rebase=preserve as alias for pull.rebase=merges UploadPack: Fix NPE when traversing a tag chain Change-Id: I16e8553d187a8ef541f578291f47fc39c3da4ac0
| * Merge branch 'stable-6.4' into stable-6.5Matthias Sohn2023-04-271-0/+0
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-6.4: [bazel] Move ToolTestCase to src folder (6.2) GcConcurrentTest: @Ignore flaky testInterruptGc Fix CommitTemplateConfigTest Fix after_open config and Snapshotting RefDir tests to work with bazel [bazel] Skip ConfigTest#testCommitTemplatePathInHomeDirecory Demote severity of some error prone bug patterns to warnings UploadPack: Fix NPE when traversing a tag chain Change-Id: I6d20fea3a417e4361b61e81756253343668eb5de
| | * Merge branch 'stable-6.3' into stable-6.4Matthias Sohn2023-04-271-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-6.3: [bazel] Move ToolTestCase to src folder (6.2) GcConcurrentTest: @Ignore flaky testInterruptGc Fix CommitTemplateConfigTest Fix after_open config and Snapshotting RefDir tests to work with bazel [bazel] Skip ConfigTest#testCommitTemplatePathInHomeDirecory Demote severity of some error prone bug patterns to warnings UploadPack: Fix NPE when traversing a tag chain Change-Id: I463f8528e623316add204848d551c44d44d04858
| | | * Merge branch 'stable-6.2' into stable-6.3Matthias Sohn2023-04-271-0/+0
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-6.2: [bazel] Move ToolTestCase to src folder (6.2) GcConcurrentTest: @Ignore flaky testInterruptGc Fix CommitTemplateConfigTest Fix after_open config and Snapshotting RefDir tests to work with bazel [bazel] Skip ConfigTest#testCommitTemplatePathInHomeDirecory Demote severity of some error prone bug patterns to warnings UploadPack: Fix NPE when traversing a tag chain Change-Id: I736c7d0ed9c6e9718fa98976c3dc5a25ab8cda85
| | | | * [bazel] Move ToolTestCase to src folder (6.2)Matthias Sohn2023-04-271-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bazel barks at the abstract ToolTestCase not containing any test. Move it from the tst/ source folder to the src/ source folder so that bazel knows this is a helper class which doesn't contain tests. Change-Id: Ie353c27526644ea9b47437b9bd9cd730a432ab29
| | | | * Prepare 6.2.1-SNAPSHOT buildsMatthias Sohn2022-06-072-21/+21
| | | | | | | | | | | | | | | | | | | | Change-Id: I4a0f3919ff43a3b9fafa85b8ecec2d760b7eb161
| | | | * JGit v6.2.0.202206071550-rv6.2.0.202206071550-rMatthias Sohn2022-06-072-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: Ib4ae85a0cabcc9cb867f2c85034d72fb676a500a
| | | | * Prepare 6.2.0-SNAPSHOT buildsMatthias Sohn2022-06-062-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Id2ad8d5b561620723b2c52c86909321d628de12f
| | | | * Merge branch 'master' into stable-6.2Andrey Loskutov2022-06-033-36/+271
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Adapt diff- and merge tool code for PGM and EGit usage Teach JGit to handle external diff/merge tools defined in .gitattributes Change-Id: I3aefc14160caaac859bd3548460dd755ebe42fc5
| | | | * | JGit v6.2.0.202206011217-rc1v6.2.0.202206011217-rc1Matthias Sohn2022-06-012-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: Id9639b466583d8c373ef700402cb685ce4a8ee15
| | * | | | Prepare 6.4.1-SNAPSHOT buildsMatthias Sohn2022-11-302-21/+21
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I860bfde113c05015c41304c4a77c44c224bd0923
| | * | | | JGit v6.4.0.202211300538-rv6.4.0.202211300538-rMatthias Sohn2022-11-302-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: If4001b255a209849b4acabd2083164d0794f00c4
| | * | | | Prepare 6.4.0-SNAPSHOT buildMatthias Sohn2022-11-232-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I41c4f73472bb47d8f9d2d117d17e11bba4802928
| | * | | | JGit v6.4.0.202211231055-rc1v6.4.0.202211231055-rc1Matthias Sohn2022-11-232-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: Ia34696d07568b298544ee2cdc6f4b6746774bb82
| * | | | | Prepare 6.5.1-SNAPSHOT buildsMatthias Sohn2023-03-072-21/+21
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idd9977ac08a339906e33beb73f57f8f6885ad86f
| * | | | | JGit v6.5.0.202303070854-rv6.5.0.202303070854-rMatthias Sohn2023-03-072-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: I8da37ead0bd527bc4990ed5f8d5d4fb4f4d5cf01
| * | | | | Prepare 6.5.0-SNAPSHOT buildsMatthias Sohn2023-03-012-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I313e3deed8fa00df0406b3d7b73e5b643dc25a05
| * | | | | JGit v6.5.0.202302281825-rc1v6.5.0.202302281825-rc1Matthias Sohn2023-03-012-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: I1eb2e87b70c2da1dc81468cdc7ecf7dbd21d4190
| * | | | | Prepare 6.5.0-SNAPSHOT buildsMatthias Sohn2023-03-012-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie95ce8fcc2a570505d23d5a1642e33c041212260
| * | | | | JGit v6.5.0.202302221508-m3v6.5.0.202302221508-m3Matthias Sohn2023-02-222-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: I00bf91823e2fe6503d52ae23bc1854f0b1d66dbd
| * | | | | Prepare 6.5.0-SNAPSHOT buildsMatthias Sohn2023-02-012-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id0c7e51293d53b1eeec081cbbdf6e27d77123200
| * | | | | JGit v6.5.0.202302011120-m2v6.5.0.202302011120-m2Matthias Sohn2023-02-012-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: I231d3f9b8a59e374477d3a33964061acb2c25ce4
* | | | | | [pgm] Implement git tag --contains optionMatthias Sohn2023-04-121-1/+42
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I390bcd2c2c563d4b27e1369f09548be59ba7c111
* | | | | | Prepare 6.6.0-SNAPSHOT buildsMatthias Sohn2023-03-012-21/+21
|/ / / / / | | | | | | | | | | | | | | | Change-Id: I17893f9db12bcb208866f40a06cd4f1ccbb4fe30
* | | | | [pgm] Fetch-CLI: add support for shallowHarald Weiner2023-01-241-0/+139
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds support for shallow cloning. The CloneCommand and the FetchCommand now have the new options --depth, --shallow-since and --shallow-exclude to tell the server that the client doesn't want to download the complete history. Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=475615 Change-Id: I8f113bed25dd6df64f2f95de6a59d4675ab8a903
* | | | | Prepare 6.5.0-SNAPSHOT buildsMatthias Sohn2022-11-232-21/+21
|/ / / / | | | | | | | | | | | | Change-Id: I4238b6181e96e22e540cf34802a332f868cb6dfb
* | | | [pgm] Add options --name-only, --name-status to diff, log, showalerthak2022-11-233-0/+190
| | | | | | | | | | | | | | | | Change-Id: Ib218bd2ccbd7990feca4c35d8c8dc34d4a8291e6
* | | | Prepare 6.4.0-SNAPSHOT buildsMatthias Sohn2022-09-142-21/+21
|/ / / | | | | | | | | | Change-Id: I47ca5f1d0263caa0bfc7c303042360c6c5ac4dec
* | | Prepare 6.3.1-SNAPSHOT buildsMatthias Sohn2022-09-122-21/+21
| | | | | | | | | | | | Change-Id: I44e159eca4131880d74d3078060e7e20f9b5ce76
* | | JGit v6.3.0.202209071007-rv6.3.0.202209071007-rMatthias Sohn2022-09-072-2/+2
| | | | | | | | | | | | | | | Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: Iea3fae9f6f6c5fb0a79f7684334a3e0059738c4f
* | | JGit v6.3.0.2022009070944-rMatthias Sohn2022-09-072-2/+2
| | | | | | | | | | | | | | | Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: I3cc78dbcf8c7970e80bf1499751611110ec2b30b
* | | Prepare 6.3.0-SNAPSHOT buildsMatthias Sohn2022-08-172-2/+2
| | | | | | | | | | | | Change-Id: Ie398b651c5308ec86812bf01fcc563d3e679c828
* | | JGit v6.3.0.202208161710-m3v6.3.0.202208161710-m3Matthias Sohn2022-08-162-2/+2
| | | | | | | | | | | | | | | Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: I0954d11a1f35eff196b157df3aa8386476c48a7e
* | | Provide encoding to String#getBytes()Han-Wen Nienhuys2022-08-081-1/+2
| | | | | | | | | | | | | | | | | | Fixes ErrorProne complaint. Change-Id: I706b225f98187bf5f86999ed5342d0072e57e314
* | | Run tests that checks araxis output only on LinuxSimeon Andreev2022-06-173-0/+11
| | | | | | | | | | | | | | | Bug: 580189 Change-Id: Ieb14f5cf061fcb468b602c7f27e27b672e3b09e2 Signed-off-by: Simeon Andreev <simeon.danailov.andreev@gmail.com>
* | | Prepare 6.3.0-SNAPSHOT buildsMatthias Sohn2022-06-072-21/+21
| |/ |/| | | | | Change-Id: I092fdd2c35d85bf35e3ef700aa7078e6d304d977
* | Teach JGit to handle external diff/merge tools defined in .gitattributesAndre Bossert2022-06-021-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Adds API that allows UI to find (and handle) diff/merge tools, specific for the given path. The assumption is that user can specify file type specific diff/merge tools via gitattributes. Bug: 552840 Change-Id: I1daa091e9afa542a9ebb5417853dff0452ed52dd Signed-off-by: Mykola Zakharchuk <zakharchuk.vn@gmail.com> Signed-off-by: Andrey Loskutov <loskutov@gmx.de> Signed-off-by: Andre Bossert <andre.bossert@siemens.com>
* | Adapt diff- and merge tool code for PGM and EGit usageAndre Bossert2022-06-023-26/+220
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Add availability check of pre-defined toolsAndre Bossert2022-06-012-10/+50
|/ | | | | | | | | | | | | | | | | see: https://git-scm.com/docs/git-difftool see: https://git-scm.com/docs/git-mergetool * now all available tools are printed with "--tool-help" * if no diff.tool or merge.tool is defined the first available pre-defined tool is used TODO: - add mergetools to difftools --> extra change or merge to this - return the exit-code of the tool to jgit / java runtime Bug: 356832 Change-Id: I20fb04e71ced981f5625020f461bbac24e6cec70 Signed-off-by: Andre Bossert <andre.bossert@siemens.com>
* Add filtering with help of DirCacheCheckout.getContent()Andre Bossert2022-05-302-57/+47
| | | | | | | | | | | | | | | | 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>
* Add mergetool merge feature (execute external tool)Andre Bossert2022-05-253-51/+364
| | | | | | | | | | | | | | | | | 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>
* Add command line support for "git mergetool"Andre Bossert2022-05-253-91/+287
| | | | | | | | | | | | | | | | | see: https://git-scm.com/docs/git-mergetool see: https://git-scm.com/docs/git-config * add command line support for "git mergetool" * add option handling for "--tool-help", "--tool=<mytool>", "--[no-]prompt", "--[no-]gui" * handle prompt * add MergeTools * add pre-defined mergetools * print merge actions --> no execute, will be done later Bug: 356832 Change-Id: I6e505ffc3d03f75ecf4bba452a25d25dfcf5793f Signed-off-by: Andre Bossert <andre.bossert@siemens.com>
* Add difftool compare feature (execute external tool)Andre Bossert2022-05-251-10/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | see: http://git-scm.com/docs/git-difftool * add CommandExecutor that handles tool execution with help of "jgit.FS" * it handles tool execution with temporary created "command file" --> for for all "command interpreters" and parameters with spaces etc. * using of external bash.exe at Windows (MinGW) if shell-script is used as difftool command. It can be enabled with parameter "jgit.usemsys2bash=auto" that checks if command contains ".sh" or enabled / disabled with "jgit.usemsys2bash=true|false" * added special handling for empty files (e.g. deleted, added etc.) that are named "/dev/null" * added creation and deletion of temporary files needed for compare * added own Exception class for reporting to pgm / command line / EGit * added prompt option handling before executing difftool * reworked trustExitCode option for specific difftool and override for all difftools from config and command line * tested with command line options "--[no]-trust-exit-code", "--tool=<toolname>", "--[no]-gui", --[no]-prompt * ContentSource * added close() methods to close / cleanup used resources (like ObjectReader TreeWalk etc.) * added isWorkingTreeSource() methods to check if file can be used from working tree instead of copy from "ObjectLoader / ObjectReader" to temporary file (fixes "difftool <commit> <commit>") Bug: 356832 Change-Id: I5462fb6dbe4ecfd9da7c74117fce4070bbfd4d7a Signed-off-by: Andre Bossert <andre.bossert@siemens.com> Signed-off-by: Simeon Andreev <simeon.danailov.andreev@gmail.com>
* [pgm tests] Relax version constraints for hamcrestMatthias Sohn2022-03-301-1/+1
| | | | | | | | We updated hamcrest to 2.2. but there is no need to prevent that older versions of hamcrest can be used. Hence relax the lower bound to 1.1 like in other bundles. Change-Id: I3f2f270d2aabc7d742a585d2fc7f0bce283e2a64
* Prepare 6.2.0-SNAPSHOT buildsMatthias Sohn2022-03-032-21/+21
| | | | Change-Id: Ic2dde88bee3242169d6fa50956f8938f3fc4ba8e
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-11 22:11:14 +0000