Merge branch 'upstream/pr-910-MatriQ' into develop

Author: AngelAlexQC

package.json

@@ -533,14 +533,19 @@
 						"Commit": {
 							"type": "boolean",
 							"title": "Visibility of the Commit column"
+						},
+						"Signature": {
+							"type": "boolean",
+							"title": "Visibility of the Signature column"
 						}
 					},
 					"default": {
 						"Date": true,
 						"Author": true,
-						"Commit": true
+						"Commit": true,
+						"Signature": true
 					},
-					"description": "An object specifying the default visibility of the Date, Author & Commit columns. Example: {\"Date\": true, \"Author\": true, \"Commit\": true}"
+					"description": "An object specifying the default visibility of the Date, Author, Commit & Signature columns. Example: {\"Date\": true, \"Author\": true, \"Commit\": true, \"Signature\": true}"
 				},
 				"git-graph.dialog.addTag.pushToRemote": {
 					"type": "boolean",

src/config.ts

@@ -162,9 +162,9 @@ class Config {
 	get defaultColumnVisibility(): DefaultColumnVisibility {
 		let obj: any = this.config.get('defaultColumnVisibility', {});
 		if (typeof obj === 'object' && obj !== null && typeof obj['Date'] === 'boolean' && typeof obj['Author'] === 'boolean' && typeof obj['Commit'] === 'boolean') {
-			return { author: obj['Author'], commit: obj['Commit'], date: obj['Date'] };
+			return { author: obj['Author'], commit: obj['Commit'], date: obj['Date'], signature: obj['Signature'] !== undefined ? obj['Signature'] : true };
 		} else {
-			return { author: true, commit: true, date: true };
+			return { author: true, commit: true, date: true, signature: true };
 		}
 	}
 

src/dataSource.ts

@@ -113,7 +113,8 @@ export class DataSource extends Disposable {
 		this.gitFormatLog = [
 			'%H', '%P', // Hash & Parent Information
 			useMailmap ? '%aN' : '%an', useMailmap ? '%aE' : '%ae', dateType, // Author / Commit Information
-			'%s' // Subject
+			'%s', // Subject
+			...(config.showSignatureStatus && this.gitExecutableSupportsGpgInfo ? ['%G?', '%GS', '%GK'] : ['', '', '']) // GPG Key Information
 		].join(GIT_LOG_SEPARATOR);
 
 		this.gitFormatStash = [
@@ -200,7 +201,18 @@ export class DataSource extends Disposable {
 
 			for (i = 0; i < commits.length; i++) {
 				commitLookup[commits[i].hash] = i;
-				commitNodes.push({ ...commits[i], heads: [], tags: [], remotes: [], stash: null });
+				commitNodes.push({
+					...commits[i],
+					heads: [],
+					tags: [],
+					remotes: [],
+					stash: null,
+					signature: commits[i].signature ? {
+						status: commits[i].signature.status,
+						signer: commits[i].signature.signer,
+						keyId: commits[i].signature.keyId
+					} : null
+				});
 			}
 
 			/* Insert Stashes */
@@ -1533,8 +1545,24 @@ export class DataSource extends Disposable {
 			let commits: GitCommitRecord[] = [];
 			for (let i = 0; i < lines.length - 1; i++) {
 				let line = lines[i].split(GIT_LOG_SEPARATOR);
-				if (line.length !== 6) break;
-				commits.push({ hash: line[0], parents: line[1] !== '' ? line[1].split(' ') : [], author: line[2], email: line[3], date: parseInt(line[4]), message: line[5] });
+				const hasSignatureFields = line.length === 9;
+				if (line.length !== 6 && !hasSignatureFields) break;
+				const commit: GitCommitRecord = {
+					hash: line[0],
+					parents: line[1] !== '' ? line[1].split(' ') : [],
+					author: line[2],
+					email: line[3],
+					date: parseInt(line[4]),
+					message: line[5]
+				};
+				if (hasSignatureFields && line[6] !== '') {
+					commit.signature = {
+						status: line[6],
+						signer: line[7],
+						keyId: line[8]
+					};
+				}
+				commits.push(commit);
 			}
 			return commits;
 		});
@@ -1961,6 +1989,11 @@ interface GitCommitRecord {
 	email: string;
 	date: number;
 	message: string;
+	signature?: {
+		status: string;
+		signer: string;
+		keyId: string;
+	};
 }
 
 interface GitCommitData {

src/types.ts

@@ -11,6 +11,7 @@ export interface GitCommit {
 	readonly tags: ReadonlyArray<GitCommitTag>;
 	readonly remotes: ReadonlyArray<GitCommitRemote>;
 	readonly stash: GitCommitStash | null; // null => not a stash, otherwise => stash info
+	readonly signature: GitCommitSignature | null; // null => no signature, otherwise => signature info
 }
 
 export interface GitCommitTag {
@@ -53,6 +54,12 @@ export const enum GitSignatureStatus {
 	Bad = 'B'
 }
 
+export interface GitCommitSignature {
+	readonly status: string; // G, B, U, X, Y, R, E, or empty
+	readonly signer: string; // Signer name
+	readonly keyId: string; // Key ID
+}
+
 export interface GitSignature {
 	readonly key: string;
 	readonly signer: string;
@@ -451,6 +458,7 @@ export interface DefaultColumnVisibility {
 	readonly date: boolean;
 	readonly author: boolean;
 	readonly commit: boolean;
+	readonly signature: boolean;
 }
 
 export interface DialogDefaults {

web/main.ts

@@ -821,7 +821,8 @@ class GitGraphView {
 		let html = '<tr id="tableColHeaders"><th id="tableHeaderGraphCol" class="tableColHeader" data-col="0">Graph</th><th class="tableColHeader" data-col="1">Description</th>' +
 			(colVisibility.date ? '<th class="tableColHeader dateCol" data-col="2">Date</th>' : '') +
 			(colVisibility.author ? '<th class="tableColHeader authorCol" data-col="3">Author</th>' : '') +
-			(colVisibility.commit ? '<th class="tableColHeader" data-col="4">Commit</th>' : '') +
+			(colVisibility.signature ? '<th class="tableColHeader signatureCol" data-col="4">Signature</th>' : '') +
+			(colVisibility.commit ? '<th class="tableColHeader" data-col="' + (4 + (colVisibility.signature ? 1 : 0)) + '">Commit</th>' : '') +
 			'</tr>';
 
 		for (let i = 0; i < this.commits.length; i++) {
@@ -869,6 +870,7 @@ class GitGraphView {
 				(this.config.referenceLabels.branchLabelsAlignedToGraph ? '<td>' + (refBranches !== '' ? '<span style="margin-left:' + (widthsAtVertices[i] - 4) + 'px"' + refBranches.substring(5) : '') + '</td><td><span class="description">' + commitDot : '<td></td><td><span class="description">' + commitDot + refBranches) + (this.config.referenceLabels.tagLabelsOnRight ? message + refTags : refTags + message) + '</span></td>' +
 				(colVisibility.date ? '<td class="dateCol text" title="' + date.title + '">' + date.formatted + '</td>' : '') +
 				(colVisibility.author ? '<td class="authorCol text" title="' + escapeHtml(commit.author + ' <' + commit.email + '>') + '">' + (this.config.fetchAvatars ? '<span class="avatar" data-email="' + escapeHtml(commit.email) + '">' + (typeof this.avatars[commit.email] === 'string' ? '<img class="avatarImg" src="' + this.avatars[commit.email] + '">' : '') + '</span>' : '') + escapeHtml(commit.author) + '</td>' : '') +
+				(colVisibility.signature ? '<td class="signatureCol text">' + generateSignatureIconHtml(commit.signature) + '</td>' : '') +
 				(colVisibility.commit ? '<td class="text" title="' + escapeHtml(commit.hash) + '">' + abbrevCommit(commit.hash) + '</td>' : '') +
 				'</tr>';
 		}
@@ -927,6 +929,7 @@ class GitGraphView {
 		document.getElementById('uncommittedChanges')!.innerHTML = '<td></td><td><b>' + escapeHtml(this.commits[0].message) + '</b></td>' +
 			(colVisibility.date ? '<td class="dateCol text" title="' + date.title + '">' + date.formatted + '</td>' : '') +
 			(colVisibility.author ? '<td class="authorCol text" title="* <>">*</td>' : '') +
+			(colVisibility.signature ? '<td class="signatureCol text">' + generateSignatureIconHtml(null) + '</td>' : '') +
 			(colVisibility.commit ? '<td class="text" title="*">*</td>' : '');
 	}
 
@@ -3959,6 +3962,62 @@ function generateSignatureHtml(signature: GG.GitSignature) {
 		+ '</span>';
 }
 
+function generateSignatureIconHtml(signature: GG.GitCommitSignature | null) {
+	if (!signature || !signature.status) {
+		return '<span class="signature-icon signature-none">-</span>';
+	}
+	const status = signature.status;
+	let icon = '';
+	let cssClass = '';
+	let title = '';
+	switch (status) {
+		case 'G':
+			icon = '✓';
+			cssClass = 'signature-valid';
+			title = 'Good signature';
+			break;
+		case 'B':
+			icon = '✗';
+			cssClass = 'signature-invalid';
+			title = 'Bad signature';
+			break;
+		case 'U':
+			icon = '⚠';
+			cssClass = 'signature-warning';
+			title = 'Good signature, unknown validity';
+			break;
+		case 'X':
+			icon = '⚠';
+			cssClass = 'signature-warning';
+			title = 'Good signature, expired';
+			break;
+		case 'Y':
+			icon = '⚠';
+			cssClass = 'signature-warning';
+			title = 'Good signature, made by expired key';
+			break;
+		case 'R':
+			icon = '✗';
+			cssClass = 'signature-invalid';
+			title = 'Good signature, revoked';
+			break;
+		case 'E':
+			icon = '❓';
+			cssClass = 'signature-error';
+			title = 'Cannot check signature';
+			break;
+		default:
+			icon = '-';
+			cssClass = 'signature-none';
+			title = '';
+			break;
+	}
+	const tooltip = title && signature.signer
+		? title + '. Signed by ' + escapeHtml(signature.signer) + ' (Key: ' + escapeHtml(signature.keyId) + ')'
+		: title;
+	return '<span class="signature-icon ' + cssClass + '"' + (tooltip ? ' title="' + tooltip + '"' : '') + '>' + icon + '</span>';
+}
+
 function closeDialogAndContextMenu() {
 	if (dialog.isOpen()) dialog.close();
 	if (contextMenu.isOpen()) contextMenu.close();

web/styles/main.css

@@ -258,6 +258,10 @@ code{
 #commitTable.autoLayout td.authorCol, #commitTable.autoLayout th.authorCol{
 	max-width:124px;
 }
+#commitTable.autoLayout td.signatureCol, #commitTable.autoLayout th.signatureCol{
+	max-width:45px;
+	text-align:center;
+}
 @media screen and (min-width: 775px) and (max-width: 850px) {
 	#commitTable.autoLayout td.dateCol, #commitTable.autoLayout th.dateCol, #commitTable.autoLayout td.authorCol, #commitTable.autoLayout th.authorCol{
 		max-width:100px;
@@ -456,6 +460,29 @@ code{
 	opacity:0.8;
 }
 
+/* Signature icon styles for main table */
+.signature-icon{
+	font-size:14px;
+	cursor:help;
+	display:inline-block;
+	vertical-align:middle;
+}
+.signature-valid{
+	color:#4ec9b0;
+}
+.signature-invalid{
+	color:#f48771;
+}
+.signature-warning{
+	color:#dcdcaa;
+}
+.signature-error{
+	color:#9cdcfe;
+}
+.signature-none{
+	color:#808080;
+}
+
 #cdvFiles{
 	left:50%;
 	right:0;