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] display tracking branches in format <remote>&<branch name>

Browse Source
This commit is contained in:
Julia Beliaeva
2016-09-07 20:03:48 +03:00
parent 39d1c9e11f
commit e5b6598da6
1 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/log/GitRefManager.java
+20 -1
View File
@@ -163,8 +163,27 @@ public class GitRefManager implements VcsLogRefManager {
VcsRef firstRef = ObjectUtils.assertNotNull(ContainerUtil.getFirstItem(firstGroup.getValue()));
VcsRefType firstRefType = firstGroup.getKey();
String name = firstRefType.isBranch() && !firstRefType.equals(HEAD) ? firstRef.getName() : "";
groups.add(new TableRefGroup(firstRefType.isBranch() && !firstRefType.equals(HEAD) ? firstRef.getName() : "", sortedReferences));
if (firstRefType.equals(LOCAL_BRANCH)) {
GitRepository repository = myRepositoryManager.getRepositoryForRoot(firstRef.getRoot());
if (repository == null) {
LOG.warn("No repository for root: " + firstRef.getRoot());
}
else {
GitBranchTrackInfo trackInfo =
ContainerUtil.find(repository.getBranchTrackInfos(), info -> info.getLocalBranch().getName().equals(firstRef.getName()));
if (trackInfo != null) {
VcsRef trackedRef = ContainerUtil
.find(references, ref -> ref.getType().equals(REMOTE_BRANCH) && ref.getName().equals(trackInfo.getRemoteBranch().getName()));
if (trackedRef != null) {
name = trackInfo.getRemote().getName() + "&" + firstRef.getName();
}
}
}
}
groups.add(new TableRefGroup(name, sortedReferences));
return groups;
}