Skip to content

Git push dialog: Sort active git branch to top and select it automatically #9385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
OndroMih wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Git push dialog: Sort active git branch to top and select it automatically #9385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions ide/git/src/org/netbeans/modules/git/ui/push/PushBranchesStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ protected void perform () {
info.refresh();
localBranches.putAll(info.getBranches());
localTags.putAll(info.getTags());
String headId = info.getActiveBranch().getId();

final List<PushMapping> l = new ArrayList<PushMapping>(branches.size());
GitClient client;
Expand Down Expand Up @@ -160,7 +161,7 @@ protected void perform () {
}
}
}
boolean preselected = !conflicted && updateNeeded;
boolean preselected = !conflicted && (updateNeeded || branch.isActive());
Copy link
Copy Markdown
Contributor

@matthiasblaesing matthiasblaesing May 14, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the branch.isActive() check should only be considered if remoteBranch is null. If remoteBranch is non-null, the logic already does the right thing, only new branches need to be considered.

Currently this can happen:

Image

The checked state for the active branch makes no sense, as there is nothing to push.


//add current branch in the list for update or for adding
l.add(new PushMapping.PushBranchMapping(remoteBranch == null ? null : remoteBranch.getName(),
Expand All @@ -185,7 +186,7 @@ protected void perform () {
String repoTagId = tags.get(tag.getTagName());
if (!tag.getTagId().equals(repoTagId)) {
//in the remote there is no such tag, need to add it.
l.add(new PushMapping.PushTagMapping(tag, repoTagId == null ? null : tag.getTagName()));
l.add(new PushMapping.PushTagMapping(tag, repoTagId == null ? null : tag.getTagName(), tag.getTaggedObjectId().equals(headId)));
}
}

Expand All @@ -195,7 +196,7 @@ protected void perform () {
GitTag localTag = localTags.get(tag);
if (localTag == null) {
//in the local repo no such tag. Probably we need to delete in the remote?
l.add(new PushMapping.PushTagMapping(tag));
l.add(new PushMapping.PushTagMapping(tag, false));
}
}

Expand Down
46 changes: 34 additions & 12 deletions ide/git/src/org/netbeans/modules/git/ui/push/PushMapping.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,17 @@ public abstract class PushMapping extends ItemSelector.Item {
private static final String COLOR_MODIFIED = GitUtils.getColorString(AnnotationColorProvider.getInstance().MODIFIED_FILE.getActualColor());
private static final String COLOR_REMOVED = GitUtils.getColorString(AnnotationColorProvider.getInstance().REMOVED_FILE.getActualColor());
private static final String COLOR_CONFLICT = GitUtils.getColorString(AnnotationColorProvider.getInstance().CONFLICT_FILE.getActualColor());

protected PushMapping (String localName, String localId, String remoteName, boolean conflict, boolean preselected, boolean updateNeeded) {
private final boolean active;

protected PushMapping (String localName, String localId, String remoteName, boolean conflict, boolean preselected, boolean updateNeeded, boolean active) {
super(preselected, localName == null || conflict);
this.localName = localName;
this.remoteName = remoteName == null ? localName : remoteName;
this.active = active;
String displayName = localName;
if (active && localName != null) {
displayName = localName + " (active)"; //NOI18N
Copy link
Copy Markdown
Contributor

@matthiasblaesing matthiasblaesing May 14, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the NOI18N tag is invalid here. If anyone wants to localize this is a good candidate.

}
if (localName == null) {
// to remove
label = MessageFormat.format(BRANCH_DELETE_MAPPING_LABEL, remoteName, "<font color=\"" + COLOR_REMOVED + "\">R</font>"); //NOI18N
Expand All @@ -61,7 +67,7 @@ protected PushMapping (String localName, String localId, String remoteName, bool
}); //NOI18N
} else if (remoteName == null) {
// added
label = MessageFormat.format(BRANCH_MAPPING_LABEL, localName, localName, "<font color=\"" + COLOR_NEW + "\">A</font>"); //NOI18N
label = MessageFormat.format(BRANCH_MAPPING_LABEL, displayName, localName, "<font color=\"" + COLOR_NEW + "\">A</font>"); //NOI18N
tooltip = NbBundle.getMessage(
PushBranchesStep.class,
"LBL_PushBranchMapping.description", //NOI18N
Expand All @@ -71,7 +77,7 @@ protected PushMapping (String localName, String localId, String remoteName, bool
}); //NOI18N
} else if (conflict) {
// modified
label = MessageFormat.format(BRANCH_MAPPING_LABEL, localName, remoteName, "<font color=\"" + COLOR_CONFLICT + "\">C</font>"); //NOI18N
label = MessageFormat.format(BRANCH_MAPPING_LABEL, displayName, remoteName, "<font color=\"" + COLOR_CONFLICT + "\">C</font>"); //NOI18N
tooltip = NbBundle.getMessage(
PushBranchesStep.class,
"LBL_PushBranchMapping.Mode.conflict.description", //NOI18N
Expand All @@ -80,7 +86,7 @@ protected PushMapping (String localName, String localId, String remoteName, bool
});
} else if (updateNeeded) {
// modified
label = MessageFormat.format(BRANCH_MAPPING_LABEL, localName, remoteName, "<font color=\"" + COLOR_MODIFIED + "\">U</font>"); //NOI18N
label = MessageFormat.format(BRANCH_MAPPING_LABEL, displayName, remoteName, "<font color=\"" + COLOR_MODIFIED + "\">U</font>"); //NOI18N
tooltip = NbBundle.getMessage(
PushBranchesStep.class,
"LBL_PushBranchMapping.description", //NOI18N
Expand All @@ -90,7 +96,7 @@ protected PushMapping (String localName, String localId, String remoteName, bool
});
} else {
// up to date
label = MessageFormat.format(BRANCH_MAPPING_LABEL_UPTODATE, localName, remoteName);
label = MessageFormat.format(BRANCH_MAPPING_LABEL_UPTODATE, displayName, remoteName);
tooltip = NbBundle.getMessage(PushBranchesStep.class,
"LBL_PushBranchMapping.Mode.uptodate.description", //NOI18N
remoteName);
Expand Down Expand Up @@ -118,13 +124,28 @@ public final String getLocalName () {
return localName;
}

public final boolean isActive () {
return active;
}

@Override
public int compareTo (Item t) {
if (t == null) {
return 1;
}
if (t instanceof PushMapping) {
PushMapping other = (PushMapping) t;
if (isActive() != other.isActive()) {
return isActive() ? -1 : 1;
}
if (isActive()) {
if (this instanceof PushBranchMapping && other instanceof PushTagMapping) {
return -1;
}
if (this instanceof PushTagMapping && other instanceof PushBranchMapping) {
return 1;
}
}
if (isDestructive() && other.isDestructive()) {
return remoteName.compareTo(other.remoteName);
} else if (isDestructive() && !other.isDestructive()) {
Expand Down Expand Up @@ -162,7 +183,7 @@ public PushBranchMapping (String remoteBranchName, String remoteBranchId, boolea
* Denotes a branch to be deleted in a remote repository
*/
public PushBranchMapping (String remoteBranchName, String remoteBranchId, boolean preselected, boolean updateNeeded) {
super(null, null, remoteBranchName, false, preselected, updateNeeded);
super(null, null, remoteBranchName, false, preselected, updateNeeded, false);
this.localBranch = null;
this.remoteBranchName = remoteBranchName;
this.remoteBranchId = remoteBranchId;
Expand All @@ -177,7 +198,8 @@ public PushBranchMapping (String remoteBranchName, String remoteBranchId, GitBra
remoteBranchName,
conflict,
preselected,
updateNeeded);
updateNeeded,
localBranch != null && localBranch.isActive());
this.localBranch = localBranch;
this.remoteBranchName = remoteBranchName;
this.remoteBranchId = remoteBranchId;
Expand Down Expand Up @@ -243,8 +265,8 @@ public static final class PushTagMapping extends PushMapping {
*
* @param remoteName remote tag name
*/
public PushTagMapping(String remoteName) {
super(null, null, remoteName, false, false, remoteName != null);
public PushTagMapping(String remoteName, boolean active) {
super(null, null, remoteName, false, false, remoteName != null, active);
this.tag = null;
this.isUpdate = remoteName != null;
this.remoteTagName = remoteName;
Expand All @@ -256,8 +278,8 @@ public PushTagMapping(String remoteName) {
* @param tag representation of a local tag
* @param remoteName remote tag name, can be null. If null than we create tag.
*/
public PushTagMapping (GitTag tag, String remoteName) {
super("tags/" + tag.getTagName(), tag.getTaggedObjectId(), remoteName, false, false, remoteName != null); //NOI18N
public PushTagMapping (GitTag tag, String remoteName, boolean active) {
super("tags/" + tag.getTagName(), tag.getTaggedObjectId(), remoteName, false, false, remoteName != null, active); //NOI18N
this.tag = tag;
this.isUpdate = remoteName != null;
this.remoteTagName = remoteName;
Expand Down
Loading