Skip to content

Commit

Permalink
Fixes #1545: adds missing branch compare actions
Browse files Browse the repository at this point in the history
  • Loading branch information
eamodio committed Jun 22, 2021
1 parent 0d39487 commit d1bacaf
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Expand Up @@ -8,6 +8,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p

### Fixed

- Fixes [#1545](https://github.com/eamodio/vscode-gitlens/issues/1545) - Missing branch comparison controls in versions 11.5.0 and 11.5.1
- Fixes [#1548](https://github.com/eamodio/vscode-gitlens/issues/1548) - "Don't show again" on debug log warning doesn't work
- Fixes [#1449](https://github.com/eamodio/vscode-gitlens/issues/1449) - Configured remotes not showing up in quickpick menu when opening commit on remote
- Fixes issues where auto-linking of GitHub 3rd party issue links didn't always work
Expand Down
12 changes: 6 additions & 6 deletions src/views/nodes/compareBranchNode.ts
Expand Up @@ -139,7 +139,6 @@ export class CompareBranchNode extends ViewNode<BranchesView | CommitsView | Rep
getTreeItem(): TreeItem {
let state: TreeItemCollapsibleState;
let label;
let description;
let tooltip;
if (this._compareWith == null) {
label = `Compare ${
Expand All @@ -159,12 +158,12 @@ export class CompareBranchNode extends ViewNode<BranchesView | CommitsView | Rep
}

const item = new TreeItem(label, state);
item.id = this.id;
item.contextValue = `${ContextValues.CompareBranch}${this.branch.current ? '+current' : ''}+${
this.comparisonType
}${this._compareWith == null ? '' : '+comparing'}${this.root ? '+root' : ''}`;

if (this._compareWith == null) {
item.id = this.id;
item.contextValue = `${ContextValues.CompareBranch}${this.branch.current ? '+current' : ''}+${
this.comparisonType
}${this._compareWith == null ? '' : '+comparing'}${this.root ? '+root' : ''}`;
item.description = description;
item.command = {
title: `Compare ${this.branch.name}${this.compareWithWorkingTree ? ' (working)' : ''} with${
GlyphChars.Ellipsis
Expand All @@ -173,6 +172,7 @@ export class CompareBranchNode extends ViewNode<BranchesView | CommitsView | Rep
arguments: [this],
};
}

item.iconPath = new ThemeIcon('git-compare');
item.tooltip = tooltip;

Expand Down

0 comments on commit d1bacaf

Please sign in to comment.