From 9eb47d0ffb209578c8c0f9af1e2f8371e2da91eb Mon Sep 17 00:00:00 2001 From: Julia Beliaeva Date: Thu, 16 Aug 2018 21:30:38 +0300 Subject: [PATCH] [file-history, hg] return repository current revision for directories Asking for a directory specifically returns null, which breaks actions such as "Compare with Local". Change was made in a37c643781f48b73aa8dbb2ab28390318d9b2ec7 in order to reuse calcCurrentRevisionNumber in VcsCachingHistory instead of calling a diff provider. But that was not actually necessary, since mercurial file history does not use cache at all. IDEA-196914 --- .../hg4idea/src/org/zmlx/hg4idea/provider/HgHistoryProvider.java | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgHistoryProvider.java b/plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgHistoryProvider.java index f6bdfb3fdd97..85c42fcc19d1 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgHistoryProvider.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgHistoryProvider.java @@ -111,6 +111,7 @@ public class HgHistoryProvider implements VcsHistoryProvider { @Override @Nullable protected VcsRevisionNumber calcCurrentRevisionNumber() { + if (filePath.isDirectory()) return new HgWorkingCopyRevisionsCommand(myProject).firstParent(vcsRoot); return new HgWorkingCopyRevisionsCommand(myProject).parents(vcsRoot, filePath).first; }