From 60b43c03e218a7c94257105820b790e8dbc0ab6f Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Mon, 5 Mar 2018 10:53:12 +0900 Subject: [PATCH] Add ConfigConstants.CONFIG_SECTION_LFS DirCacheCheckout has a warning about non-localised string "lfs". Other classes use org.eclipse.jgit.lfs.lib.Constants but that is not visible to DirCacheCheckout. Add a new constant in ConfigConstants and use that in DirCacheCheckout. Replace existing uses of org.eclipse.jgit.lfs.lib.Constants.LFS with the new constant, except where it is referring to the folder name. Change-Id: I0f21b951babff9a2e579d68c4de0c62ee4bc23d4 Signed-off-by: David Pursehouse --- .../org/eclipse/jgit/lfs/server/fs/CheckoutTest.java | 12 +++++++----- .../src/org/eclipse/jgit/lfs/BuiltinLFS.java | 7 ++++--- .../src/org/eclipse/jgit/lfs/InstallLfsCommand.java | 7 ++++--- .../jgit/lfs/internal/LfsConnectionFactory.java | 7 ++++--- .../org/eclipse/jgit/dircache/DirCacheCheckout.java | 3 ++- .../src/org/eclipse/jgit/lib/ConfigConstants.java | 6 ++++++ 6 files changed, 27 insertions(+), 15 deletions(-) diff --git a/org.eclipse.jgit.lfs.server.test/tst/org/eclipse/jgit/lfs/server/fs/CheckoutTest.java b/org.eclipse.jgit.lfs.server.test/tst/org/eclipse/jgit/lfs/server/fs/CheckoutTest.java index 67c8bd267..fb6225b1c 100644 --- a/org.eclipse.jgit.lfs.server.test/tst/org/eclipse/jgit/lfs/server/fs/CheckoutTest.java +++ b/org.eclipse.jgit.lfs.server.test/tst/org/eclipse/jgit/lfs/server/fs/CheckoutTest.java @@ -53,7 +53,6 @@ import org.eclipse.jgit.junit.JGitTestUtil; import org.eclipse.jgit.junit.TestRepository; import org.eclipse.jgit.lfs.BuiltinLFS; -import org.eclipse.jgit.lfs.lib.Constants; import org.eclipse.jgit.lfs.lib.LongObjectId; import org.eclipse.jgit.lib.ConfigConstants; import org.eclipse.jgit.lib.Repository; @@ -81,11 +80,13 @@ public void setup() throws Exception { .create(tmp.resolve(".git").toFile()); db.create(); StoredConfig cfg = db.getConfig(); - cfg.setBoolean(ConfigConstants.CONFIG_FILTER_SECTION, Constants.LFS, + cfg.setBoolean(ConfigConstants.CONFIG_FILTER_SECTION, + ConfigConstants.CONFIG_SECTION_LFS, ConfigConstants.CONFIG_KEY_USEJGITBUILTIN, true); - cfg.setBoolean(ConfigConstants.CONFIG_FILTER_SECTION, Constants.LFS, + cfg.setBoolean(ConfigConstants.CONFIG_FILTER_SECTION, + ConfigConstants.CONFIG_SECTION_LFS, ConfigConstants.CONFIG_KEY_REQUIRED, false); - cfg.setString(Constants.LFS, null, "url", + cfg.setString(ConfigConstants.CONFIG_SECTION_LFS, null, "url", server.getURI().toString() + "/lfs"); cfg.save(); @@ -122,7 +123,8 @@ public void testUnknownContent() throws Exception { @Test(expected = JGitInternalException.class) public void testUnknownContentRequired() throws Exception { StoredConfig cfg = tdb.getRepository().getConfig(); - cfg.setBoolean(ConfigConstants.CONFIG_FILTER_SECTION, Constants.LFS, + cfg.setBoolean(ConfigConstants.CONFIG_FILTER_SECTION, + ConfigConstants.CONFIG_SECTION_LFS, ConfigConstants.CONFIG_KEY_REQUIRED, true); cfg.save(); diff --git a/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/BuiltinLFS.java b/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/BuiltinLFS.java index e1b9e34ed..d65e4e999 100644 --- a/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/BuiltinLFS.java +++ b/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/BuiltinLFS.java @@ -49,7 +49,6 @@ import org.eclipse.jgit.annotations.Nullable; import org.eclipse.jgit.attributes.Attribute; import org.eclipse.jgit.hooks.PrePushHook; -import org.eclipse.jgit.lfs.lib.Constants; import org.eclipse.jgit.lib.ConfigConstants; import org.eclipse.jgit.lib.ObjectLoader; import org.eclipse.jgit.lib.Repository; @@ -118,7 +117,8 @@ private boolean isEnabled(Repository db) { return false; } return db.getConfig().getBoolean(ConfigConstants.CONFIG_FILTER_SECTION, - Constants.LFS, ConfigConstants.CONFIG_KEY_USEJGITBUILTIN, + ConfigConstants.CONFIG_SECTION_LFS, + ConfigConstants.CONFIG_KEY_USEJGITBUILTIN, false); } @@ -134,7 +134,8 @@ private boolean isEnabled(Repository db, Attribute attribute) { if (attribute == null) { return false; } - return isEnabled(db) && Constants.LFS.equals(attribute.getValue()); + return isEnabled(db) && ConfigConstants.CONFIG_SECTION_LFS + .equals(attribute.getValue()); } } diff --git a/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/InstallLfsCommand.java b/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/InstallLfsCommand.java index f9e863c0f..b204d0c15 100644 --- a/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/InstallLfsCommand.java +++ b/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/InstallLfsCommand.java @@ -48,7 +48,6 @@ import org.eclipse.jgit.errors.ConfigInvalidException; import org.eclipse.jgit.lfs.internal.LfsText; -import org.eclipse.jgit.lfs.lib.Constants; import org.eclipse.jgit.lib.ConfigConstants; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.lib.StoredConfig; @@ -81,9 +80,11 @@ public Void call() throws Exception { cfg = repository.getConfig(); } - cfg.setBoolean(ConfigConstants.CONFIG_FILTER_SECTION, Constants.LFS, + cfg.setBoolean(ConfigConstants.CONFIG_FILTER_SECTION, + ConfigConstants.CONFIG_SECTION_LFS, ConfigConstants.CONFIG_KEY_USEJGITBUILTIN, true); - cfg.setBoolean(ConfigConstants.CONFIG_FILTER_SECTION, Constants.LFS, + cfg.setBoolean(ConfigConstants.CONFIG_FILTER_SECTION, + ConfigConstants.CONFIG_SECTION_LFS, ConfigConstants.CONFIG_KEY_REQUIRED, true); cfg.save(); diff --git a/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/internal/LfsConnectionFactory.java b/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/internal/LfsConnectionFactory.java index 3196e0730..5d8268b73 100644 --- a/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/internal/LfsConnectionFactory.java +++ b/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/internal/LfsConnectionFactory.java @@ -61,7 +61,6 @@ import org.eclipse.jgit.lfs.LfsPointer; import org.eclipse.jgit.lfs.Protocol; import org.eclipse.jgit.lfs.errors.LfsConfigInvalidException; -import org.eclipse.jgit.lfs.lib.Constants; import org.eclipse.jgit.lib.ConfigConstants; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.lib.StoredConfig; @@ -131,12 +130,14 @@ private static String getLfsUrl(Repository db, String purpose, Map additionalHeaders) throws LfsConfigInvalidException { StoredConfig config = db.getConfig(); - String lfsUrl = config.getString(Constants.LFS, null, + String lfsUrl = config.getString(ConfigConstants.CONFIG_SECTION_LFS, + null, ConfigConstants.CONFIG_KEY_URL); if (lfsUrl == null) { String remoteUrl = null; for (String remote : db.getRemoteNames()) { - lfsUrl = config.getString(Constants.LFS, remote, + lfsUrl = config.getString(ConfigConstants.CONFIG_SECTION_LFS, + remote, ConfigConstants.CONFIG_KEY_URL); // This could be done better (more precise logic), but according // to https://github.com/git-lfs/git-lfs/issues/1759 git-lfs diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java index 5c85afd8d..0b03eb152 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java @@ -1541,7 +1541,8 @@ private static void runBuiltinFilterCommand(Repository repo, CheckoutMetadata checkoutMetadata, ObjectLoader ol, OutputStream channel) throws MissingObjectException, IOException { boolean isMandatory = repo.getConfig().getBoolean( - ConfigConstants.CONFIG_FILTER_SECTION, "lfs", + ConfigConstants.CONFIG_FILTER_SECTION, + ConfigConstants.CONFIG_SECTION_LFS, ConfigConstants.CONFIG_KEY_REQUIRED, false); FilterCommand command = null; try { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java index 9091629e0..5a790350b 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java @@ -426,4 +426,10 @@ public class ConfigConstants { * @since 4.11 */ public static final String CONFIG_KEY_REQUIRED = "required"; + + /** + * The "lfs" section + * @since 4.11 + */ + public static final String CONFIG_SECTION_LFS = "lfs"; }