Merge "Update bouncycastle to 1.77"

org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/commitgraph/CommitGraphWriter.java

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/commitgraph/CommitGraphWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/commitgraph/CommitGraphWriter.java
index b697edb..1f1c35a 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/commitgraph/CommitGraphWriter.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/commitgraph/CommitGraphWriter.java
@@ -261,7 +261,6 @@ private void writeFanoutTable(CancellableDigestOutputStream out)
 		for (int n : fanout) {
 			NB.encodeInt32(tmp, 0, n);
 			out.write(tmp, 0, 4);
-			out.getWriteMonitor().update(1);
 		}
 	}
 
@@ -272,7 +271,6 @@ private void writeOidLookUp(CancellableDigestOutputStream out)
 		for (RevCommit c : graphCommits) {
 			c.copyRawTo(tmp, 0);
 			out.write(tmp, 0, hashsz);
-			out.getWriteMonitor().update(1);
 		}
 	}
 
@@ -470,7 +468,6 @@ private void writeExtraEdges(CancellableDigestOutputStream out)
 					}
 					NB.encodeInt32(tmp, 0, edgeValue);
 					out.write(tmp);
-					out.getWriteMonitor().update(1);
 				}
 			}
 		}

org.eclipse.jgit/src/org/eclipse/jgit/revwalk/BitmapWalker.java

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/BitmapWalker.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/BitmapWalker.java
index 5060823..2218462 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/BitmapWalker.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/BitmapWalker.java
@@ -48,29 +48,39 @@ public final class BitmapWalker {
 	private Bitmap prevBitmap;
 
 	/**
-	 * Report events happening during the walk.
+	 * Report commits found during the walk
 	 *
 	 * @since 6.8
 	 */
 	public interface BitmapWalkListener {
-
 		/**
-		 * The object is in the walk, and it has a bitmap
+		 * The commit is already in the walk bitmap
 		 *
 		 * @param oid
-		 *            objectId with a bitmap in the bitmap index
+		 *            objectId of the commit already in bitmap
 		 */
-		default void onBitmapFound(ObjectId oid) {
+		default void onCommitInBitmap(ObjectId oid) {
 			// Nothing to do
 		}
 
 		/**
-		 * The object is in the walk but doesn't have bitmap
+		 * The commit has a bitmap in the bitmap index
 		 *
 		 * @param oid
-		 *            objectId without a bitmap in the bitmap index
+		 *            objectId of the commit with a bitmap in the bitmap index
 		 */
-		default void onBitmapNotFound(ObjectId oid) {
+		default void onCommitWithBitmap(ObjectId oid) {
+			// Nothing to do
+		}
+
+		/**
+		 * The commit doesn't have bitmap
+		 *
+		 * @param oid
+		 *            objectId of the commit without a bitmap in the bitmap
+		 *            index
+		 */
+		default void onCommitWithoutBitmap(ObjectId oid) {
 			// Nothing to do
 		}
 	}
@@ -195,7 +205,7 @@ public BitmapBuilder findObjects(Iterable<? extends ObjectId> start, BitmapBuild
 			Bitmap bitmap = bitmapIndex.getBitmap(obj);
 			if (bitmap != null) {
 				result.or(bitmap);
-				listener.onBitmapFound(obj);
+				listener.onCommitWithBitmap(obj);
 			}
 		}
 
@@ -236,7 +246,7 @@ private BitmapBuilder findObjectsWalk(Iterable<? extends ObjectId> start, Bitmap
 			Bitmap bitmap = bitmapIndex.getBitmap(obj);
 			if (bitmap != null) {
 				bitmapResult.or(bitmap);
-				listener.onBitmapFound(obj);
+				listener.onCommitWithBitmap(obj);
 			}
 		}
 
@@ -279,7 +289,7 @@ private BitmapBuilder findObjectsWalk(Iterable<? extends ObjectId> start, Bitmap
 				// of bitmaps.
 				pm.update(1);
 				countOfBitmapIndexMisses++;
-				listener.onBitmapNotFound(oid);
+				listener.onCommitWithoutBitmap(oid);
 			}
 
 			RevObject ro;