-
Notifications
You must be signed in to change notification settings - Fork 55
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into stable-7.1
* master: PackDirectory: Filter out tmp GC pack files Add pack-refs command to the CLI Test advertised capabilities with protocol V0 and allow*Sha1InWant Align request policies with CGit GitTimeParser: Fix multiple errorprone and style comments PersonIdent: Preserve the timezone when copying with new time PersonIdent: Revert @SInCE of #getZoneId tests/BasicTest: Use java.time constructors for PersonIdent RawParseUtils test: Use java.time to create PersonIdents Change default similarity score to 50(%) to match git's default Pack.java: Recover more often in Pack.copyAsIs2() Change-Id: I1386addb355ffba09dcbf1a6e8634d605c0d3b5c
- Loading branch information
Showing
24 changed files
with
640 additions
and
260 deletions.
There are no files selected for viewing
81 changes: 81 additions & 0 deletions
81
org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/PackRefsTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| /* | ||
| * Copyright (c) 2024 Qualcomm Innovation Center, Inc. | ||
| * and other copyright owners as documented in the project's IP log. | ||
| * | ||
| * This program and the accompanying materials are made available under the | ||
| * terms of the Eclipse Distribution License v. 1.0 which is available at | ||
| * https://www.eclipse.org/org/documents/edl-v10.php. | ||
| * | ||
| * SPDX-License-Identifier: BSD-3-Clause | ||
| */ | ||
|
|
||
| package org.eclipse.jgit.pgm; | ||
|
|
||
| import static org.junit.Assert.assertEquals; | ||
| import static org.junit.Assert.assertNotNull; | ||
| import static org.junit.Assert.assertTrue; | ||
|
|
||
| import java.io.File; | ||
|
|
||
| import org.eclipse.jgit.api.Git; | ||
| import org.eclipse.jgit.internal.storage.file.FileRepository; | ||
| import org.eclipse.jgit.lib.CLIRepositoryTestCase; | ||
| import org.eclipse.jgit.lib.ConfigConstants; | ||
| import org.eclipse.jgit.lib.Constants; | ||
| import org.eclipse.jgit.lib.Ref; | ||
| import org.junit.Before; | ||
| import org.junit.Test; | ||
|
|
||
| public class PackRefsTest extends CLIRepositoryTestCase { | ||
| private Git git; | ||
|
|
||
| @Override | ||
| @Before | ||
| public void setUp() throws Exception { | ||
| super.setUp(); | ||
| git = new Git(db); | ||
| git.commit().setMessage("initial commit").call(); | ||
| } | ||
|
|
||
| @Test | ||
| public void tagPacked() throws Exception { | ||
| git.tag().setName("test").call(); | ||
| git.packRefs().call(); | ||
| assertEquals(Ref.Storage.PACKED, | ||
| git.getRepository().exactRef("refs/tags/test").getStorage()); | ||
| } | ||
|
|
||
| @Test | ||
| public void nonTagRefNotPackedWithoutAll() throws Exception { | ||
| git.branchCreate().setName("test").call(); | ||
| git.packRefs().call(); | ||
| assertEquals(Ref.Storage.LOOSE, | ||
| git.getRepository().exactRef("refs/heads/test").getStorage()); | ||
| } | ||
|
|
||
| @Test | ||
| public void nonTagRefPackedWithAll() throws Exception { | ||
| git.branchCreate().setName("test").call(); | ||
| git.packRefs().setAll(true).call(); | ||
| assertEquals(Ref.Storage.PACKED, | ||
| git.getRepository().exactRef("refs/heads/test").getStorage()); | ||
| } | ||
|
|
||
| @Test | ||
| public void refTableCompacted() throws Exception { | ||
| ((FileRepository) git.getRepository()).convertRefStorage( | ||
| ConfigConstants.CONFIG_REF_STORAGE_REFTABLE, false, false); | ||
|
|
||
| git.commit().setMessage("test commit").call(); | ||
| File tableDir = new File(db.getDirectory(), Constants.REFTABLE); | ||
| File[] reftables = tableDir.listFiles(); | ||
| assertNotNull(reftables); | ||
| assertTrue(reftables.length > 2); | ||
|
|
||
| git.packRefs().call(); | ||
|
|
||
| reftables = tableDir.listFiles(); | ||
| assertNotNull(reftables); | ||
| assertEquals(2, reftables.length); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
34 changes: 34 additions & 0 deletions
34
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/PackRefs.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| /* | ||
| * Copyright (c) 2024 Qualcomm Innovation Center, Inc. | ||
| * and other copyright owners as documented in the project's IP log. | ||
| * | ||
| * This program and the accompanying materials are made available under the | ||
| * terms of the Eclipse Distribution License v. 1.0 which is available at | ||
| * https://www.eclipse.org/org/documents/edl-v10.php. | ||
| * | ||
| * SPDX-License-Identifier: BSD-3-Clause | ||
| */ | ||
|
|
||
| package org.eclipse.jgit.pgm; | ||
|
|
||
| import org.eclipse.jgit.api.Git; | ||
| import org.eclipse.jgit.api.errors.GitAPIException; | ||
| import org.eclipse.jgit.lib.TextProgressMonitor; | ||
| import org.kohsuke.args4j.Option; | ||
|
|
||
| @Command(common = true, usage = "usage_PackRefs") | ||
| class PackRefs extends TextBuiltin { | ||
| @Option(name = "--all", usage = "usage_All") | ||
| private boolean all; | ||
|
|
||
| @Override | ||
| protected void run() { | ||
| Git git = Git.wrap(db); | ||
| try { | ||
| git.packRefs().setProgressMonitor(new TextProgressMonitor(errw)) | ||
| .setAll(all).call(); | ||
| } catch (GitAPIException e) { | ||
| throw die(e.getMessage(), e); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.