summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Nieder <jrn@google.com>2016-08-08 19:55:57 -0400
committerGerrit Code Review @ Eclipse.org <gerrit@eclipse.org>2016-08-08 19:55:59 -0400
commit22f24e7df27859a4fd341654968bbcf32f0ba1fd (patch)
tree42dda7bb742f549b9104483819d9d3866253f0da
parent6ccc7992d46d11e9fecd04fcf3126deb039e9217 (diff)
parentf28de24fa80046969d490f33fc6ec05a59c3d8c4 (diff)
downloadjgit-22f24e7df27859a4fd341654968bbcf32f0ba1fd.tar.gz
jgit-22f24e7df27859a4fd341654968bbcf32f0ba1fd.zip
Merge "Document new PackWriter#preparePack variant's parameters and exceptions"
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java20
1 files changed, 20 insertions, 0 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java
index 9d331ad9e7..d347fd94e2 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java
@@ -723,6 +723,26 @@ public class PackWriter implements AutoCloseable {
* be shallow any more ("unshallow" commits as in {@link #setShallowPack})
* from the shallow set.
*
+ * @param countingMonitor
+ * progress during object enumeration.
+ * @param want
+ * objects of interest, ancestors of which will be included in
+ * the pack. Must not be {@code null}.
+ * @param have
+ * objects whose ancestors (up to and including
+ * {@code shallow} commits) do not need to be included in the
+ * pack because they are already available from elsewhere.
+ * Must not be {@code null}.
+ * @param shallow
+ * commits indicating the boundary of the history marked with
+ * {@code have}. Shallow commits have parents but those
+ * parents are considered not to be already available.
+ * Parents of {@code shallow} commits and earlier generations
+ * will be included in the pack if requested by {@code want}.
+ * Must not be {@code null}.
+ * @param IOException
+ * an I/O problem occured while reading objects.
+ *
* @since 4.5
*/
public void preparePack(ProgressMonitor countingMonitor,