Commit Graph

2862 Commits

Author SHA1 Message Date
Matthias Sohn 176c4b4d5e Prepare 4.0.2-SNAPSHOT builds
Change-Id: I645cacfdde21aa28aa2e17c10dec0576b170ed0e
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-24 13:51:21 +02:00
Matthias Sohn 90f36e5002 JGit v4.0.1.201506240215-r
Change-Id: Ib7713b657e7812b0debd72bb4eece0daa187e80d
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-24 08:17:29 +02:00
Christian Halstrick 6b65adca2d Add a grace period for packfiles during GC
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-22 11:18:31 +02:00
Matthias Sohn 2dd4dc149c Prepare 4.0.1-SNAPSHOT builds
Change-Id: I51d03d1a47d1e3cd453701e397750749867028a2
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-09 15:17:22 +02:00
Matthias Sohn 4f22185455 JGit v4.0.0.201506090130-r
Change-Id: I01ad84fc74555656c42934cd62a85269a7030557
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-09 07:29:27 +02:00
Shawn Pearce fb21fb10fc Revert "Fix unchecked conversion warning in MergeFormatter"
This reverts commit 6d4ebd168d.

Change-Id: I01f0c7cd997b9b3577cc1e98ab1adb5cdc5b55e4
2015-06-03 14:31:41 -04:00
Matthias Sohn d19ce2435d Delete deprecated TemporaryBuffer.LocalFile constructors
Change-Id: I5fdbf997ebcbe48e86f4c41c6b2643f47054b0c3
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-03 13:16:27 +02:00
Matthias Sohn f691106547 Delete deprecated FileUtils.setExecute(File, boolean)
Change-Id: Ifa63e3743fb4de25e074404c301f860a1ffb5e02
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-03 13:16:27 +02:00
Matthias Sohn ba51037a69 Delete deprecated WorkingTreeIterator.isModified(DirCacheEntry, boolean)
Change-Id: I687c392e5a625fd66c45998c94373aa59921b986
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-03 13:16:26 +02:00
Matthias Sohn 08c8cf027d Delete deprecated UploadPackMayNotContinueException
Change-Id: Id298fc860684d2a2288769282fd8ce4475009dc8
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-03 13:16:26 +02:00
Matthias Sohn fa56e0deae Delete deprecated TransferConfig.isFsckObjects()
Change-Id: Ib7f36282d69a3298b1ac177ae17af0f80d64964f
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-03 13:16:26 +02:00
Matthias Sohn 913095e39e Delete deprecated Merger.getBaseCommit()
Change-Id: I3b39a2c0d547110709b4c28b66c4694cdef943e8
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-03 13:16:25 +02:00
Matthias Sohn 72ecb5c8c7 Prepare post 4.0-RC3 builds
Change-Id: I74469f1243503098fb05b5ddec3fa609132debab
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-02 23:11:57 +02:00
Matthias Sohn d59fafc7ca JGit v4.0.0.201506020755-rc3
Change-Id: I31c6177d19cba228aa67b2b5c3e0d82c38395cda
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-02 13:55:16 +02:00
Christian Halstrick 6d09c486ed Fix CommitCommand.setOnly()
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-06-01 10:42:21 +02:00
Matthias Sohn efacad0fc8 Improve exception thrown when pull can't find advertised ref
- 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-29 00:15:33 +02:00
Matthias Sohn 8787176ef1 Silence unchecked conversion warning in TransportSftp
Change-Id: I3dc8e0b483072bdf193ae4190a60d1867ebefd12
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-29 00:15:33 +02:00
Matthias Sohn e013bcdcc6 Silence deprecation warning in WindowCacheConfig
Change-Id: I923b65efeaacc5e9cc8aecc754ab8d8e63ccd2e5
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-29 00:15:33 +02:00
Matthias Sohn 17307df3af Silence deprecation warning in DirCacheCheckout
Change-Id: I9e021ba2e0d1317bd98e86f832d55787ed6b0a63
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-29 00:15:33 +02:00
Matthias Sohn faae5cdb5b Fix hidden field warnings in bundle org.eclipse.jgit
Change-Id: I4e79cefe15037df0e1c520956bf2482240e31a7d
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-29 00:15:32 +02:00
Matthias Sohn 6d4ebd168d Fix unchecked conversion warning in MergeFormatter
Change-Id: Id57ef8b2e80736652e4c5062364efa3ccd39c4c7
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-29 00:15:32 +02:00
Hugo Arès 663ccd76f0 Close WindowCursor using try-with-resources in UnpackedObject
Change-Id: I187403ed432f7d6b1e84223918bd72d895e6bdfe
Signed-off-by: Hugo Arès <hugo.ares@ericsson.com>
2015-05-28 16:07:23 -04:00
Shawn Pearce a3468f87cb Merge changes I7b6d7be4,I63a74651,I39c2ea6b
* 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-28 15:39:08 -04:00
Shawn Pearce 5426ba2778 Merge "Silence false potential null pointer access warnings" 2015-05-28 15:37:11 -04:00
Shawn Pearce 10b99121b0 Merge "Fix WindowCursor memory leak." 2015-05-28 15:35:26 -04:00
Hugo Arès 27128b3e01 Fix WindowCursor memory leak.
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-28 15:14:25 -04:00
Jonathan Nieder a5778b6f41 archive: Drop unnecessary empty comments and 'final' qualifiers on locals
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-27 16:49:34 -07:00
Jonathan Nieder 1287cdaf33 Close 'out' consistently in ArchiveCommand.call
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-27 16:49:12 -07:00
Christian Halstrick ebfd62433a Fix that exceptions in ReceivePack cause Invalid Channel 101 exceptions
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-27 23:52:53 +02:00
Christian Halstrick 261b514ceb Better report too large pack-files from PushCommand
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-27 23:52:53 +02:00
Dave Borowitz b8c8008115 FS: Extract GobblerThread into a private static class
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-27 10:04:35 -07:00
Terry Parker 0e8ac496cd Add bitmap index misses to PackWriter.Statistics
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-26 14:37:17 -07:00
Shawn Pearce 2ad2d85bcd Merge "Enable public access to SimilarityIndex scoring function" 2015-05-26 16:49:30 -04:00
David Pletcher 5e57cc9585 Enable public access to SimilarityIndex scoring function
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>
2015-05-26 13:27:33 -07:00
Shawn Pearce 5635d9e1af Merge "Add getters to RepoProject." 2015-05-26 13:14:00 -04:00
Yuxuan 'fishy' Wang 744c370c1b Add getters to RepoProject.
Change-Id: I74ded6c2c3f5985568cd77bd8799b45017fb1d09
Signed-off-by: Yuxuan 'fishy' Wang <fishywang@google.com>
2015-05-26 09:58:38 -07:00
Matthias Sohn eea43de7a4 Silence unused object warning in MyersDiff
Change-Id: I7b6d7be4bb283c1f451bc58f29c71a8082580989
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-26 10:52:23 +02:00
Matthias Sohn 11a0dffd16 Silence resource leak warnings where caller is responsible to close
Change-Id: I63a74651689c10426d5f150ab2e027c6b63cab95
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-26 10:52:23 +02:00
Matthias Sohn bb48901ddf Silence false potential null pointer access warnings
Change-Id: I30c074a1b3436e47316b2eb2f083708161182d32
2015-05-26 10:52:22 +02:00
Matthias Sohn 746cf09b33 Silence non-externalized string warnings in org.eclipse.jgit
Change-Id: I7fa180db0c59e4a317a0c99ec48574cb0e5ac2f2
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-26 10:52:22 +02:00
Matthias Sohn d5a34551d5 Fix potential null pointer access in IndexDiffFilter
Change-Id: I39c2ea6b3090d7028cc1e246af6e3cc4e7bc70c2
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-26 10:52:22 +02:00
Matthias Sohn 2390531888 Externalize translatable texts in org.eclipse.jgit
Change-Id: Ibf4c299f9d203c78cae79e61f88d4bea60ea2795
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-26 10:52:20 +02:00
Saša Živkov d9062145b8 Don't invalidate pack file on InterruptedIOException
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>
2015-05-26 10:28:59 +02:00
Andrey Loskutov 4d565f0b5f Guard agains null ReflogReader if named ref does not exist
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>
2015-05-25 22:58:14 +02:00
Sebastian Schuberth 7ce6abe858 FS: Allow to manually set the path to the Git system config file
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>
2015-05-25 21:23:21 +02:00
Sebastian Schuberth 9599f3f1a6 FS: Fix a minor typo in runInShell() docs
Change-Id: I5b1a5f3732aa97f83a4d39b42ba0f1e8eff9dec4
Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
2015-05-25 21:23:20 +02:00
Sebastian Schuberth 7ee351fb95 FS: Improve javadoc of some recently introduced methods
Change-Id: I31e788ee20ac3e8439559d9060d39e9792f6dc7d
Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-25 21:23:20 +02:00
Andrey Loskutov 1773002a34 Cleanup code and Eclipse compile errors in new gitrepo API
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>
2015-05-24 10:27:20 +02:00
Shawn Pearce a990cce776 Merge "Refactor to expose ManifestParser." 2015-05-22 14:24:46 -04:00
Yuxuan 'fishy' Wang d3348e5623 Refactor to expose ManifestParser.
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>
2015-05-22 11:08:52 -07:00