diff --git a/CHANGELOG.md b/CHANGELOG.md index 65fb194..68dd67b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p - Adds `gitlens.hovers.avatars` setting to specify whether to show avatar images in hovers — closes [#432](https://github.com/eamodio/vscode-gitlens/issues/432) thanks to [PR #441](https://github.com/eamodio/vscode-gitlens/pull/441) by Segev Finer ([@segevfiner](https://github.com/segevfiner)) - Adds `gitlens.hovers.avatars` setting to the interactive settings editor to specify whether to show avatar images in hovers - Adds *Choose from Branch or Tag History...* to the quick pick menu shown by the *Show File History...* command (`gitlens.showQuickFileHistory`) — closes [#316](https://github.com/eamodio/vscode-gitlens/issues/316) +- Adds the *Compare File with Revision...* command (`gitlens.diffWithRevision`) as an alternate (`alt+click`) for the *Compare File with Previous Revision* command in the editor toolbar ### Changed - Renames the *GitLens History* explorer to *GitLens File History* explorer for better clarity diff --git a/images/dark/icon-prev-commit-menu.svg b/images/dark/icon-prev-commit-menu.svg new file mode 100644 index 0000000..5f4b670 --- /dev/null +++ b/images/dark/icon-prev-commit-menu.svg @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/images/light/icon-prev-commit-menu.svg b/images/light/icon-prev-commit-menu.svg new file mode 100644 index 0000000..2f941c9 --- /dev/null +++ b/images/light/icon-prev-commit-menu.svg @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/package.json b/package.json index 75c27fd..89aac45 100644 --- a/package.json +++ b/package.json @@ -1439,7 +1439,11 @@ { "command": "gitlens.diffWithRevision", "title": "Compare File with Revision...", - "category": "GitLens" + "category": "GitLens", + "icon": { + "dark": "images/dark/icon-prev-commit-menu.svg", + "light": "images/light/icon-prev-commit-menu.svg" + } }, { "command": "gitlens.diffWithWorking", @@ -2535,11 +2539,13 @@ "editor/title": [ { "command": "gitlens.diffWithPrevious", + "alt": "gitlens.diffWithRevision", "when": "!isInDiffEditor && gitlens:activeFileStatus =~ /tracked/ && config.gitlens.menus.editorGroup.compare", "group": "navigation@97" }, { "command": "gitlens.diffWithPreviousInDiff", + "alt": "gitlens.diffWithRevision", "when": "isInDiffEditor && gitlens:activeFileStatus =~ /tracked/ && config.gitlens.menus.editorGroup.compare", "group": "navigation@97" }, diff --git a/src/commands/diffWithRevision.ts b/src/commands/diffWithRevision.ts index fc65aba..cfc6954 100644 --- a/src/commands/diffWithRevision.ts +++ b/src/commands/diffWithRevision.ts @@ -37,7 +37,9 @@ export class DiffWithRevisionCommand extends ActiveEditorCommand { const placeHolder = `Compare ${gitUri.getFormattedPath( args.branchOrTag ? ` (${args.branchOrTag.name})${Strings.pad(GlyphChars.Dot, 2, 2)}` : undefined - )}${gitUri.sha ? ` ${Strings.pad(GlyphChars.Dot, 1, 1)} ${gitUri.shortSha}` : ''} with${GlyphChars.Ellipsis}`; + )}${gitUri.sha ? ` ${Strings.pad(GlyphChars.Dot, 1, 1)} ${gitUri.shortSha}` : ''} with revision${ + GlyphChars.Ellipsis + }`; const progressCancellation = FileHistoryQuickPick.showProgress(placeHolder); try {