ソースを参照
Adds explore repo from here command (wip)
Replaces git content provider with git fs provider Adds Buffer output support to git callsmain
Eric Amodio
6年前
22個のファイルの変更、735行の追加、361行の削除
分割表示
差分オプション
-
+172 -128package-lock.json
-
+15 -3package.json
-
+1 -1src/codelens/gitCodeLensProvider.ts
-
+13 -7src/commands/common.ts
-
+2 -1src/constants.ts
-
+3 -5src/container.ts
-
+172 -0src/git/fsProvider.ts
-
+115 -91src/git/git.ts
-
+3 -3src/git/gitLocator.ts
-
+37 -20src/git/gitUri.ts
-
+1 -0src/git/models/models.ts
-
+1 -1src/git/models/repository.ts
-
+8 -0src/git/models/tree.ts
-
+1 -0src/git/parsers/parsers.ts
-
+32 -0src/git/parsers/treeParser.ts
-
+1 -1src/git/remotes/provider.ts
-
+11 -6src/git/shell.ts
-
+0 -32src/gitContentProvider.ts
-
+47 -27src/gitService.ts
-
+48 -22src/system/searchTree.ts
-
+37 -12src/system/string.ts
-
+15 -1src/views/explorerCommands.ts
+ 172
- 128
package-lock.json
ファイルの表示
+ 15
- 3
package.json
ファイルの表示
+ 1
- 1
src/codelens/gitCodeLensProvider.ts
ファイルの表示
+ 13
- 7
src/commands/common.ts
ファイルの表示
+ 2
- 1
src/constants.ts
ファイルの表示
+ 3
- 5
src/container.ts
ファイルの表示
+ 172
- 0
src/git/fsProvider.ts
ファイルの表示
| @ -0,0 +1,172 @@ | |||
| 'use strict'; | |||
| import { | |||
| Disposable, | |||
| Event, | |||
| EventEmitter, | |||
| FileChangeEvent, | |||
| FileStat, | |||
| FileSystemError, | |||
| FileSystemProvider, | |||
| FileType, | |||
| Uri, | |||
| workspace | |||
| } from 'vscode'; | |||
| import { DocumentSchemes } from '../constants'; | |||
| import { Container } from '../container'; | |||
| import { GitService, GitTree, GitUri } from '../gitService'; | |||
| import { Iterables, TernarySearchTree } from '../system'; | |||
| export function fromGitLensFSUri(uri: Uri): { path: string; ref: string; repoPath: string } { | |||
| const gitUri = uri instanceof GitUri ? uri : GitUri.fromRevisionUri(uri); | |||
| return { path: gitUri.getRelativePath(), ref: gitUri.sha!, repoPath: gitUri.repoPath! }; | |||
| } | |||
| export function toGitLensFSUri(ref: string, repoPath: string): Uri { | |||
| return GitUri.toRevisionUri(ref, repoPath, repoPath); | |||
| } | |||
| const emptyArray = new Uint8Array(0); | |||
| export class GitFileSystemProvider implements FileSystemProvider, Disposable { | |||
| private readonly _disposable: Disposable; | |||
| private readonly _searchTreeMap = new Map<string, Promise<TernarySearchTree<GitTree>>>(); | |||
| constructor() { | |||
| this._disposable = Disposable.from( | |||
| workspace.registerFileSystemProvider(DocumentSchemes.GitLens, this, { | |||
| isCaseSensitive: true, | |||
| isReadonly: true | |||
| }) | |||
| ); | |||
| } | |||
| dispose() { | |||
| this._disposable && this._disposable.dispose(); | |||
| } | |||
| private _onDidChangeFile = new EventEmitter<FileChangeEvent[]>(); | |||
| get onDidChangeFile(): Event<FileChangeEvent[]> { | |||
| return this._onDidChangeFile.event; | |||
| } | |||
| copy?(): void | Thenable<void> { | |||
| throw FileSystemError.NoPermissions; | |||
| } | |||
| createDirectory(): void | Thenable<void> { | |||
| throw FileSystemError.NoPermissions; | |||
| } | |||
| delete(): void | Thenable<void> { | |||
| throw FileSystemError.NoPermissions; | |||
| } | |||
| async readDirectory(uri: Uri): Promise<[string, FileType][]> { | |||
| const tree = await this.getTree(uri); | |||
| if (tree === undefined) { | |||
| debugger; | |||
| throw FileSystemError.FileNotFound(uri); | |||
| } | |||
| const items = [...Iterables.map<GitTree, [string, FileType]>(tree, t => [t.path, typeToFileType(t.type)])]; | |||
| return items; | |||
| } | |||
| async readFile(uri: Uri): Promise<Uint8Array> { | |||
| const { path, ref, repoPath } = fromGitLensFSUri(uri); | |||
| if (ref === GitService.deletedSha) return emptyArray; | |||
| const buffer = await Container.git.getVersionedFileBuffer(repoPath, path, ref); | |||
| if (buffer === undefined) return emptyArray; | |||
| return buffer; | |||
| } | |||
| rename(): void | Thenable<void> { | |||
| throw FileSystemError.NoPermissions; | |||
| } | |||
| async stat(uri: Uri): Promise<FileStat> { | |||
| const { path, ref, repoPath } = fromGitLensFSUri(uri); | |||
| if (ref === GitService.deletedSha) { | |||
| return { | |||
| type: FileType.File, | |||
| size: 0, | |||
| ctime: 0, | |||
| mtime: 0 | |||
| }; | |||
| } | |||
| let treeItem; | |||
| const searchTree = this._searchTreeMap.get(ref); | |||
| if (searchTree !== undefined) { | |||
| // Add the fake root folder to the path | |||
| treeItem = (await searchTree).get(`/~/${path}`); | |||
| } | |||
| else { | |||
| treeItem = await Container.git.getTreeFileForRevision(repoPath, path, ref); | |||
| } | |||
| if (treeItem === undefined) { | |||
| throw FileSystemError.FileNotFound(uri); | |||
| } | |||
| return { | |||
| type: typeToFileType(treeItem.type), | |||
| size: treeItem.size, | |||
| ctime: 0, | |||
| mtime: 0 | |||
| }; | |||
| } | |||
| watch(): Disposable { | |||
| return { dispose: () => {} }; | |||
| } | |||
| writeFile(): void | Thenable<void> { | |||
| throw FileSystemError.NoPermissions; | |||
| } | |||
| private async createSearchTree(ref: string, repoPath: string) { | |||
| const searchTree = TernarySearchTree.forPaths() as TernarySearchTree<GitTree>; | |||
| const trees = await Container.git.getTreeForRevision(repoPath, ref); | |||
| // Add a fake root folder so that searches will work | |||
| searchTree.set(`~`, { commitSha: '', path: '~', size: 0, type: 'tree' }); | |||
| for (const item of trees) { | |||
| searchTree.set(`~/${item.path}`, item); | |||
| } | |||
| return searchTree; | |||
| } | |||
| private async getOrCreateSearchTree(ref: string, repoPath: string) { | |||
| let searchTree = this._searchTreeMap.get(ref); | |||
| if (searchTree === undefined) { | |||
| searchTree = this.createSearchTree(ref, repoPath); | |||
| this._searchTreeMap.set(ref, searchTree); | |||
| } | |||
| return searchTree; | |||
| } | |||
| private async getTree(uri: Uri) { | |||
| const { path, ref, repoPath } = fromGitLensFSUri(uri); | |||
| const searchTree = await this.getOrCreateSearchTree(ref, repoPath); | |||
| // Add the fake root folder to the path | |||
| return searchTree!.findSuperstr(`/~/${path}`, true); | |||
| } | |||
| } | |||
| function typeToFileType(type: 'blob' | 'tree' | undefined | null) { | |||
| switch (type) { | |||
| case 'blob': | |||
| return FileType.File; | |||
| case 'tree': | |||
| return FileType.Directory; | |||
| default: | |||
| return FileType.Unknown; | |||
| } | |||
| } | |||
+ 115
- 91
src/git/git.ts
ファイルの表示
+ 3
- 3
src/git/gitLocator.ts
ファイルの表示
+ 37
- 20
src/git/gitUri.ts
ファイルの表示
+ 1
- 0
src/git/models/models.ts
ファイルの表示
+ 1
- 1
src/git/models/repository.ts
ファイルの表示
+ 8
- 0
src/git/models/tree.ts
ファイルの表示
| @ -0,0 +1,8 @@ | |||
| 'use strict'; | |||
| export interface GitTree { | |||
| commitSha: string; | |||
| path: string; | |||
| size: number; | |||
| type: 'blob' | 'tree'; | |||
| } | |||
+ 1
- 0
src/git/parsers/parsers.ts
ファイルの表示
+ 32
- 0
src/git/parsers/treeParser.ts
ファイルの表示
| @ -0,0 +1,32 @@ | |||
| 'use strict'; | |||
| import { GitTree } from './../git'; | |||
| const treeRegex = /(?:.+?)\s+(.+?)\s+(.+?)\s+(.+?)\s+(.+)/gm; | |||
| export class GitTreeParser { | |||
| static parse(data: string | undefined): GitTree[] | undefined { | |||
| if (!data) return undefined; | |||
| const trees: GitTree[] = []; | |||
| let match: RegExpExecArray | null = null; | |||
| do { | |||
| match = treeRegex.exec(data); | |||
| if (match == null) break; | |||
| const [, type, commitSha, size, filePath] = match; | |||
| trees.push({ | |||
| // Stops excessive memory usage -- https://bugs.chromium.org/p/v8/issues/detail?id=2869 | |||
| commitSha: commitSha === undefined ? '' : (' ' + commitSha).substr(1), | |||
| path: filePath === undefined ? '' : filePath, | |||
| size: size === '-' ? 0 : Number(size || 0), | |||
| // Stops excessive memory usage -- https://bugs.chromium.org/p/v8/issues/detail?id=2869 | |||
| type: (type === undefined ? '' : (' ' + type).substr(1)) as 'blob' | 'tree' | |||
| }); | |||
| } while (match != null); | |||
| if (!trees.length) return undefined; | |||
| return trees; | |||
| } | |||
| } | |||
+ 1
- 1
src/git/remotes/provider.ts
ファイルの表示
+ 11
- 6
src/git/shell.ts
ファイルの表示
+ 0
- 32
src/gitContentProvider.ts
ファイルの表示
| @ -1,32 +0,0 @@ | |||
| 'use strict'; | |||
| import * as path from 'path'; | |||
| import { CancellationToken, TextDocumentContentProvider, Uri, window, workspace } from 'vscode'; | |||
| import { DocumentSchemes } from './constants'; | |||
| import { GitService, GitUri } from './gitService'; | |||
| import { Logger } from './logger'; | |||
| export class GitContentProvider implements TextDocumentContentProvider { | |||
| static scheme = DocumentSchemes.GitLensGit; | |||
| async provideTextDocumentContent(uri: Uri, token: CancellationToken): Promise<string | undefined> { | |||
| const gitUri = GitUri.fromRevisionUri(uri); | |||
| if (!gitUri.repoPath || gitUri.sha === GitService.deletedSha) return ''; | |||
| try { | |||
| const document = await workspace.openTextDocument( | |||
| Uri.parse(`git:/${gitUri.fsPath}?${JSON.stringify({ path: gitUri.fsPath, ref: gitUri.sha || 'HEAD' })}`) | |||
| ); | |||
| return document.getText(); | |||
| } | |||
| catch (ex) { | |||
| Logger.error(ex, 'GitContentProvider', 'getVersionedFileText'); | |||
| window.showErrorMessage( | |||
| `Unable to show Git revision ${GitService.shortenSha(gitUri.sha)} of '${path.relative( | |||
| gitUri.repoPath, | |||
| gitUri.fsPath | |||
| )}'` | |||
| ); | |||
| return undefined; | |||
| } | |||
| } | |||
| } | |||