summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Prepare 4.1.0-SNAPSHOT buildsMatthias Sohn2015-06-0346-249/+249
| | | | | Change-Id: I03d08b8e2d3400d4b5cdb4ab541b312870776843 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Merge branch 'stable-4.0'Matthias Sohn2015-06-030-0/+0
|\ | | | | | | | | | | | | | | | | * stable-4.0: Prepare post 4.0-RC3 builds JGit v4.0.0.201506020755-rc3 Change-Id: I3387e5d90a24645cba736a2d0739fb95cd557049 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Prepare post 4.0-RC3 buildsMatthias Sohn2015-06-0246-49/+49
| | | | | | | | | | Change-Id: I74469f1243503098fb05b5ddec3fa609132debab Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * JGit v4.0.0.201506020755-rc3v4.0.0.201506020755-rc3Matthias Sohn2015-06-0246-49/+49
| | | | | | | | | | Change-Id: I31c6177d19cba228aa67b2b5c3e0d82c38395cda Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Merge branch 'master' into stable-4.0Matthias Sohn2015-06-0251-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>
* | Add more reports to maven siteMatthias Sohn2015-06-011-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>
* | Update project meta-data in pom.xml used for site generationMatthias Sohn2015-06-011-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>
* | Update dependencies to the versions used in target platformMatthias Sohn2015-06-012-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>
* | Update 4.5 target platform to use final Mars Orbit repositoryMatthias Sohn2015-06-013-5/+5
| | | | | | | | | | Change-Id: Ie8ff09e6b054e5fae0786557b8fe831eb9e82dd2 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Compare API changes in clirr report against 3.7.0Matthias Sohn2015-06-011-1/+1
| | | | | | | | Change-Id: Id819fd700ed44cdc3cdbe33a4bb9ee52a6fbbd41 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Fix CommitCommand.setOnly()Christian Halstrick2015-06-012-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>
* | Merge changes Ib7d18bb2,I3dc8e0b4,I923b65ef,I9e021ba2,I4e79cefeShawn Pearce2015-05-318-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
| * | Improve exception thrown when pull can't find advertised refMatthias Sohn2015-05-293-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>
| * | Silence unchecked conversion warning in TransportSftpMatthias Sohn2015-05-291-0/+1
| | | | | | | | | | | | Change-Id: I3dc8e0b483072bdf193ae4190a60d1867ebefd12 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | Silence deprecation warning in WindowCacheConfigMatthias Sohn2015-05-291-0/+1
| | | | | | | | | | | | Change-Id: I923b65efeaacc5e9cc8aecc754ab8d8e63ccd2e5 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | Silence deprecation warning in DirCacheCheckoutMatthias Sohn2015-05-291-0/+1
| | | | | | | | | | | | Change-Id: I9e021ba2e0d1317bd98e86f832d55787ed6b0a63 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | Fix hidden field warnings in bundle org.eclipse.jgitMatthias Sohn2015-05-292-10/+9
| | | | | | | | | | | | Change-Id: I4e79cefe15037df0e1c520956bf2482240e31a7d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Add "src" folder to source folders of org.eclipse.jgit.testMatthias Sohn2015-05-291-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>
* | Fix unchecked conversion warning in MergeFormatterMatthias Sohn2015-05-291-1/+1
| | | | | | | | Change-Id: Id57ef8b2e80736652e4c5062364efa3ccd39c4c7 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Close WindowCursor using try-with-resources in UnpackedObjectHugo Arès2015-05-281-4/+1
| | | | | | | | | | Change-Id: I187403ed432f7d6b1e84223918bd72d895e6bdfe Signed-off-by: Hugo Arès <hugo.ares@ericsson.com>
* | Merge changes I7b6d7be4,I63a74651,I39c2ea6bShawn Pearce2015-05-284-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
| * | Silence unused object warning in MyersDiffMatthias Sohn2015-05-261-0/+1
| | | | | | | | | | | | Change-Id: I7b6d7be4bb283c1f451bc58f29c71a8082580989 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | Silence resource leak warnings where caller is responsible to closeMatthias Sohn2015-05-262-2/+5
| | | | | | | | | | | | Change-Id: I63a74651689c10426d5f150ab2e027c6b63cab95 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | Fix potential null pointer access in IndexDiffFilterMatthias Sohn2015-05-261-1/+2
| | | | | | | | | | | | Change-Id: I39c2ea6b3090d7028cc1e246af6e3cc4e7bc70c2 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Merge "Silence false potential null pointer access warnings"Shawn Pearce2015-05-281-0/+2
|\| |
| * | Silence false potential null pointer access warningsMatthias Sohn2015-05-261-0/+2
| | | | | | | | | | | | Change-Id: I30c074a1b3436e47316b2eb2f083708161182d32
* | | Merge "Fix WindowCursor memory leak."Shawn Pearce2015-05-286-8/+7
|\ \ \
| * | | Fix WindowCursor memory leak.Hugo Arès2015-05-286-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>
* | | | Merge changes I144a53fe,I2b268e6aShawn Pearce2015-05-285-3/+192
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Add tests for ObjectFilter Expose Sets helper to tests outside org.eclipse.jgit.api
| * | | | Add tests for ObjectFilterJonathan Nieder2015-05-211-0/+186
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test that - the default ObjectFilter is ALL - ObjectFilter affects nextObject() and not next() - omitting a tree implies omitting its subtrees - a blob or tree reached by another path is still returned - ObjectFilter can be mixed with RevFilter Change-Id: I144a53fe677070fff8c3ddf8cba07a848773bc1b Signed-off-by: Jonathan Nieder <jrn@google.com>
| * | | | Expose Sets helper to tests outside org.eclipse.jgit.apiJonathan Nieder2015-05-214-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A later patch will make use of this class in a org.eclipse.jgit.lib test. Change-Id: I2b268e6a5dbf12174201f45259f9f007686708d2 Signed-off-by: Jonathan Nieder <jrn@google.com>
* | | | | archive: Drop unnecessary empty comments and 'final' qualifiers on localsJonathan Nieder2015-05-272-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>
* | | | | Close 'out' consistently in ArchiveCommand.callJonathan Nieder2015-05-271-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>
* | | | Fix that exceptions in ReceivePack cause Invalid Channel 101 exceptionsChristian Halstrick2015-05-273-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>
* | | | Better report too large pack-files from PushCommandChristian Halstrick2015-05-274-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>
* | | | FS: Extract GobblerThread into a private static classDave Borowitz2015-05-273-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
* | | | Add bitmap index misses to PackWriter.StatisticsTerry Parker2015-05-262-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>
* | | | Merge "Enable public access to SimilarityIndex scoring function"Shawn Pearce2015-05-261-4/+48
|\ \ \ \
| * | | | Enable public access to SimilarityIndex scoring functionDavid Pletcher2015-05-261-4/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The SimilarityIndex class implements the useful capability of scoring the similarity between two files. That capability is required for a feature that's being developed in another package, to detect files derived from a set of potential sources. This CL adds a public factory method to create a SimilarityIndex from an ObjectLoader. It grants public access to the SimilarityIndex class, the score method, an inner exception class and a special marker instance of that exception class. Change-Id: I3f72670da643be3bb8e261c5af5e9664bcd0401b Signed-off-by: David Pletcher <dpletcher@google.com>
* | | | | Merge "Add getters to RepoProject."Shawn Pearce2015-05-264-33/+108
|\ \ \ \ \
| * | | | | Add getters to RepoProject.Yuxuan 'fishy' Wang2015-05-264-33/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I74ded6c2c3f5985568cd77bd8799b45017fb1d09 Signed-off-by: Yuxuan 'fishy' Wang <fishywang@google.com>
* | | | | | Merge branch 'stable-4.0'Matthias Sohn2015-05-260-0/+0
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | / | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | * stable-4.0: Prepare post 4.0.0-rc2 builds JGit v4.0.0.201505260635-rc2 Change-Id: I1a67726b037be5311d85d90d815110b422182d33 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | | | Prepare post 4.0.0-rc2 buildsMatthias Sohn2015-05-2646-49/+49
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3ba1bb0d7f220f88eb768a3137493f737aadf466 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | | | JGit v4.0.0.201505260635-rc2v4.0.0.201505260635-rc2Matthias Sohn2015-05-2646-49/+49
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I496743145da865f9631b46a432c65c1e63ccb501 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | | | Merge branch 'master' into stable-4.0Matthias Sohn2015-05-26128-1654/+2080
| |\ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Silence non-externalized string warnings in org.eclipse.jgit Externalize translatable texts in org.eclipse.jgit Don't invalidate pack file on InterruptedIOException Update Mars target platforms to use Mars RC2 orbit Update build to use eclipse-jarsigner-plugin 1.1.2 Guard agains null ReflogReader if named ref does not exist FS: Allow to manually set the path to the Git system config file FS: Fix a minor typo in runInShell() docs FS: Improve javadoc of some recently introduced methods Cleanup code and Eclipse compile errors in new gitrepo API Refactor to expose ManifestParser. FS: Remove the gitprefix logic SystemReader: Use discoverGitSystemConfig() in openSystemConfig() FS: Add a method to discover the system-wide config file FS: Extend readPipe() to optionally take additional environment FS: Document readpipe()'s encoding parameter Split discoverGitPrefix() code out into discoverGitExe() Equalize discoverGitPrefix() implementations between POSIX and Win32 Move resolveGrandparentFile() to the base class for wider use Replace deprecated release() methods by close() Use AutoClosable to close resources in bundle org.eclipse.jgit ReceivePack: support quiet capability Fix ObjectReader resources leak Change-Id: I0cd9f7ad57f26f0a0cbf412845d00ba1efbea346 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | | Silence non-externalized string warnings in org.eclipse.jgitMatthias Sohn2015-05-2610-39/+40
| | | | | | | | | | | | | | | | | | | | Change-Id: I7fa180db0c59e4a317a0c99ec48574cb0e5ac2f2 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | | Externalize translatable texts in org.eclipse.jgitMatthias Sohn2015-05-2620-108/+314
| | | | | | | | | | | | | | | | | | | | Change-Id: Ibf4c299f9d203c78cae79e61f88d4bea60ea2795 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | | Don't invalidate pack file on InterruptedIOExceptionSaša Živkov2015-05-261-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the thread reading a pack file is interrupted don't invalidate that pack file. This could happen when Gerrit invoked JGit for computing a diff in one thread and waited for the call to finish from another thread, with a timeout. When the timeout was reached the "diff" thread was interrupted. If it happened to be in an IO operation, reading a pack file, an InterruptedIOException was thrown and the pack file was marked as invalid and removed from the pack list. Invalidating the pack in that case could cause the project disappearing in Gerrit as discussed in [1] and [2]. [1] https://groups.google.com/forum/#!topic/repo-discuss/CYYoHfDxCfA [2] https://groups.google.com/forum/#!topic/repo-discuss/ZeGWPyyJlrM Change-Id: I2eb1f98370936b5be541d96d70c3973cbfc39238 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Signed-off-by: Sasa Zivkov <sasa.zivkov@sap.com>
* | | | | Update Mars target platforms to use Mars RC2 orbitMatthias Sohn2015-05-253-12/+12
| | | | | | | | | | | | | | | | | | | | Change-Id: Idda321d5026329ec194d53ad635973465bcccd49 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | | Update build to use eclipse-jarsigner-plugin 1.1.2Matthias Sohn2015-05-252-2/+2
| |_|/ / |/| | | | | | | | | | | Change-Id: Ic2fb30cf851542e12508e4cf638b52b65519f41d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-23 19:24:34 +0000