Commit Graph

3747 Commits

Author SHA1 Message Date
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 527ac37781 Merge branch 'stable-4.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>
2015-05-26 16:54:37 +02:00
Matthias Sohn 74009ba3ef Prepare post 4.0.0-rc2 builds
Change-Id: I3ba1bb0d7f220f88eb768a3137493f737aadf466
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-26 15:05:25 +02:00
Matthias Sohn 3ed57820f2 JGit v4.0.0.201505260635-rc2
Change-Id: I496743145da865f9631b46a432c65c1e63ccb501
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-26 12:33:24 +02:00
Matthias Sohn 04b3cd0e15 Merge branch 'master' into stable-4.0
* 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>
2015-05-26 11:39:31 +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 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
Matthias Sohn 39a29fba50 Update Mars target platforms to use Mars RC2 orbit
Change-Id: Idda321d5026329ec194d53ad635973465bcccd49
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-25 23:53:39 +02:00
Matthias Sohn 9ae83b83fc Update build to use eclipse-jarsigner-plugin 1.1.2
Change-Id: Ic2fb30cf851542e12508e4cf638b52b65519f41d
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-25 23:13:50 +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
Sebastian Schuberth d7a44736ce FS: Remove the gitprefix logic
The only purpose of the gitprefix logic was to determine the path to the
system-wide config file. This is now done by discoverGitSystemConfig()
independent of the gitprefix, so get rid of this unused code.

Change-Id: Iaa88df9bd066dc1ed4067c18618af809e49876b3
Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
2015-05-22 09:37:35 +02:00
Sebastian Schuberth d9ffc03837 SystemReader: Use discoverGitSystemConfig() in openSystemConfig()
Bug: 410568
Change-Id: Id768294e83f374f50ae5e6486f4e757515c8262d
Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-22 09:37:34 +02:00
Sebastian Schuberth cb12f4f0ad FS: Add a method to discover the system-wide config file
Change-Id: I969e26a5ab5f8ca3ab29024f405c1e34afdba493
Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-22 09:37:26 +02:00
Sebastian Schuberth b8b6357fe6 FS: Extend readPipe() to optionally take additional environment
Change-Id: I4db7763826e4ada92074317d4d1c9a32299f3af8
Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-21 23:42:13 +02:00
Sebastian Schuberth 8ed6b745bb FS: Document readpipe()'s encoding parameter
Change-Id: I36f0edf0f9d0bfa26448e25355c6d78dea524079
Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
2015-05-21 23:39:26 +02:00
Sebastian Schuberth 6fdd214349 Split discoverGitPrefix() code out into discoverGitExe()
Change-Id: I700540eec06efb24eeb09bfcb40420820c32d156
Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-21 23:37:42 +02:00
Sebastian Schuberth 4ca2fc5ce7 Equalize discoverGitPrefix() implementations between POSIX and Win32
Change-Id: I936df151890d4bba9079d79c65b75a69c209523b
Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
2015-05-21 23:32:07 +02:00
Sebastian Schuberth 8025443db4 Move resolveGrandparentFile() to the base class for wider use
Change-Id: I67ec732ea2e5345a6946783f0c5ef60c07ce254e
Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-21 23:29:28 +02:00
Matthias Sohn 686124bec3 Replace deprecated release() methods by close()
See the discussion [1] in the Gerrit mailing list.

[1] https://groups.google.com/forum/#!topic/repo-discuss/RRQT_xCqz4o

Change-Id: I2c67384309c5c2e8511a7d0d4e088b4e95f819ff
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-21 02:05:45 +02:00
Matthias Sohn 0e73d39506 Use AutoClosable to close resources in bundle org.eclipse.jgit
- use try-with-resource where possible
- replace use of deprecated release() by close()

Change-Id: I0f139c3535679087b7fa09649166bca514750b81
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-21 00:01:36 +02:00
Matthias Sohn 6424dcd694 Merge "ReceivePack: support quiet capability" 2015-05-20 17:49:14 -04:00
Shawn Pearce 0419f8128b ReceivePack: support quiet capability
git-core has supported this for a long time; allowing clients to
avoid progress messages from the server if they are dumping to a
pipe instead of a tty.

Avoid the two progress monitors going on side-band and expose
isQuiet() method to allow hooks to also reduce their output if
this is sensible for them.

Change-Id: I1df7e38d16765446b441366500b017a90b8ff958
2015-05-20 08:23:47 -07:00
Matthias Sohn 0b5cb2e11e Merge branch 'stable-4.0'
* stable-4.0:
  Prepare post 4.0.0-rc1 builds
  JGit v4.0.0.201505191015-rc1

Change-Id: I9731a591368e2e7ed642e36bd1ffee312b9568c7
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-20 08:55:47 +02:00
Shawn Pearce faf0a8f61d Merge "Fix ObjectReader resources leak" 2015-05-20 02:02:26 -04:00
Matthias Sohn ed6694bd89 Prepare post 4.0.0-rc1 builds
Change-Id: I5c18bb97336e5b94fae46743cbbb0f02a6e4b477
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-19 22:34:37 +02:00
Matthias Sohn e2c062f529 JGit v4.0.0.201505191015-rc1
Change-Id: Ib3371a082cbfaafd67471c56807b6d89f1161c8b
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-19 16:12:20 +02:00
Matthias Sohn fd04e0548f Merge branch 'master' into stable-4.0
* master:
  Fix warnings in ObjectFilter
  Fix typo in reflog message written by RebaseCommand.tryFastForward()
  Correct @since tags for ObjectFilter
  Fix typo in ObjectWalk#getObjectFilter javadoc
  Allow ObjectWalk to be filtered by an arbitrary predicate
  Remove SoftReference from dfs.DeltaBaseCache
  Fix memory leak in dfs.DeltaBaseCase
  Update to Jetty 9.2.10
  Update javax.servlet to 3.1
  Use ANY_DIFF filter in ResolveMerger only for bare repositories
  FS_POSIX: Rework umask detection to make it settable
  Expose disposeBody() on RevCommit and RevTag
  ObjectReader: remove the walkAdvice API
  RevWalk: Discard uninteresting commits unless RevSort.BOUNDARY
  ObjectWalk: make setRetainBody(false) the default
  Do not concatenate strings as arguments to StringBuilder.append()
  IndexDiffFilter: Simplify a boolean expression
  GroupHead: Remove a redundant call to String.format()
  FS_Win32: Avoid an IOException on Windows if bash is not in PATH
  Skip logging stack trace on corrupt objects
  Add repository name to failures in HTTP server log
  Fix possible AIOOB in DirCacheTree.contains()
  Delete deprecated PackWriter.preparePack() methods
  Delete deprecated class IgnoreRule
  Delete deprecated checkoutEntry() methods in DirCacheCheckout
  Fix IllegalArgumentException in AmazonS3

Change-Id: Ica3d4f0675c81684fbe48fcf0053f2a949bc5c9b
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-19 16:07:32 +02:00
Matthias Sohn 4cbe66af47 Fix warnings in ObjectFilter
- add missing tags in JavaDoc of ObjectFilter.include()
- remove unnecessary import

Change-Id: I24b9dcc49f66380f77345d704df70c05f7f74db8
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-15 23:20:46 +02:00
Matthias Sohn 0243da320e Fix typo in reflog message written by RebaseCommand.tryFastForward()
Change-Id: I1ad544f2b5673ed3b4a2206b5eb4ce20fd3c86d2
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-15 23:00:53 +02:00
Hugo Arès 9d6507ba4d Fix ObjectReader resources leak
In 77030a5e, AutoClosable was implemented on classes that use release().
This caused a resource leak because the ObjectReader.close method  was
not calling the now deprecated release method, which is the method that
sub classes implements to release resources.

Change-Id: I247651ec8fd7ca9941d256ca46d14cc43cc35c6e
Signed-off-by: Hugo Arès <hugo.ares@ericsson.com>
2015-05-15 16:10:49 -04:00
Jonathan Nieder b35b09d09a Correct @since tags for ObjectFilter
Although the stable-4.0 branch already exists, 4.0 development is
still happening on master until IP logs are sent for review, which
will happen at the end of May.

Change-Id: I863ba85c6303f8ef2eb13bca5e2d30e5d3c58b29
Signed-off-by: Jonathan Nieder <jrn@google.com>
2015-05-15 11:37:57 -07:00
Jonathan Nieder f91f4e5ed6 Fix typo in ObjectWalk#getObjectFilter javadoc
While trying to decide between "which matches every object" and "as it
matches every object", I became distracted and wrote both.

Change-Id: I867ce29664e661a81a9d441e59ffd0b72270dd98
Signed-off-by: Jonathan Nieder <jrn@google.com>
2015-05-15 11:23:55 -07:00
Jonathan Nieder f2be5bca04 Allow ObjectWalk to be filtered by an arbitrary predicate
This will make it possible to declare a collection of objects as
ineligible for the walk en masse, for example if they are known to be
uninteresting via a bitmap.

Change-Id: I637008b25bf9fb57df60ebb2133a70214930546a
Signed-off-by: Jonathan Nieder <jrn@google.com>
2015-05-14 18:43:38 -07:00
Matthias Sohn 1b18a6e1b6 Merge "Update to Jetty 9.2.10" 2015-05-12 09:00:03 -04:00
Shawn Pearce 2eb16aa6ca Remove SoftReference from dfs.DeltaBaseCache
The Java GC doesn't always clear these before running out of memory
and failing allocations. In practice OpenJDK 7 is leaving these live,
removing any advantage of the SoftReference to attempt to shed memory
when the GC is unable to continue allocating.

Instead follow the pattern of the DfsBlockCache and use hard refs
to the object data. Require applications to configure the cache
size more accurately given expected memory usage.

Change-Id: I87586b3e71b1cba0308a6a278d42e971be4bccd3
2015-05-11 11:39:28 -07:00
Shawn Pearce 8ff08455f6 Fix memory leak in dfs.DeltaBaseCase
The LRU chain management code was broken leading to situations where
the chain was incomplete.  This prevented the cache from removing
items when it exceeded its memory target, causing a leak.

One case was repeated hit on the head of the chain. moveToHead(e)
was invoked linking the head back to itself in a cycle orphaning
the rest of the table.

Add some unit tests to cover this and a few other paths.

Change-Id: Ib27486eaa1b1d2bf1c745a56d0a5832bfb029322
2015-05-11 11:39:28 -07:00
Shawn Pearce 3852a085bd Merge "FS_POSIX: Rework umask detection to make it settable" 2015-05-11 14:17:49 -04:00
Christian Halstrick 446fa0e480 Merge "Fix possible AIOOB in DirCacheTree.contains()" 2015-05-11 04:09:55 -04:00
Matthias Sohn a24b7c3cc7 Update to Jetty 9.2.10
Change-Id: Iace29e6e99836019bb603ce06a08b91bada7c627
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-10 23:36:49 +02:00