Eric Amodio
4 years ago
36 changed files with 1854 additions and 387 deletions
Split View
Diff Options
-
+393 -49package.json
-
+2 -2src/commands/setViewsLayout.ts
-
+132 -43src/config.ts
-
+31 -2src/container.ts
-
+28 -20src/git/gitService.ts
-
+7 -5src/git/models/branch.ts
-
+2 -1src/git/models/models.ts
-
+62 -26src/git/models/repository.ts
-
+7 -1src/trackers/trackedDocument.ts
-
+403 -0src/views/branchesView.ts
-
+18 -26src/views/compareView.ts
-
+15 -21src/views/fileHistoryView.ts
-
+326 -0src/views/historyView.ts
-
+15 -21src/views/lineHistoryView.ts
-
+49 -19src/views/nodes/branchNode.ts
-
+120 -0src/views/nodes/branchTrackingStatusFilesNode.ts
-
+28 -11src/views/nodes/branchTrackingStatusNode.ts
-
+15 -9src/views/nodes/branchesNode.ts
-
+3 -3src/views/nodes/commitNode.ts
-
+3 -1src/views/nodes/compareNode.ts
-
+1 -1src/views/nodes/fileHistoryNode.ts
-
+3 -3src/views/nodes/folderNode.ts
-
+1 -1src/views/nodes/lineHistoryNode.ts
-
+3 -3src/views/nodes/reflogRecordNode.ts
-
+1 -1src/views/nodes/remoteNode.ts
-
+11 -9src/views/nodes/repositoryNode.ts
-
+3 -3src/views/nodes/resultsCommitsNode.ts
-
+3 -3src/views/nodes/resultsFilesNode.ts
-
+2 -2src/views/nodes/searchResultsCommitsNode.ts
-
+3 -3src/views/nodes/stashNode.ts
-
+3 -3src/views/nodes/stashesNode.ts
-
+12 -4src/views/nodes/statusFilesNode.ts
-
+2 -0src/views/nodes/viewNode.ts
-
+16 -53src/views/repositoriesView.ts
-
+18 -26src/views/searchView.ts
-
+113 -12src/views/viewBase.ts
+ 393
- 49
package.json
View File
+ 2
- 2
src/commands/setViewsLayout.ts
View File
+ 132
- 43
src/config.ts
View File
+ 31
- 2
src/container.ts
View File
+ 28
- 20
src/git/gitService.ts
View File
+ 7
- 5
src/git/models/branch.ts
View File
+ 2
- 1
src/git/models/models.ts
View File
+ 62
- 26
src/git/models/repository.ts
View File
+ 7
- 1
src/trackers/trackedDocument.ts
View File
+ 403
- 0
src/views/branchesView.ts
View File
| @ -0,0 +1,403 @@ | |||
| 'use strict'; | |||
| import { | |||
| CancellationToken, | |||
| commands, | |||
| ConfigurationChangeEvent, | |||
| ProgressLocation, | |||
| TreeItem, | |||
| TreeItemCollapsibleState, | |||
| window, | |||
| } from 'vscode'; | |||
| import { BranchesViewConfig, configuration, ViewBranchesLayout, ViewFilesLayout } from '../configuration'; | |||
| import { Container } from '../container'; | |||
| import { | |||
| GitBranch, | |||
| GitBranchReference, | |||
| GitLogCommit, | |||
| GitReference, | |||
| GitRevisionReference, | |||
| Repository, | |||
| RepositoryChange, | |||
| RepositoryChangeEvent, | |||
| } from '../git/git'; | |||
| import { GitUri } from '../git/gitUri'; | |||
| import { | |||
| BranchesNode, | |||
| BranchNode, | |||
| BranchOrTagFolderNode, | |||
| ContextValues, | |||
| MessageNode, | |||
| RemoteNode, | |||
| RemotesNode, | |||
| RepositoriesNode, | |||
| RepositoryNode, | |||
| SubscribeableViewNode, | |||
| unknownGitUri, | |||
| ViewNode, | |||
| } from './nodes'; | |||
| import { debug, gate } from '../system'; | |||
| import { ViewBase } from './viewBase'; | |||
| export class BranchesRepositoryNode extends SubscribeableViewNode<BranchesView> { | |||
| private child: ViewNode | undefined; | |||
| constructor( | |||
| uri: GitUri, | |||
| view: BranchesView, | |||
| parent: ViewNode, | |||
| public readonly repo: Repository, | |||
| private readonly root: boolean, | |||
| ) { | |||
| super(uri, view, parent); | |||
| } | |||
| async getChildren(): Promise<ViewNode[]> { | |||
| if (this.child == null) { | |||
| this.child = new BranchesNode(this.uri, this.view, this, this.repo); | |||
| void this.ensureSubscription(); | |||
| } | |||
| return this.child.getChildren(); | |||
| } | |||
| getTreeItem(): TreeItem { | |||
| const item = new TreeItem( | |||
| this.repo.formattedName ?? this.uri.repoPath ?? '', | |||
| TreeItemCollapsibleState.Expanded, | |||
| ); | |||
| item.contextValue = ContextValues.RepositoryFolder; | |||
| void this.ensureSubscription(); | |||
| return item; | |||
| } | |||
| @gate() | |||
| @debug() | |||
| async refresh(reset: boolean = false) { | |||
| await this.child?.triggerChange(reset); | |||
| await this.ensureSubscription(); | |||
| } | |||
| @debug() | |||
| protected subscribe() { | |||
| return this.repo.onDidChange(this.onRepositoryChanged, this); | |||
| } | |||
| @debug({ | |||
| args: { | |||
| 0: (e: RepositoryChangeEvent) => | |||
| `{ repository: ${e.repository ? e.repository.name : ''}, changes: ${e.changes.join()} }`, | |||
| }, | |||
| }) | |||
| private onRepositoryChanged(e: RepositoryChangeEvent) { | |||
| if (e.changed(RepositoryChange.Closed)) { | |||
| this.dispose(); | |||
| void this.parent?.triggerChange(true); | |||
| return; | |||
| } | |||
| if (e.changed(RepositoryChange.Heads)) { | |||
| void this.triggerChange(true); | |||
| if (this.root) { | |||
| void this.parent?.triggerChange(true); | |||
| } | |||
| } | |||
| } | |||
| } | |||
| export class BranchesViewNode extends ViewNode<BranchesView> { | |||
| private children: BranchesRepositoryNode[] | undefined; | |||
| constructor(view: BranchesView) { | |||
| super(unknownGitUri, view); | |||
| } | |||
| async getChildren(): Promise<ViewNode[]> { | |||
| if (this.children != null) { | |||
| for (const child of this.children) { | |||
| child.dispose?.(); | |||
| } | |||
| this.children = undefined; | |||
| } | |||
| const repositories = await Container.git.getOrderedRepositories(); | |||
| if (repositories.length === 0) return [new MessageNode(this.view, this, 'No branches could be found.')]; | |||
| const root = repositories.length === 1; | |||
| this.children = repositories.map( | |||
| r => new BranchesRepositoryNode(GitUri.fromRepoPath(r.path), this.view, this, r, root), | |||
| ); | |||
| if (root) { | |||
| const [child] = this.children; | |||
| const branches = await child.repo.getBranches({ filter: b => !b.remote }); | |||
| this.view.description = branches.length === 0 ? undefined : `(${branches.length})`; | |||
| return child.getChildren(); | |||
| } | |||
| return this.children; | |||
| } | |||
| getTreeItem(): TreeItem { | |||
| const item = new TreeItem('Branches', TreeItemCollapsibleState.Expanded); | |||
| return item; | |||
| } | |||
| } | |||
| export class BranchesView extends ViewBase<BranchesViewNode, BranchesViewConfig> { | |||
| protected readonly configKey = 'branches'; | |||
| constructor() { | |||
| super('gitlens.views.branches', 'Branches'); | |||
| } | |||
| getRoot() { | |||
| return new BranchesViewNode(this); | |||
| } | |||
| protected registerCommands() { | |||
| void Container.viewCommands; | |||
| commands.registerCommand( | |||
| this.getQualifiedCommand('copy'), | |||
| () => commands.executeCommand('gitlens.views.copy', this.selection), | |||
| this, | |||
| ); | |||
| commands.registerCommand(this.getQualifiedCommand('refresh'), () => this.refresh(true), this); | |||
| commands.registerCommand( | |||
| this.getQualifiedCommand('setBranchesLayoutToList'), | |||
| () => this.setBranchesLayout(ViewBranchesLayout.List), | |||
| this, | |||
| ); | |||
| commands.registerCommand( | |||
| this.getQualifiedCommand('setBranchesLayoutToTree'), | |||
| () => this.setBranchesLayout(ViewBranchesLayout.Tree), | |||
| this, | |||
| ); | |||
| commands.registerCommand( | |||
| this.getQualifiedCommand('setFilesLayoutToAuto'), | |||
| () => this.setFilesLayout(ViewFilesLayout.Auto), | |||
| this, | |||
| ); | |||
| commands.registerCommand( | |||
| this.getQualifiedCommand('setFilesLayoutToList'), | |||
| () => this.setFilesLayout(ViewFilesLayout.List), | |||
| this, | |||
| ); | |||
| commands.registerCommand( | |||
| this.getQualifiedCommand('setFilesLayoutToTree'), | |||
| () => this.setFilesLayout(ViewFilesLayout.Tree), | |||
| this, | |||
| ); | |||
| commands.registerCommand(this.getQualifiedCommand('setShowAvatarsOn'), () => this.setShowAvatars(true), this); | |||
| commands.registerCommand(this.getQualifiedCommand('setShowAvatarsOff'), () => this.setShowAvatars(false), this); | |||
| } | |||
| protected filterConfigurationChanged(e: ConfigurationChangeEvent) { | |||
| const changed = super.filterConfigurationChanged(e); | |||
| if ( | |||
| !changed && | |||
| !configuration.changed(e, 'defaultDateFormat') && | |||
| !configuration.changed(e, 'defaultDateSource') && | |||
| !configuration.changed(e, 'defaultDateStyle') && | |||
| !configuration.changed(e, 'defaultGravatarsStyle') && | |||
| !configuration.changed(e, 'sortBranchesBy') | |||
| ) { | |||
| return false; | |||
| } | |||
| return true; | |||
| } | |||
| protected onConfigurationChanged(e: ConfigurationChangeEvent) { | |||
| if (configuration.initializing(e)) { | |||
| this.initialize(undefined, { showCollapseAll: true }); | |||
| } | |||
| if (!configuration.initializing(e) && this._root != null) { | |||
| void this.refresh(true); | |||
| } | |||
| } | |||
| findBranch(branch: GitBranchReference, token?: CancellationToken) { | |||
| const repoNodeId = RepositoryNode.getId(branch.repoPath); | |||
| if (branch.remote) { | |||
| return this.findNode((n: any) => n.branch !== undefined && n.branch.ref === branch.ref, { | |||
| allowPaging: true, | |||
| maxDepth: 6, | |||
| canTraverse: n => { | |||
| // Only search for branch nodes in the same repo within BranchesNode | |||
| if (n instanceof RepositoriesNode) return true; | |||
| if (n instanceof RemoteNode) { | |||
| if (!n.id.startsWith(repoNodeId)) return false; | |||
| return branch.remote && n.remote.name === GitBranch.getRemote(branch.name); //branch.getRemoteName(); | |||
| } | |||
| if ( | |||
| n instanceof RepositoryNode || | |||
| n instanceof BranchesNode || | |||
| n instanceof RemotesNode || | |||
| n instanceof BranchOrTagFolderNode | |||
| ) { | |||
| return n.id.startsWith(repoNodeId); | |||
| } | |||
| return false; | |||
| }, | |||
| token: token, | |||
| }); | |||
| } | |||
| return this.findNode((n: any) => n.branch !== undefined && n.branch.ref === branch.ref, { | |||
| allowPaging: true, | |||
| maxDepth: 5, | |||
| canTraverse: n => { | |||
| // Only search for branch nodes in the same repo within BranchesNode | |||
| if (n instanceof RepositoriesNode) return true; | |||
| if (n instanceof RepositoryNode || n instanceof BranchesNode || n instanceof BranchOrTagFolderNode) { | |||
| return n.id.startsWith(repoNodeId); | |||
| } | |||
| return false; | |||
| }, | |||
| token: token, | |||
| }); | |||
| } | |||
| async findCommit(commit: GitLogCommit | { repoPath: string; ref: string }, token?: CancellationToken) { | |||
| const repoNodeId = RepositoryNode.getId(commit.repoPath); | |||
| // Get all the branches the commit is on | |||
| let branches = await Container.git.getCommitBranches(commit.repoPath, commit.ref); | |||
| if (branches.length !== 0) { | |||
| return this.findNode((n: any) => n.commit !== undefined && n.commit.ref === commit.ref, { | |||
| allowPaging: true, | |||
| maxDepth: 6, | |||
| canTraverse: async n => { | |||
| // Only search for commit nodes in the same repo within BranchNodes | |||
| if (n instanceof RepositoriesNode) return true; | |||
| if (n instanceof BranchNode) { | |||
| if (n.id.startsWith(repoNodeId) && branches.includes(n.branch.name)) { | |||
| await n.showMore({ until: commit.ref }); | |||
| return true; | |||
| } | |||
| } | |||
| if ( | |||
| n instanceof RepositoryNode || | |||
| n instanceof BranchesNode || | |||
| n instanceof BranchOrTagFolderNode | |||
| ) { | |||
| return n.id.startsWith(repoNodeId); | |||
| } | |||
| return false; | |||
| }, | |||
| token: token, | |||
| }); | |||
| } | |||
| // If we didn't find the commit on any local branches, check remote branches | |||
| branches = await Container.git.getCommitBranches(commit.repoPath, commit.ref, { remotes: true }); | |||
| if (branches.length === 0) return undefined; | |||
| const remotes = branches.map(b => b.split('/', 1)[0]); | |||
| return this.findNode((n: any) => n.commit !== undefined && n.commit.ref === commit.ref, { | |||
| allowPaging: true, | |||
| maxDepth: 8, | |||
| canTraverse: n => { | |||
| // Only search for commit nodes in the same repo within BranchNodes | |||
| if (n instanceof RepositoriesNode) return true; | |||
| if (n instanceof RemoteNode) { | |||
| return n.id.startsWith(repoNodeId) && remotes.includes(n.remote.name); | |||
| } | |||
| if (n instanceof BranchNode) { | |||
| return n.id.startsWith(repoNodeId) && branches.includes(n.branch.name); | |||
| } | |||
| if (n instanceof RepositoryNode || n instanceof RemotesNode || n instanceof BranchOrTagFolderNode) { | |||
| return n.id.startsWith(repoNodeId); | |||
| } | |||
| return false; | |||
| }, | |||
| token: token, | |||
| }); | |||
| } | |||
| @gate(() => '') | |||
| revealBranch( | |||
| branch: GitBranchReference, | |||
| options?: { | |||
| select?: boolean; | |||
| focus?: boolean; | |||
| expand?: boolean | number; | |||
| }, | |||
| ) { | |||
| return window.withProgress( | |||
| { | |||
| location: ProgressLocation.Notification, | |||
| title: `Revealing ${GitReference.toString(branch, { icon: false })} in the Repositories view...`, | |||
| cancellable: true, | |||
| }, | |||
| async (progress, token) => { | |||
| const node = await this.findBranch(branch, token); | |||
| if (node === undefined) return node; | |||
| await this.ensureRevealNode(node, options); | |||
| return node; | |||
| }, | |||
| ); | |||
| } | |||
| @gate(() => '') | |||
| async revealCommit( | |||
| commit: GitRevisionReference, | |||
| options?: { | |||
| select?: boolean; | |||
| focus?: boolean; | |||
| expand?: boolean | number; | |||
| }, | |||
| ) { | |||
| return window.withProgress( | |||
| { | |||
| location: ProgressLocation.Notification, | |||
| title: `Revealing ${GitReference.toString(commit, { icon: false })} in the Repositories view...`, | |||
| cancellable: true, | |||
| }, | |||
| async (progress, token) => { | |||
| const node = await this.findCommit(commit, token); | |||
| if (node === undefined) return node; | |||
| await this.ensureRevealNode(node, options); | |||
| return node; | |||
| }, | |||
| ); | |||
| } | |||
| private setBranchesLayout(layout: ViewBranchesLayout) { | |||
| return configuration.updateEffective('views', this.configKey, 'branches', 'layout', layout); | |||
| } | |||
| private setFilesLayout(layout: ViewFilesLayout) { | |||
| return configuration.updateEffective('views', this.configKey, 'files', 'layout', layout); | |||
| } | |||
| private setShowAvatars(enabled: boolean) { | |||
| return configuration.updateEffective('views', this.configKey, 'avatars', enabled); | |||
| } | |||
| } | |||
+ 18
- 26
src/views/compareView.ts
View File
+ 15
- 21
src/views/fileHistoryView.ts
View File
+ 326
- 0
src/views/historyView.ts
View File
| @ -0,0 +1,326 @@ | |||
| 'use strict'; | |||
| import { | |||
| CancellationToken, | |||
| commands, | |||
| ConfigurationChangeEvent, | |||
| ProgressLocation, | |||
| TreeItem, | |||
| TreeItemCollapsibleState, | |||
| window, | |||
| } from 'vscode'; | |||
| import { configuration, HistoryViewConfig, ViewFilesLayout } from '../configuration'; | |||
| import { GlyphChars } from '../constants'; | |||
| import { Container } from '../container'; | |||
| import { | |||
| GitLogCommit, | |||
| GitReference, | |||
| GitRevisionReference, | |||
| Repository, | |||
| RepositoryChange, | |||
| RepositoryChangeEvent, | |||
| } from '../git/git'; | |||
| import { GitUri } from '../git/gitUri'; | |||
| import { | |||
| BranchesNode, | |||
| BranchNode, | |||
| BranchOrTagFolderNode, | |||
| ContextValues, | |||
| MessageNode, | |||
| RemoteNode, | |||
| RemotesNode, | |||
| RepositoriesNode, | |||
| RepositoryNode, | |||
| SubscribeableViewNode, | |||
| unknownGitUri, | |||
| ViewNode, | |||
| } from './nodes'; | |||
| import { debug, gate } from '../system'; | |||
| import { ViewBase } from './viewBase'; | |||
| export class HistoryRepositoryNode extends SubscribeableViewNode<HistoryView> { | |||
| private children: BranchNode[] | undefined; | |||
| constructor( | |||
| uri: GitUri, | |||
| view: HistoryView, | |||
| parent: ViewNode, | |||
| public readonly repo: Repository, | |||
| private readonly root: boolean, | |||
| ) { | |||
| super(uri, view, parent); | |||
| } | |||
| async getChildren(): Promise<ViewNode[]> { | |||
| if (this.children == null) { | |||
| const branch = await this.repo.getBranch(); | |||
| if (branch == null) return [new MessageNode(this.view, this, 'No commits could be found.')]; | |||
| this.children = [ | |||
| new BranchNode(this.uri, this.view, this, branch, true, { | |||
| expanded: true, | |||
| showCurrent: false, | |||
| showTracking: true, | |||
| }), | |||
| ]; | |||
| void this.ensureSubscription(); | |||
| } | |||
| return this.children; | |||
| } | |||
| getTreeItem(): TreeItem { | |||
| const item = new TreeItem( | |||
| this.repo.formattedName ?? this.uri.repoPath ?? '', | |||
| TreeItemCollapsibleState.Expanded, | |||
| ); | |||
| item.contextValue = ContextValues.RepositoryFolder; | |||
| void this.ensureSubscription(); | |||
| return item; | |||
| } | |||
| @gate() | |||
| @debug() | |||
| async refresh(reset: boolean = false) { | |||
| if (reset) { | |||
| this.children = undefined; | |||
| } else { | |||
| void this.parent?.triggerChange(false); | |||
| } | |||
| await this.ensureSubscription(); | |||
| } | |||
| @debug() | |||
| protected subscribe() { | |||
| return this.repo.onDidChange(this.onRepositoryChanged, this); | |||
| } | |||
| @debug({ | |||
| args: { | |||
| 0: (e: RepositoryChangeEvent) => | |||
| `{ repository: ${e.repository ? e.repository.name : ''}, changes: ${e.changes.join()} }`, | |||
| }, | |||
| }) | |||
| private onRepositoryChanged(e: RepositoryChangeEvent) { | |||
| if (e.changed(RepositoryChange.Closed)) { | |||
| this.dispose(); | |||
| void this.parent?.triggerChange(true); | |||
| return; | |||
| } | |||
| if (e.changed(RepositoryChange.Index) || e.changed(RepositoryChange.Heads)) { | |||
| void this.triggerChange(true); | |||
| if (this.root) { | |||
| void this.parent?.triggerChange(true); | |||
| } | |||
| } | |||
| } | |||
| } | |||
| export class HistoryViewNode extends ViewNode<HistoryView> { | |||
| private children: HistoryRepositoryNode[] | undefined; | |||
| constructor(view: HistoryView) { | |||
| super(unknownGitUri, view); | |||
| } | |||
| async getChildren(): Promise<ViewNode[]> { | |||
| if (this.children != null) { | |||
| for (const child of this.children) { | |||
| child.dispose(); | |||
| } | |||
| this.children = undefined; | |||
| } | |||
| const repositories = await Container.git.getOrderedRepositories(); | |||
| if (repositories.length === 0) return [new MessageNode(this.view, this, 'No commits could be found.')]; | |||
| const root = repositories.length === 1; | |||
| this.children = repositories.map( | |||
| r => new HistoryRepositoryNode(GitUri.fromRepoPath(r.path), this.view, this, r, root), | |||
| ); | |||
| if (root) { | |||
| const [child] = this.children; | |||
| const branch = await child.repo.getBranch(); | |||
| const status = branch?.getTrackingStatus(); | |||
| this.view.titleContext = | |||
| branch != null ? `${branch.name}${status ? ` ${GlyphChars.Dot} ${status}` : ''}` : undefined; | |||
| return child.getChildren(); | |||
| } | |||
| return this.children; | |||
| } | |||
| getTreeItem(): TreeItem { | |||
| const item = new TreeItem('History', TreeItemCollapsibleState.Expanded); | |||
| return item; | |||
| } | |||
| } | |||
| export class HistoryView extends ViewBase<HistoryViewNode, HistoryViewConfig> { | |||
| protected readonly configKey = 'history'; | |||
| constructor() { | |||
| super('gitlens.views.history', 'History'); | |||
| } | |||
| getRoot() { | |||
| return new HistoryViewNode(this); | |||
| } | |||
| protected registerCommands() { | |||
| void Container.viewCommands; | |||
| commands.registerCommand( | |||
| this.getQualifiedCommand('copy'), | |||
| () => commands.executeCommand('gitlens.views.copy', this.selection), | |||
| this, | |||
| ); | |||
| commands.registerCommand(this.getQualifiedCommand('refresh'), () => this.refresh(true), this); | |||
| commands.registerCommand( | |||
| this.getQualifiedCommand('setFilesLayoutToAuto'), | |||
| () => this.setFilesLayout(ViewFilesLayout.Auto), | |||
| this, | |||
| ); | |||
| commands.registerCommand( | |||
| this.getQualifiedCommand('setFilesLayoutToList'), | |||
| () => this.setFilesLayout(ViewFilesLayout.List), | |||
| this, | |||
| ); | |||
| commands.registerCommand( | |||
| this.getQualifiedCommand('setFilesLayoutToTree'), | |||
| () => this.setFilesLayout(ViewFilesLayout.Tree), | |||
| this, | |||
| ); | |||
| commands.registerCommand(this.getQualifiedCommand('setShowAvatarsOn'), () => this.setShowAvatars(true), this); | |||
| commands.registerCommand(this.getQualifiedCommand('setShowAvatarsOff'), () => this.setShowAvatars(false), this); | |||
| } | |||
| protected filterConfigurationChanged(e: ConfigurationChangeEvent) { | |||
| const changed = super.filterConfigurationChanged(e); | |||
| if ( | |||
| !changed && | |||
| !configuration.changed(e, 'defaultDateFormat') && | |||
| !configuration.changed(e, 'defaultDateSource') && | |||
| !configuration.changed(e, 'defaultDateStyle') && | |||
| !configuration.changed(e, 'defaultGravatarsStyle') | |||
| ) { | |||
| return false; | |||
| } | |||
| return true; | |||
| } | |||
| protected onConfigurationChanged(e: ConfigurationChangeEvent) { | |||
| if (configuration.initializing(e)) { | |||
| this.initialize(undefined, { showCollapseAll: true }); | |||
| } | |||
| if (!configuration.initializing(e) && this._root !== undefined) { | |||
| void this.refresh(true); | |||
| } | |||
| } | |||
| async findCommit(commit: GitLogCommit | { repoPath: string; ref: string }, token?: CancellationToken) { | |||
| const repoNodeId = RepositoryNode.getId(commit.repoPath); | |||
| // Get all the branches the commit is on | |||
| let branches = await Container.git.getCommitBranches(commit.repoPath, commit.ref); | |||
| if (branches.length !== 0) { | |||
| return this.findNode((n: any) => n.commit !== undefined && n.commit.ref === commit.ref, { | |||
| allowPaging: true, | |||
| maxDepth: 6, | |||
| canTraverse: async n => { | |||
| // Only search for commit nodes in the same repo within BranchNodes | |||
| if (n instanceof RepositoriesNode) return true; | |||
| if (n instanceof BranchNode) { | |||
| if (n.id.startsWith(repoNodeId) && branches.includes(n.branch.name)) { | |||
| await n.showMore({ until: commit.ref }); | |||
| return true; | |||
| } | |||
| } | |||
| if ( | |||
| n instanceof RepositoryNode || | |||
| n instanceof BranchesNode || | |||
| n instanceof BranchOrTagFolderNode | |||
| ) { | |||
| return n.id.startsWith(repoNodeId); | |||
| } | |||
| return false; | |||
| }, | |||
| token: token, | |||
| }); | |||
| } | |||
| // If we didn't find the commit on any local branches, check remote branches | |||
| branches = await Container.git.getCommitBranches(commit.repoPath, commit.ref, { remotes: true }); | |||
| if (branches.length === 0) return undefined; | |||
| const remotes = branches.map(b => b.split('/', 1)[0]); | |||
| return this.findNode((n: any) => n.commit !== undefined && n.commit.ref === commit.ref, { | |||
| allowPaging: true, | |||
| maxDepth: 8, | |||
| canTraverse: n => { | |||
| // Only search for commit nodes in the same repo within BranchNodes | |||
| if (n instanceof RepositoriesNode) return true; | |||
| if (n instanceof RemoteNode) { | |||
| return n.id.startsWith(repoNodeId) && remotes.includes(n.remote.name); | |||
| } | |||
| if (n instanceof BranchNode) { | |||
| return n.id.startsWith(repoNodeId) && branches.includes(n.branch.name); | |||
| } | |||
| if (n instanceof RepositoryNode || n instanceof RemotesNode || n instanceof BranchOrTagFolderNode) { | |||
| return n.id.startsWith(repoNodeId); | |||
| } | |||
| return false; | |||
| }, | |||
| token: token, | |||
| }); | |||
| } | |||
| @gate(() => '') | |||
| async revealCommit( | |||
| commit: GitRevisionReference, | |||
| options?: { | |||
| select?: boolean; | |||
| focus?: boolean; | |||
| expand?: boolean | number; | |||
| }, | |||
| ) { | |||
| return window.withProgress( | |||
| { | |||
| location: ProgressLocation.Notification, | |||
| title: `Revealing ${GitReference.toString(commit, { icon: false })} in the Repositories view...`, | |||
| cancellable: true, | |||
| }, | |||
| async (progress, token) => { | |||
| const node = await this.findCommit(commit, token); | |||
| if (node === undefined) return node; | |||
| await this.ensureRevealNode(node, options); | |||
| return node; | |||
| }, | |||
| ); | |||
| } | |||
| private setFilesLayout(layout: ViewFilesLayout) { | |||
| return configuration.updateEffective('views', this.configKey, 'files', 'layout', layout); | |||
| } | |||
| private setShowAvatars(enabled: boolean) { | |||
| return configuration.updateEffective('views', this.configKey, 'avatars', enabled); | |||
| } | |||
| } | |||
+ 15
- 21
src/views/lineHistoryView.ts
View File
+ 49
- 19
src/views/nodes/branchNode.ts
View File
+ 120
- 0
src/views/nodes/branchTrackingStatusFilesNode.ts
View File
| @ -0,0 +1,120 @@ | |||
| 'use strict'; | |||
| import * as paths from 'path'; | |||
| import { TreeItem, TreeItemCollapsibleState } from 'vscode'; | |||
| import { BranchNode } from './branchNode'; | |||
| import { BranchTrackingStatus } from './branchTrackingStatusNode'; | |||
| import { ViewFilesLayout } from '../../configuration'; | |||
| import { Container } from '../../container'; | |||
| import { FileNode, FolderNode } from './folderNode'; | |||
| import { GitBranch, GitFileWithCommit, GitRevision } from '../../git/git'; | |||
| import { GitUri } from '../../git/gitUri'; | |||
| import { StatusFileNode } from './statusFileNode'; | |||
| import { Arrays, Iterables, Objects, Strings } from '../../system'; | |||
| import { ViewsWithFiles } from '../viewBase'; | |||
| import { ContextValues, ViewNode } from './viewNode'; | |||
| export class BranchTrackingStatusFilesNode extends ViewNode<ViewsWithFiles> { | |||
| static key = ':status-branch:files'; | |||
| static getId(repoPath: string, name: string, root: boolean, upstream: string, direction: string): string { | |||
| return `${BranchNode.getId(repoPath, name, root)}${this.key}(${upstream}|${direction})`; | |||
| } | |||
| readonly repoPath: string; | |||
| constructor( | |||
| view: ViewsWithFiles, | |||
| parent: ViewNode, | |||
| public readonly branch: GitBranch, | |||
| public readonly status: Required<BranchTrackingStatus>, | |||
| public readonly direction: 'ahead' | 'behind', | |||
| private readonly root: boolean = false, | |||
| ) { | |||
| super(GitUri.fromRepoPath(status.repoPath), view, parent); | |||
| this.repoPath = status.repoPath; | |||
| } | |||
| get id(): string { | |||
| return BranchTrackingStatusFilesNode.getId( | |||
| this.status.repoPath, | |||
| this.status.ref, | |||
| this.root, | |||
| this.status.upstream, | |||
| this.direction, | |||
| ); | |||
| } | |||
| async getChildren(): Promise<ViewNode[]> { | |||
| const log = await Container.git.getLog(this.repoPath, { | |||
| limit: 0, | |||
| ref: GitRevision.createRange(this.status.upstream, this.branch.ref), | |||
| }); | |||
| const files = | |||
| log != null | |||
| ? [ | |||
| ...Iterables.flatMap(log.commits.values(), c => | |||
| c.files.map(s => { | |||
| const file: GitFileWithCommit = { ...s, commit: c }; | |||
| return file; | |||
| }), | |||
| ), | |||
| ] | |||
| : []; | |||
| files.sort((a, b) => b.commit.date.getTime() - a.commit.date.getTime()); | |||
| const groups = Arrays.groupBy(files, s => s.fileName); | |||
| let children: FileNode[] = [ | |||
| ...Iterables.map( | |||
| Objects.values(groups), | |||
| files => | |||
| new StatusFileNode( | |||
| this.view, | |||
| this, | |||
| this.repoPath, | |||
| files[files.length - 1], | |||
| files.map(s => s.commit), | |||
| ), | |||
| ), | |||
| ]; | |||
| if (this.view.config.files.layout !== ViewFilesLayout.List) { | |||
| const hierarchy = Arrays.makeHierarchical( | |||
| children, | |||
| n => n.uri.relativePath.split('/'), | |||
| (...parts: string[]) => Strings.normalizePath(paths.join(...parts)), | |||
| this.view.config.files.compact, | |||
| ); | |||
| const root = new FolderNode(this.view, this, this.repoPath, '', hierarchy, true); | |||
| children = root.getChildren() as FileNode[]; | |||
| } else { | |||
| children.sort( | |||
| (a, b) => | |||
| a.priority - b.priority || | |||
| a.label!.localeCompare(b.label!, undefined, { numeric: true, sensitivity: 'base' }), | |||
| ); | |||
| } | |||
| return children; | |||
| } | |||
| async getTreeItem(): Promise<TreeItem> { | |||
| // if (this.status.state.ahead > 0) { | |||
| const stats = await Container.git.getChangedFilesCount(this.repoPath, `${this.status.upstream}...`); | |||
| const files = stats?.files ?? 0; | |||
| // } | |||
| const label = `${Strings.pluralize('file', files)} changed`; | |||
| const item = new TreeItem(label, TreeItemCollapsibleState.Collapsed); | |||
| item.id = this.id; | |||
| item.contextValue = ContextValues.StatusFiles; | |||
| // item.iconPath = { | |||
| // dark: Container.context.asAbsolutePath('images/dark/icon-diff.svg'), | |||
| // light: Container.context.asAbsolutePath('images/light/icon-diff.svg'), | |||
| // }; | |||
| return item; | |||
| } | |||
| } | |||