diff --git a/CHANGELOG.md b/CHANGELOG.md index e37ee84..c52bc86 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,25 +11,24 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p - Adds new _Commit Graph_ features and improvements - Adds a new experimental minimap of commit activity to the _Commit Graph_ - Adds the ability to show upstream status (ahead/behind) on local branches with remotes - - Adds a context menu to the WIP row [#2458](https://github.com/gitkraken/vscode-gitlens/issues/2458) + - Adds a context menu to the WIP row — closes [#2458](https://github.com/gitkraken/vscode-gitlens/issues/2458) - Adds new settings - - Adds a `gitlens.graph.pullRequests.enabled` setting to toggle PR icons [#2450](https://github.com/gitkraken/vscode-gitlens/issues/2450) + - Adds a `gitlens.graph.pullRequests.enabled` setting to toggle PR icons — closes [#2450](https://github.com/gitkraken/vscode-gitlens/issues/2450) - Adds a `gitlens.graph.showUpstreamStatus` setting to toggle upstream indicators on branches - Improves tooltips in the graph: - Author and avatar tooltips now also show the contributor's email address, if available - - Date tooltips now always show the absolute date, even when relative date formatting is enabled + - Date tooltips now always show both the absolute date and relative date -### Changed +### Removed -- Removes "preview" flag from pre-releases -- Removes use of color libraries in the _File Heatmap_ annotations and webview themes +- Removes the use of an external color library for the _File Heatmap_ annotations and webview themes — reduces the bundled extension size ### Fixed - Fixes [#2473](https://github.com/gitkraken/vscode-gitlens/issues/2473) - Commit graph status bar show wrong last fetched date -- Fixes pinning not being respected in Commit Details +- Fixes [#2409](https://github.com/gitkraken/vscode-gitlens/issues/2409) - Commit Graph Show Current Branch Only shows unrelated commits from other branches +- Fixes an issue where pinning not being respected in Commit Details view - Fixes graph issue where search results that are merge commits are not highlighted when the `gitlens.graph.dimMergeCommits` setting is enabled -- Fixes graph issue where the "Current Branch Only" filter shows unrelated commits from other branches [#2409](https://github.com/gitkraken/vscode-gitlens/issues/2409) - Fixes graph issue where rows with tags belonging to a hovered branch are not highlighted when the `gitlens.graph.highlightRowsOnRefHover` setting is enabled ## [13.2.0] - 2022-12-20 diff --git a/src/webviews/apps/plus/graph/GraphWrapper.tsx b/src/webviews/apps/plus/graph/GraphWrapper.tsx index 3de9f60..e61e457 100644 --- a/src/webviews/apps/plus/graph/GraphWrapper.tsx +++ b/src/webviews/apps/plus/graph/GraphWrapper.tsx @@ -1322,17 +1322,17 @@ export function GraphWrapper({ } function formatCommitDateTime( - commitDateTime: number, + date: number, style: DateStyle = DateStyle.Absolute, format: DateTimeFormat | string = 'short+short', source?: GraphCommitDateTimeSource, ): string { switch (source) { case GraphCommitDateTimeSources.Tooltip: - return formatDate(commitDateTime, format); + return `${formatDate(date, format)} (${fromNow(date)})`; case GraphCommitDateTimeSources.RowEntry: default: - return style === DateStyle.Relative ? fromNow(commitDateTime) : formatDate(commitDateTime, format); + return style === DateStyle.Relative ? fromNow(date) : formatDate(date, format); } }