ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 18:46:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

modify git edits to make webpack not be stupid (#10442)

Browse Source
This commit is contained in:
Anthony Dresser
2020-05-15 15:00:22 -07:00
committed by GitHub
parent b83279c24c
commit e0bdfc8b21
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
extensions/git/src/main.ts
View File

@@ -6,7 +6,7 @@
import * as nls from 'vscode-nls'; import * as nls from 'vscode-nls';
const localize = nls.loadMessageBundle(); const localize = nls.loadMessageBundle();
import { ExtensionContext, workspace, window, Disposable, commands, OutputChannel } from 'vscode'; // {{SQL CARBON EDIT}} - remove unused imports import { ExtensionContext, workspace, window, Disposable, commands, OutputChannel, Uri } from 'vscode';
import { findGit, Git, IGit } from './git'; import { findGit, Git, IGit } from './git';
import { Model } from './model'; import { Model } from './model';
import { CommandCenter } from './commands'; import { CommandCenter } from './commands';
@@ -78,7 +78,7 @@ async function createModel(context: ExtensionContext, outputChannel: OutputChann
new GitTimelineProvider(model) new GitTimelineProvider(model)
); );
await checkGitVersion(info); // await checkGitVersion(info); {{SQL CARBON EDIT}} Don't check git version
return model; return model;
} }
@@ -180,13 +180,8 @@ export async function activate(context: ExtensionContext): Promise<GitExtension>
return result; return result;
} }
async function checkGitVersion(_info: IGit): Promise<void> { // {{SQL CARBON EDIT}} - Rename info to _info to prevent error due to unused variable // @ts-expect-error
return; /* {{SQL CARBON EDIT}} return immediately async function checkGitVersion(info: IGit): Promise<void> {
/*const config = workspace.getConfiguration('git');
const shouldIgnore = config.get<boolean>('ignoreLegacyWarning') === true;
const config = workspace.getConfiguration('git'); const config = workspace.getConfiguration('git');
const shouldIgnore = config.get<boolean>('ignoreLegacyWarning') === true; const shouldIgnore = config.get<boolean>('ignoreLegacyWarning') === true;
@@ -211,5 +206,5 @@ async function checkGitVersion(_info: IGit): Promise<void> { // {{SQL CARBON EDI
commands.executeCommand('vscode.open', Uri.parse('https://git-scm.com/')); commands.executeCommand('vscode.open', Uri.parse('https://git-scm.com/'));
} else if (choice === neverShowAgain) { } else if (choice === neverShowAgain) {
await config.update('ignoreLegacyWarning', true, true); await config.update('ignoreLegacyWarning', true, true);
}*/ }
} }