Eric Amodio
4 years ago
18 changed files with 667 additions and 72 deletions
Split View
Diff Options
-
+161 -28package.json
-
+2 -1src/commands.ts
-
+2 -0src/commands/common.ts
-
+57 -0src/commands/openPullRequestOnRemote.ts
-
+32 -0src/config.ts
-
+59 -2src/git/gitService.ts
-
+13 -1src/git/models/branch.ts
-
+9 -1src/git/models/commit.ts
-
+5 -0src/git/models/pullRequest.ts
-
+21 -1src/git/remotes/github.ts
-
+41 -1src/git/remotes/provider.ts
-
+148 -25src/github/github.ts
-
+1 -1src/statusbar/statusBarController.ts
-
+26 -4src/views/nodes/branchNode.ts
-
+16 -4src/views/nodes/commitNode.ts
-
+70 -0src/views/nodes/pullRequestNode.ts
-
+3 -3src/views/nodes/stashNode.ts
-
+1 -0src/views/nodes/viewNode.ts
+ 161
- 28
package.json
View File
+ 2
- 1
src/commands.ts
View File
+ 2
- 0
src/commands/common.ts
View File
+ 57
- 0
src/commands/openPullRequestOnRemote.ts
View File
| @ -0,0 +1,57 @@ | |||
| 'use strict'; | |||
| import { env, Uri } from 'vscode'; | |||
| import { | |||
| Command, | |||
| command, | |||
| CommandContext, | |||
| Commands, | |||
| isCommandViewContextWithCommit, | |||
| isCommandViewContextWithFileCommit, | |||
| } from './common'; | |||
| import { Container } from '../container'; | |||
| import { PullRequestNode } from '../views/nodes/pullRequestNode'; | |||
| export interface OpenPullRequestOnRemoteCommandArgs { | |||
| ref?: string; | |||
| repoPath?: string; | |||
| pr?: { url: string }; | |||
| } | |||
| @command() | |||
| export class OpenPullRequestOnRemoteCommand extends Command { | |||
| constructor() { | |||
| super([Commands.OpenPullRequestOnRemote, Commands.OpenAssociatedPullRequestOnRemote]); | |||
| } | |||
| protected preExecute(context: CommandContext, args?: OpenPullRequestOnRemoteCommandArgs) { | |||
| if (context.command === Commands.OpenPullRequestOnRemote) { | |||
| if (context.type === 'viewItem' && context.node instanceof PullRequestNode) { | |||
| args = { | |||
| ...args, | |||
| pr: { url: context.node.pullRequest.url }, | |||
| }; | |||
| } | |||
| } else if (isCommandViewContextWithCommit(context) || isCommandViewContextWithFileCommit(context)) { | |||
| args = { ...args, ref: context.node.commit.sha, repoPath: context.node.commit.repoPath }; | |||
| } | |||
| return this.execute(args); | |||
| } | |||
| async execute(args?: OpenPullRequestOnRemoteCommandArgs) { | |||
| if (args?.pr == null) { | |||
| if (args?.repoPath == null || args?.ref == null) return; | |||
| const remote = await Container.git.getRemoteWithApiProvider(args.repoPath); | |||
| if (remote?.provider == null) return; | |||
| const pr = await Container.git.getPullRequestForCommit(args.ref, remote.provider); | |||
| if (pr == null) return; | |||
| args = { ...args }; | |||
| args.pr = pr; | |||
| } | |||
| void env.openExternal(Uri.parse(args.pr.url)); | |||
| } | |||
| } | |||
+ 32
- 0
src/config.ts
View File
+ 59
- 2
src/git/gitService.ts
View File
+ 13
- 1
src/git/models/branch.ts
View File
+ 9
- 1
src/git/models/commit.ts
View File
+ 5
- 0
src/git/models/pullRequest.ts
View File
+ 21
- 1
src/git/remotes/github.ts
View File
+ 41
- 1
src/git/remotes/provider.ts
View File
+ 148
- 25
src/github/github.ts
View File
+ 1
- 1
src/statusbar/statusBarController.ts
View File
+ 26
- 4
src/views/nodes/branchNode.ts
View File
+ 16
- 4
src/views/nodes/commitNode.ts
View File
+ 70
- 0
src/views/nodes/pullRequestNode.ts
View File
| @ -0,0 +1,70 @@ | |||
| 'use strict'; | |||
| import { ThemeIcon, TreeItem, TreeItemCollapsibleState } from 'vscode'; | |||
| import { BranchesView } from '../branchesView'; | |||
| import { CommitsView } from '../commitsView'; | |||
| import { CompareView } from '../compareView'; | |||
| import { ContributorsView } from '../contributorsView'; | |||
| import { GitBranch, GitCommit, PullRequest, PullRequestState } from '../../git/git'; | |||
| import { GitUri } from '../../git/gitUri'; | |||
| import { RemotesView } from '../remotesView'; | |||
| import { RepositoriesView } from '../repositoriesView'; | |||
| import { RepositoryNode } from './repositoryNode'; | |||
| import { SearchView } from '../searchView'; | |||
| import { ContextValues, ViewNode } from './viewNode'; | |||
| export class PullRequestNode extends ViewNode< | |||
| BranchesView | CommitsView | CompareView | ContributorsView | RemotesView | RepositoriesView | SearchView | |||
| > { | |||
| static key = ':pullrequest'; | |||
| static getId(repoPath: string, number: number, ref: string): string { | |||
| return `${RepositoryNode.getId(repoPath)}${this.key}(${number}):${ref}`; | |||
| } | |||
| constructor( | |||
| view: BranchesView | CommitsView | CompareView | ContributorsView | RemotesView | RepositoriesView | SearchView, | |||
| parent: ViewNode, | |||
| public readonly pullRequest: PullRequest, | |||
| public readonly branchOrCommit: GitBranch | GitCommit, | |||
| ) { | |||
| super(GitUri.fromRepoPath(branchOrCommit.repoPath), view, parent); | |||
| } | |||
| toClipboard(): string { | |||
| return this.pullRequest.url; | |||
| } | |||
| get id(): string { | |||
| return PullRequestNode.getId(this.branchOrCommit.repoPath, this.pullRequest.number, this.branchOrCommit.ref); | |||
| } | |||
| getChildren(): ViewNode[] { | |||
| return []; | |||
| } | |||
| getTreeItem(): TreeItem { | |||
| const item = new TreeItem( | |||
| `#${this.pullRequest.number}: ${this.pullRequest.title}`, | |||
| TreeItemCollapsibleState.None, | |||
| ); | |||
| item.contextValue = ContextValues.PullRequest; | |||
| item.description = `${this.pullRequest.state}, ${this.pullRequest.formatDateFromNow()}`; | |||
| item.iconPath = new ThemeIcon('git-pull-request'); | |||
| item.id = this.id; | |||
| item.tooltip = `${this.pullRequest.title}\n#${this.pullRequest.number} by ${this.pullRequest.author.name} was ${ | |||
| this.pullRequest.state === PullRequestState.Open ? 'opened' : this.pullRequest.state.toLowerCase() | |||
| } ${this.pullRequest.formatDateFromNow()}`; | |||
| if (this.branchOrCommit instanceof GitCommit) { | |||
| item.tooltip = `Commit ${this.branchOrCommit.shortSha} was introduced by PR #${this.pullRequest.number}\n${item.tooltip}`; | |||
| } | |||
| // item.tooltip = `Open Pull Request #${this.pullRequest.number} on ${this.pullRequest.provider}`; | |||
| // item.command = { | |||
| // title: 'Open Pull Request', | |||
| // command: Commands.OpenPullRequestOnRemote, | |||
| // arguments: [this], | |||
| // }; | |||
| return item; | |||
| } | |||
| } | |||