Skip to main content
aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-09-23JGit v4.0.3.201509231615-rv4.0.3.201509231615-rstable-4.0Matthias Sohn46-49/+49
Change-Id: I7ec09e82d806cde61165a6ceb79de022f18d9fe2 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-09-14Prepare 4.0.3-SNAPSHOT buildsMatthias Sohn46-248/+248
Change-Id: Ic5ab059bee460c76c6ff3e08141ce351a559691c Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-09-14JGit v4.0.2.201509141540-rv4.0.2.201509141540-rMatthias Sohn46-49/+49
Change-Id: I766d95aa282c92dcbd2846145ee52e9cc62dd1f8 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-09-03Update build to final R20150821153341 Orbit repository for Mars.1Matthias Sohn4-44/+5
Change-Id: I32d4c21f7cdd0c1a24f797012f98daa9a7f48acf Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-09-03Update org.apache.httpcomponentsMatthias Sohn6-23/+23
- update org.apache.httpcomponents.httpcore to 4.3.3 - update org.apache.httpcomponents.httpclient to 4.3.6, 4.3.5 and later are reported to fix vulnerability CVE-2014-3577 CQ: 9220 CQ: 9221 Bug: 470523 Change-Id: I024448c941e81f7c1dc1cc2394329df90e9b3048 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-08-19Update com.jcraft.jsch to 0.1.53Matthias Sohn5-7/+46
Update target platform to Orbit M20150818205559 for Mars in order to update com.jcraft.jsch to 0.1.53. Also update pom.xml to use Mars target platform profile by default. CQ: 10045 Bug: 463580 Change-Id: I1bf151fbee7b00c7bd38cf1236c9bad50e3c64bd Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-24Prepare 4.0.2-SNAPSHOT buildsMatthias Sohn46-248/+248
Change-Id: I645cacfdde21aa28aa2e17c10dec0576b170ed0e Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-24JGit v4.0.1.201506240215-rv4.0.1.201506240215-rMatthias Sohn46-49/+49
Change-Id: Ib7713b657e7812b0debd72bb4eece0daa187e80d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-22Add a grace period for packfiles during GCChristian Halstrick2-20/+81
For loose objects an expiration date can be set which will save too young objects from being deleted. Add the same for packfiles. Packfiles which are too young are not deleted. Bug: 468024 Change-Id: I3956411d19b47aaadc215dab360d57fa6c24635e Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-09Prepare 4.0.1-SNAPSHOT buildsMatthias Sohn46-248/+248
Change-Id: I51d03d1a47d1e3cd453701e397750749867028a2 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-09JGit v4.0.0.201506090130-rv4.0.0.201506090130-rMatthias Sohn46-49/+49
Change-Id: I01ad84fc74555656c42934cd62a85269a7030557 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-08Update build to use Tycho 0.23Matthias Sohn2-2/+2
see https://wiki.eclipse.org/Tycho/Release_Notes/0.23 Change-Id: I70e6711294e2a92efa77fd9dd1c906c449c9b4db Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-03Revert "Fix unchecked conversion warning in MergeFormatter"Shawn Pearce1-1/+1
This reverts commit 6d4ebd168da236c5753f237e77b2dfcbb4e42065. Change-Id: I01f0c7cd997b9b3577cc1e98ab1adb5cdc5b55e4
2015-06-03Delete deprecated TemporaryBuffer.LocalFile constructorsMatthias Sohn1-23/+0
Change-Id: I5fdbf997ebcbe48e86f4c41c6b2643f47054b0c3 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-03Delete deprecated FileUtils.setExecute(File, boolean)Matthias Sohn1-14/+0
Change-Id: Ifa63e3743fb4de25e074404c301f860a1ffb5e02 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-03Delete deprecated WorkingTreeIterator.isModified(DirCacheEntry, boolean)Matthias Sohn1-27/+0
Change-Id: I687c392e5a625fd66c45998c94373aa59921b986 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-03Delete deprecated UploadPackMayNotContinueExceptionMatthias Sohn1-68/+0
Change-Id: Id298fc860684d2a2288769282fd8ce4475009dc8 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-03Delete deprecated TransferConfig.isFsckObjects()Matthias Sohn1-9/+0
Change-Id: Ib7f36282d69a3298b1ac177ae17af0f80d64964f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-03Delete deprecated TextBuiltin.outMatthias Sohn1-10/+0
Change-Id: I184c2f0e0203fa95e0a117391bae93da0d23a435 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-03Delete deprecated Merger.getBaseCommit()Matthias Sohn1-33/+0
Change-Id: I3b39a2c0d547110709b4c28b66c4694cdef943e8 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-02Prepare post 4.0-RC3 buildsMatthias Sohn46-49/+49
Change-Id: I74469f1243503098fb05b5ddec3fa609132debab Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-02JGit v4.0.0.201506020755-rc3v4.0.0.201506020755-rc3Matthias Sohn46-49/+49
Change-Id: I31c6177d19cba228aa67b2b5c3e0d82c38395cda Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-01Merge branch 'master' into stable-4.0Matthias Sohn51-212/+1099
* master: Add more reports to maven site Update project meta-data in pom.xml used for site generation Update dependencies to the versions used in target platform Update 4.5 target platform to use final Mars Orbit repository Compare API changes in clirr report against 3.7.0 Fix CommitCommand.setOnly() Add "src" folder to source folders of org.eclipse.jgit.test Improve exception thrown when pull can't find advertised ref Silence unchecked conversion warning in TransportSftp Silence deprecation warning in WindowCacheConfig Silence deprecation warning in DirCacheCheckout Fix unchecked conversion warning in MergeFormatter Fix hidden field warnings in bundle org.eclipse.jgit Close WindowCursor using try-with-resources in UnpackedObject Fix WindowCursor memory leak. archive: Drop unnecessary empty comments and 'final' qualifiers on locals Close 'out' consistently in ArchiveCommand.call Fix that exceptions in ReceivePack cause Invalid Channel 101 exceptions Better report too large pack-files from PushCommand FS: Extract GobblerThread into a private static class Add bitmap index misses to PackWriter.Statistics Enable public access to SimilarityIndex scoring function Add getters to RepoProject. Silence unused object warning in MyersDiff Silence resource leak warnings where caller is responsible to close Silence false potential null pointer access warnings Fix potential null pointer access in IndexDiffFilter Add tests for ObjectFilter Expose Sets helper to tests outside org.eclipse.jgit.api Change-Id: I34b2bb45f51ed6f52a6bb1215de654ebb2ffde10 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-01Add more reports to maven siteMatthias Sohn1-0/+42
Add the following additional reports: - cross-reference report - API changes report using clirr - findbugs report - surefire-report Run $ mvn test install site:site site:stage to generate and stage the site Also see https://wiki.eclipse.org/EGit/Contributor_Guide#JGit_3 Change-Id: Ibb6a2e13e128d7728b3c632cc16bf79716dc75f5 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-01Update project meta-data in pom.xml used for site generationMatthias Sohn1-4/+21
- Update list of committers - Update scm information - Expose jgit hudson for Maven site - Name our project's organization - Scm URL should point to a web-enabled view on the repository - Extract tycho-extras version used during signing to a property Change-Id: If32bed323ec283b5e83d28ffe8775220f7c4cecd Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-01Update dependencies to the versions used in target platformMatthias Sohn2-4/+4
- update com.jcraft.jsch to 0.1.51 - update javax.servlet to 3.1.0 Change-Id: Ie536182d1efc6dcc3abd03f8a9acd013adcbf2a8 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-01Update 4.5 target platform to use final Mars Orbit repositoryMatthias Sohn3-5/+5
Change-Id: Ie8ff09e6b054e5fae0786557b8fe831eb9e82dd2 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-01Compare API changes in clirr report against 3.7.0Matthias Sohn1-1/+1
Change-Id: Id819fd700ed44cdc3cdbe33a4bb9ee52a6fbbd41 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-01Fix CommitCommand.setOnly()Christian Halstrick2-1/+12
When CommitCommand.setOnly(path) is used a temporary index has to be created containing only modifications for the specified pathes. The process to fill this temporary index was broken because filling the index was stopped when we reached the first untracked file. Instead the process to fill the temporary index should continue until we processed all pathes. Bug: 451465 Change-Id: I22af50d70bd3b81e7c056358724956122b0d158d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-31Merge changes Ib7d18bb2,I3dc8e0b4,I923b65ef,I9e021ba2,I4e79cefeShawn Pearce8-16/+76
* changes: Improve exception thrown when pull can't find advertised ref Silence unchecked conversion warning in TransportSftp Silence deprecation warning in WindowCacheConfig Silence deprecation warning in DirCacheCheckout Fix hidden field warnings in bundle org.eclipse.jgit
2015-05-29Add "src" folder to source folders of org.eclipse.jgit.testMatthias Sohn1-0/+1
Otherwise MergeCommandTest using Sets doesn't compile in Eclipse since adbcbc79 moved Sets from the "tst" to the "src" folder. Change-Id: I661b987513365a8af0b568ec95b0898e5758f59f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-28Improve exception thrown when pull can't find advertised refMatthias Sohn3-6/+64
- throw an API exception instead of an internal exception to allow applications to handle this problem - improve error message to give hints about possible root causes Bug: 464660 Change-Id: Ib7d18bb2eeeac0fc218daea375b290ea5034bda1 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-28Silence unchecked conversion warning in TransportSftpMatthias Sohn1-0/+1
Change-Id: I3dc8e0b483072bdf193ae4190a60d1867ebefd12 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-28Silence deprecation warning in WindowCacheConfigMatthias Sohn1-0/+1
Change-Id: I923b65efeaacc5e9cc8aecc754ab8d8e63ccd2e5 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-28Silence deprecation warning in DirCacheCheckoutMatthias Sohn1-0/+1
Change-Id: I9e021ba2e0d1317bd98e86f832d55787ed6b0a63 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-28Fix unchecked conversion warning in MergeFormatterMatthias Sohn1-1/+1
Change-Id: Id57ef8b2e80736652e4c5062364efa3ccd39c4c7 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-28Fix hidden field warnings in bundle org.eclipse.jgitMatthias Sohn2-10/+9
Change-Id: I4e79cefe15037df0e1c520956bf2482240e31a7d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-28Close WindowCursor using try-with-resources in UnpackedObjectHugo Arès1-4/+1
Change-Id: I187403ed432f7d6b1e84223918bd72d895e6bdfe Signed-off-by: Hugo Arès <hugo.ares@ericsson.com>
2015-05-28Merge changes I7b6d7be4,I63a74651,I39c2ea6bShawn Pearce4-3/+8
* changes: Silence unused object warning in MyersDiff Silence resource leak warnings where caller is responsible to close Fix potential null pointer access in IndexDiffFilter
2015-05-28Merge "Silence false potential null pointer access warnings"Shawn Pearce1-0/+2
2015-05-28Merge "Fix WindowCursor memory leak."Shawn Pearce6-8/+7
2015-05-28Merge changes I144a53fe,I2b268e6aShawn Pearce5-3/+192
* changes: Add tests for ObjectFilter Expose Sets helper to tests outside org.eclipse.jgit.api
2015-05-28Fix WindowCursor memory leak.Hugo Arès6-8/+7
ObjectReader release method was replaced by close method but WindowCursor was still implementing release method. To prevent the same mistake again, make ObjectReader close method abstract to force sub classes to implement it. Change-Id: I50d0d1d19a26e306fd0dba77b246a95a44fd6584 Signed-off-by: Hugo Arès <hugo.ares@ericsson.com>
2015-05-27archive: Drop unnecessary empty comments and 'final' qualifiers on localsJonathan Nieder2-80/+80
Early JGit code used comments to inform the Eclipse formatter about where to break lines and used final in the hope of making code faster. The ArchiveCommand command implementation imitated that style. Nowadays the project relies less on the Eclipse formatter and relies more on Java having sane performance with local variables that are not explicitly marked 'final'. Removing the unnecessary empty comments and 'final' qualifiers makes this code more readable and more consistent with recent JGit code. Change-Id: I7a181432eda7e18bd32cf110d89c0efbe490c4f1 Signed-off-by: Jonathan Nieder <jrn@google.com>
2015-05-27Close 'out' consistently in ArchiveCommand.callJonathan Nieder1-6/+7
Whether the output stream specified with setOutputStream() is closed by ArchiveCommand.call() is murky and inconsistent: - on success, it is closed - if an exception is encountered when writing the archive, it is closed - if an exception is encountered when calling createArchiveStream to open the archive, we forget to close it Close the output stream consistently to avoid leaks. Now that the inner try-with-resources doesn't have its own finally block, this allows us to merge the two try blocks. It would be even better to never close the output stream. That will involve more API changes to avoid silently breaking callers, so it is deferred to a later change. Change-Id: I0185bdaa60ecee4a541eab5d8ff6c9c4dbe40bf1 Signed-off-by: Jonathan Nieder <jrn@google.com>
2015-05-27Fix that exceptions in ReceivePack cause Invalid Channel 101 exceptionsChristian Halstrick3-4/+307
When during a PushOperation the server hits an exception different from UnpackException the JGit server behaved wrong. That kind of exceptions are handled so late that the connection is already released and the information whether to talk sideband to the client is lost. In detail: ReceivePack.receive() will call release() and that will reset the capabilities. But later on the stack in ReceivePackServlet.doPost() it is tried to send a response to client now with reset capabilities (no sideband!). Change-Id: I0a609acc6152ab43b47a93d712deb65bb1105f75 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-27Better report too large pack-files from PushCommandChristian Halstrick4-2/+88
JGits PushCommand and BasePackPushConnection were throwing generic TransportExceptions when the pushed pack-file was rejected by the server since it was too big. Let JGit better interprete the server's response to detect this situation and throw a more specific exception. This detection works by parsing the status line sent by the server. This change only recognizes the response sent by a JGit based server. All other servers which report such problems in a different way still lead to a generic TransportExceptions. Change-Id: Ic075764ea152939ce72c446252464620dd54edea Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-27FS: Extract GobblerThread into a private static classDave Borowitz3-33/+59
The primary goal is to improve exception readability. Since this is a standalone thread, just logging the stack trace of the caught exception is not very useful: java.io.IOException: Stream closed at java.io.BufferedInputStream.getBufIfOpen(BufferedInputStream.java:162) at java.io.BufferedInputStream.read(BufferedInputStream.java:258) at org.eclipse.jgit.util.FS$2.run(FS.java:451) Providing a named class eliminates the "FS$2", and including the command name provides a little more context in the error message. A future improvement might include the stack trace that created the GobblerThread as well. Change-Id: Ibf16d15b47a85b6f41844a177e398c2fc94f27b0
2015-05-26Add bitmap index misses to PackWriter.StatisticsTerry Parker2-3/+32
RevWalks to find commits that are not in bitmap indices are expensive. Track the count of commits that are enumerated via RevWalks as "bitmap index misses" in the PackWriter.Statistics class. Change-Id: Ie0135a0a0aeba2dfb6df78839d545006629f16cb Signed-off-by: Terry Parker <tparker@google.com>
2015-05-26Merge "Enable public access to SimilarityIndex scoring function"Shawn Pearce1-4/+48

Back to the top