aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/META-INF/MANIFEST.MF
Commit message (Collapse)AuthorAgeFilesLines
...
| | | | * | | Prepare 5.13.0-SNAPSHOT buildsMatthias Sohn2021-06-141-51/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie9cfc1eeb0eda7b2bbe744a22a7e4cfe6d59bc37
| | | | * | | Prepare 5.12.1-SNAPSHOT buildsMatthias Sohn2021-06-131-51/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idf266c34aa9a04cf9c5e0e09bcb415c13d773d4c
| | | | * | | JGit v5.12.0.202106070339-rv5.12.0.202106070339-rMatthias Sohn2021-06-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0fbfea2c83f1ce83f75130cc97591547032f1104 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | * | | Prepare 5.12.0-SNAPSHOT buildsMatthias Sohn2021-06-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifc72d3f3ac84b9c4055b95ec0093d877ffb09ab0 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | * | | JGit v5.12.0.202106021050-rc1v5.12.0.202106021050-rc1Matthias Sohn2021-06-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I622ee049f14f37504ff4a062f03d6fc25465d0ec Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | * | | Prepare 5.12.0-SNAPSHOT buildsMatthias Sohn2021-06-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I25e4efc9b40ae4e7168b37385445c73992c5beb0
| | | | * | | JGit v5.12.0.202106011439-rc1v5.12.0.202106011439-rc1Matthias Sohn2021-06-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ieac1d02879defe0f4791062448d4efc328a2f652 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | * | | Prepare 5.12.0-SNAPSHOT buildsMatthias Sohn2021-06-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If563be77aab768ac1f31ae2211fb0892d0205a2a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | * | | JGit v5.12.0.202105261145-m3v5.12.0.202105261145-m3Matthias Sohn2021-05-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3b1af2032227900e6e0c6189f47bace1df67f0ab Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | * | | Prepare 5.12.0-SNAPSHOT buildsMatthias Sohn2021-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2fc5305e7eaaa4593d418fc3b31d20e4b6e1e585
| | | | * | | JGit v5.12.0.202105051250-m2v5.12.0.202105051250-m2Matthias Sohn2021-05-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic7d86c91ec0ff9aa0678dcb971c197e62a4ca2dc Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | * | | Prepare 5.12.0-SNAPSHOT buildsMatthias Sohn2021-03-101-51/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I736de7c3deb11da75777d459f47332df0b486443 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | * | | Prepare 5.11.1-SNAPSHOT buildsMatthias Sohn2021-03-091-51/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I94628ccbb5099a65aa4345cfd28a141ff5555b68 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | * | | JGit v5.11.0.202103091610-rv5.11.0.202103091610-rMatthias Sohn2021-03-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8e6855eaf7228459f492036feb4e34ca085698a7 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | * | | Prepare 5.11.0-SNAPSHOT buildsMatthias Sohn2021-03-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I89ed49a6acc53dd75d16f40c99e1140e0c18f646 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | * | | JGit v5.11.0.202103031150-rc1v5.11.0.202103031150-rc1Matthias Sohn2021-03-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0a86fa59645888f9f36ea6938c9121e095f02fc6 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | * | | Prepare 5.11.0-SNAPSHOT buildsMatthias Sohn2021-02-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If3dbe084ee37ae4b993d3a10ec48b14e8709ff6d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | * | | JGit v5.11.0.202102240950-m3v5.11.0.202102240950-m3Matthias Sohn2021-02-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iea6b3515fa63db497989194b6bf50fe7324086d0 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | * | | Prepare 5.11.0-SNAPSHOT buildsMatthias Sohn2021-02-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I191674448c4a220e61ec5f0c181c0809eb873166 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | * | | JGit v5.11.0.202102031030-m2v5.11.0.202102031030-m2Matthias Sohn2021-02-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie14c162a7fc5e1e8f34bf4bbc944f4dbe13e4dd0 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | * | | | Prepare 6.0.1-SNAPSHOT buildsMatthias Sohn2021-11-291-51/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iddb67ed9578293b83b8147aa18dd8319426f83d1
| | | * | | | JGit v6.0.0.202111291000-rv6.0.0.202111291000-rMatthias Sohn2021-11-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6441d9226e8131552bfafe1fb2c353f2e07e42ac Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | * | | | Prepare 6.0.0-SNAPSHOT buildsMatthias Sohn2021-11-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4e06186cf62681767962e391331cc65bafddc205
| | | * | | | JGit v6.0.0.202111241155-rc1v6.0.0.202111241155-rc1Matthias Sohn2021-11-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I35dc089a00ee12f83f506fb320d23762fa030063 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | * | | | Prepare 6.0.0-SNAPSHOT buildsMatthias Sohn2021-11-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibfc7fb21b039fe2a7669c8dee3c10f5ade33d520
| | | * | | | JGit v6.0.0.202111161950-m3v6.0.0.202111161950-m3Matthias Sohn2021-11-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If6c36994be05848c567d3d664eb683d9bed26c48 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | * | | | | Prepare 6.1.1-SNAPSHOT buildsMatthias Sohn2022-03-081-52/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifc80355025d8459245843be1c24dc5a286913e77
| | * | | | | JGit v6.1.0.202203080745-rv6.1.0.202203080745-rMatthias Sohn2022-03-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8766ed400020c9571f321bbbfe34b0688af0107d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | * | | | | Prepare 6.1.0-SNAPSHOT buildsMatthias Sohn2022-03-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I525fc1258a729c36d63fdb3c8170e9f04ad55cec
| | * | | | | JGit v6.1.0.202203021511-rc1v6.1.0.202203021511-rc1Matthias Sohn2022-03-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4c75a58fd76102e773af4f1f8a1487d5e7ffc7cf Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | * | | | | Prepare 6.1.0-SNAPSHOT buildsMatthias Sohn2022-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I30a89277373ad62c857151532942e135e34d1d0c
| | * | | | | JGit v6.1.0.202202221755-m3v6.1.0.202202221755-m3Matthias Sohn2022-02-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idcd46e05ca3eec376f8ac83209dba0978e004f9a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | | | | | Prepare 6.2.1-SNAPSHOT buildsMatthias Sohn2022-06-071-52/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4a0f3919ff43a3b9fafa85b8ecec2d760b7eb161
| * | | | | | JGit v6.2.0.202206071550-rv6.2.0.202206071550-rMatthias Sohn2022-06-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: Ib4ae85a0cabcc9cb867f2c85034d72fb676a500a
| * | | | | | Prepare 6.2.0-SNAPSHOT buildsMatthias Sohn2022-06-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id2ad8d5b561620723b2c52c86909321d628de12f
| * | | | | | Merge branch 'master' into stable-6.2Andrey Loskutov2022-06-031-2/+4
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: Id9639b466583d8c373ef700402cb685ce4a8ee15
| * | | | | | | Prepare 6.2.0-SNAPSHOT buildsMatthias Sohn2022-05-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9d6afd80cc024d6e03aa46bbaaaeec10b60fb485
| * | | | | | | JGit v6.2.0.202205251150-m3v6.2.0.202205251150-m3Matthias Sohn2022-05-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I48492aef02c2ea39cec171d84e92643859e064a6 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | | | | | | Prepare 6.2.0-SNAPSHOT buildsMatthias Sohn2022-05-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic3788b38d6408e83729caa718c128a5632798a60
| * | | | | | | JGit v6.2.0.202205041315-m2v6.2.0.202205041315-m2Matthias Sohn2022-05-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie13beac020e79182a4058ba67550bb78b2008833 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | | | | | JGit blame very slow for large merge commits that rename filesSimeon Andreev2022-07-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjusted BlameGenerator to filter rename detection with the blame path. This reduces the running time of the blame computation significantly, for repositories with massive commits involving renames. The filtered rename detection is made (internally) available with: org.eclipse.jgit.internal.diff.FilteredRenameDetector Bug: 578900 Change-Id: I6580004e81102d685081b8180da1587a35073d36 Signed-off-by: Simeon Andreev <simeon.danailov.andreev@gmail.com>
* | | | | | | | Prepare 6.3.0-SNAPSHOT buildsMatthias Sohn2022-06-071-52/+52
| |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | Change-Id: I092fdd2c35d85bf35e3ef700aa7078e6d304d977
* | | | | | | Adapt diff- and merge tool code for PGM and EGit usageAndre Bossert2022-06-021-2/+4
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* / / / / / Prepare 6.2.0-SNAPSHOT buildsMatthias Sohn2022-03-031-52/+52
|/ / / / / | | | | | | | | | | | | | | | Change-Id: Ic2dde88bee3242169d6fa50956f8938f3fc4ba8e
* | | | / Let org.eclipse.jgit.pgm use BooleanTriStateMatthias Sohn2022-01-191-1/+2
| |_|_|/ |/| | | | | | | | | | | Change-Id: I575cd5e1ecd326514a8bb4c36a86a2dc71ba5457
* | | | Add config reader for user-defined difftoolsAndre Bossert2021-12-081-0/+1
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | see: http://git-scm.com/docs/git-difftool * add config reader for user-defined difftools * diff.tool * diff.guitool * difftool.prompt * difftool.trustExitCode * difftool.<tool>.path * difftool.<tool>.cmd * add pre-defined difftools * implemented "git difftool --tool-help" to verify config reader and pre-defined difftools Bug: 356832 Change-Id: Idde8fddbef61f3378ee565c6321570b3962d0e1d Signed-off-by: Andre Bossert <andre.bossert@siemens.com> Signed-off-by: Simeon Andreev <simeon.danailov.andreev@gmail.com>
* | | Fix MANIFEST.MF of org.eclipse.jgit to correctly export packages:Simeon Andreev2021-11-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | org.eclipse.jgit.internal.diffmergetool org.eclipse.jgit.internal.fsck This was broken with changes for bug 356832. Bug: 356832 Change-Id: Id008d058769b4923d545a9373b45ceb3a3d27a08 Signed-off-by: Simeon Andreev <simeon.danailov.andreev@gmail.com>
* | | Add command line support for "git difftool"Andre Bossert2021-11-251-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | see: http://git-scm.com/docs/git-difftool * add command line support for "jgit difftool" * show supported commands with "jgit difftool --help" * added "git difftool --tool-help" to show the tools (empty now) * prepare for all other commands Bug: 356832 Change-Id: Ice0c13ef7953a20feaf25e7746d62b94ff4e89e5 Signed-off-by: Andre Bossert <andre.bossert@siemens.com> Signed-off-by: Simeon Andreev <simeon.danailov.andreev@gmail.com>
* | | Prepare 6.1.0-SNAPSHOT buildsMatthias Sohn2021-11-241-51/+51
|/ / | | | | | | Change-Id: Ied07b1298bd32672a5025cec5079440ab9b9a100