ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-02 01:25:39 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 7653d836944892f83ce9e1f95c1204bafa1aec31

Browse Source
This commit is contained in:
ADS Merger
2020-05-08 03:58:34 +00:00
parent dac1970c43
commit fa62ec1f34
209 changed files with 5131 additions and 2480 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/git/src/commands.ts
View File

@@ -2494,6 +2494,10 @@ export class CommandCenter {
env.clipboard.writeText(item.message);
}
@command('git.rebaseAbort', { repository: true })
async rebaseAbort(repository: Repository): Promise<void> {
await repository.rebaseAbort();
}
private createCommand(id: string, key: string, method: Function, options: CommandOptions): (...args: any[]) => any {
const result = (...args: any[]) => {

4
extensions/git/src/git.ts
View File

@@ -1333,6 +1333,10 @@ export class Repository {
}
}
async rebaseAbort(): Promise<void> {
await this.run(['rebase', '--abort']);
}
async rebaseContinue(): Promise<void> {
const args = ['rebase', '--continue'];

5
extensions/git/src/repository.ts
View File

@@ -303,6 +303,7 @@ export const enum Operation {
CheckIgnore = 'CheckIgnore',
GetObjectDetails = 'GetObjectDetails',
SubmoduleUpdate = 'SubmoduleUpdate',
RebaseAbort = 'RebaseAbort',
RebaseContinue = 'RebaseContinue',
FindTrackingBranches = 'GetTracking',
Apply = 'Apply',
@@ -1331,6 +1332,10 @@ export class Repository implements Disposable {
});
}
async rebaseAbort(): Promise<void> {
await this.run(Operation.RebaseAbort, async () => await this.repository.rebaseAbort());
}
checkIgnore(filePaths: string[]): Promise<Set<string>> {
return this.run(Operation.CheckIgnore, () => {
return new Promise<Set<string>>((resolve, reject) => {