diff --git a/CHANGELOG.md b/CHANGELOG.md index 49f121c..5465efd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p ## [Unreleased] +### Added + +- Adds new actions options to the status bar blame + - Adds a `gitlens.showCommitsInView` option to show the commit in the _Search Commits_ view + - Adds a `gitlens.revealCommitInView` option to to reveal the commit in the _Repositories_ view + ### Fixed - Fixes issues with issue linking in hovers diff --git a/package.json b/package.json index 482f842..3ff4e46 100644 --- a/package.json +++ b/package.json @@ -1327,6 +1327,8 @@ "gitlens.diffWithPrevious", "gitlens.diffWithWorking", "gitlens.toggleCodeLens", + "gitlens.revealCommitInView", + "gitlens.showCommitsInView", "gitlens.showQuickCommitDetails", "gitlens.showQuickCommitFileDetails", "gitlens.showQuickFileHistory", @@ -1337,6 +1339,8 @@ "Compares the current line commit with the previous", "Compares the current line commit with the working tree", "Toggles Git code lens", + "Reveals the commit in the Repositories view", + "Shows the commit in the Search Commits view", "Shows a commit details quick pick", "Shows a commit file details quick pick", "Shows a file history quick pick", diff --git a/src/config.ts b/src/config.ts index 752a1fd..d97d287 100644 --- a/src/config.ts +++ b/src/config.ts @@ -189,6 +189,8 @@ export enum KeyMap { export enum StatusBarCommand { DiffWithPrevious = 'gitlens.diffWithPrevious', DiffWithWorking = 'gitlens.diffWithWorking', + RevealCommitInView = 'gitlens.revealCommitInView', + ShowCommitsInView = 'gitlens.showCommitsInView', ShowQuickCommitDetails = 'gitlens.showQuickCommitDetails', ShowQuickCommitFileDetails = 'gitlens.showQuickCommitFileDetails', ShowQuickCurrentBranchHistory = 'gitlens.showQuickRepoHistory', diff --git a/src/statusbar/statusBarController.ts b/src/statusbar/statusBarController.ts index 723882f..5a14a6f 100644 --- a/src/statusbar/statusBarController.ts +++ b/src/statusbar/statusBarController.ts @@ -133,19 +133,25 @@ export class StatusBarController implements Disposable { switch (cfg.command) { case StatusBarCommand.ToggleFileBlame: - this._blameStatusBarItem.tooltip = 'Toggle Blame Annotations'; + this._blameStatusBarItem.tooltip = 'Toggle File Blame Annotations'; break; case StatusBarCommand.DiffWithPrevious: this._blameStatusBarItem.command = Commands.DiffLineWithPrevious; - this._blameStatusBarItem.tooltip = 'Compare Line Revision with Previous'; + this._blameStatusBarItem.tooltip = 'Open Line Changes with Previous Revision'; break; case StatusBarCommand.DiffWithWorking: this._blameStatusBarItem.command = Commands.DiffLineWithWorking; - this._blameStatusBarItem.tooltip = 'Compare Line Revision with Working'; + this._blameStatusBarItem.tooltip = 'Open Line Changes with Working File'; break; case StatusBarCommand.ToggleCodeLens: this._blameStatusBarItem.tooltip = 'Toggle Git CodeLens'; break; + case StatusBarCommand.RevealCommitInView: + this._blameStatusBarItem.tooltip = 'Reveal Commit in Repositories View'; + break; + case StatusBarCommand.ShowCommitsInView: + this._blameStatusBarItem.tooltip = 'Show Commit in Repositories View'; + break; case StatusBarCommand.ShowQuickCommitDetails: this._blameStatusBarItem.tooltip = 'Show Commit Details'; break; diff --git a/src/webviews/apps/settings/index.html b/src/webviews/apps/settings/index.html index 9f75735..667d918 100644 --- a/src/webviews/apps/settings/index.html +++ b/src/webviews/apps/settings/index.html @@ -347,7 +347,7 @@ >toggles the file blame annotations opens changes with the previous revision toggles the file blame annotations opens changes with the previous revision toggles the file blame annotations opens line changes with the previous revision opens line changes with the working file + +