Adds new advanced date formatting tokens

 - Adds `agoAndDate`, `agoAndDateShort`, and `agoAndDateBothSources`
   -  `agoAndDateBothSources` shows relative and absolute date and the corresponding author/committer relative date (if they differ)
 - Updates default tooltip and status bar formats to utilize these new tokens

Author: eamodio

package.json

@@ -440,7 +440,7 @@
 					},
 					"gitlens.statusBar.tooltipFormat": {
 						"type": "string",
-						"default": "${avatar}  __${author}__  $(history) ${ago} _(${date})_${' via  'pullRequest} ${message}${\n\n---\n\nfootnotes}\n\n${commands}",
+						"default": "${avatar}  __${author}__  $(history) ${agoAndDateBothSources}${' via  'pullRequest} ${message}${\n\n---\n\nfootnotes}\n\n${commands}",
 						"editPresentation": "multilineText",
 						"markdownDescription": "Specifies the format (in markdown) of hover shown over the blame information in the status bar. See [_Commit Tokens_](https://github.com/gitkraken/vscode-gitlens/wiki/Custom-Formatting#commit-tokens) in the GitLens docs",
 						"scope": "window",
@@ -586,7 +586,7 @@
 					},
 					"gitlens.hovers.detailsMarkdownFormat": {
 						"type": "string",
-						"default": "${avatar}  __${author}__  $(history) ${ago} _(${date})_${' via  'pullRequest} ${message}${\n\n---\n\nfootnotes}\n\n${commands}",
+						"default": "${avatar}  __${author}__  $(history) ${agoAndDateBothSources}${' via  'pullRequest} ${message}${\n\n---\n\nfootnotes}\n\n${commands}",
 						"editPresentation": "multilineText",
 						"markdownDescription": "Specifies the format (in markdown) of the _commit details_ hover. See [_Commit Tokens_](https://github.com/gitkraken/vscode-gitlens/wiki/Custom-Formatting#commit-tokens) in the GitLens docs",
 						"scope": "window",
@@ -1746,14 +1746,14 @@
 					},
 					"gitlens.views.formats.commits.tooltip": {
 						"type": "string",
-						"default": "${avatar}  __${author}__  $(history) ${ago} _(${date})_ \\\n${link}${' via  'pullRequest}${'  'changesDetail} ${message}${\n\n---\n\nfootnotes}\n\n${tips}",
+						"default": "${avatar}  __${author}__  $(history) ${agoAndDateBothSources} \\\n${link}${' via  'pullRequest}${'  'changesDetail} ${message}${\n\n---\n\nfootnotes}\n\n${tips}",
 						"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": "${avatar}  __${author}__  $(history) ${ago} _(${date})_ \\\n${link}${' via  'pullRequest}  •  {{slot-status}} ${message}${\n\n---\n\nfootnotes}\n\n${tips}",
+						"default": "${avatar}  __${author}__  $(history) ${agoAndDateBothSources} \\\n${link}${' via  'pullRequest}  •  {{slot-status}} ${message}${\n\n---\n\nfootnotes}\n\n${tips}",
 						"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
@@ -1788,7 +1788,7 @@
 					},
 					"gitlens.views.formats.stashes.tooltip": {
 						"type": "string",
-						"default": "${link}${' on `'stashOnRef`}${'\\\n  'changesDetail} \\\n  $(history) ${ago} _(${date})_ ${message}${\n\n---\n\nfootnotes}",
+						"default": "${link}${' on `'stashOnRef`}${'\\\n  'changesDetail} \\\n  $(history) ${agoAndDate} ${message}${\n\n---\n\nfootnotes}",
 						"markdownDescription": "Specifies the tooltip format (in markdown) of stashes in the views. See [_Commit Tokens_](https://github.com/eamodio/vscode-gitlens/wiki/Custom-Formatting#commit-tokens) in the GitLens docs",
 						"scope": "window",
 						"order": 52

src/container.ts

@@ -17,7 +17,7 @@ import { setDefaultGravatarsStyle } from './avatars';
 import { CacheProvider } from './cache';
 import { GitCodeLensController } from './codelens/codeLensController';
 import type { ToggleFileAnnotationCommandArgs } from './commands/toggleFileAnnotations';
-import type { DateStyle, FileAnnotationType, Mode } from './config';
+import type { DateSource, DateStyle, FileAnnotationType, Mode } from './config';
 import { fromOutputLevel } from './config';
 import { extensionPrefix } from './constants';
 import type { GlCommands } from './constants.commands';
@@ -137,8 +137,8 @@ export class Container {
 
 	readonly CommitDateFormatting = {
 		dateFormat: null as string | null,
-		dateSource: 'authored',
-		dateStyle: 'relative',
+		dateSource: 'authored' as DateSource,
+		dateStyle: 'relative' as DateStyle,
 
 		reset: (): void => {
 			this.CommitDateFormatting.dateFormat = configuration.get('defaultDateFormat');

src/git/formatters/commitFormatter.ts

@@ -17,7 +17,7 @@ import { OpenFileAtRevisionCommand } from '../../commands/openFileAtRevision';
 import { ConnectRemoteProviderCommand } from '../../commands/remoteProviders';
 import type { ShowQuickCommitCommandArgs } from '../../commands/showQuickCommit';
 import { ShowQuickCommitFileCommand } from '../../commands/showQuickCommitFile';
-import type { DateStyle } from '../../config';
+import type { DateSource, DateStyle } from '../../config';
 import { GlyphChars } from '../../constants';
 import { actionCommandPrefix } from '../../constants.commands';
 import { Container } from '../../container';
@@ -51,6 +51,7 @@ import { Formatter } from './formatter';
 export interface CommitFormatOptions extends FormatOptions {
 	aiEnabled?: boolean;
 	avatarSize?: number;
+	dateSource?: DateSource;
 	dateStyle?: DateStyle;
 	editor?: { line: number; uri: Uri };
 	footnotes?: Map<number, string>;
@@ -86,6 +87,9 @@ export interface CommitFormatOptions extends FormatOptions {
 		ago?: TokenOptions;
 		agoOrDate?: TokenOptions;
 		agoOrDateShort?: TokenOptions;
+		agoAndDate?: TokenOptions;
+		agoAndDateShort?: TokenOptions;
+		agoAndDateBothSources?: TokenOptions;
 		author?: TokenOptions;
 		authorFirst?: TokenOptions;
 		authorLast?: TokenOptions;
@@ -211,6 +215,49 @@ export class CommitFormatter extends Formatter<GitCommit, CommitFormatOptions> {
 		);
 	}
 
+	get agoAndDate(): string {
+		return this._padOrTruncate(
+			this._options.outputFormat === 'markdown'
+				? `${this._dateAgo} _(${this._date})_`
+				: `${this._dateAgo} (${this._date})`,
+			this._options.tokenOptions.agoAndDate,
+		);
+	}
+
+	get agoAndDateBothSources(): string {
+		const committerAgo = this.committerAgo;
+		const committerDate = this.committerDate;
+		const authorAgo = this.authorAgo;
+		const authorDate = this.authorDate;
+
+		const source = this._options.dateSource ?? configuration.get('defaultDateSource');
+
+		if (source === 'committed') {
+			return this._padOrTruncate(
+				this._options.outputFormat === 'markdown'
+					? `${committerAgo} _(${committerDate}${committerAgo === authorAgo ? '' : `, authored ${authorAgo}`})_`
+					: `${committerAgo} (${committerDate}${committerAgo === authorAgo ? '' : `, authored ${authorAgo}`})`,
+				this._options.tokenOptions.agoAndDateBothSources,
+			);
+		}
+
+		return this._padOrTruncate(
+			this._options.outputFormat === 'markdown'
+				? `${authorAgo} _(${authorDate}${committerAgo === authorAgo ? '' : `, committed ${committerAgo}`})_`
+				: `${authorAgo} (${authorDate}${committerAgo === authorAgo ? '' : `, committed ${committerAgo}`})`,
+			this._options.tokenOptions.agoAndDateBothSources,
+		);
+	}
+
+	get agoAndDateShort(): string {
+		return this._padOrTruncate(
+			this._options.outputFormat === 'markdown'
+				? `${this._dateAgoShort} _(${this._date})_`
+				: `${this._dateAgoShort} (${this._date})`,
+			this._options.tokenOptions.agoAndDateShort,
+		);
+	}
+
 	get author(): string {
 		return this.formatAuthor(this._item.author.name, this._item.author.email, this._options.tokenOptions.author);
 	}

src/webviews/plus/graph/graphWebview.ts

@@ -1313,12 +1313,7 @@ export class GraphWebviewProvider implements WebviewProvider<State, State, Graph
 			pr = getSettledValue(prResult);
 		}
 
-		let template;
-		if (isStash(commit)) {
-			template = configuration.get('views.formats.stashes.tooltip');
-		} else {
-			template = configuration.get('views.formats.commits.tooltip');
-		}
+		const template = configuration.get(`views.formats.${isStash(commit) ? 'stashes' : 'commits'}.tooltip`);
 
 		this._getBranchesAndTagsTips ??= await svc.getBranchesAndTagsTipsLookup();