summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit
Commit message (Collapse)AuthorAgeFilesLines
* Prepare 4.0.2-SNAPSHOT buildsMatthias Sohn2015-06-243-40/+40
| | | | | Change-Id: I645cacfdde21aa28aa2e17c10dec0576b170ed0e Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* JGit v4.0.1.201506240215-rv4.0.1.201506240215-rMatthias Sohn2015-06-243-4/+4
| | | | | Change-Id: Ib7713b657e7812b0debd72bb4eece0daa187e80d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Add a grace period for packfiles during GCChristian Halstrick2015-06-221-20/+37
| | | | | | | | | 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>
* Prepare 4.0.1-SNAPSHOT buildsMatthias Sohn2015-06-093-40/+40
| | | | | Change-Id: I51d03d1a47d1e3cd453701e397750749867028a2 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* JGit v4.0.0.201506090130-rv4.0.0.201506090130-rMatthias Sohn2015-06-093-4/+4
| | | | | Change-Id: I01ad84fc74555656c42934cd62a85269a7030557 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Revert "Fix unchecked conversion warning in MergeFormatter"Shawn Pearce2015-06-031-1/+1
| | | | | | This reverts commit 6d4ebd168da236c5753f237e77b2dfcbb4e42065. Change-Id: I01f0c7cd997b9b3577cc1e98ab1adb5cdc5b55e4
* Delete deprecated TemporaryBuffer.LocalFile constructorsMatthias Sohn2015-06-031-23/+0
| | | | Change-Id: I5fdbf997ebcbe48e86f4c41c6b2643f47054b0c3 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Delete deprecated FileUtils.setExecute(File, boolean)Matthias Sohn2015-06-031-14/+0
| | | | Change-Id: Ifa63e3743fb4de25e074404c301f860a1ffb5e02 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Delete deprecated WorkingTreeIterator.isModified(DirCacheEntry, boolean)Matthias Sohn2015-06-031-27/+0
| | | | Change-Id: I687c392e5a625fd66c45998c94373aa59921b986 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Delete deprecated UploadPackMayNotContinueExceptionMatthias Sohn2015-06-031-68/+0
| | | | Change-Id: Id298fc860684d2a2288769282fd8ce4475009dc8 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Delete deprecated TransferConfig.isFsckObjects()Matthias Sohn2015-06-031-9/+0
| | | | Change-Id: Ib7f36282d69a3298b1ac177ae17af0f80d64964f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Delete deprecated Merger.getBaseCommit()Matthias Sohn2015-06-031-33/+0
| | | | Change-Id: I3b39a2c0d547110709b4c28b66c4694cdef943e8 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Prepare post 4.0-RC3 buildsMatthias Sohn2015-06-023-4/+4
| | | | | Change-Id: I74469f1243503098fb05b5ddec3fa609132debab Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* JGit v4.0.0.201506020755-rc3v4.0.0.201506020755-rc3Matthias Sohn2015-06-023-4/+4
| | | | | Change-Id: I31c6177d19cba228aa67b2b5c3e0d82c38395cda Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Fix CommitCommand.setOnly()Christian Halstrick2015-06-011-1/+1
| | | | | | | | | | | | 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>
* 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>
* 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-284-6/+5
|\ \
| * | Fix WindowCursor memory leak.Hugo Arès2015-05-284-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | archive: Drop unnecessary empty comments and 'final' qualifiers on localsJonathan Nieder2015-05-271-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-272-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | 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-263-27/+102
|\ \ \ | |_|/ |/| |
| * | Add getters to RepoProject.Yuxuan 'fishy' Wang2015-05-263-27/+102
| | | | | | | | | | | | | | | Change-Id: I74ded6c2c3f5985568cd77bd8799b45017fb1d09 Signed-off-by: Yuxuan 'fishy' Wang <fishywang@google.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>
* | Guard agains null ReflogReader if named ref does not existAndrey Loskutov2015-05-252-2/+15
| | | | | | | | | | | | | | Follow up on egit bug 466973. Change-Id: Idd83d87803e86b25f106dfd725214b5a3ec5171c Signed-off-by: Andrey Loskutov <loskutov@gmx.de> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | FS: Allow to manually set the path to the Git system config fileSebastian Schuberth2015-05-252-1/+29
| | | | | | | | | | | | | | | | | | | | | | Now that d7a4473 removed the gitprefix property, we did not have a way to specify the path to the Git system config file in case discoverGitSystemConfig() fails. Fix that by introducing a member variable that caches the result of discoverGitSystemConfig() as well as a setter method to overwrite the content of that variable. Change-Id: Icd965bffbe2f11b18c9505ee2ddd2afad5b64d70 Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
* | FS: Fix a minor typo in runInShell() docsSebastian Schuberth2015-05-251-1/+1
| | | | | | | | | | Change-Id: I5b1a5f3732aa97f83a4d39b42ba0f1e8eff9dec4 Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
* | FS: Improve javadoc of some recently introduced methodsSebastian Schuberth2015-05-251-2/+4
|/ | | | | Change-Id: I31e788ee20ac3e8439559d9060d39e9792f6dc7d Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Cleanup code and Eclipse compile errors in new gitrepo APIAndrey Loskutov2015-05-243-6/+17
| | | | | | | | | | | | Commit d3348e introduced few errors in Eclipse. This commit cleans up the new API: - fixes API error in RepoCommand after moving IncludedFileReader type - fixes unused imports in RepoCommand & RepoCommandTest - fix javadoc errors in ManifestParser & RepoProject - makes three (implicitly final) fields in ManifestParser final. Change-Id: I4185f451d97039d155391f62815bb9d3afe39fa6 Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
* Merge "Refactor to expose ManifestParser."Shawn Pearce2015-05-223-376/+593
|\
| * Refactor to expose ManifestParser.Yuxuan 'fishy' Wang2015-05-223-376/+593
| | | | | | | | | | | | | | | | | | | | The repo xml manifest parser used in RepoCommand could also be useful for others, so refactor to make it public. Also this breaks backward compatibility slightly. Change-Id: I5001bd2fe77541109fe32dbe2597a065e6ad585e Signed-off-by: Yuxuan 'fishy' Wang <fishywang@google.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-29 13:49:09 +0000