diff --git a/CHANGELOG.md b/CHANGELOG.md index d9fa876..817f26b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p - Ensures new worktrees are created from the "main" repo, if already in a worktree - Adds a new _remote_ command to the _Git Command Palette_ to add, prune, and remove remotes - Adds a _Create Worktree for Pull Request via GitLens..._ context menu command on pull requests in the _GitHub Pull Requests and Issues_ extension's views +- Adds settings to control the format of commits in the GitLens views ### Changed diff --git a/package.json b/package.json index 3a2d14a..196de63 100644 --- a/package.json +++ b/package.json @@ -775,40 +775,54 @@ "scope": "window", "order": 31 }, + "gitlens.views.formats.commits.tooltip": { + "type": "string", + "default": "${link}${' via 'pullRequest}${'  •  'changesDetail}${'    'tips}\n\n${avatar}  __${author}__, ${ago}   _(${date})_ \n\n${message}${\n\n---\n\nfootnotes}", + "markdownDescription": "Specifies the tooltip format (in markdown) of commits in the views. See [_Commit Tokens_](https://github.com/eamodio/vscode-gitlens/wiki/Custom-Formatting#commit-tokens) in the GitLens docs", + "scope": "window", + "order": 32 + }, + "gitlens.views.formats.commits.tooltipWithStatus": { + "type": "string", + "default": "${link}${' via 'pullRequest}  •  {{slot-status}}${'  •  'changesDetail}${'    'tips}\n\n${avatar}  __${author}__, ${ago}   _(${date})_ \n\n${message}${\n\n---\n\nfootnotes}", + "markdownDescription": "Specifies the tooltip format (in markdown) of \"file\" commits in the views. See [_Commit Tokens_](https://github.com/eamodio/vscode-gitlens/wiki/Custom-Formatting#commit-tokens) in the GitLens docs", + "scope": "window", + "order": 32 + }, "gitlens.views.formats.files.label": { "type": "string", "default": "${working }${file}", "markdownDescription": "Specifies the format of a file in the views. See [_File Tokens_](https://github.com/gitkraken/vscode-gitlens/wiki/Custom-Formatting#file-tokens) in the GitLens docs", "scope": "window", - "order": 32 + "order": 40 }, "gitlens.views.formats.files.description": { "type": "string", "default": "${directory}${ ← originalPath}", "markdownDescription": "Specifies the description format of a file in the views. See [_File Tokens_](https://github.com/gitkraken/vscode-gitlens/wiki/Custom-Formatting#file-tokens) in the GitLens docs", "scope": "window", - "order": 33 + "order": 41 }, "gitlens.views.formats.stashes.label": { "type": "string", "default": "${message}", "markdownDescription": "Specifies the format of stashes in the views. See [_Commit Tokens_](https://github.com/gitkraken/vscode-gitlens/wiki/Custom-Formatting#commit-tokens) in the GitLens docs", "scope": "window", - "order": 34 + "order": 50 }, "gitlens.views.formats.stashes.description": { "type": "string", "default": "${stashOnRef, }${agoOrDate}", "markdownDescription": "Specifies the description format of stashes in the views. See [_Commit Tokens_](https://github.com/gitkraken/vscode-gitlens/wiki/Custom-Formatting#commit-tokens) in the GitLens docs", "scope": "window", - "order": 35 + "order": 51 }, "gitlens.views.experimental.multiSelect.enabled": { "type": "boolean", "default": false, "markdownDescription": "Specifies whether to enable experimental multi-select support in the views.\n**NOTE**: Requires a restart to take effect.", "scope": "window", - "order": 35 + "order": 60 }, "gitlens.views.commitFileFormat": { "deprecationMessage": "Deprecated. Use `gitlens.views.formats.files.label` instead", diff --git a/src/config.ts b/src/config.ts index 6383183..d5f1d14 100644 --- a/src/config.ts +++ b/src/config.ts @@ -580,6 +580,8 @@ export interface ViewsCommonConfig { commits: { label: string; description: string; + tooltip: string; + tooltipWithStatus: string; }; files: { label: string; diff --git a/src/views/nodes/commitNode.ts b/src/views/nodes/commitNode.ts index d1315b0..40cd653 100644 --- a/src/views/nodes/commitNode.ts +++ b/src/views/nodes/commitNode.ts @@ -269,21 +269,17 @@ export class CommitNode extends ViewRefNode