MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

git: reorder branch actions in Branch Popup, show incoming indicator instead of icon

Browse Source 
GitOrigin-RevId: fd69453d9de442166c17be8897c4a435fa851c33
This commit is contained in:
Nadya Zabrodina
2019-12-06 15:36:07 +00:00
committed by intellij-monorepo-bot
parent e9e133c80d
commit cb1d126c07
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/ui/branch/GitBranchPopupActions.java
+15 -4
View File
@@ -277,7 +277,6 @@ public class GitBranchPopupActions {
new CheckoutAction(myProject, myRepositories, myBranchName),
new CheckoutAsNewBranch(myProject, myRepositories, myBranchName),
new CheckoutWithRebaseAction(myProject, myRepositories, myBranchName),
new UpdateSelectedBranchAction(myProject, myRepositories, myBranchName),
new Separator(),
new CompareAction(myProject, myRepositories, myBranchName),
new ShowDiffWithBranchAction(myProject, myRepositories, myBranchName),
@@ -285,6 +284,7 @@ public class GitBranchPopupActions {
new RebaseAction(myProject, myRepositories, myBranchName),
new MergeAction(myProject, myRepositories, myBranchName, true),
new Separator(),
new UpdateSelectedBranchAction(myProject, myRepositories, myBranchName, hasIncomingCommits()),
new PushBranchAction(myProject, myRepositories, myBranchName, hasOutgoingCommits()),
new Separator(),
new RenameBranchAction(myProject, myRepositories, myBranchName),
@@ -771,18 +771,23 @@ public class GitBranchPopupActions {
}
}
private static class UpdateSelectedBranchAction extends DumbAwareAction {
private static class UpdateSelectedBranchAction extends DumbAwareAction implements CustomIconProvider {
private final Project myProject;
private final List<? extends GitRepository> myRepositories;
private final String myBranchName;
private final List<String> myBranchNameList;
private final boolean myHasIncoming;
UpdateSelectedBranchAction(@NotNull Project project, @NotNull List<? extends GitRepository> repositories, @NotNull String branchName) {
super("Update", null, AllIcons.Actions.CheckOut);
UpdateSelectedBranchAction(@NotNull Project project,
@NotNull List<? extends GitRepository> repositories,
@NotNull String branchName,
boolean hasIncoming) {
super("Update");
myProject = project;
myRepositories = repositories;
myBranchName = branchName;
myBranchNameList = Collections.singletonList(branchName);
myHasIncoming = hasIncoming;
}
@Override
@@ -804,6 +809,12 @@ public class GitBranchPopupActions {
public void actionPerformed(@NotNull AnActionEvent e) {
updateBranches(myProject, myRepositories, myBranchNameList);
}
@Nullable
@Override
public Icon getRightIcon() {
return myHasIncoming ? DvcsImplIcons.Incoming : null;
}
}
static class TagActions extends BranchActionGroup {