aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.pgm
Commit message (Collapse)AuthorAgeFilesLines
...
| | | | | | | * Add pack options to preserve and prune old pack filesMatthias Sohn2023-02-111-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the options - pack.preserveOldPacks - pack.prunePreserved This allows to configure in git config if old packs should be preserved during gc and pruned during the next gc. The original implementation in 91132bb0 only allows to set these options using the API. Change-Id: I5b23ab4f317d12f5ccd234401419913e8263cc9a
| | | | | | | * Prepare 5.13.2-SNAPSHOT buildsMatthias Sohn2022-06-143-43/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4862e5d80a7d95a1a119d06306e3f6927445d1d3
| | | | | | | * JGit v5.13.1.202206130422-rv5.13.1.202206130422-rMatthias Sohn2022-06-133-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: Ife74d64e8171c68dbf08271492c0ac852a6dc51c
| | | | | * | | Prepare 6.1.1-SNAPSHOT buildsMatthias Sohn2022-03-083-46/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifc80355025d8459245843be1c24dc5a286913e77
| | | | | * | | JGit v6.1.0.202203080745-rv6.1.0.202203080745-rMatthias Sohn2022-03-083-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8766ed400020c9571f321bbbfe34b0688af0107d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | * | | Prepare 6.1.0-SNAPSHOT buildsMatthias Sohn2022-03-023-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I525fc1258a729c36d63fdb3c8170e9f04ad55cec
| | | | | * | | JGit v6.1.0.202203021511-rc1v6.1.0.202203021511-rc1Matthias Sohn2022-03-023-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4c75a58fd76102e773af4f1f8a1487d5e7ffc7cf Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | * | | | Prepare 6.2.1-SNAPSHOT buildsMatthias Sohn2022-06-073-46/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4a0f3919ff43a3b9fafa85b8ecec2d760b7eb161
| | | | * | | | JGit v6.2.0.202206071550-rv6.2.0.202206071550-rMatthias Sohn2022-06-073-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: Ib4ae85a0cabcc9cb867f2c85034d72fb676a500a
| | | | * | | | Prepare 6.2.0-SNAPSHOT buildsMatthias Sohn2022-06-063-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id2ad8d5b561620723b2c52c86909321d628de12f
| | | | * | | | Merge branch 'master' into stable-6.2Andrey Loskutov2022-06-034-150/+207
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-013-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: Id9639b466583d8c373ef700402cb685ce4a8ee15
| | * | | | | | | Prepare 6.4.1-SNAPSHOT buildsMatthias Sohn2022-11-303-46/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I860bfde113c05015c41304c4a77c44c224bd0923
| | * | | | | | | JGit v6.4.0.202211300538-rv6.4.0.202211300538-rMatthias Sohn2022-11-303-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: If4001b255a209849b4acabd2083164d0794f00c4
| | * | | | | | | Prepare 6.4.0-SNAPSHOT buildMatthias Sohn2022-11-233-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I41c4f73472bb47d8f9d2d117d17e11bba4802928
| | * | | | | | | JGit v6.4.0.202211231055-rc1v6.4.0.202211231055-rc1Matthias Sohn2022-11-233-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: Ia34696d07568b298544ee2cdc6f4b6746774bb82
| * | | | | | | | [pgm] Fetch-CLI: add support for shallowHarald Weiner2023-01-246-0/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-233-46/+46
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4238b6181e96e22e540cf34802a332f868cb6dfb
| * | | | | | | [pgm] Add options --name-only, --name-status to diff, log, showalerthak2022-11-235-8/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib218bd2ccbd7990feca4c35d8c8dc34d4a8291e6
| * | | | | | | [pgm] Ensure UploadPack is closed to fix resource leakMatthias Sohn2022-11-211-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I40da4b331012dd1c6f4b497e46c973fd776b737f
| * | | | | | | pgm/BUILD: Add dependencty to java EWAHIvan Frade2022-10-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A fetch to a locally run daemon triggers a runtime exception: Listening on localhost/127.0.0.1:9418 java.lang.NoClassDefFoundError: com/googlecode/javaewah/EWAHCompressedBitmap Add javaEWAH in the deps of the PGM library. To reproduce: 0. Assume a git repo in <dir-with-repos>/a-repo 1. Run daemon e.g.: $ bazel run //org.eclipse.jgit.pgm:jgit -- daemon --export-all=true --listen localhost --enable upload-pack <dir-with-repos> 2. Fetch: $ git clone git://0.0.0.0:9418/a-repo Change-Id: I503f9fe45347a5891c3f3de0452b7f300b1e8206
| * | | | | | | Prepare 6.4.0-SNAPSHOT buildsMatthias Sohn2022-09-143-46/+46
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I47ca5f1d0263caa0bfc7c303042360c6c5ac4dec
| * | | | | | Prepare 6.3.1-SNAPSHOT buildsMatthias Sohn2022-09-123-46/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I44e159eca4131880d74d3078060e7e20f9b5ce76
| * | | | | | JGit v6.3.0.202209071007-rv6.3.0.202209071007-rMatthias Sohn2022-09-073-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: Iea3fae9f6f6c5fb0a79f7684334a3e0059738c4f
| * | | | | | JGit v6.3.0.2022009070944-rMatthias Sohn2022-09-073-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: I3cc78dbcf8c7970e80bf1499751611110ec2b30b
| * | | | | | Prepare 6.3.0-SNAPSHOT buildsMatthias Sohn2022-08-173-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie398b651c5308ec86812bf01fcc563d3e679c828
| * | | | | | JGit v6.3.0.202208161710-m3v6.3.0.202208161710-m3Matthias Sohn2022-08-163-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: I0954d11a1f35eff196b157df3aa8386476c48a7e
* | | | | | | Merge branch 'master' into nextMatthias Sohn2022-07-0613-89/+752
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (193 commits) Add aarch64 environment to target platform configuration JGit blame very slow for large merge commits that rename files UploadPack: don't prematurely terminate timer in case of error Do not create reflog for remote tracking branches during clone UploadPack: do not check reachability of visible SHA1s Fix warnings about non-externalized string literals [sshd] Correct signature for RSA keys from an SSH agent Run tests that checks araxis output only on Linux Add missing package import javax.management to org.eclipse.jgit Add 4.25 target platform for Eclipse 2022-09 Suppress API errors raised for new API introduced in 5.13.1 Eclipse 4.24 was released, adapt p2 URL accordingly Fix DefaultCharset bug pattern flagged by error prone Use SystemReader#getDefaultCharset to read console input Annotate the exception with the possible failure reason when Bitmaps are not enabled. Prepare 5.13.2-SNAPSHOT builds JGit v5.13.1.202206130422-r AmazonS3: Add support for AWS API signature version 4 Fix typo in DiffTools#compare javadoc Update jgit-last-release-version to 6.2.0.202206071550-r ... Change-Id: I561a0178f6bc512e8ce7d75f1870a044cb051fac
| * | | | | | Fix DefaultCharset bug pattern flagged by error proneDavid Ostrovsky2022-06-172-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See more details in: [1]. [1] https://errorprone.info/bugpattern/DefaultCharset Change-Id: I3de0be57a2d74490a5b4e66801e9767b38f13bf9
| * | | | | | Use SystemReader#getDefaultCharset to read console inputDavid Ostrovsky2022-06-171-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In I986f97a410 SystemReader.getDefaultCharset() that provides the locale-dependent charset the way JEP 400 recommends. Change-Id: I30560ac47e450070e3864325d153d45f1a66882c
| * | | | | | Prepare 6.3.0-SNAPSHOT buildsMatthias Sohn2022-06-073-46/+46
| | |/ / / / | |/| | | | | | | | | | | | | | | | Change-Id: I092fdd2c35d85bf35e3ef700aa7078e6d304d977
| * | | | | Adapt diff- and merge tool code for PGM and EGit usageAndre Bossert2022-06-022-155/+155
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-014-37/+94
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-46/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-254-69/+305
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-254-2/+218
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-252-31/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | Prepare 6.2.0-SNAPSHOT buildsMatthias Sohn2022-03-033-46/+46
| |/ / / | | | | | | | | | | | | Change-Id: Ic2dde88bee3242169d6fa50956f8938f3fc4ba8e
| * | | [pgm] Add describe --abbrev optionMatthias Sohn2022-03-022-0/+7
| | | | | | | | | | | | | | | | Change-Id: I8adf2fad21db71b43266d3f274143eee6bc9dce2
| * | | Introduce a constant for the length of an abbreviated hash stringSebastian Schuberth2022-02-033-4/+13
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Sebastian Schuberth <sebastian.schuberth@bosch.io> Change-Id: I196d58a813f7caa1965af4cf8e2f977ed4cdc350
| * | | [errorprone] Fix implicit use of platform default charsetMatthias Sohn2022-01-191-1/+3
| | | | | | | | | | | | | | | | Change-Id: I42f893c4248d8b00bf4aaf59cd528c43940f99e2
| * | | Merge branch 'stable-6.0'Thomas Wolf2022-01-054-13/+8
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-6.0: Use slf4j-simple instead of log4j for logging Update orbit to R20211213173813 Change-Id: I746b7fb71571020ce49f7b50fd675c9864327719 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
| | * | Merge branch 'stable-5.13' into stable-6.0Thomas Wolf2022-01-054-13/+8
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.13: Use slf4j-simple instead of log4j for logging Update orbit to R20211213173813 Change-Id: I219ef3901c1d908b91bf9c8f00431b22686ff7a5 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
| | | * Use slf4j-simple instead of log4j for loggingMatthias Sohn2021-12-314-13/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JGit uses slf4j-api as logging API. The libraries - org.eclipse.jgit.http.test - org.eclipse.jgit.pgm - org.eclipse.jgit.ssh.apache.test - org.eclipse.jgit.test used the outdated log4j 1.2.15 which is EOL since years. Since both jgit command line and also the tests don't need sophisticated logging features replace log4j with the much simpler slf4j-simple log implementation. The org.slf4j.binding.simple 1.7.30 archive has only 25kB instead of 429kB for log4j 1.2.15 Applications using jgit are free to choose any other log implementation supporting slf4j API. Change-Id: I89e85cd3c76e954c3434622510975ce65dc227d4
| | | * Prepare 5.13.1-SNAPSHOT buildsMatthias Sohn2021-09-083-43/+43
| | | | | | | | | | | | | | | | Change-Id: Ib2f689d8d13eab022da5b5e83d6d6bebc1bb81d3
| | | * JGit v5.13.0.202109080827-rv5.13.0.202109080827-rMatthias Sohn2021-09-083-4/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: If3b2d4256712cc7e577c23e75c0d4ad940870e72 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | * Prepare 5.13.0-SNAPSHOT buildsMatthias Sohn2021-09-013-4/+4
| | | | | | | | | | | | | | | | Change-Id: I2a1d7ab24d5ca718348f4ce3cda351553e48cd1f
| | | * JGit v5.13.0.202109011149-rc1v5.13.0.202109011149-rc1Matthias Sohn2021-09-013-4/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: Id8d0970102f18e61a2fc7cf941267c9089d71c1a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | * | Prepare 6.0.1-SNAPSHOT buildsMatthias Sohn2021-11-293-44/+44
| | | | | | | | | | | | | | | | Change-Id: Iddb67ed9578293b83b8147aa18dd8319426f83d1
| | * | JGit v6.0.0.202111291000-rv6.0.0.202111291000-rMatthias Sohn2021-11-293-4/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: I6441d9226e8131552bfafe1fb2c353f2e07e42ac Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-22 20:35:09 +0000