diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgHistoryProvider.java b/plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgHistoryProvider.java index fe3aaa62c69c..bd21e74bfaf8 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgHistoryProvider.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgHistoryProvider.java @@ -115,7 +115,7 @@ public class HgHistoryProvider implements VcsHistoryProvider { //workaround: --follow options doesn't work with largefiles extension; //see http://selenic.com/pipermail/mercurial-devel/2013-May/051209.html logCommand - .setFollowCopies(!filePath.isDirectory() && HgUtil.getRepositoryNamedConfig(project, vcsRoot, "extensions", "largefiles") == null); + .setFollowCopies(!filePath.isDirectory() && HgUtil.getConfig(project, vcsRoot, "extensions", "largefiles") == null); logCommand.setIncludeRemoved(true); try { return logCommand.execute(new HgFile(vcsRoot, filePath), limit, false); diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgUtil.java b/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgUtil.java index 1626048e7783..6392b58c77ef 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgUtil.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgUtil.java @@ -569,10 +569,10 @@ public abstract class HgUtil { } @Nullable - public static String getRepositoryNamedConfig(@NotNull Project project, - @NotNull VirtualFile root, - @NotNull String section, - @Nullable String configName) { + public static String getConfig(@NotNull Project project, + @NotNull VirtualFile root, + @NotNull String section, + @Nullable String configName) { HgRepository hgRepository = getRepositoryManager(project).getRepositoryForRoot(root); return hgRepository != null ? hgRepository.getRepositoryConfig().getNamedConfig(section, configName) : null; } diff --git a/plugins/hg4idea/testSrc/hg4idea/test/config/HgConfigTest.java b/plugins/hg4idea/testSrc/hg4idea/test/config/HgConfigTest.java index d5a59f108938..94beeea4846b 100644 --- a/plugins/hg4idea/testSrc/hg4idea/test/config/HgConfigTest.java +++ b/plugins/hg4idea/testSrc/hg4idea/test/config/HgConfigTest.java @@ -55,6 +55,6 @@ public class HgConfigTest extends HgPlatformTest { FileUtil.appendToFile(hgrc, "\n[extensions]\n" + "largefiles ="); updateRepoConfig(myProject, myChildRepo); - assertNotNull(HgUtil.getRepositoryNamedConfig(myProject, myChildRepo, "extensions", "largefiles")); + assertNotNull(HgUtil.getConfig(myProject, myChildRepo, "extensions", "largefiles")); } }