Revert "Merge from vscode 81d7885dc2e9dc617e1522697a2966bc4025a45d (#5949)" (#5983)

This reverts commit d15a3fcc98.

extensions/git/package.json

@@ -3,7 +3,6 @@
   "displayName": "%displayName%",
   "description": "%description%",
   "publisher": "vscode",
-  "license": "MIT",
   "version": "1.0.0",
   "engines": {
     "vscode": "^1.5.0"
@@ -21,8 +20,7 @@
   "scripts": {
     "compile": "gulp compile-extension:git",
     "watch": "gulp watch-extension:git",
-    "update-grammar": "node ./build/update-grammars.js",
-    "test": "mocha"
+    "update-grammar": "node ./build/update-grammars.js"
   },
   "contributes": {
     "commands": [
@@ -1460,14 +1458,13 @@
     "jschardet": "^1.6.0",
     "vscode-extension-telemetry": "0.1.1",
     "vscode-nls": "^4.0.0",
-    "vscode-uri": "^2.0.0",
     "which": "^1.3.0"
   },
   "devDependencies": {
     "@types/byline": "4.2.31",
     "@types/file-type": "^5.2.1",
     "@types/mocha": "2.2.43",
-    "@types/node": "^10.14.8",
+    "@types/node": "^10.12.21",
     "@types/which": "^1.0.28",
     "mocha": "^3.2.0"
   }

extensions/git/src/api/git.d.ts

@@ -235,4 +235,4 @@ export const enum GitErrorCodes {
 	CantRebaseMultipleBranches = 'CantRebaseMultipleBranches',
 	PatchDoesNotApply = 'PatchDoesNotApply',
 	NoPathFound = 'NoPathFound'
-}
+}

extensions/git/src/commands.ts

@@ -56,13 +56,7 @@ class CheckoutRemoteHeadItem extends CheckoutItem {
 			return;
 		}
 
-		const branches = await repository.findTrackingBranches(this.ref.name);
-
-		if (branches.length > 0) {
-			await repository.checkout(branches[0].name!);
-		} else {
-			await repository.checkoutTracking(this.ref.name);
-		}
+		await repository.checkoutTracking(this.ref.name);
 	}
 }
 

extensions/git/src/git.ts

@@ -12,8 +12,7 @@ import { EventEmitter } from 'events';
 import iconv = require('iconv-lite');
 import * as filetype from 'file-type';
 import { assign, groupBy, denodeify, IDisposable, toDisposable, dispose, mkdirp, readBytes, detectUnicodeEncoding, Encoding, onceEvent } from './util';
-import { CancellationToken } from 'vscode';
-import { URI } from 'vscode-uri';
+import { CancellationToken, Uri, workspace } from 'vscode';
 import { detectEncoding } from './encoding';
 import { Ref, RefType, Branch, Remote, GitErrorCodes, LogOptions, Change, Status } from './api/git';
 
@@ -558,7 +557,7 @@ export function parseGitmodules(raw: string): Submodule[] {
 			return;
 		}
 
-		const propertyMatch = /^\s*(\w+)\s+=\s+(.*)$/.exec(line);
+		const propertyMatch = /^\s*(\w+) = (.*)$/.exec(line);
 
 		if (!propertyMatch) {
 			return;
@@ -637,7 +636,6 @@ export interface CommitOptions {
 
 export interface PullOptions {
 	unshallow?: boolean;
-	tags?: boolean;
 }
 
 export enum ForcePushMode {
@@ -997,7 +995,7 @@ export class Repository {
 				break;
 			}
 
-			const originalUri = URI.file(path.isAbsolute(resourcePath) ? resourcePath : path.join(this.repositoryRoot, resourcePath));
+			const originalUri = Uri.file(path.isAbsolute(resourcePath) ? resourcePath : path.join(this.repositoryRoot, resourcePath));
 			let status: Status = Status.UNTRACKED;
 
 			// Copy or Rename status comes with a number, e.g. 'R100'. We don't need the number, so we use only first character of the status.
@@ -1025,7 +1023,7 @@ export class Repository {
 						break;
 					}
 
-					const uri = URI.file(path.isAbsolute(newPath) ? newPath : path.join(this.repositoryRoot, newPath));
+					const uri = Uri.file(path.isAbsolute(newPath) ? newPath : path.join(this.repositoryRoot, newPath));
 					result.push({
 						uri,
 						renameUri: uri,
@@ -1365,8 +1363,9 @@ export class Repository {
 
 	async pull(rebase?: boolean, remote?: string, branch?: string, options: PullOptions = {}): Promise<void> {
 		const args = ['pull'];
+		const config = workspace.getConfiguration('git', Uri.file(this.root));
 
-		if (options.tags) {
+		if (config.get<boolean>('pullTags')) {
 			args.push('--tags');
 		}
 
@@ -1579,14 +1578,6 @@ export class Repository {
 		}
 	}
 
-	async findTrackingBranches(upstreamBranch: string): Promise<Branch[]> {
-		const result = await this.run(['for-each-ref', '--format', '%(refname:short)%00%(upstream:short)', 'refs/heads']);
-		return result.stdout.trim().split('\n')
-			.map(line => line.trim().split('\0'))
-			.filter(([_, upstream]) => upstream === upstreamBranch)
-			.map(([ref]) => ({ name: ref, type: RefType.Head } as Branch));
-	}
-
 	async getRefs(): Promise<Ref[]> {
 		const result = await this.run(['for-each-ref', '--format', '%(refname) %(objectname)', '--sort', '-committerdate']);
 

extensions/git/src/repository.ts

@@ -299,7 +299,6 @@ export const enum Operation {
 	GetObjectDetails = 'GetObjectDetails',
 	SubmoduleUpdate = 'SubmoduleUpdate',
 	RebaseContinue = 'RebaseContinue',
-	FindTrackingBranches = 'GetTracking',
 	Apply = 'Apply',
 	Blame = 'Blame',
 	Log = 'Log',
@@ -910,10 +909,6 @@ export class Repository implements Disposable {
 		await this.run(Operation.CheckoutTracking, () => this.repository.checkout(treeish, [], { track: true }));
 	}
 
-	async findTrackingBranches(upstreamRef: string): Promise<Branch[]> {
-		return await this.run(Operation.FindTrackingBranches, () => this.repository.findTrackingBranches(upstreamRef));
-	}
-
 	async getCommit(ref: string): Promise<Commit> {
 		return await this.repository.getCommit(ref);
 	}
@@ -984,12 +979,11 @@ export class Repository implements Disposable {
 			await this.maybeAutoStash(async () => {
 				const config = workspace.getConfiguration('git', Uri.file(this.root));
 				const fetchOnPull = config.get<boolean>('fetchOnPull');
-				const tags = config.get<boolean>('pullTags');
 
 				if (fetchOnPull) {
-					await this.repository.pull(rebase, undefined, undefined, { unshallow, tags });
+					await this.repository.pull(rebase, undefined, undefined, { unshallow });
 				} else {
-					await this.repository.pull(rebase, remote, branch, { unshallow, tags });
+					await this.repository.pull(rebase, remote, branch, { unshallow });
 				}
 			});
 		});
@@ -1045,12 +1039,11 @@ export class Repository implements Disposable {
 			await this.maybeAutoStash(async () => {
 				const config = workspace.getConfiguration('git', Uri.file(this.root));
 				const fetchOnPull = config.get<boolean>('fetchOnPull');
-				const tags = config.get<boolean>('pullTags');
 
 				if (fetchOnPull) {
-					await this.repository.pull(rebase, undefined, undefined, { tags });
+					await this.repository.pull(rebase);
 				} else {
-					await this.repository.pull(rebase, remoteName, pullBranch, { tags });
+					await this.repository.pull(rebase, remoteName, pullBranch);
 				}
 
 				const remote = this.remotes.find(r => r.name === remoteName);
@@ -1163,7 +1156,7 @@ export class Repository implements Disposable {
 				}
 
 				// https://git-scm.com/docs/git-check-ignore#git-check-ignore--z
-				const child = this.repository.stream(['check-ignore', '-v', '-z', '--stdin'], { stdio: [null, null, null] });
+				const child = this.repository.stream(['check-ignore', '-z', '--stdin'], { stdio: [null, null, null] });
 				child.stdin.end(filePaths.join('\0'), 'utf8');
 
 				const onExit = (exitCode: number) => {
@@ -1171,7 +1164,8 @@ export class Repository implements Disposable {
 						// nothing ignored
 						resolve(new Set<string>());
 					} else if (exitCode === 0) {
-						resolve(new Set<string>(this.parseIgnoreCheck(data)));
+						// paths are separated by the null-character
+						resolve(new Set<string>(data.split('\0')));
 					} else {
 						if (/ is in submodule /.test(stderr)) {
 							reject(new GitError({ stdout: data, stderr, exitCode, gitErrorCode: GitErrorCodes.IsInSubmodule }));
@@ -1199,23 +1193,6 @@ export class Repository implements Disposable {
 		});
 	}
 
-	// Parses output of `git check-ignore -v -z` and returns only those paths
-	// that are actually ignored by git.
-	// Matches to a negative pattern (starting with '!') are filtered out.
-	// See also https://git-scm.com/docs/git-check-ignore#_output.
-	private parseIgnoreCheck(raw: string): string[] {
-		const ignored = [];
-		const elements = raw.split('\0');
-		for (let i = 0; i < elements.length; i += 4) {
-			const pattern = elements[i + 2];
-			const path = elements[i + 3];
-			if (pattern && !pattern.startsWith('!')) {
-				ignored.push(path);
-			}
-		}
-		return ignored;
-	}
-
 	private async run<T>(operation: Operation, runOperation: () => Promise<T> = () => Promise.resolve<any>(null)): Promise<T> {
 		if (this.state !== RepositoryState.Idle) {
 			throw new Error('Repository not initialized');

extensions/git/src/test/git.test.ts

@@ -172,17 +172,6 @@ suite('git', () => {
 				{ name: 'deps/spdlog4', path: 'deps/spdlog4', url: 'https://github.com/gabime/spdlog4.git' }
 			]);
 		});
-
-		test('whitespace #74844', () => {
-			const sample = `[submodule "deps/spdlog"]
-	path = deps/spdlog
-	url  = https://github.com/gabime/spdlog.git
-`;
-
-			assert.deepEqual(parseGitmodules(sample), [
-				{ name: 'deps/spdlog', path: 'deps/spdlog', url: 'https://github.com/gabime/spdlog.git' }
-			]);
-		});
 	});
 
 	suite('parseGitCommit', () => {

extensions/git/yarn.lock

@@ -26,10 +26,10 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.51.tgz#b31d716fb8d58eeb95c068a039b9b6292817d5fb"
   integrity sha512-El3+WJk2D/ppWNd2X05aiP5l2k4EwF7KwheknQZls+I26eSICoWRhRIJ56jGgw2dqNGQ5LtNajmBU2ajS28EvQ==
 
-"@types/node@^10.14.8":
-  version "10.14.8"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.14.8.tgz#fe444203ecef1162348cd6deb76c62477b2cc6e9"
-  integrity sha512-I4+DbJEhLEg4/vIy/2gkWDvXBOOtPKV9EnLhYjMoqxcRW+TTZtUftkHktz/a8suoD5mUL7m6ReLrkPvSsCQQmw==
+"@types/node@^10.12.21":
+  version "10.12.21"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.12.21.tgz#7e8a0c34cf29f4e17a36e9bd0ea72d45ba03908e"
+  integrity sha512-CBgLNk4o3XMnqMc0rhb6lc77IwShMEglz05deDcn2lQxyXEZivfwgYJu7SMha9V5XcrP6qZuevTHV/QrN2vjKQ==
 
 "@types/which@^1.0.28":
   version "1.0.28"
@@ -325,11 +325,6 @@ vscode-nls@^4.0.0:
   resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.0.0.tgz#4001c8a6caba5cedb23a9c5ce1090395c0e44002"
   integrity sha512-qCfdzcH+0LgQnBpZA53bA32kzp9rpq/f66Som577ObeuDlFIrtbEJ+A/+CCxjIh4G8dpJYNCKIsxpRAHIfsbNw==
 
-vscode-uri@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-2.0.0.tgz#2df704222f72b8a71ff266ba0830ed6c51ac1542"
-  integrity sha512-lWXWofDSYD8r/TIyu64MdwB4FaSirQ608PP/TzUyslyOeHGwQ0eTHUZeJrK1ILOmwUHaJtV693m2JoUYroUDpw==
-
 which@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a"