Merge branch 'master' into stable-7.6

* master:
  MidxIterator: Add reset method
  PackIndexMerger: remove rawIterator() method
  PackIndexMerge: Use deduped iterators instead of deduping while reading
  PackIndexMerger: use MidxIterators instead of its own
  MidxIterators: Helpers around the MidxIterator
  Bazel: align JGit with shared external_deps repository
  Bazel: bump rules_jvm_external to 6.10
  MultiPackIndex: Offer an iterator over the entries in the midx
  RevWalk: abort computation of merged commits if the monitor is canceled
  [cli] Add options --pack-refs and --no-pack-refs to Gc command
  Add missing LF at the end of GarbageCollectCommandTest
  Add GarbageCollectCommand#setGcConfig
  GC: add flag to control whether gc should pack all refs
  Downgrade spring-boot-maven-plugin to 3.5.10
  pack-refs: Add sorted flag
  Bazel: enforce strict MODULE.bazel.lock synchronization
  DfsPackFileMidxSingle: No need to set ints to 0 in constructor
  MidxPackFilter: Remove debug printlns
  DfsMidxWriter: add writing bitmaps to the newly created midx
  RefAdvancer: helper to find when a branch enters a pack
  Throw IOException if API tries to use destroyed TemporaryBuffer
  Update com.google.errorprone:error_prone_type_annotations to 2.46.0
  Update Apache sshd to 2.17.1
  DfsPackFileMidx: offer local objects as ObjectToPack

Change-Id: I6296337594bf55033aeb680824f42bb739050989

Author: msohn

.bazelrc

@@ -1,6 +1,6 @@
 # TODO(davido): Migrate all dependencies from WORKSPACE to MODULE.bazel
 # https://issues.gerritcodereview.com/issues/303819949
-common --enable_bzlmod
+common --enable_bzlmod --lockfile_mode=error
 common --enable_workspace
 
 build --workspace_status_command="python3 ./tools/workspace_status.py"

Documentation/config-options.md

@@ -80,6 +80,7 @@ For details on native git options see also the official [git config documentatio
 | `gc.autoDetach` | `true` |  ✅ | Make auto gc return immediately and run in background. |
 | `gc.autoPackLimit` | `50` |  ✅ | Number of packs until auto gc consolidates existing packs (except those marked with a .keep file) into a single pack. Setting `gc.autoPackLimit` to 0 disables automatic consolidation of packs. |
 | `gc.logExpiry` | `1.day.ago` | ✅ | If the file `gc.log` exists, then auto gc will print its content and exit successfully instead of running unless that file is more than `gc.logExpiry` old. |
+| `gc.packRefs`| `true` | ✅ | This variable determines whether JGit garbage collection will also pack refs. This can be set to `notbare` to enable it within all non-bare repos or it can be set to a boolean value. |
 | `gc.pruneExpire` | `2.weeks.ago` | ✅ | Grace period after which unreachable objects will be pruned. |
 | `gc.prunePackExpire` | `1.hour.ago` |  ⃞ | Grace period after which packfiles only containing unreachable objects will be pruned. |
 | `gc.writeChangedPaths` | `false`| ⃞ | Whether bloom filter should be written to commit-graph during a gc operation. |

MODULE.bazel

@@ -1,7 +1,7 @@
 module(name = "jgit")
 
 bazel_dep(name = "rules_java", version = "8.11.0")
-bazel_dep(name = "rules_jvm_external", version = "6.7")
+bazel_dep(name = "rules_jvm_external", version = "6.10")
 bazel_dep(name = "rbe_autoconfig")
 git_override(
     module_name = "rbe_autoconfig",
@@ -33,15 +33,15 @@ JNA_VERSION = "5.18.1"
 
 SLF4J_VERSION = "2.0.17"
 
-SSHD_VERSION = "2.16.0"
+SSHD_VERSION = "2.17.1"
 
 maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
 maven.install(
-    name = "jgit_deps",
+    name = "external_deps",
     artifacts = [
         "args4j:args4j:2.37",
         "com.google.code.gson:gson:2.13.2",
-        "com.google.errorprone:error_prone_type_annotations:2.38.0",
+        "com.google.errorprone:error_prone_type_annotations:2.46.0",
         "com.googlecode.javaewah:JavaEWAH:1.2.3",
         "com.jcraft:jsch:0.1.55",
         "com.jcraft:jzlib:1.1.3",
@@ -87,9 +87,10 @@ maven.install(
     duplicate_version_warning = "warn",
     fail_on_missing_checksum = True,
     fetch_sources = True,
+    known_contributing_modules = ["jgit"],
     repositories = [
         "https://repo1.maven.org/maven2",
     ],
     strict_visibility = True,
 )
-use_repo(maven, "jgit_deps")
+use_repo(maven, "external_deps")

MODULE.bazel.lock

@@ -6,7 +6,7 @@ java_library(
         "//org.eclipse.jgit.pgm:__pkg__",
         "//org.eclipse.jgit.pgm.test:__pkg__",
     ],
-    exports = ["@jgit_deps//:args4j_args4j"],
+    exports = ["@external_deps//:args4j_args4j"],
 )
 
 java_library(
@@ -16,7 +16,7 @@ java_library(
         "//org.eclipse.jgit.pgm.test:__pkg__",
         "//org.eclipse.jgit.test:__pkg__",
     ],
-    exports = ["@jgit_deps//:org_apache_commons_commons_compress"],
+    exports = ["@external_deps//:org_apache_commons_commons_compress"],
 )
 
 java_library(
@@ -26,7 +26,7 @@ java_library(
         "//org.eclipse.jgit.pgm.test:__pkg__",
         "//org.eclipse.jgit.test:__pkg__",
     ],
-    exports = ["@jgit_deps//:org_apache_commons_commons_lang3"],
+    exports = ["@external_deps//:org_apache_commons_commons_lang3"],
 )
 
 java_library(
@@ -36,7 +36,7 @@ java_library(
         "//org.eclipse.jgit.pgm.test:__pkg__",
         "//org.eclipse.jgit.test:__pkg__",
     ],
-    exports = ["@jgit_deps//:commons_io_commons_io"],
+    exports = ["@external_deps//:commons_io_commons_io"],
 )
 
 java_library(
@@ -45,13 +45,13 @@ java_library(
         "//org.eclipse.jgit:__pkg__",
         "//org.eclipse.jgit.test:__pkg__",
     ],
-    exports = ["@jgit_deps//:commons_codec_commons_codec"],
+    exports = ["@external_deps//:commons_codec_commons_codec"],
 )
 
 java_library(
     name = "commons-logging",
     visibility = ["//visibility:public"],
-    exports = ["@jgit_deps//:commons_logging_commons_logging"],
+    exports = ["@external_deps//:commons_logging_commons_logging"],
 )
 
 java_library(
@@ -60,7 +60,7 @@ java_library(
         "//org.eclipse.jgit.lfs:__pkg__",
         "//org.eclipse.jgit.lfs.server:__pkg__",
     ],
-    exports = ["@jgit_deps//:com_google_code_gson_gson"],
+    exports = ["@external_deps//:com_google_code_gson_gson"],
 )
 
 java_library(
@@ -70,7 +70,7 @@ java_library(
         "//org.eclipse.jgit.lfs.server.test:__pkg__",
         "//org.eclipse.jgit.pgm:__pkg__",
     ],
-    exports = ["@jgit_deps//:org_apache_httpcomponents_httpclient"],
+    exports = ["@external_deps//:org_apache_httpcomponents_httpclient"],
 )
 
 java_library(
@@ -82,7 +82,7 @@ java_library(
         "//org.eclipse.jgit.lfs.server.test:__pkg__",
         "//org.eclipse.jgit.pgm:__pkg__",
     ],
-    exports = ["@jgit_deps//:org_apache_httpcomponents_httpcore"],
+    exports = ["@external_deps//:org_apache_httpcomponents_httpcore"],
 )
 
 java_library(
@@ -94,7 +94,7 @@ java_library(
         "//org.eclipse.jgit.ssh.apache.test:__pkg__",
         "//org.eclipse.jgit.test:__pkg__",
     ],
-    exports = ["@jgit_deps//:org_apache_sshd_sshd_osgi"],
+    exports = ["@external_deps//:org_apache_sshd_sshd_osgi"],
 )
 
 java_library(
@@ -105,89 +105,89 @@ java_library(
         "//org.eclipse.jgit.ssh.apache.test:__pkg__",
         "//org.eclipse.jgit.test:__pkg__",
     ],
-    exports = ["@jgit_deps//:org_apache_sshd_sshd_sftp"],
+    exports = ["@external_deps//:org_apache_sshd_sshd_sftp"],
 )
 
 java_library(
     name = "jna",
     visibility = [
         "//org.eclipse.jgit.ssh.apache.agent:__pkg__",
     ],
-    exports = ["@jgit_deps//:net_java_dev_jna_jna"],
+    exports = ["@external_deps//:net_java_dev_jna_jna"],
 )
 
 java_library(
     name = "jna-platform",
     visibility = [
         "//org.eclipse.jgit.ssh.apache.agent:__pkg__",
     ],
-    exports = ["@jgit_deps//:net_java_dev_jna_jna_platform"],
+    exports = ["@external_deps//:net_java_dev_jna_jna_platform"],
 )
 
 java_library(
     name = "javaewah",
     visibility = ["//visibility:public"],
-    exports = ["@jgit_deps//:com_googlecode_javaewah_JavaEWAH"],
+    exports = ["@external_deps//:com_googlecode_javaewah_JavaEWAH"],
 )
 
 java_library(
     name = "jetty-http",
     # TODO: This should be testonly but org.eclipse.jgit.pgm depends on it.
     visibility = ["//visibility:public"],
-    exports = ["@jgit_deps//:org_eclipse_jetty_jetty_http"],
+    exports = ["@external_deps//:org_eclipse_jetty_jetty_http"],
     runtime_deps = [":commons-codec"],
 )
 
 java_library(
     name = "jetty-io",
     # TODO: This should be testonly but org.eclipse.jgit.pgm depends on it.
     visibility = ["//visibility:public"],
-    exports = ["@jgit_deps//:org_eclipse_jetty_jetty_io"],
+    exports = ["@external_deps//:org_eclipse_jetty_jetty_io"],
 )
 
 java_library(
     name = "jetty-security",
     # TODO: This should be testonly but org.eclipse.jgit.pgm depends on it.
     visibility = ["//visibility:public"],
-    exports = ["@jgit_deps//:org_eclipse_jetty_jetty_security"],
+    exports = ["@external_deps//:org_eclipse_jetty_jetty_security"],
 )
 
 java_library(
     name = "jetty-session",
     # TODO: This should be testonly but org.eclipse.jgit.pgm depends on it.
     visibility = ["//visibility:public"],
-    exports = ["@jgit_deps//:org_eclipse_jetty_jetty_session"],
+    exports = ["@external_deps//:org_eclipse_jetty_jetty_session"],
 )
 
 java_library(
     name = "jetty-server",
     # TODO: This should be testonly but org.eclipse.jgit.pgm depends on it.
     visibility = ["//visibility:public"],
-    exports = ["@jgit_deps//:org_eclipse_jetty_jetty_server"],
+    exports = ["@external_deps//:org_eclipse_jetty_jetty_server"],
 )
 
 java_library(
     name = "jetty-servlet",
     # TODO: This should be testonly but org.eclipse.jgit.pgm depends on it.
     visibility = ["//visibility:public"],
     exports = [
-        "@jgit_deps//:org_eclipse_jetty_ee10_jetty_ee10_servlet",
-        "@jgit_deps//:org_eclipse_jetty_jetty_util_ajax",
+        "@external_deps//:org_eclipse_jetty_ee10_jetty_ee10_servlet",
+        "@external_deps//:org_eclipse_jetty_jetty_util_ajax",
     ],
 )
 
 java_library(
     name = "jetty-util",
     # TODO: This should be testonly but org.eclipse.jgit.pgm depends on it.
     visibility = ["//visibility:public"],
-    exports = ["@jgit_deps//:org_eclipse_jetty_jetty_util"],
+    exports = ["@external_deps//:org_eclipse_jetty_jetty_util"],
 )
 
 java_library(
     name = "jetty-ee10-servlet",
     # TODO: This should be testonly but org.eclipse.jgit.pgm depends on it.
     visibility = ["//visibility:public"],
-    exports = ["@jgit_deps//:org_eclipse_jetty_ee10_jetty_ee10_servlet"],
+    exports = ["@external_deps//:org_eclipse_jetty_ee10_jetty_ee10_servlet"],
 )
 
 java_library(
@@ -197,7 +197,7 @@ java_library(
         "//org.eclipse.jgit.ssh.jsch:__pkg__",
         "//org.eclipse.jgit.ssh.jsch.test:__pkg__",
     ],
-    exports = ["@jgit_deps//:com_jcraft_jsch"],
+    exports = ["@external_deps//:com_jcraft_jsch"],
 )
 
 java_library(
@@ -209,7 +209,7 @@ java_library(
         "//org.eclipse.jgit.ssh.apache.test:__pkg__",
         "//org.eclipse.jgit.test:__pkg__",
     ],
-    exports = ["@jgit_deps//:org_bouncycastle_bcpg_jdk18on"],
+    exports = ["@external_deps//:org_bouncycastle_bcpg_jdk18on"],
 )
 
 java_library(
@@ -222,7 +222,7 @@ java_library(
         "//org.eclipse.jgit.ssh.jsch.test:__pkg__",
         "//org.eclipse.jgit.test:__pkg__",
     ],
-    exports = ["@jgit_deps//:org_bouncycastle_bcprov_jdk18on"],
+    exports = ["@external_deps//:org_bouncycastle_bcprov_jdk18on"],
 )
 
 java_library(
@@ -235,7 +235,7 @@ java_library(
         "//org.eclipse.jgit.ssh.jsch.test:__pkg__",
         "//org.eclipse.jgit.test:__pkg__",
     ],
-    exports = ["@jgit_deps//:org_bouncycastle_bcutil_jdk18on"],
+    exports = ["@external_deps//:org_bouncycastle_bcutil_jdk18on"],
 )
 
 java_library(
@@ -247,7 +247,7 @@ java_library(
         "//org.eclipse.jgit.ssh.jsch.test:__pkg__",
         "//org.eclipse.jgit.test:__pkg__",
     ],
-    exports = ["@jgit_deps//:org_bouncycastle_bcpkix_jdk18on"],
+    exports = ["@external_deps//:org_bouncycastle_bcpkix_jdk18on"],
 )
 
 java_library(
@@ -256,20 +256,20 @@ java_library(
         "//org.eclipse.jgit.ssh.jsch:__pkg__",
         "//org.eclipse.jgit.test:__pkg__",
     ],
-    exports = ["@jgit_deps//:com_jcraft_jzlib"],
+    exports = ["@external_deps//:com_jcraft_jzlib"],
 )
 
 java_library(
     name = "junit",
     testonly = 1,
     visibility = ["//visibility:public"],
     exports = [
-        "@jgit_deps//:net_bytebuddy_byte_buddy_agent",
-        "@jgit_deps//:net_bytebuddy_byte_buddy",
-        "@jgit_deps//:org_hamcrest_hamcrest",
-        "@jgit_deps//:junit_junit",
-        "@jgit_deps//:org_mockito_mockito_core",
-        "@jgit_deps//:org_objenesis_objenesis",
+        "@external_deps//:net_bytebuddy_byte_buddy_agent",
+        "@external_deps//:net_bytebuddy_byte_buddy",
+        "@external_deps//:org_hamcrest_hamcrest",
+        "@external_deps//:junit_junit",
+        "@external_deps//:org_mockito_mockito_core",
+        "@external_deps//:org_objenesis_objenesis",
     ],
 )
 
@@ -278,10 +278,10 @@ java_library(
     testonly = 1,
     visibility = ["//visibility:public"],
     exports = [
-        "@jgit_deps//:net_bytebuddy_byte_buddy_agent",
-        "@jgit_deps//:net_bytebuddy_byte_buddy",
-        "@jgit_deps//:org_mockito_mockito_core",
-        "@jgit_deps//:org_objenesis_objenesis",
+        "@external_deps//:net_bytebuddy_byte_buddy_agent",
+        "@external_deps//:net_bytebuddy_byte_buddy",
+        "@external_deps//:org_mockito_mockito_core",
+        "@external_deps//:org_objenesis_objenesis",
     ],
 )
 
@@ -290,7 +290,7 @@ java_library(
     testonly = 1,
     visibility = ["//visibility:public"],
     exports = [
-        "@jgit_deps//:org_assertj_assertj_core",
+        "@external_deps//:org_assertj_assertj_core",
     ],
 )
 
@@ -305,24 +305,24 @@ java_library(
         "//org.eclipse.jgit.lfs.server.test:__pkg__",
         "//org.eclipse.jgit.pgm:__pkg__",
     ],
-    exports = ["@jgit_deps//:jakarta_servlet_jakarta_servlet_api_6_1_0"],
+    exports = ["@external_deps//:jakarta_servlet_jakarta_servlet_api_6_1_0"],
 )
 
 java_library(
     name = "slf4j-api",
     visibility = ["//visibility:public"],
-    exports = ["@jgit_deps//:org_slf4j_slf4j_api"],
+    exports = ["@external_deps//:org_slf4j_slf4j_api"],
 )
 
 java_library(
     name = "slf4j-simple",
     visibility = ["//visibility:public"],
-    exports = ["@jgit_deps//:org_slf4j_slf4j_simple"],
+    exports = ["@external_deps//:org_slf4j_slf4j_simple"],
 )
 
 java_library(
     name = "xz",
     testonly = 1,
     visibility = ["//visibility:public"],
-    exports = ["@jgit_deps//:org_tukaani_xz"],
+    exports = ["@external_deps//:org_tukaani_xz"],
 )

lib/BUILD

@@ -4,9 +4,9 @@ java_library(
     name = "jmh",
     visibility = ["//visibility:public"],
     exports = [
-        "@jgit_deps//:org_openjdk_jmh_jmh_generator_annprocess",
-        "@jgit_deps//:org_openjdk_jmh_jmh_core",
-        "@jgit_deps//:net_sf_jopt_simple_jopt_simple",
-        "@jgit_deps//:org_apache_commons_commons_math3",
+        "@external_deps//:org_openjdk_jmh_jmh_generator_annprocess",
+        "@external_deps//:org_openjdk_jmh_jmh_core",
+        "@external_deps//:net_sf_jopt_simple_jopt_simple",
+        "@external_deps//:org_apache_commons_commons_math3",
     ],
 )