SCM - Add Incoming/Outgoing information into the Source Control view

extensions/git/src/historyProvider.ts

@@ -10,6 +10,7 @@ import { IDisposable } from './util';
 import { toGitUri } from './uri';
 import { SyncActionButton } from './actionButton';
 import { RefType, Status } from './api/git';
+import { emojify, ensureEmojis } from './emoji';
 
 export class GitHistoryProvider implements SourceControlHistoryProvider, FileDecorationProvider, IDisposable {
 
@@ -83,6 +84,8 @@ export class GitHistoryProvider implements SourceControlHistoryProvider, FileDec
 			this.getSummaryHistoryItem(optionsRef, historyItemGroupIdRef)
 		]);
 
+		await ensureEmojis();
+
 		const historyItems = commits.length === 0 ? [] : [summary];
 		historyItems.push(...commits.map(commit => {
 			const newLineIndex = commit.message.indexOf('\n');
@@ -91,9 +94,9 @@ export class GitHistoryProvider implements SourceControlHistoryProvider, FileDec
 			return {
 				id: commit.hash,
 				parentIds: commit.parents,
-				label: subject,
+				label: emojify(subject),
 				description: commit.authorName,
-				icon: new ThemeIcon('account'),
+				icon: new ThemeIcon('git-commit'),
 				timestamp: commit.authorDate?.getTime()
 			};
 		}));

src/vs/workbench/contrib/scm/browser/media/scm.css

@@ -144,18 +144,36 @@
 	padding-right: 4px;
 }
 
-.scm-sync-view .monaco-list-row .history-item .monaco-icon-label .icon-container {
+.scm-view .monaco-list-row .history-item .monaco-icon-label .icon-container {
 	display: flex;
 	font-size: 14px;
 	padding-right: 4px;
 }
 
-.scm-sync-view .monaco-list-row .history-item .monaco-icon-label .avatar {
+.scm-view .monaco-list-row .history-item .monaco-icon-label .avatar {
 	width: 14px;
 	height: 14px;
 	border-radius: 14px;
 }
 
+.scm-view .monaco-list-row .separator-container {
+	display: flex;
+	align-items: center;
+	padding-left: 11px;
+}
+
+.scm-view .monaco-list-row .separator-container .label-name {
+	font-size: 10px;
+}
+
+.scm-view .monaco-list-row .separator-container .separator {
+	display: flex;
+	flex-grow: 1;
+	height: 0;
+	margin-left: 6px;
+	border-top: 1px solid var(--vscode-sideBar-border);
+}
+
 .scm-view .monaco-list-row .history > .name,
 .scm-view .monaco-list-row .history-item-group > .name,
 .scm-view .monaco-list-row .resource-group > .name {

src/vs/workbench/contrib/scm/browser/scm.contribution.ts

@@ -32,8 +32,8 @@ import { Context as SuggestContext } from 'vs/editor/contrib/suggest/browser/sug
 import { MANAGE_TRUST_COMMAND_ID, WorkspaceTrustContext } from 'vs/workbench/contrib/workspace/common/workspace';
 import { IQuickDiffService } from 'vs/workbench/contrib/scm/common/quickDiff';
 import { QuickDiffService } from 'vs/workbench/contrib/scm/common/quickDiffService';
-import { SCMSyncViewPane } from 'vs/workbench/contrib/scm/browser/scmSyncViewPane';
 import { getActiveElement } from 'vs/base/browser/dom';
+import { SCMSyncViewPane } from 'vs/workbench/contrib/scm/browser/scmSyncViewPane';
 
 ModesRegistry.registerLanguage({
 	id: 'scminput',
@@ -81,7 +81,7 @@ viewsRegistry.registerViews([{
 	ctorDescriptor: new SyncDescriptor(SCMViewPane),
 	canToggleVisibility: true,
 	canMoveView: true,
-	weight: 60,
+	weight: 80,
 	order: -999,
 	containerIcon: sourceControlViewIcon,
 	openCommandActionDescriptor: {
@@ -302,6 +302,25 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).regis
 			type: 'boolean',
 			description: localize('showSyncView', "Controls whether the Source Control Sync view is shown."),
 			default: false
+		},
+		'scm.experimental.showSyncInformation': {
+			type: 'object',
+			description: localize('showSyncInformation', "Controls whether incoming/outgoing changes are shown in the Source Control view."),
+			additionalProperties: false,
+			properties: {
+				'incoming': {
+					type: 'boolean',
+					description: localize('showSyncInformationIncoming', "Show incoming changes in the Source Control view."),
+				},
+				'outgoing': {
+					type: 'boolean',
+					description: localize('showSyncInformationOutgoing', "Show outgoing changes in the Source Control view."),
+				},
+			},
+			default: {
+				'incoming': false,
+				'outgoing': false
+			}
 		}
 	}
 });

src/vs/workbench/contrib/scm/browser/scmSyncViewPane.ts

@@ -32,7 +32,6 @@ import { ActionButtonRenderer } from 'vs/workbench/contrib/scm/browser/scmViewPa
 import { getActionViewItemProvider, isSCMActionButton, isSCMRepository, isSCMRepositoryArray } from 'vs/workbench/contrib/scm/browser/util';
 import { ISCMActionButton, ISCMRepository, ISCMViewService, ISCMViewVisibleRepositoryChangeEvent, SYNC_VIEW_PANE_ID } from 'vs/workbench/contrib/scm/common/scm';
 import { comparePaths } from 'vs/base/common/comparers';
-import { ISCMHistoryItem, ISCMHistoryItemChange, ISCMHistoryItemGroup } from 'vs/workbench/contrib/scm/common/history';
 import { localize } from 'vs/nls';
 import { Iterable } from 'vs/base/common/iterator';
 import { IListAccessibilityProvider } from 'vs/base/browser/ui/list/listWidget';
@@ -50,6 +49,7 @@ import { ICompressibleTreeRenderer } from 'vs/base/browser/ui/tree/objectTree';
 import { ICompressedTreeNode } from 'vs/base/browser/ui/tree/compressedObjectTreeModel';
 import { IResourceNode, ResourceTree } from 'vs/base/common/resourceTree';
 import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
+import { SCMHistoryItemChangeTreeElement, SCMHistoryItemGroupTreeElement, SCMHistoryItemTreeElement } from 'vs/workbench/contrib/scm/common/history';
 
 type SCMHistoryItemChangeResourceTreeNode = IResourceNode<SCMHistoryItemChangeTreeElement, SCMHistoryItemTreeElement>;
 type TreeElement = ISCMRepository[] | ISCMRepository | ISCMActionButton | SCMHistoryItemGroupTreeElement | SCMHistoryItemTreeElement | SCMHistoryItemChangeTreeElement | SCMHistoryItemChangeResourceTreeNode;
@@ -117,24 +117,6 @@ const ContextKeys = {
 	ViewMode: new RawContextKey<ViewMode>('scmSyncViewMode', ViewMode.List),
 };
 
-interface SCMHistoryItemGroupTreeElement extends ISCMHistoryItemGroup {
-	readonly description?: string;
-	readonly ancestor?: string;
-	readonly count?: number;
-	readonly repository: ISCMRepository;
-	readonly type: 'historyItemGroup';
-}
-
-interface SCMHistoryItemTreeElement extends ISCMHistoryItem {
-	readonly historyItemGroup: SCMHistoryItemGroupTreeElement;
-	readonly type: 'historyItem';
-}
-
-interface SCMHistoryItemChangeTreeElement extends ISCMHistoryItemChange {
-	readonly historyItem: SCMHistoryItemTreeElement;
-	readonly type: 'historyItemChange';
-}
-
 class ListDelegate implements IListVirtualDelegate<any> {
 
 	getHeight(element: any): number {