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

GitCompareWithBranchAction: fix the title of the current revision

Browse Source 
Display current branch name (or short hash), not the full hash.
This commit is contained in:
Kirill Likhodedov
2012-07-26 20:07:14 +04:00
parent 5411fe5a78
commit 27b8a0d7c8
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/actions/GitCompareWithBranchAction.java
+11 -9
View File
@@ -66,13 +66,20 @@ public class GitCompareWithBranchAction extends DumbAwareAction {
final VirtualFile file = getAffectedFile(event);
GitRepositoryManager manager = GitUtil.getRepositoryManager(project);
if (manager == null) {
return;
}
GitRepository repository = manager.getRepositoryForFile(file);
assert repository != null;
final String head = repository.getCurrentRevision();
GitBranch currentBranch = repository.getCurrentBranch();
final String head;
if (currentBranch == null) {
String currentRevision = repository.getCurrentRevision();
LOG.assertTrue(currentRevision != null,
"Current revision is null for " + repository + ". Compare with branch shouldn't be available for fresh repository");
head = GitUtil.getShortHash(currentRevision);
}
else {
head = currentBranch.getName();
}
final List<String> branchNames = getBranchNamesExceptCurrent(repository);
// prepare and invoke popup
@@ -132,11 +139,6 @@ public class GitCompareWithBranchAction extends DumbAwareAction {
}
GitRepositoryManager manager = GitUtil.getRepositoryManager(project);
if (manager == null) {
presentation.setEnabled(false);
presentation.setVisible(true);
return;
}
GitRepository repository = manager.getRepositoryForFile(vFiles[0]);
if (repository == null || repository.isFresh() || noBranchesToCompare(repository)) {