Eric Amodio
5 years ago
32 changed files with 1222 additions and 163 deletions
Split View
Diff Options
-
+1 -1.eslintrc.json
-
+3 -0images/dark/icon-help.svg
-
+3 -0images/dark/icon-plug.svg
-
+3 -0images/dark/icon-unplug.svg
-
+57 -3package.json
-
+3 -5src/annotations/annotations.ts
-
+52 -5src/annotations/lineAnnotationController.ts
-
+1 -0src/commands.ts
-
+3 -1src/commands/common.ts
-
+97 -0src/commands/remoteProviders.ts
-
+3 -0src/config.ts
-
+14 -1src/container.ts
-
+92 -0src/credentials.ts
-
+133 -49src/git/formatters/commitFormatter.ts
-
+90 -1src/git/gitService.ts
-
+1 -0src/git/models/models.ts
-
+109 -0src/git/models/pullRequest.ts
-
+2 -2src/git/models/remote.ts
-
+32 -7src/git/models/repository.ts
-
+1 -1src/git/remotes/azure-devops.ts
-
+2 -2src/git/remotes/bitbucket-server.ts
-
+2 -2src/git/remotes/bitbucket.ts
-
+5 -3src/git/remotes/factory.ts
-
+73 -19src/git/remotes/github.ts
-
+1 -1src/git/remotes/gitlab.ts
-
+155 -35src/git/remotes/provider.ts
-
+92 -0src/github/github.ts
-
+19 -3src/hovers/hovers.ts
-
+16 -0src/system/promise.ts
-
+27 -19src/views/nodes/remoteNode.ts
-
+27 -2webpack.config.js
-
+103 -1yarn.lock
+ 1
- 1
.eslintrc.json
View File
+ 3
- 0
images/dark/icon-help.svg
View File
| @ -0,0 +1,3 @@ | |||
| <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none" viewBox="0 0 16 16"> | |||
| <path fill="#C5C5C5" fill-rule="evenodd" d="M3.89 2.1a6.5 6.5 0 117.182 10.835A6.5 6.5 0 013.89 2.1zm.55 10A5.5 5.5 0 109.6 2.42a5.38 5.38 0 00-3.17-.31 5.47 5.47 0 00-4.32 4.32 5.5 5.5 0 002.33 5.64v.03zM8.41 4a2.26 2.26 0 00-.85-.17 2.09 2.09 0 00-.85.17 2.33 2.33 0 00-.7.47 2.14 2.14 0 00-.46.69 1.93 1.93 0 00-.17.84h.87a1.3 1.3 0 01.8-1.21 1.3 1.3 0 01.51-.11c.179.002.356.04.52.11.315.135.565.385.7.7.064.163.098.335.1.51a1.18 1.18 0 01-.13.52 2.34 2.34 0 01-.33.43L8 7.32c-.15.14-.29.29-.42.45a2.14 2.14 0 00-.32.55 1.57 1.57 0 00-.13.68v.44H8V9a1.06 1.06 0 01.13-.52c.092-.156.203-.3.33-.43.133-.14.273-.274.42-.4.15-.14.29-.29.42-.45a2.14 2.14 0 00.32-.55A1.72 1.72 0 009.75 6a2.26 2.26 0 00-.17-.85A2.3 2.3 0 008.41 4zM8 11.22v-.88h-.87v.88H8z" clip-rule="evenodd"/> | |||
| </svg> | |||
+ 3
- 0
images/dark/icon-plug.svg
View File
| @ -0,0 +1,3 @@ | |||
| <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none" viewBox="0 0 16 16"> | |||
| <path fill="#C5C5C5" fill-rule="evenodd" d="M7 1H6v3H4.5l-.5.5V8a4 4 0 003.5 3.969V15h1v-3.031A4 4 0 0012 8V4.5l-.5-.5H10V1H9v3H7V1zm3.121 9.121A3 3 0 015 8V5h6v3a3 3 0 01-.879 2.121z" clip-rule="evenodd"/> | |||
| </svg> | |||
+ 3
- 0
images/dark/icon-unplug.svg
View File
| @ -0,0 +1,3 @@ | |||
| <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none" viewBox="0 0 16 16"> | |||
| <path fill="#C5C5C5" fill-rule="evenodd" d="M13.617 3.844a2.87 2.87 0 00-.451-.868l1.354-1.36L13.904 1l-1.36 1.354c-.264-.201-.554-.351-.868-.452a3.073 3.073 0 00-2.14.075 3.03 3.03 0 00-.991.664L7 4.192l4.327 4.328 1.552-1.545c.287-.287.508-.618.663-.992a3.074 3.074 0 00.075-2.14zm-.889 1.804a2.15 2.15 0 01-.471.705l-.93.93-3.09-3.09.93-.93a2.15 2.15 0 01.704-.472 2.134 2.134 0 011.689.007c.264.114.494.271.69.472.2.195.358.426.472.69a2.134 2.134 0 01.007 1.688zm-4.824 4.994l1.484-1.545-.616-.622-1.49 1.551-1.86-1.859 1.491-1.552L6.291 6 4.808 7.545l-.616-.615-1.551 1.545c-.287.287-.509.62-.663.998a3.023 3.023 0 00-.233 1.169c0 .332.05.656.15.97.105.31.258.597.459.862L1 13.834l.615.615 1.36-1.353c.265.2.552.353.862.458.314.1.638.15.97.15.406 0 .796-.077 1.17-.232.378-.155.71-.376.998-.663l1.545-1.552-.616-.615zm-2.262 2.023a2.16 2.16 0 01-.834.164c-.301 0-.586-.057-.855-.17a2.278 2.278 0 01-.697-.466 2.28 2.28 0 01-.465-.697 2.167 2.167 0 01-.17-.854 2.16 2.16 0 01.642-1.545l.93-.93 3.09 3.09-.93.93a2.22 2.22 0 01-.711.478z" clip-rule="evenodd"/> | |||
| </svg> | |||
+ 57
- 3
package.json
View File
+ 3
- 5
src/annotations/annotations.ts
View File
+ 52
- 5
src/annotations/lineAnnotationController.ts
View File
+ 1
- 0
src/commands.ts
View File
+ 3
- 1
src/commands/common.ts
View File
+ 97
- 0
src/commands/remoteProviders.ts
View File
| @ -0,0 +1,97 @@ | |||
| 'use strict'; | |||
| import { GitCommit, GitRemote } from '../git/gitService'; | |||
| import { command, Command, CommandContext, Commands, isCommandViewContextWithRemote } from './common'; | |||
| import { Container } from '../container'; | |||
| export interface ConnectRemoteProviderCommandArgs { | |||
| remote: string; | |||
| repoPath: string; | |||
| } | |||
| @command() | |||
| export class ConnectRemoteProviderCommand extends Command { | |||
| static getMarkdownCommandArgs(args: ConnectRemoteProviderCommandArgs): string; | |||
| static getMarkdownCommandArgs(remote: GitRemote): string; | |||
| static getMarkdownCommandArgs(argsOrRemote: ConnectRemoteProviderCommandArgs | GitRemote): string { | |||
| let args: ConnectRemoteProviderCommandArgs | GitCommit; | |||
| if (GitRemote.is(argsOrRemote)) { | |||
| args = { | |||
| remote: argsOrRemote.id, | |||
| repoPath: argsOrRemote.repoPath | |||
| }; | |||
| } else { | |||
| args = argsOrRemote; | |||
| } | |||
| return super.getMarkdownCommandArgsCore<ConnectRemoteProviderCommandArgs>(Commands.ConnectRemoteProvider, args); | |||
| } | |||
| constructor() { | |||
| super(Commands.ConnectRemoteProvider); | |||
| } | |||
| protected preExecute(context: CommandContext, args?: ConnectRemoteProviderCommandArgs) { | |||
| if (isCommandViewContextWithRemote(context)) { | |||
| args = { ...args, remote: context.node.remote.name, repoPath: context.node.remote.repoPath }; | |||
| } | |||
| return this.execute(args); | |||
| } | |||
| async execute(args?: ConnectRemoteProviderCommandArgs): Promise<any> { | |||
| if (args?.repoPath == null || args?.remote == null) return undefined; | |||
| const remote = (await Container.git.getRemotes(args.repoPath)).find(r => args.remote); | |||
| if (!remote?.provider?.hasApi()) return undefined; | |||
| return remote.provider.connect(); | |||
| } | |||
| } | |||
| export interface DisconnectRemoteProviderCommandArgs { | |||
| remote: string; | |||
| repoPath: string; | |||
| } | |||
| @command() | |||
| export class DisconnectRemoteProviderCommand extends Command { | |||
| static getMarkdownCommandArgs(args: DisconnectRemoteProviderCommandArgs): string; | |||
| static getMarkdownCommandArgs(remote: GitRemote): string; | |||
| static getMarkdownCommandArgs(argsOrRemote: DisconnectRemoteProviderCommandArgs | GitRemote): string { | |||
| let args: DisconnectRemoteProviderCommandArgs | GitCommit; | |||
| if (GitRemote.is(argsOrRemote)) { | |||
| args = { | |||
| remote: argsOrRemote.id, | |||
| repoPath: argsOrRemote.repoPath | |||
| }; | |||
| } else { | |||
| args = argsOrRemote; | |||
| } | |||
| return super.getMarkdownCommandArgsCore<DisconnectRemoteProviderCommandArgs>( | |||
| Commands.DisconnectRemoteProvider, | |||
| args | |||
| ); | |||
| } | |||
| constructor() { | |||
| super(Commands.DisconnectRemoteProvider); | |||
| } | |||
| protected preExecute(context: CommandContext, args?: ConnectRemoteProviderCommandArgs) { | |||
| if (isCommandViewContextWithRemote(context)) { | |||
| args = { ...args, remote: context.node.remote.name, repoPath: context.node.remote.repoPath }; | |||
| } | |||
| return this.execute(args); | |||
| } | |||
| async execute(args?: DisconnectRemoteProviderCommandArgs): Promise<any> { | |||
| if (args?.repoPath == null || args?.remote == null) return undefined; | |||
| const remote = (await Container.git.getRemotes(args.repoPath)).find(r => args.remote); | |||
| if (!remote?.provider?.hasApi()) return undefined; | |||
| return remote.provider.disconnect(); | |||
| } | |||
| } | |||
+ 3
- 0
src/config.ts
View File
+ 14
- 1
src/container.ts
View File
+ 92
- 0
src/credentials.ts
View File
| @ -0,0 +1,92 @@ | |||
| 'use strict'; | |||
| // eslint-disable-next-line import/no-unresolved | |||
| import * as keytarType from 'keytar'; | |||
| import { Event, EventEmitter } from 'vscode'; | |||
| import { extensionId } from './constants'; | |||
| import { Logger } from './logger'; | |||
| const CredentialKey = `${extensionId}:vscode`; | |||
| // keytar depends on a native module shipped in vscode | |||
| function getNodeModule<T>(moduleName: string): T | undefined { | |||
| // eslint-disable-next-line no-eval | |||
| const vscodeRequire = eval('require'); | |||
| try { | |||
| return vscodeRequire(moduleName); | |||
| } catch { | |||
| return undefined; | |||
| } | |||
| } | |||
| const keychain = getNodeModule<typeof keytarType>('keytar'); | |||
| interface CredentialSaveEvent { | |||
| key: string; | |||
| reason: 'save'; | |||
| } | |||
| interface CredentialClearEvent { | |||
| key: string | undefined; | |||
| reason: 'clear'; | |||
| } | |||
| export type CredentialChangeEvent = CredentialSaveEvent | CredentialClearEvent; | |||
| export namespace CredentialManager { | |||
| const _onDidChange = new EventEmitter<CredentialChangeEvent>(); | |||
| export const onDidChange: Event<CredentialChangeEvent> = _onDidChange.event; | |||
| export async function addOrUpdate(key: string, value: string | {}) { | |||
| if (!key || !value) return; | |||
| if (keychain == null) { | |||
| Logger.log('CredentialManager.addOrUpdate: No credential store found'); | |||
| return; | |||
| } | |||
| try { | |||
| await keychain.setPassword(CredentialKey, key, typeof value === 'string' ? value : JSON.stringify(value)); | |||
| _onDidChange.fire({ key: key, reason: 'save' }); | |||
| } catch (ex) { | |||
| Logger.error(ex, 'CredentialManager.addOrUpdate: Failed to set credentials'); | |||
| } | |||
| } | |||
| export async function clear(key: string) { | |||
| if (!key) return; | |||
| if (keychain == null) { | |||
| Logger.log('CredentialManager.clear: No credential store found'); | |||
| return; | |||
| } | |||
| try { | |||
| await keychain.deletePassword(CredentialKey, key); | |||
| _onDidChange.fire({ key: key, reason: 'clear' }); | |||
| } catch (ex) { | |||
| Logger.error(ex, 'CredentialManager.clear: Failed to clear credentials'); | |||
| } | |||
| } | |||
| export async function get(key: string): Promise<string | undefined> { | |||
| if (!key) return undefined; | |||
| if (keychain == null) { | |||
| Logger.log('CredentialManager.clear: No credential store found'); | |||
| return undefined; | |||
| } | |||
| try { | |||
| const value = await keychain.getPassword(CredentialKey, key); | |||
| return value ?? undefined; | |||
| } catch (ex) { | |||
| Logger.error(ex, 'CredentialManager.get: Failed to get credentials'); | |||
| return undefined; | |||
| } | |||
| } | |||
| export async function getAs<T extends {}>(key: string): Promise<T | undefined> { | |||
| const value = await get(key); | |||
| if (value == null) return undefined; | |||
| return JSON.parse(value) as T; | |||
| } | |||
| } | |||
+ 133
- 49
src/git/formatters/commitFormatter.ts
View File
+ 90
- 1
src/git/gitService.ts
View File
+ 1
- 0
src/git/models/models.ts
View File
+ 109
- 0
src/git/models/pullRequest.ts
View File
| @ -0,0 +1,109 @@ | |||
| 'use strict'; | |||
| import { configuration, DateStyle } from '../../configuration'; | |||
| import { Dates, memoize } from '../../system'; | |||
| export const PullRequestDateFormatting = { | |||
| dateFormat: undefined! as string | null, | |||
| dateStyle: undefined! as DateStyle, | |||
| reset: () => { | |||
| PullRequestDateFormatting.dateFormat = configuration.get('defaultDateFormat'); | |||
| PullRequestDateFormatting.dateStyle = configuration.get('defaultDateStyle'); | |||
| } | |||
| }; | |||
| export enum PullRequestState { | |||
| Open = 'Open', | |||
| Closed = 'Closed', | |||
| Merged = 'Merged' | |||
| } | |||
| export class PullRequest { | |||
| constructor( | |||
| public readonly number: number, | |||
| public readonly title: string, | |||
| public readonly url: string, | |||
| public readonly state: PullRequestState, | |||
| public readonly date: Date, | |||
| public readonly closedDate?: Date, | |||
| public readonly mergedDate?: Date | |||
| ) {} | |||
| get formattedDate(): string { | |||
| return PullRequestDateFormatting.dateStyle === DateStyle.Absolute | |||
| ? this.formatDate(PullRequestDateFormatting.dateFormat) | |||
| : this.formatDateFromNow(); | |||
| } | |||
| @memoize() | |||
| private get dateFormatter(): Dates.DateFormatter { | |||
| return Dates.getFormatter(this.mergedDate ?? this.closedDate ?? this.date); | |||
| } | |||
| @memoize<PullRequest['formatDate']>(format => (format == null ? 'MMMM Do, YYYY h:mma' : format)) | |||
| formatDate(format?: string | null) { | |||
| if (format == null) { | |||
| format = 'MMMM Do, YYYY h:mma'; | |||
| } | |||
| return this.dateFormatter.format(format); | |||
| } | |||
| formatDateFromNow() { | |||
| return this.dateFormatter.fromNow(); | |||
| } | |||
| @memoize() | |||
| private get closedDateFormatter(): Dates.DateFormatter | undefined { | |||
| return this.closedDate === undefined ? undefined : Dates.getFormatter(this.closedDate); | |||
| } | |||
| @memoize<PullRequest['formatClosedDate']>(format => (format == null ? 'MMMM Do, YYYY h:mma' : format)) | |||
| formatClosedDate(format?: string | null) { | |||
| if (format == null) { | |||
| format = 'MMMM Do, YYYY h:mma'; | |||
| } | |||
| return this.closedDateFormatter?.format(format) ?? ''; | |||
| } | |||
| formatClosedDateFromNow() { | |||
| return this.closedDateFormatter?.fromNow() ?? ''; | |||
| } | |||
| @memoize() | |||
| private get mergedDateFormatter(): Dates.DateFormatter | undefined { | |||
| return this.mergedDate === undefined ? undefined : Dates.getFormatter(this.mergedDate); | |||
| } | |||
| @memoize<PullRequest['formatMergedDate']>(format => (format == null ? 'MMMM Do, YYYY h:mma' : format)) | |||
| formatMergedDate(format?: string | null) { | |||
| if (format == null) { | |||
| format = 'MMMM Do, YYYY h:mma'; | |||
| } | |||
| return this.mergedDateFormatter?.format(format) ?? ''; | |||
| } | |||
| formatMergedDateFromNow() { | |||
| return this.mergedDateFormatter?.fromNow() ?? ''; | |||
| } | |||
| @memoize() | |||
| private get updatedDateFormatter(): Dates.DateFormatter { | |||
| return Dates.getFormatter(this.date); | |||
| } | |||
| @memoize<PullRequest['formatUpdatedDate']>(format => (format == null ? 'MMMM Do, YYYY h:mma' : format)) | |||
| formatUpdatedDate(format?: string | null) { | |||
| if (format == null) { | |||
| format = 'MMMM Do, YYYY h:mma'; | |||
| } | |||
| return this.updatedDateFormatter.format(format); | |||
| } | |||
| formatUpdatedDateFromNow() { | |||
| return this.updatedDateFormatter.fromNow(); | |||
| } | |||
| } | |||
+ 2
- 2
src/git/models/remote.ts
View File
+ 32
- 7
src/git/models/repository.ts
View File
+ 1
- 1
src/git/remotes/azure-devops.ts
View File
+ 2
- 2
src/git/remotes/bitbucket-server.ts
View File
+ 2
- 2
src/git/remotes/bitbucket.ts
View File
+ 5
- 3
src/git/remotes/factory.ts
View File
+ 73
- 19
src/git/remotes/github.ts
View File
+ 1
- 1
src/git/remotes/gitlab.ts
View File
+ 155
- 35
src/git/remotes/provider.ts
View File
+ 92
- 0
src/github/github.ts
View File
| @ -0,0 +1,92 @@ | |||
| 'use strict'; | |||
| import { graphql } from '@octokit/graphql'; | |||
| import { Logger } from '../logger'; | |||
| import { debug } from '../system'; | |||
| import { PullRequest, PullRequestState } from '../git/gitService'; | |||
| export class GitHubApi { | |||
| @debug() | |||
| async getPullRequestForCommit( | |||
| token: string, | |||
| owner: string, | |||
| repo: string, | |||
| ref: string, | |||
| options?: { | |||
| baseUrl?: string; | |||
| } | |||
| ): Promise<PullRequest | undefined> { | |||
| const cc = Logger.getCorrelationContext(); | |||
| try { | |||
| const query = `query pr($owner: String!, $repo: String!, $sha: String!) { | |||
| repository(name: $repo, owner: $owner) { | |||
| object(expression: $sha) { | |||
| ... on Commit { | |||
| associatedPullRequests(first: 1, orderBy: {field: UPDATED_AT, direction: DESC}) { | |||
| nodes { | |||
| permalink | |||
| number | |||
| title | |||
| state | |||
| updatedAt | |||
| closedAt | |||
| mergedAt | |||
| repository { | |||
| owner { | |||
| login | |||
| } | |||
| } | |||
| } | |||
| } | |||
| } | |||
| } | |||
| } | |||
| }`; | |||
| const variables = { owner: owner, repo: repo, sha: ref }; | |||
| Logger.debug(cc, `variables: ${JSON.stringify(variables)}`); | |||
| const rsp = await graphql(query, { | |||
| ...variables, | |||
| headers: { authorization: `token ${token}` }, | |||
| ...options | |||
| }); | |||
| const pr = rsp?.repository?.object?.associatedPullRequests?.nodes?.[0] as GitHubPullRequest | undefined; | |||
| if (pr == null) return undefined; | |||
| // GitHub seems to sometimes return PRs for forks | |||
| if (pr.repository.owner.login !== owner) return undefined; | |||
| return new PullRequest( | |||
| pr.number, | |||
| pr.title, | |||
| pr.permalink, | |||
| pr.state === 'MERGED' | |||
| ? PullRequestState.Merged | |||
| : pr.state === 'CLOSED' | |||
| ? PullRequestState.Closed | |||
| : PullRequestState.Open, | |||
| new Date(pr.updatedAt), | |||
| pr.closedAt == null ? undefined : new Date(pr.closedAt), | |||
| pr.mergedAt == null ? undefined : new Date(pr.mergedAt) | |||
| ); | |||
| } catch (ex) { | |||
| Logger.error(ex, cc); | |||
| throw ex; | |||
| } | |||
| } | |||
| } | |||
| interface GitHubPullRequest { | |||
| permalink: string; | |||
| number: number; | |||
| title: string; | |||
| state: 'OPEN' | 'CLOSED' | 'MERGED'; | |||
| updatedAt: string; | |||
| closedAt: string | null; | |||
| mergedAt: string | null; | |||
| repository: { | |||
| owner: { | |||
| login: string; | |||
| }; | |||
| }; | |||
| } | |||