Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-22 17:48:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Implemented rebase onto

Browse Source
This commit is contained in:
tomerstav
2020-10-19 04:13:52 +00:00
parent 74ef0a92fe
commit 741925db11
5 changed files with 81 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -300,6 +300,7 @@ export const enum Operation {
RenameBranch = 'RenameBranch',
DeleteRef = 'DeleteRef',
Merge = 'Merge',
Rebase = 'Rebase',
Ignore = 'Ignore',
Tag = 'Tag',
DeleteTag = 'DeleteTag',
@@ -1067,6 +1068,10 @@ export class Repository implements Disposable {
await this.run(Operation.Merge, () => this.repository.merge(ref));
}
async rebase(branch: string): Promise<void> {
await this.run(Operation.Rebase, () => this.repository.rebase(branch));
}
async tag(name: string, message?: string): Promise<void> {
await this.run(Operation.Tag, () => this.repository.tag(name, message));
}
@@ -1143,6 +1148,14 @@ export class Repository implements Disposable {
return this.pullFrom(true, remote, branch);
}
@throttle
async rebaseOnto(head: Branch | undefined, branch: Branch | undefined): Promise<void> {
if (head?.name && branch?.name) {
await this.checkout(branch.name);
await this.rebase(head.name);
}
}
@throttle
async pull(head?: Branch, unshallow?: boolean): Promise<void> {
let remote: string | undefined;