git.confirmSync

fixes #8541

src/vs/workbench/parts/git/browser/gitActions.ts

@@ -9,7 +9,6 @@ import nls = require('vs/nls');
 import { IEventEmitter } from 'vs/base/common/eventEmitter';
 import { ITree } from 'vs/base/parts/tree/browser/tree';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import strings = require('vs/base/common/strings');
 import { isString } from 'vs/base/common/types';
 import { Action } from 'vs/base/common/actions';
 import { IDiffEditor, ICodeEditor } from 'vs/editor/browser/editorBrowser';
@@ -25,9 +24,8 @@ import { IEventService } from 'vs/platform/event/common/event';
 import { IFileService, IFileStat } from 'vs/platform/files/common/files';
 import { IMessageService, IConfirmation } from 'vs/platform/message/common/message';
 import Severity from 'vs/base/common/severity';
-import { IGitService, IFileStatus, Status, StatusType, ServiceState,
-	IModel, IBranch, GitErrorCodes, ServiceOperations }
-	from 'vs/workbench/parts/git/common/git';
+import {IConfigurationService} from 'vs/platform/configuration/common/configuration';
+import { IGitService, IFileStatus, Status, StatusType, ServiceState, IModel, IBranch, GitErrorCodes, IGitConfiguration } from 'vs/workbench/parts/git/common/git';
 import { IQuickOpenService } from 'vs/workbench/services/quickopen/common/quickOpenService';
 import paths = require('vs/base/common/paths');
 import URI from 'vs/base/common/uri';
@@ -1059,10 +1057,16 @@ export class PublishAction extends GitAction {
 	}
 }
 
-export abstract class BaseSyncAction extends GitAction {
+export class SyncAction extends GitAction {
 
-	constructor(id: string, label: string, className: string, gitService: IGitService) {
-		super(id, label, className, gitService);
+	static ID = 'workbench.action.git.sync';
+	static LABEL = 'Sync';
+
+	constructor(id: string, label: string,
+		@IGitService gitService: IGitService,
+		@IConfigurationService private configurationService: IConfigurationService
+	) {
+		super(id, label, 'git-action sync', gitService);
 	}
 
 	protected isEnabled():boolean {
@@ -1089,6 +1093,12 @@ export abstract class BaseSyncAction extends GitAction {
 			return TPromise.as(null);
 		}
 
+		const config = this.configurationService.getConfiguration<IGitConfiguration>('git');
+
+		if (config.confirmSync && !window.confirm(nls.localize('sureSync', "Are you sure you want to synchronize your git repository?"))) {
+			return TPromise.as(null);
+		}
+
 		return this.gitService.sync().then(null, (err) => {
 			if (err.gitErrorCode === GitErrorCodes.AuthenticationFailed) {
 				return Promise.wrapError(errors.create(nls.localize('authFailed', "Authentication failed on the git remote.")));
@@ -1099,79 +1109,6 @@ export abstract class BaseSyncAction extends GitAction {
 	}
 }
 
-export class SyncAction extends BaseSyncAction {
-
-	static ID = 'workbench.action.git.sync';
-	static LABEL = 'Sync';
-
-	constructor(id: string, label: string, @IGitService gitService: IGitService) {
-		super(id, label, 'git-action sync', gitService);
-	}
-}
-
-export class LiveSyncAction extends BaseSyncAction {
-
-	static ID = 'workbench.action.git.liveSync';
-	static CLASS_NAME = 'git-action live-sync';
-	static CLASS_NAME_LOADING = 'git-action live-sync loading';
-
-	constructor(@IGitService gitService: IGitService) {
-		super(LiveSyncAction.ID, 'sync', LiveSyncAction.CLASS_NAME, gitService);
-	}
-
-	protected onGitServiceChange(): void {
-		super.onGitServiceChange();
-
-		if (this.gitService.getRunningOperations().some(op =>
-			op.id === ServiceOperations.SYNC ||
-			op.id === ServiceOperations.PULL ||
-			op.id === ServiceOperations.PUSH))
-		{
-			this.label = '';
-			this.class = LiveSyncAction.CLASS_NAME_LOADING;
-			this.tooltip = nls.localize('synchronizing', "Synchronizing...");
-
-		} else {
-			this.class = LiveSyncAction.CLASS_NAME;
-
-			var model = this.gitService.getModel();
-			var HEAD = model.getHEAD();
-
-			if (!HEAD) {
-				this.label = '';
-				this.tooltip = '';
-
-			} else if (!HEAD.name) {
-				this.label = '';
-				this.tooltip = nls.localize('currentlyDetached', "Can't sync in detached mode.");
-
-			} else if (!HEAD.upstream) {
-				this.label = '';
-				this.tooltip = nls.localize('noUpstream', "Current branch '{0} doesn't have an upstream branch configured.", HEAD.name);
-
-			} else if (!HEAD.ahead && !HEAD.behind) {
-				this.label = '';
-				this.tooltip = nls.localize('currentBranch', "Current branch '{0}' is up to date.", HEAD.name);
-
-			} else {
-				this.label = strings.format('{0}↓ {1}↑', HEAD.behind, HEAD.ahead);
-
-				if (model.getStatus().getGroups().some(g => g.all().length > 0)) {
-					this.tooltip = nls.localize('dirtyChanges', "Please commit, undo or stash your changes before synchronizing.");
-				} else if (HEAD.behind === 1 && HEAD.ahead === 1) {
-					this.tooltip = nls.localize('currentBranchSingle', "Current branch '{0}' is {1} commit behind and {2} commit ahead of '{3}'.", HEAD.name, HEAD.behind, HEAD.ahead, HEAD.upstream);
-				} else if (HEAD.behind === 1) {
-					this.tooltip = nls.localize('currentBranchSinglePlural', "Current branch '{0}' is {1} commit behind and {2} commits ahead of '{3}'.", HEAD.name, HEAD.behind, HEAD.ahead, HEAD.upstream);
-				} else if (HEAD.ahead === 1) {
-					this.tooltip = nls.localize('currentBranchPluralSingle', "Current branch '{0}' is {1} commits behind and {2} commit ahead of '{3}'.", HEAD.name, HEAD.behind, HEAD.ahead, HEAD.upstream);
-				} else {
-					this.tooltip = nls.localize('currentBranchPlural', "Current branch '{0}' is {1} commits behind and {2} commits ahead of '{3}'.", HEAD.name, HEAD.behind, HEAD.ahead, HEAD.upstream);
-				}
-			}
-		}
-	}
-}
-
 export class UndoLastCommitAction extends GitAction {
 
 	static ID = 'workbench.action.git.undoLastCommit';

src/vs/workbench/parts/git/browser/gitWorkbenchContributions.ts

@@ -542,6 +542,11 @@ export function registerContributions(): void {
 				type: 'boolean',
 				description: nls.localize('gitLargeRepos', "Always allow large repositories to be managed by Code."),
 				default: false
+			},
+			'git.confirmSync': {
+				type: 'boolean',
+				description: nls.localize('confirmSync', "Confirm before synchronizing git repositories."),
+				default: false
 			}
 		}
 	});

src/vs/workbench/parts/git/common/git.ts

@@ -234,6 +234,7 @@ export interface IGitConfiguration {
 	autofetch: boolean;
 	enableLongCommitWarning: boolean;
 	allowLargeRepositories: boolean;
+	confirmSync: boolean;
 }
 
 // Service interfaces