From 4e16c4174b1ed8b3d2a4d33d0a829fb6c5efef40 Mon Sep 17 00:00:00 2001 From: Nadya Zabrodina Date: Fri, 20 Dec 2013 18:35:42 +0400 Subject: [PATCH] Multiply revision node presentation in HgLog for only one revision fixed. *click on status bar widget has created new HgRepository instance, so update and refresh were called then incorrect presentation appeared --- .../src/org/zmlx/hg4idea/status/ui/HgStatusWidget.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/status/ui/HgStatusWidget.java b/plugins/hg4idea/src/org/zmlx/hg4idea/status/ui/HgStatusWidget.java index dad66a06fb4c..a4a8025ca565 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/status/ui/HgStatusWidget.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/status/ui/HgStatusWidget.java @@ -33,7 +33,7 @@ import org.zmlx.hg4idea.HgProjectSettings; import org.zmlx.hg4idea.HgUpdater; import org.zmlx.hg4idea.HgVcs; import org.zmlx.hg4idea.action.HgBranchPopup; -import org.zmlx.hg4idea.repo.HgRepositoryImpl; +import org.zmlx.hg4idea.repo.HgRepository; import org.zmlx.hg4idea.status.HgCurrentBranchStatus; import org.zmlx.hg4idea.util.HgUtil; @@ -101,8 +101,9 @@ public class HgStatusWidget extends EditorBasedWidget return null; } VirtualFile root = HgUtil.getRootForSelectedFile(project); - if (root != null) { - return HgBranchPopup.getInstance(project, HgRepositoryImpl.getInstance(root, project, project)).asListPopup(); + HgRepository repository = HgUtil.getRepositoryManager(project).getRepositoryForRoot(root); + if (repository != null) { + return HgBranchPopup.getInstance(project, repository).asListPopup(); } return null; }