Merge branch 'stable-7.0'

* stable-7.0:
  DiffDriver: fix doc for rust built-in
  DiffDriver: fix formatting of javadoc
  Add numberOfObjectsSinceBitmap to RepoStatistics
  Support built-in diff drivers for hunk header function names
  Don't fail when trying to prune pack which is already gone
  Rename numberOfPackFilesAfterBitmap to numberOfPackFilesSinceBitmap

Change-Id: I98beec1186132e749a749706f399237de7d7e45e

diff --cc org.eclipse.jgit/.settings/.api_filters
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..9f8018d3124be0e56732b0a09789336799be7eea
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/org.eclipse.jgit/.settings/.api_filters
@@@ -1,0 -1,0 +1,67 @@@
++<?xml version="1.0" encoding="UTF-8" standalone="no"?>
++<component id="org.eclipse.jgit" version="2">
++    <resource path="src/org/eclipse/jgit/diff/DiffDriver.java" type="org.eclipse.jgit.diff.DiffDriver">
++        <filter id="1109393411">
++            <message_arguments>
++                <message_argument value="6.10.1"/>
++                <message_argument value="org.eclipse.jgit.diff.DiffDriver"/>
++            </message_arguments>
++        </filter>
++    </resource>
++    <resource path="src/org/eclipse/jgit/diff/DiffFormatter.java" type="org.eclipse.jgit.diff.DiffFormatter">
++        <filter id="1142947843">
++            <message_arguments>
++                <message_argument value="6.10.1"/>
++                <message_argument value="format(EditList, RawText, RawText, DiffDriver)"/>
++            </message_arguments>
++        </filter>
++        <filter id="1142947843">
++            <message_arguments>
++                <message_argument value="6.10.1"/>
++                <message_argument value="format(FileHeader, RawText, RawText, DiffDriver)"/>
++            </message_arguments>
++        </filter>
++        <filter id="1142947843">
++            <message_arguments>
++                <message_argument value="6.10.1"/>
++                <message_argument value="writeHunkHeader(int, int, int, int, String)"/>
++            </message_arguments>
++        </filter>
++    </resource>
++    <resource path="src/org/eclipse/jgit/lib/Constants.java" type="org.eclipse.jgit.lib.Constants">
++        <filter id="1142947843">
++            <message_arguments>
++                <message_argument value="6.10.1"/>
++                <message_argument value="ATTR_BUILTIN_UNION_MERGE_DRIVER"/>
++            </message_arguments>
++        </filter>
++    </resource>
++    <resource path="src/org/eclipse/jgit/merge/ContentMergeStrategy.java" type="org.eclipse.jgit.merge.ContentMergeStrategy">
++        <filter id="1176502275">
++            <message_arguments>
++                <message_argument value="6.10.1"/>
++                <message_argument value="UNION"/>
++            </message_arguments>
++        </filter>
++    </resource>
++    <resource path="src/org/eclipse/jgit/merge/ResolveMerger.java" type="org.eclipse.jgit.merge.ResolveMerger">
++        <filter id="336658481">
++            <message_arguments>
++                <message_argument value="org.eclipse.jgit.merge.ResolveMerger"/>
++                <message_argument value="attributesNodeProvider"/>
++            </message_arguments>
++        </filter>
++        <filter id="1142947843">
++            <message_arguments>
++                <message_argument value="6.10.1"/>
++                <message_argument value="attributesNodeProvider"/>
++            </message_arguments>
++        </filter>
++        <filter id="1142947843">
++            <message_arguments>
++                <message_argument value="6.10.1"/>
++                <message_argument value="setAttributesNodeProvider(AttributesNodeProvider)"/>
++            </message_arguments>
++        </filter>
++    </resource>
++</component>

diff --cc org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java
Simple merge