From e04fbe6cc9c6f31e80e9e1ef2dbf6a047d9dd5e6 Mon Sep 17 00:00:00 2001 From: Nadya Zabrodina Date: Thu, 20 Jun 2013 18:29:01 +0400 Subject: [PATCH] IDEA-109185 Hg | Branches: if there is only one repository in the project show all icons inline, and don't show repository group --- .../src/org/zmlx/hg4idea/action/HgBranchPopup.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgBranchPopup.java b/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgBranchPopup.java index 3eb7da84d8c6..9cbb1f0687a4 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgBranchPopup.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgBranchPopup.java @@ -94,18 +94,20 @@ public class HgBranchPopup { private ActionGroup createActions() { DefaultActionGroup popupGroup = new DefaultActionGroup(null, false); - fillPopupWithCurrentRepositoryActions(popupGroup, createRepositoriesActions()); - popupGroup.addSeparator(); return popupGroup; } + @Nullable private DefaultActionGroup createRepositoriesActions() { + List repositories = HgUtil.getHgRepositories(myProject); + if (repositories.size() == 1) { + return null; // if project has only one repository all branches, bookmarks and actions should be inline and no repository group needed + } DefaultActionGroup popupGroup = new DefaultActionGroup(null, false); popupGroup.addSeparator("Repositories"); - List repositories = HgUtil.getHgRepositories(myProject); boolean isMultiRepoConfig = repositories.size() > 1; for (VirtualFile repository : repositories) { HgRepository repo = HgRepositoryImpl.getFullInstance(repository, myProject, myProject);