瀏覽代碼

Fixes #1545: adds missing branch compare actions

main
Eric Amodio 3 年之前
父節點
當前提交
d1bacafe31
共有 2 個檔案被更改,包括 7 行新增6 行删除
  1. +1
    -0
      CHANGELOG.md
  2. +6
    -6
      src/views/nodes/compareBranchNode.ts

+ 1
- 0
CHANGELOG.md 查看文件

@ -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

+ 6
- 6
src/views/nodes/compareBranchNode.ts 查看文件

@ -139,7 +139,6 @@ export class CompareBranchNode extends ViewNode
getTreeItem(): TreeItem {
let state: TreeItemCollapsibleState;
let label;
let description;
let tooltip;
if (this._compareWith == null) {
label = `Compare ${
@ -159,12 +158,12 @@ export class CompareBranchNode extends ViewNode
}
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
@ -173,6 +172,7 @@ export class CompareBranchNode extends ViewNode
arguments: [this],
};
}
item.iconPath = new ThemeIcon('git-compare');
item.tooltip = tooltip;

Loading…
取消
儲存