MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-02-04 23:39:07 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-285766 Git branches popup duplicates branch

Browse Source 
GitOrigin-RevId: 750780c92a931a7aa7cad35114a4a5937a70be9d
This commit is contained in:
Gregory.Shrago
2022-01-21 17:51:05 +03:00
committed by intellij-monorepo-bot
parent 695bdb18a1
commit 69fb64e29a
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
platform/dvcs-impl/src/com/intellij/dvcs/branch/DvcsBranchPopup.java
View File

@@ -55,8 +55,7 @@ public abstract class DvcsBranchPopup<Repo extends Repository> {
myMultiRootBranchConfig = multiRootBranchConfig;
myInSpecificRepository = myRepositoryManager.moreThanOneRoot() && myVcsSettings.getSyncSetting() == DvcsSyncSettings.Value.DONT_SYNC;
String title = buildTitle(currentRepository);
myPopup = new BranchActionGroupPopup(title, myProject, preselectActionCondition,
ActionGroupUtil.forceRecursiveUpdateInBackground(createActions()), dimensionKey, dataContext);
myPopup = new BranchActionGroupPopup(title, myProject, preselectActionCondition, createActions(), dimensionKey, dataContext);
initBranchSyncPolicyIfNotInitialized();
warnThatBranchesDivergedIfNeeded();
if (myRepositoryManager.moreThanOneRoot()) {

2
platform/dvcs-impl/src/com/intellij/dvcs/ui/BranchActionGroupPopup.java
View File

@@ -68,7 +68,7 @@ public final class BranchActionGroupPopup extends FlatSpeedSearchPopup {
@NotNull ActionGroup actions,
@Nullable String dimensionKey,
@NotNull DataContext dataContext) {
super(title, createBranchSpeedSearchActionGroup(actions), dataContext, preselectActionCondition, true);
super(title, ActionGroupUtil.forceRecursiveUpdateInBackground(createBranchSpeedSearchActionGroup(actions)), dataContext, preselectActionCondition, true);
getTitle().setBackground(JBColor.PanelBackground);
myProject = project;
DataManager.registerDataProvider(getList(), dataId -> POPUP_MODEL.is(dataId) ? getListModel() : null);