motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge branch 'stable-6.5' into stable-6.6 

* stable-6.5:
  PackConfig: fix @since tags
  Remove unused API problem filters
  Add support for git config repack.packKeptObjects
  Do not exclude objects in locked packs from bitmap processing

Change-Id: I7272a22451c0de6b4770767e7bb4e24c81518c20
This commit is contained in:
Matthias Sohn 2023-10-13 08:46:11 +02:00
parent 43d6bc5ef1 626264a12d
commit b6098c549d
10 changed files with 296 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/config-options.md
View File

@ -118,3 +118,9 @@ Proxy configuration uses the standard Java mechanisms via class `java.net.ProxyS
| `pack.waitPreventRacyPack` | `false` | ⃞ | Whether we wait before opening a newly written pack to prevent its lastModified timestamp could be racy. |
| `pack.window` | `10` | ✅ | Number of objects to try when looking for a delta base per thread searching for deltas. |
| `pack.windowMemory` | `0` (unlimited) | ✅ | Maximum number of bytes to put into the delta search window. |
## __repack__ options
| option | default | git option | description |
|---------|---------|------------|-------------|
| `repack.packKeptObjects` | `true` when `pack.buildBitmaps` is set, `false` otherwise | ✅ | Include objects in packs locked by a `.keep` file when repacking. |

1
org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties
View File

@ -299,6 +299,7 @@ usage_MakeCacheTree=Show the current cache tree structure
usage_Match=Only consider tags matching the given glob(7) pattern or patterns, excluding the "refs/tags/" prefix.
usage_MergeBase=Find as good common ancestors as possible for a merge
usage_MergesTwoDevelopmentHistories=Merges two development histories
usage_PackKeptObjects=Include objects in packs locked by a ".keep" file when repacking
usage_PreserveOldPacks=Preserve old pack files by moving them into the preserved subdirectory instead of deleting them after repacking
usage_PrunePreserved=Remove the preserved subdirectory containing previously preserved old pack files before repacking, and before preserving more old pack files
usage_ReadDirCache= Read the DirCache 100 times

6
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Gc.java
View File

@ -27,6 +27,9 @@ class Gc extends TextBuiltin {
@Option(name = "--prune-preserved", usage = "usage_PrunePreserved")
private Boolean prunePreserved;
@Option(name = "--pack-kept-objects", usage = "usage_PackKeptObjects")
private Boolean packKeptObjects;
/** {@inheritDoc} */
@Override
protected void run() {
@ -40,6 +43,9 @@ protected void run() {
if (prunePreserved != null) {
command.setPrunePreserved(prunePreserved.booleanValue());
}
if (packKeptObjects != null) {
command.setPackKeptObjects(packKeptObjects.booleanValue());
}
command.call();
} catch (GitAPIException e) {
throw die(e.getMessage(), e);

28
org.eclipse.jgit.ssh.apache.agent/bin/.project Normal file
View File

@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.eclipse.jgit.ssh.apache.agent</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.SchemaBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>

156
org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcKeepFilesTest.java
View File

@ -10,8 +10,13 @@
package org.eclipse.jgit.internal.storage.file;
import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_BUILD_BITMAPS;
import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_PACK_KEPT_OBJECTS;
import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_PACK_SECTION;
import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_REPACK_SECTION;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import java.util.Iterator;
@ -19,9 +24,14 @@
import org.eclipse.jgit.internal.storage.file.PackIndex.MutableEntry;
import org.eclipse.jgit.internal.storage.pack.PackExt;
import org.eclipse.jgit.junit.TestRepository.BranchBuilder;
import org.eclipse.jgit.lib.Config;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.storage.pack.PackConfig;
import org.junit.Test;
public class GcKeepFilesTest extends GcTestCase {
private static final int COMMIT_AND_TREE_OBJECTS = 2;
@Test
public void testKeepFiles() throws Exception {
BranchBuilder bb = tr.branch("refs/heads/master");
@ -51,6 +61,7 @@ public void testKeepFiles() throws Exception {
PackFile bitmapFile = singlePack.getPackFile().create(PackExt.BITMAP_INDEX);
assertTrue(keepFile.exists());
assertTrue(bitmapFile.delete());
gc.setPackKeptObjects(false);
gc.gc().get();
stats = gc.getStatistics();
assertEquals(0, stats.numberOfLooseObjects);
@ -72,4 +83,149 @@ public void testKeepFiles() throws Exception {
+ e.toObjectId(),
ind2.hasObject(e.toObjectId()));
}
@Test
public void testKeptObjectsAreIncludedByDefault() throws Exception {
testKeptObjectsAreIncluded();
}
@Test
public void testKeptObjectsAreIncludedByDefaultWhenBuildBitmapsIsTrue()
throws Exception {
PackConfig packConfig = new PackConfig();
Config repoConfig = repo.getObjectDatabase().getConfig();
repoConfig.setBoolean(CONFIG_PACK_SECTION, null,
CONFIG_KEY_BUILD_BITMAPS, true);
packConfig.fromConfig(repoConfig);
gc.setPackConfig(packConfig);
testKeptObjectsAreIncluded();
}
@Test
public void testKeptObjectsAreIncludedWhenPackKeptObjectsIsFalseButOverriddenViaCommandLine()
throws Exception {
PackConfig packConfig = new PackConfig();
packConfig.setPackKeptObjects(false);
gc.setPackConfig(packConfig);
gc.setPackKeptObjects(true);
testKeptObjectsAreIncluded();
}
@Test
public void testKeptObjectsAreNotIncludedByDefaultWhenBuildBitmapsIsFalse()
throws Exception {
PackConfig packConfig = new PackConfig();
packConfig.setBuildBitmaps(false);
gc.setPackConfig(packConfig);
testKeptObjectsAreNotIncluded();
}
@Test
public void testKeptObjectsAreIncludedWhenBuildBitmapsIsFalseButPackKeptObjectsIsTrue()
throws Exception {
PackConfig packConfig = new PackConfig();
Config repoConfig = repo.getObjectDatabase().getConfig();
repoConfig.setBoolean(CONFIG_PACK_SECTION, null,
CONFIG_KEY_BUILD_BITMAPS, false);
repoConfig.setBoolean(CONFIG_REPACK_SECTION, null,
CONFIG_KEY_PACK_KEPT_OBJECTS, true);
packConfig.fromConfig(repoConfig);
gc.setPackConfig(packConfig);
testKeptObjectsAreIncluded();
}
@Test
public void testKeptObjectsAreNotIncludedWhenPackKeptObjectsIsTrueButOverriddenViaCommandLine()
throws Exception {
PackConfig packConfig = new PackConfig();
packConfig.setPackKeptObjects(true);
gc.setPackConfig(packConfig);
gc.setPackKeptObjects(false);
testKeptObjectsAreNotIncluded();
}
@Test
public void testKeptObjectsAreNotIncludedWhenPackKeptObjectsConfigIsFalse()
throws Exception {
PackConfig packConfig = new PackConfig();
packConfig.setPackKeptObjects(false);
gc.setPackConfig(packConfig);
testKeptObjectsAreNotIncluded();
}
private void testKeptObjectsAreIncluded() throws Exception {
BranchBuilder bb = tr.branch("refs/heads/master");
ObjectId commitObjectInLockedPack = bb.commit().create().toObjectId();
gc.gc();
stats = gc.getStatistics();
assertEquals(COMMIT_AND_TREE_OBJECTS, stats.numberOfPackedObjects);
assertEquals(1, stats.numberOfPackFiles);
assertTrue(getSinglePack().getPackFile().create(PackExt.KEEP)
.createNewFile());
bb.commit().create();
gc.gc();
stats = gc.getStatistics();
assertEquals(2 * COMMIT_AND_TREE_OBJECTS + 1,
stats.numberOfPackedObjects);
assertEquals(2, stats.numberOfPackFiles);
PackIndex lockedPackIdx = null;
PackIndex newPackIdx = null;
for (Pack pack : repo.getObjectDatabase().getPacks()) {
if (pack.getObjectCount() == COMMIT_AND_TREE_OBJECTS) {
lockedPackIdx = pack.getIndex();
} else {
newPackIdx = pack.getIndex();
}
}
assertNotNull(lockedPackIdx);
assertTrue(lockedPackIdx.hasObject(commitObjectInLockedPack));
assertNotNull(newPackIdx);
assertTrue(newPackIdx.hasObject(commitObjectInLockedPack));
}
private void testKeptObjectsAreNotIncluded() throws Exception {
BranchBuilder bb = tr.branch("refs/heads/master");
ObjectId commitObjectInLockedPack = bb.commit().create().toObjectId();
gc.gc();
stats = gc.getStatistics();
assertEquals(COMMIT_AND_TREE_OBJECTS, stats.numberOfPackedObjects);
assertEquals(1, stats.numberOfPackFiles);
assertTrue(getSinglePack().getPackFile().create(PackExt.KEEP)
.createNewFile());
bb.commit().create();
gc.gc();
stats = gc.getStatistics();
assertEquals(COMMIT_AND_TREE_OBJECTS + 1, stats.numberOfPackedObjects);
assertEquals(2, stats.numberOfPackFiles);
PackIndex lockedPackIdx = null;
PackIndex newPackIdx = null;
for (Pack pack : repo.getObjectDatabase().getPacks()) {
if (pack.getObjectCount() == COMMIT_AND_TREE_OBJECTS) {
lockedPackIdx = pack.getIndex();
} else {
newPackIdx = pack.getIndex();
}
}
assertNotNull(lockedPackIdx);
assertTrue(lockedPackIdx.hasObject(commitObjectInLockedPack));
assertNotNull(newPackIdx);
assertFalse(newPackIdx.hasObject(commitObjectInLockedPack));
}
private Pack getSinglePack() {
Iterator<Pack> packIt = repo.getObjectDatabase().getPacks().iterator();
Pack singlePack = packIt.next();
assertFalse(packIt.hasNext());
return singlePack;
}
}

57
org.eclipse.jgit/.settings/.api_filters
View File

@ -1,57 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.jgit" version="2">
<resource path="src/org/eclipse/jgit/dircache/Checkout.java" type="org.eclipse.jgit.dircache.Checkout">
<filter id="1109393411">
<message_arguments>
<message_argument value="6.6.1"/>
<message_argument value="org.eclipse.jgit.dircache.Checkout"/>
</message_arguments>
</filter>
</resource>
<resource path="src/org/eclipse/jgit/errors/PackMismatchException.java" type="org.eclipse.jgit.errors.PackMismatchException">
<filter id="1142947843">
<message_arguments>
<message_argument value="5.9.1"/>
<message_argument value="isPermanent()"/>
</message_arguments>
</filter>
<filter id="1142947843">
<message_arguments>
<message_argument value="5.9.1"/>
<message_argument value="setPermanent(boolean)"/>
</message_arguments>
</filter>
</resource>
<resource path="src/org/eclipse/jgit/lib/ConfigConstants.java" type="org.eclipse.jgit.lib.ConfigConstants">
<filter id="1142947843">
<message_arguments>
<message_argument value="5.13.2"/>
<message_argument value="CONFIG_KEY_SKIPHASH"/>
</message_arguments>
</filter>
</resource>
<resource path="src/org/eclipse/jgit/lib/FileModeCache.java" type="org.eclipse.jgit.lib.FileModeCache">
<filter id="1109393411">
<message_arguments>
<message_argument value="6.6.1"/>
<message_argument value="org.eclipse.jgit.lib.FileModeCache"/>
</message_arguments>
</filter>
</resource>
<resource path="src/org/eclipse/jgit/revwalk/RevCommit.java" type="org.eclipse.jgit.revwalk.RevCommit">
<filter id="1193279491">
<message_arguments>
<message_argument value="6.5.1"/>
<message_argument value="buffer"/>
</message_arguments>
</filter>
</resource>
<resource path="src/org/eclipse/jgit/storage/pack/PackConfig.java" type="org.eclipse.jgit.storage.pack.PackConfig">
<filter id="336658481">
<message_arguments>
<message_argument value="org.eclipse.jgit.storage.pack.PackConfig"/>
<message_argument value="DEFAULT_WRITE_REVERSE_INDEX"/>
</message_arguments>
</filter>
</resource>
</component>

19
org.eclipse.jgit/src/org/eclipse/jgit/api/GarbageCollectCommand.java
View File

@ -63,6 +63,8 @@ public class GarbageCollectCommand extends GitCommand<Properties> {
private PackConfig pconfig;
private Boolean packKeptObjects;
/**
* Constructor for GarbageCollectCommand.
*
@ -131,6 +133,19 @@ public GarbageCollectCommand setAggressive(boolean aggressive) {
return this;
}
/**
* Whether to include objects in `.keep` packs when repacking.
*
* @param packKeptObjects
* whether to include objects in `.keep` files when repacking.
* @return this instance
* @since 5.13.3
*/
public GarbageCollectCommand setPackKeptObjects(boolean packKeptObjects) {
this.packKeptObjects = Boolean.valueOf(packKeptObjects);
return this;
}
/**
* Whether to preserve old pack files instead of deleting them.
*
@ -175,7 +190,9 @@ public Properties call() throws GitAPIException {
gc.setProgressMonitor(monitor);
if (this.expire != null)
gc.setExpire(expire);
if (this.packKeptObjects != null) {
gc.setPackKeptObjects(packKeptObjects.booleanValue());
}
try {
gc.gc().get();
return toProperties(gc.getStatistics());

20
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java
View File

@ -162,6 +162,8 @@ public static void setExecutor(ExecutorService e) {
private Date packExpire;
private Boolean packKeptObjects;
private PackConfig pconfig;
/**
@ -843,8 +845,9 @@ public Collection<Pack> repack() throws IOException {
List<ObjectIdSet> excluded = new LinkedList<>();
for (Pack p : repo.getObjectDatabase().getPacks()) {
checkCancelled();
if (p.shouldBeKept())
if (!shouldPackKeptObjects() && p.shouldBeKept()) {
excluded.add(p.getIndex());
}
}
// Don't exclude tags that are also branch tips
@ -1418,6 +1421,21 @@ private void checkCancelled() throws CancelledException {
}
}
/**
* Define whether to include objects in `.keep` files when repacking.
*
* @param packKeptObjects Whether to include objects in `.keep` files when repacking.
*/
public void setPackKeptObjects(boolean packKeptObjects) {
this.packKeptObjects = Boolean.valueOf(packKeptObjects);
}
@SuppressWarnings("boxing")
private boolean shouldPackKeptObjects() {
return Optional.ofNullable(packKeptObjects)
.orElse(pconfig.isPackKeptObjects());
}
/**
* A class holding statistical data for a FileRepository regarding how many
* objects are stored as loose or packed objects

13
org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java
View File

@ -103,6 +103,12 @@ public final class ConfigConstants {
/** The "gc" section */
public static final String CONFIG_GC_SECTION = "gc";
/**
* The "repack" section
* @since 5.13.3
*/
public static final String CONFIG_REPACK_SECTION = "repack";
/** The "pack" section */
public static final String CONFIG_PACK_SECTION = "pack";
@ -842,6 +848,13 @@ public final class ConfigConstants {
*/
public static final String CONFIG_KEY_MIN_BYTES_OBJ_SIZE_INDEX = "minBytesForObjSizeIndex";
/**
* The "repack.packKeptObjects" key
*
* @since 5.13.3
*/
public static final String CONFIG_KEY_PACK_KEPT_OBJECTS = "packkeptobjects";
/**
* The "feature" section
*

51
org.eclipse.jgit/src/org/eclipse/jgit/storage/pack/PackConfig.java
View File

@ -29,6 +29,7 @@
import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_INDEXVERSION;
import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_MIN_BYTES_OBJ_SIZE_INDEX;
import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_MIN_SIZE_PREVENT_RACYPACK;
import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_PACK_KEPT_OBJECTS;
import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_PRESERVE_OLD_PACKS;
import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_PRUNE_PRESERVED;
import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_REUSE_DELTAS;
@ -41,6 +42,7 @@
import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_WINDOW_MEMORY;
import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_WRITE_REVERSE_INDEX;
import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_PACK_SECTION;
import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_REPACK_SECTION;
import java.time.Duration;
import java.util.concurrent.Executor;
@ -178,6 +180,16 @@ public class PackConfig {
*/
public static final boolean DEFAULT_BUILD_BITMAPS = true;
/**
* Default value for including objects in packs locked by .keep file when
* repacking: {@value}
*
* @see #setPackKeptObjects(boolean)
* @since 5.13.3
*/
public static final boolean DEFAULT_PACK_KEPT_OBJECTS = false;
/**
* Default count of most recent commits to select for bitmaps. Only applies
* when bitmaps are enabled: {@value}
@ -305,6 +317,8 @@ public class PackConfig {
private boolean buildBitmaps = DEFAULT_BUILD_BITMAPS;
private boolean packKeptObjects = DEFAULT_PACK_KEPT_OBJECTS;
private int bitmapContiguousCommitCount = DEFAULT_BITMAP_CONTIGUOUS_COMMIT_COUNT;
private int bitmapRecentCommitCount = DEFAULT_BITMAP_RECENT_COMMIT_COUNT;
@ -386,6 +400,7 @@ public PackConfig(PackConfig cfg) {
this.indexVersion = cfg.indexVersion;
this.writeReverseIndex = cfg.writeReverseIndex;
this.buildBitmaps = cfg.buildBitmaps;
this.packKeptObjects = cfg.packKeptObjects;
this.bitmapContiguousCommitCount = cfg.bitmapContiguousCommitCount;
this.bitmapRecentCommitCount = cfg.bitmapRecentCommitCount;
this.bitmapRecentCommitSpan = cfg.bitmapRecentCommitSpan;
@ -1039,6 +1054,34 @@ public void setBuildBitmaps(boolean buildBitmaps) {
this.buildBitmaps = buildBitmaps;
}
/**
* Set whether to include objects in `.keep` files when repacking.
*
* <p>
* Default setting: {@value #DEFAULT_PACK_KEPT_OBJECTS}
*
* @param packKeptObjects
* boolean indicating whether to include objects in `.keep` files
* when repacking.
* @since 5.13.3
*/
public void setPackKeptObjects(boolean packKeptObjects) {
this.packKeptObjects = packKeptObjects;
}
/**
* True if objects in `.keep` files should be included when repacking.
*
* Default setting: {@value #DEFAULT_PACK_KEPT_OBJECTS}
*
* @return True if objects in `.keep` files should be included when
* repacking.
* @since 5.13.3
*/
public boolean isPackKeptObjects() {
return packKeptObjects;
}
/**
* Get the count of most recent commits for which to build bitmaps.
*
@ -1325,8 +1368,12 @@ public void fromConfig(Config rc) {
getSinglePack()));
setWriteReverseIndex(rc.getBoolean(CONFIG_PACK_SECTION,
CONFIG_KEY_WRITE_REVERSE_INDEX, isWriteReverseIndex()));
setBuildBitmaps(rc.getBoolean(CONFIG_PACK_SECTION,
CONFIG_KEY_BUILD_BITMAPS, isBuildBitmaps()));
boolean buildBitmapsFromConfig = rc.getBoolean(CONFIG_PACK_SECTION,
CONFIG_KEY_BUILD_BITMAPS, isBuildBitmaps());
setBuildBitmaps(buildBitmapsFromConfig);
setPackKeptObjects(rc.getBoolean(CONFIG_REPACK_SECTION,
CONFIG_KEY_PACK_KEPT_OBJECTS,
buildBitmapsFromConfig || isPackKeptObjects()));
setBitmapContiguousCommitCount(rc.getInt(CONFIG_PACK_SECTION,
CONFIG_KEY_BITMAP_CONTIGUOUS_COMMIT_COUNT,
getBitmapContiguousCommitCount()));