Merge from vscode 4d91d96e5e121b38d33508cdef17868bab255eae

extensions/git/package.json

@@ -14,7 +14,8 @@
     "Other"
   ],
   "activationEvents": [
-    "*"
+    "*",
+    "onFileSystem:git"
   ],
   "main": "./out/main",
   "icon": "resources/icons/git.png",
@@ -1870,14 +1871,14 @@
       {
         "view": "explorer",
         "contents": "%view.workbench.cloneRepository%",
-        "when": "config.git.enabled"
+        "when": "config.git.enabled && git.state == initialized"
       }
     ]
   },
   "dependencies": {
     "byline": "^5.0.0",
     "file-type": "^7.2.0",
-    "iconv-lite": "^0.4.24",
+    "iconv-lite": "0.6.0",
     "jschardet": "2.1.1",
     "vscode-extension-telemetry": "0.1.1",
     "vscode-nls": "^4.0.0",

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

@@ -134,6 +134,8 @@ export interface CommitOptions {
 
 export interface BranchQuery {
 	readonly remote?: boolean;
+	readonly pattern?: string;
+	readonly count?: number;
 	readonly contains?: string;
 }
 

extensions/git/src/fileSystemProvider.ts

@@ -133,6 +133,8 @@ export class GitFileSystemProvider implements FileSystemProvider {
 	}
 
 	async stat(uri: Uri): Promise<FileStat> {
+		await this.model.isInitialized;
+
 		const { submoduleOf, path, ref } = fromGitUri(uri);
 		const repository = submoduleOf ? this.model.getRepository(submoduleOf) : this.model.getRepository(uri);
 		if (!repository) {
@@ -158,6 +160,8 @@ export class GitFileSystemProvider implements FileSystemProvider {
 	}
 
 	async readFile(uri: Uri): Promise<Uint8Array> {
+		await this.model.isInitialized;
+
 		const { path, ref, submoduleOf } = fromGitUri(uri);
 
 		if (submoduleOf) {

extensions/git/src/git.ts

@@ -422,7 +422,7 @@ export class Git {
 		const result = await this.exec(repositoryPath, ['rev-parse', '--show-toplevel']);
 
 		// Keep trailing spaces which are part of the directory name
-		const repoPath = path.normalize(result.stdout.trimLeft().replace(/(\r\n|\r|\n)+$/, ''));
+		const repoPath = path.normalize(result.stdout.trimLeft().replace(/[\r\n]+$/, ''));
 
 		if (isWindows) {
 			// On Git 2.25+ if you call `rev-parse --show-toplevel` on a mapped drive, instead of getting the mapped drive path back, you get the UNC path for the mapped drive.
@@ -905,7 +905,7 @@ export class Repository {
 	}
 
 	async buffer(object: string): Promise<Buffer> {
-		const child = this.stream(['show', object]);
+		const child = this.stream(['show', '--textconv', object]);
 
 		if (!child.stdout) {
 			return Promise.reject<Buffer>('Can\'t open file from git');
@@ -978,7 +978,7 @@ export class Repository {
 	}
 
 	async detectObjectType(object: string): Promise<{ mimetype: string, encoding?: string }> {
-		const child = await this.stream(['show', object]);
+		const child = await this.stream(['show', '--textconv', object]);
 		const buffer = await readBytes(child.stdout!, 4100);
 
 		try {
@@ -1791,13 +1791,23 @@ export class Repository {
 			.map(([ref]) => ({ name: ref, type: RefType.Head } as Branch));
 	}
 
-	async getRefs(opts?: { sort?: 'alphabetically' | 'committerdate', contains?: string }): Promise<Ref[]> {
-		const args = ['for-each-ref', '--format', '%(refname) %(objectname)'];
+	async getRefs(opts?: { sort?: 'alphabetically' | 'committerdate', contains?: string, pattern?: string, count?: number }): Promise<Ref[]> {
+		const args = ['for-each-ref'];
+
+		if (opts?.count) {
+			args.push(`--count=${opts.count}`);
+		}
 
 		if (opts && opts.sort && opts.sort !== 'alphabetically') {
 			args.push('--sort', `-${opts.sort}`);
 		}
 
+		args.push('--format', '%(refname) %(objectname)');
+
+		if (opts?.pattern) {
+			args.push(opts.pattern);
+		}
+
 		if (opts?.contains) {
 			args.push('--contains', opts.contains);
 		}
@@ -1920,7 +1930,7 @@ export class Repository {
 	}
 
 	async getBranches(query: BranchQuery): Promise<Ref[]> {
-		const refs = await this.getRefs({ contains: query.contains });
+		const refs = await this.getRefs({ contains: query.contains, pattern: query.pattern ? `refs/${query.pattern}` : undefined, count: query.count });
 		return refs.filter(value => (value.type !== RefType.Tag) && (query.remote || !value.remote));
 	}
 

extensions/git/src/model.ts

@@ -6,7 +6,7 @@
 import { workspace, WorkspaceFoldersChangeEvent, Uri, window, Event, EventEmitter, QuickPickItem, Disposable, SourceControl, SourceControlResourceGroup, TextEditor, Memento, OutputChannel, commands } from 'vscode';
 import { Repository, RepositoryState } from './repository';
 import { memoize, sequentialize, debounce } from './decorators';
-import { dispose, anyEvent, filterEvent, isDescendant, firstIndex, pathEquals, toDisposable } from './util';
+import { dispose, anyEvent, filterEvent, isDescendant, firstIndex, pathEquals, toDisposable, eventToPromise } from './util';
 import { Git } from './git';
 import * as path from 'path';
 import * as fs from 'fs';
@@ -77,6 +77,15 @@ export class Model implements IRemoteSourceProviderRegistry {
 		commands.executeCommand('setContext', 'git.state', state);
 	}
 
+	@memoize
+	get isInitialized(): Promise<void> {
+		if (this._state === 'initialized') {
+			return Promise.resolve();
+		}
+
+		return eventToPromise(filterEvent(this.onDidChangeState, s => s === 'initialized')) as Promise<any>;
+	}
+
 	private remoteSourceProviders = new Set<RemoteSourceProvider>();
 
 	private _onDidAddRemoteSourceProvider = new EventEmitter<RemoteSourceProvider>();
@@ -148,6 +157,13 @@ export class Model implements IRemoteSourceProviderRegistry {
 	}
 
 	private onPossibleGitRepositoryChange(uri: Uri): void {
+		const config = workspace.getConfiguration('git');
+		const autoRepositoryDetection = config.get<boolean | 'subFolders' | 'openEditors'>('autoRepositoryDetection');
+
+		if (autoRepositoryDetection === false) {
+			return;
+		}
+
 		this.eventuallyScanPossibleGitRepository(uri.fsPath.replace(/\.git.*$/, ''));
 	}
 

extensions/git/src/staging.ts

@@ -19,7 +19,7 @@ export function applyLineChanges(original: TextDocument, modified: TextDocument,
 		// if this is a deletion at the very end of the document,then we need to account
 		// for a newline at the end of the last line which may have been deleted
 		// https://github.com/Microsoft/vscode/issues/59670
-		if (isDeletion && diff.originalStartLineNumber === original.lineCount) {
+		if (isDeletion && diff.originalEndLineNumber === original.lineCount) {
 			endLine -= 1;
 			endCharacter = original.lineAt(endLine).range.end.character;
 		}

extensions/git/yarn.lock

@@ -425,10 +425,10 @@ https-proxy-agent@^2.2.1:
     agent-base "^4.3.0"
     debug "^3.1.0"
 
-iconv-lite@^0.4.24:
-  version "0.4.24"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
-  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
+iconv-lite@0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.0.tgz#66a93b80df0bd05d2a43a7426296b7f91073f125"
+  integrity sha512-43ZpGYZ9QtuutX5l6WC1DSO8ane9N+Ct5qPLF2OV7vM9abM69gnAbVkh66ibaZd3aOGkoP1ZmringlKhLBkw2Q==
   dependencies:
     safer-buffer ">= 2.1.2 < 3"