add unshallow as an option for git pull

joaomoreno · joaomoreno · commit ff157f90a060 · 2019-01-07T11:22:26.000+01:00
diff --git a/extensions/git/src/api/api1.ts b/extensions/git/src/api/api1.ts
@@ -172,8 +172,8 @@ export class ApiRepository implements Repository {
 		return this._repository.fetch(remote, ref, depth);
 	}
 
-	pull(): Promise<void> {
-		return this._repository.pull();
+	pull(unshallow?: boolean): Promise<void> {
+		return this._repository.pull(undefined, unshallow);
 	}
 
 	push(remoteName?: string, branchName?: string, setUpstream: boolean = false): Promise<void> {
diff --git a/extensions/git/src/api/git.d.ts b/extensions/git/src/api/git.d.ts
@@ -154,7 +154,7 @@ export interface Repository {
 	removeRemote(name: string): Promise<void>;
 
 	fetch(remote?: string, ref?: string, depth?: number): Promise<void>;
-	pull(): Promise<void>;
+	pull(unshallow?: boolean): Promise<void>;
 	push(remoteName?: string, branchName?: string, setUpstream?: boolean): Promise<void>;
 }
 
diff --git a/extensions/git/src/git.ts b/extensions/git/src/git.ts
@@ -629,6 +629,10 @@ export interface CommitOptions {
 	empty?: boolean;
 }
 
+export interface PullOptions {
+	unshallow?: boolean;
+}
+
 export enum ForcePushMode {
 	Force,
 	ForceWithLease
@@ -1183,7 +1187,7 @@ export class Repository {
 			args.push('--prune');
 		}
 
-		if (options.depth) {
+		if (typeof options.depth === 'number') {
 			args.push(`--depth=${options.depth}`);
 		}
 
@@ -1200,8 +1204,12 @@ export class Repository {
 		}
 	}
 
-	async pull(rebase?: boolean, remote?: string, branch?: string): Promise<void> {
-		const args = ['pull', '--tags', '--unshallow'];
+	async pull(rebase?: boolean, remote?: string, branch?: string, options: PullOptions = {}): Promise<void> {
+		const args = ['pull', '--tags'];
+
+		if (options.unshallow) {
+			args.push('--unshallow');
+		}
 
 		if (rebase) {
 			args.push('-r');
diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts
@@ -951,7 +951,7 @@ export class Repository implements Disposable {
 	}
 
 	@throttle
-	async pull(head?: Branch): Promise<void> {
+	async pull(head?: Branch, unshallow?: boolean): Promise<void> {
 		let remote: string | undefined;
 		let branch: string | undefined;
 
@@ -960,19 +960,19 @@ export class Repository implements Disposable {
 			branch = `${head.upstream.name}`;
 		}
 
-		return this.pullFrom(false, remote, branch);
+		return this.pullFrom(false, remote, branch, unshallow);
 	}
 
-	async pullFrom(rebase?: boolean, remote?: string, branch?: string): Promise<void> {
+	async pullFrom(rebase?: boolean, remote?: string, branch?: string, unshallow?: boolean): Promise<void> {
 		await this.run(Operation.Pull, async () => {
 			await this.maybeAutoStash(async () => {
 				const config = workspace.getConfiguration('git', Uri.file(this.root));
 				const fetchOnPull = config.get<boolean>('fetchOnPull');
 
 				if (fetchOnPull) {
-					await this.repository.pull(rebase);
+					await this.repository.pull(rebase, undefined, undefined, { unshallow });
 				} else {
-					await this.repository.pull(rebase, remote, branch);
+					await this.repository.pull(rebase, remote, branch, { unshallow });
 				}
 			});
 		});

Original file line number	Diff line number	Diff line change
`@@ -172,8 +172,8 @@ export class ApiRepository implements Repository {`
`172`	`172`	`return this._repository.fetch(remote, ref, depth);`
`173`	`173`	`}`
`174`	`174`
`175`		`- pull(): Promise<void> {`
`176`		`- return this._repository.pull();`
	`175`	`+ pull(unshallow?: boolean): Promise<void> {`
	`176`	`+ return this._repository.pull(undefined, unshallow);`
`177`	`177`	`}`
`178`	`178`
`179`	`179`	`push(remoteName?: string, branchName?: string, setUpstream: boolean = false): Promise<void> {`
Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ export interface Repository {`
`154`	`154`	`removeRemote(name: string): Promise<void>;`
`155`	`155`
`156`	`156`	`fetch(remote?: string, ref?: string, depth?: number): Promise<void>;`
`157`		`- pull(): Promise<void>;`
	`157`	`+ pull(unshallow?: boolean): Promise<void>;`
`158`	`158`	`push(remoteName?: string, branchName?: string, setUpstream?: boolean): Promise<void>;`
`159`	`159`	`}`
`160`	`160`
Original file line number	Diff line number	Diff line change
`@@ -629,6 +629,10 @@ export interface CommitOptions {`
`629`	`629`	`empty?: boolean;`
`630`	`630`	`}`
`631`	`631`
	`632`	`+export interface PullOptions {`
	`633`	`+ unshallow?: boolean;`
	`634`	`+}`
	`635`	`+`
`632`	`636`	`export enum ForcePushMode {`
`633`	`637`	`Force,`
`634`	`638`	`ForceWithLease`
`@@ -1183,7 +1187,7 @@ export class Repository {`
`1183`	`1187`	`args.push('--prune');`
`1184`	`1188`	`}`
`1185`	`1189`
`1186`		`- if (options.depth) {`
	`1190`	`+ if (typeof options.depth === 'number') {`
`1187`	`1191`	args.push(`--depth=${options.depth}`);
`1188`	`1192`	`}`
`1189`	`1193`
`@@ -1200,8 +1204,12 @@ export class Repository {`
`1200`	`1204`	`}`
`1201`	`1205`	`}`
`1202`	`1206`
`1203`		`- async pull(rebase?: boolean, remote?: string, branch?: string): Promise<void> {`
`1204`		`- const args = ['pull', '--tags', '--unshallow'];`
	`1207`	`+ async pull(rebase?: boolean, remote?: string, branch?: string, options: PullOptions = {}): Promise<void> {`
	`1208`	`+ const args = ['pull', '--tags'];`
	`1209`	`+`
	`1210`	`+ if (options.unshallow) {`
	`1211`	`+ args.push('--unshallow');`
	`1212`	`+ }`
`1205`	`1213`
`1206`	`1214`	`if (rebase) {`
`1207`	`1215`	`args.push('-r');`