summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* JGit v6.2.0.202206071550-rv6.2.0.202206071550-rMatthias Sohn2022-06-0791-125/+125
| | | | | Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: Ib4ae85a0cabcc9cb867f2c85034d72fb676a500a
* Merge branch 'stable-6.1' into stable-6.2Matthias Sohn2022-06-071-12/+24
|\ | | | | | | | | | | | | * stable-6.1: Fix connection leak for smart http connections Change-Id: I4d38c62fa5416fd40b699de5b0ecfa03d498c21d
| * Merge branch 'stable-6.0' into stable-6.1Matthias Sohn2022-06-071-12/+24
| |\ | | | | | | | | | | | | | | | | | | * stable-6.0: Fix connection leak for smart http connections Change-Id: I8b7e643b87c0f788cdafb060a2c9e8b4ef6f7375
| | * Merge branch 'stable-5.13' into stable-6.0Matthias Sohn2022-06-071-12/+24
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.13: Fix connection leak for smart http connections Change-Id: Ic851f2c4660ed761f5527e405b116b54da42fb7c
| | | * Merge branch 'stable-5.12' into stable-5.13Matthias Sohn2022-06-071-12/+24
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.12: Fix connection leak for smart http connections Change-Id: Id34f29c1b27a80c2b56c911cad7e3f64ef63af48
| | | | * Merge branch 'stable-5.11' into stable-5.12Matthias Sohn2022-06-071-12/+24
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.11: Fix connection leak for smart http connections Change-Id: I6caabf4774ccf34706cef846c1087710f67e2ecd
| | | | | * Merge branch 'stable-5.10' into stable-5.11Matthias Sohn2022-06-071-12/+24
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.10: Fix connection leak for smart http connections Change-Id: I3885c6114caed897f762f5ce523d3b27288205b2
| | | | | | * Merge branch 'stable-5.9' into stable-5.10Matthias Sohn2022-06-071-11/+23
| | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.9: Fix connection leak for smart http connections Change-Id: I5e7144b2f5cd850978220c476947001ae2debb8e
| | | | | | | * Fix connection leak for smart http connectionsSaša Živkov2022-06-061-11/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SmartHttpPushConnection: close InputStream and OutputStream after processing. Wrap IOExceptions which aren't TransportExceptions already as a TransportException. Also-By: Matthias Sohn <matthias.sohn@sap.com> Change-Id: I8e11d899672fc470c390a455dc86367e92ef9076
* | | | | | | | Update DEPENDENCIES for 6.2.0 to be released with 2022-06Matthias Sohn2022-06-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifdead74d1000fb110802eeb421b021ab674a9d59
* | | | | | | | Update orbit to R20220531185310 for 2022-06Matthias Sohn2022-06-0617-26/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I436ba965e5f6677f7967ee8f4992dfb467054472
* | | | | | | | Merge branch 'master' into stable-6.2Matthias Sohn2022-06-061-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: [releng] Fix MANIFEST.MF of o.e.j.ssh.apache.agent Change-Id: Ica9069dd97b58aeefc6ac39f2034e513eb58f1e6
| * | | | | | | | [releng] Fix MANIFEST.MF of o.e.j.ssh.apache.agentThomas Wolf2022-06-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the missing Bundle-Localization header. Bug: 580081 Change-Id: If21e0778dbb60b49a8f83030461670656eeb0ce4 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
* | | | | | | | | Prepare 6.2.0-SNAPSHOT buildsMatthias Sohn2022-06-0691-125/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id2ad8d5b561620723b2c52c86909321d628de12f
* | | | | | | | | Merge branch 'master' into stable-6.2Andrey Loskutov2022-06-0327-503/+1862
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | | | | | | | Teach JGit to handle external diff/merge tools defined in .gitattributesAndre Bossert2022-06-028-12/+382
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0216-485/+1214
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0118-97/+357
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | | | JGit v6.2.0.202206011217-rc1v6.2.0.202206011217-rc1Matthias Sohn2022-06-0191-125/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: Id9639b466583d8c373ef700402cb685ce4a8ee15
* | | | | | | | | Merge branch 'master' into stable-6.2Matthias Sohn2022-06-0130-204/+3474
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Fixed since tags added for new merge constants Add filtering with help of DirCacheCheckout.getContent() Avoid warning "no explicit project encoding" Add mergetool merge feature (execute external tool) Add command line support for "git mergetool" Add config reader for user-defined mergetools Add difftool compare feature (execute external tool) Change-Id: Ie215b8205b85cfd9efddb622c90dfad7a5ae0caa
| * | | | | | | | Merge "Add filtering with help of DirCacheCheckout.getContent()"Andrey Loskutov2022-05-3012-257/+483
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Add filtering with help of DirCacheCheckout.getContent()Andre Bossert2022-05-3012-257/+483
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | | | | | | Fixed since tags added for new merge constantsAndrey Loskutov2022-05-301-4/+4
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 356832 Change-Id: I70197522675de0e9b53399ee3d9ed3f10312ff6b
| * | | | | | | | Merge "Merge branch 'stable-6.1' into stable-6.2"Matthias Sohn2022-05-280-0/+0
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Merge branch 'stable-6.1' into stable-6.2Matthias Sohn2022-05-270-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-6.1: Remove stray files (probes or lock files) created by background threads Change-Id: I7114d68b059a2549fde69fa1b04e45b7bb876804
| * | | | | | | | | Merge "Add mergetool merge feature (execute external tool)"Andrey Loskutov2022-05-2711-185/+847
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Add mergetool merge feature (execute external tool)Andre Bossert2022-05-2511-185/+847
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | | | | | | | Merge "Add command line support for "git mergetool""Andrey Loskutov2022-05-2716-171/+1269
| |\| | | | | | | | |
| | * | | | | | | | | Add command line support for "git mergetool"Andre Bossert2022-05-2516-171/+1269
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | | | | | | | Merge "Add config reader for user-defined mergetools"Andrey Loskutov2022-05-276-4/+483
| |\| | | | | | | | |
| | * | | | | | | | | Add config reader for user-defined mergetoolsAndre Bossert2022-05-256-4/+483
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | see: https://git-scm.com/docs/git-mergetool see: https://git-scm.com/docs/git-config * add config reader for user-defined mergetools * merge.tool * merge.guitool * mergetool.prompt * mergetool.keepBackup * mergetool.keepTemporaries * mergetool.writeToTemp * mergetool.<tool>.path * mergetool.<tool>.cmd * mergetool.<tool>.trustExitCode Bug: 356832 Change-Id: Ic4f07376630713d8e06cbad284d9c72c9ecc0405 Signed-off-by: Andre Bossert <andre.bossert@siemens.com>
| * | | | | | | | | | Merge "Add difftool compare feature (execute external tool)"Andrey Loskutov2022-05-2712-97/+894
| |\| | | | | | | | |
| | * | | | | | | | | Add difftool compare feature (execute external tool)Andre Bossert2022-05-2512-97/+894
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | | | | | | | Avoid warning "no explicit project encoding"Michael Keppler2022-05-264-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Eclipse 2022-06 raises that warning for each project without explicit encoding. We can avoid the warning by adding explicit project settings for the otherwise implicit encoding. There is no functional change, neither for users of Eclipse nor for users of other IDEs or build tools. Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de> Change-Id: I30a6f1369ef09bd445f5730628d01772db2ee7b3
* | | | | | | | | | | Merge branch 'stable-6.1' into stable-6.2Matthias Sohn2022-05-280-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | / / / / / / / | | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-6.1: Remove stray files (probes or lock files) created by background threads Change-Id: I1645106e91bc28153ec032ea66ad0f30f47b647e
| * | | | | | | | | Merge branch 'stable-6.0' into stable-6.1Matthias Sohn2022-05-273-9/+39
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-6.0: Remove stray files (probes or lock files) created by background threads Change-Id: Iab21b9776c2ebecd4cad5d015028cadd4b6541db
| | * | | | | | | | Merge branch 'stable-5.13' into stable-6.0Matthias Sohn2022-05-273-9/+39
| | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.13: Remove stray files (probes or lock files) created by background threads Change-Id: I7af1355a77f14995118145162f6bb8a4f1755f2b
| | | * | | | | | | Remove stray files (probes or lock files) created by background threadsJames Z.M. Gao2022-05-273-9/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOTE: port back from master branch. On process exit, it was possible that the filesystem timestamp resolution measurement left behind .probe files or even a lock file for the jgit.config. Ensure the SAVE_RUNNER is shut down when the process exits (via System.exit() or otherwise). Move lf.lock() into the try-finally block when saving the config file. Delete .probe files on JVM shutdown -- they are created in daemon threads that may terminate abruptly, not executing the "finally" clause that normally removes these files. Bug: 579445 Change-Id: Iaee2301eb14e6201406398a90228ad10cfea6098
* | | | | | | | | | Prepare 6.2.0-SNAPSHOT buildsMatthias Sohn2022-05-2691-125/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9d6afd80cc024d6e03aa46bbaaaeec10b60fb485
* | | | | | | | | | JGit v6.2.0.202205251150-m3v6.2.0.202205251150-m3Matthias Sohn2022-05-2591-125/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I48492aef02c2ea39cec171d84e92643859e064a6 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | | | | | | | Merge branch 'master' into stable-6.2Matthias Sohn2022-05-2518-103/+217
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: RewriteGenerator: Fully buffering of input is no longer necessary Update Orbit to S20220517184036 PackFileSnapshot: Resolve warnings by using "equals" instead of "==" Remove stray files (probes or lock files) created by background threads Change-Id: I1522fcd03fb7ef0d7512b5d0b3bc09271e918c48
| * | | | | | | | | RewriteGenerator: Fully buffering of input is no longer necessarySimon Sohrt2022-05-254-22/+68
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fully buffering by the previous generator of the input for the RewriteGenerator is no longer necessary. Bug: 577948 Signed-off-by: Simon Sohrt <sohrt@his.de> Change-Id: I59c7a7c7f3766e97627764608bc8dc733804274c
| * | | | | | | | Update Orbit to S20220517184036Matthias Sohn2022-05-259-71/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and - net.i2p.crypto.eddsa to 0.3.0.v20220506-1020 - org.bouncycastle.bcpg to 1.70.0.v20220507-1208 - org.bouncycastle.bcprov to 1.70.0.v20220507-1208 Change-Id: Ifc450da0a9b469629b7d3a7e4194a2bc8a2a4403
| * | | | | | | | PackFileSnapshot: Resolve warnings by using "equals" instead of "=="Fabio Ponciroli2022-05-202-1/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Errorprone raises the following warning: "[ReferenceEquality] Comparison using reference equality instead of value equality" Added Equality#isSameInstance util method to be reused in similar cases. Change-Id: Ifc9885c9806dcafa1c5ee1351d3095bf1517dbf5
| * | | | | | | | Remove stray files (probes or lock files) created by background threadsJames Z.M. Gao2022-05-153-9/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On process exit, it was possible that the filesystem timestamp resolution measurement left behind .probe files or even a lock file for the jgit.config. Ensure the SAVE_RUNNER is shut down when the process exits (via System.exit() or otherwise). Move lf.lock() into the try-finally block when saving the config file. Delete .probe files on JVM shutdown -- they are created in daemon threads that may terminate abruptly, not executing the "finally" clause that normally removes these files. Bug: 579445 Change-Id: Ie27aca1fdaddfa487ebe072c3913d78355910df8
| * | | | | | | | Merge branch 'stable-6.2'Matthias Sohn2022-05-094-23/+56
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-6.2: HTTP Smart: set correct HTTP status on error Change-Id: I7bf99b0c720f9dabb65da5cc777281a1d227f5a8
* | | | | | | | | Merge branch 'stable-6.1' into stable-6.2Matthias Sohn2022-05-094-23/+56
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-6.1: HTTP Smart: set correct HTTP status on error Change-Id: I792d6cdfe9e76a3d2e6d1e01ec1dc96805ed2900
| * | | | | | | | HTTP Smart: set correct HTTP status on errorSven Selberg2022-05-094-23/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previous behavior was that status code was automatically set to 200 regardless of reported status and according to HTTP Smart protocol[1]: If there is no repository at $GIT_URL, or the resource pointed to by a location matching $GIT_URL does not exist, the server MUST NOT respond with 200 OK response. A server SHOULD respond with 404 Not Found, 410 Gone, or any other suitable HTTP status code which does not imply the resource exists as requested. Since the jgit HTTP client isn't able to handle reading content from a response reporting an error (calling HttpURLConnection#getInputStream on a "failed" connection throws an exception and the internal interface HttpConnection does not expose HttpURLConnection#getErrorStream) the SmartClientSmartServerTest needed to be rewritten to expect the generic response messages. [1] https://git-scm.com/docs/http-protocol#_general_request_processing Bug: 579676 Change-Id: Ibb942d02124a0bc279df09600b091354019ce064
| | * | | | | | | Merge branch 'stable-6.2'Matthias Sohn2022-05-050-0/+0
| | |\ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-6.2: Prepare 6.2.0-SNAPSHOT builds JGit v6.2.0.202205041315-m2 Change-Id: Ia5180f086ac07fe6fa0e68d233ddb963010945b6
* | | | | | | | | Prepare 6.2.0-SNAPSHOT buildsMatthias Sohn2022-05-0591-125/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic3788b38d6408e83729caa718c128a5632798a60
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-17 02:26:04 +0000