Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
e300d55
Changes delete comment icon from close to trash (#2390)
Jan 25, 2021
27a17d8
Adds GitLens integration for creating a PR (#2386)
Jan 25, 2021
fe9636c
Adds notification to offer PR create on publish (#2362)
Jan 25, 2021
35bd960
Ensure the pull request defaults use a local remote (#2393)
Jan 25, 2021
35bbade
Fix validation message styling
Jan 26, 2021
3b0c941
Unable to find GitHub repository matching 'undefined'. (#2418)
Jan 27, 2021
8eacfc9
PR flow: Create as draft not vertically centered on Linux (#2416)
Jan 27, 2021
d4ea410
Double "cancel" in need to push commits dialogue (#2417)
Jan 27, 2021
5ecaab1
Are both "Create PR" and "Create Draft PR" needed? (#2419)
Jan 27, 2021
98ebf2f
Pull request description set incorrectly for "ask" (#2421)
Jan 27, 2021
d533a0f
fix focus color for select and input (#2423)
TylerLeonhardt Jan 27, 2021
85691f4
GH PR: picker for repository could provide help text and should stay …
Jan 27, 2021
5c023eb
GH PR: clicking on + in SCM repos view should not ask me for which fo…
Jan 27, 2021
2a52a65
Deprecate githubPullRequests.pullRequestTitle and githubPullRequests.…
Jan 27, 2021
2e45e24
Prompted to publish branch again in create flow (#2430)
Jan 27, 2021
0e79717
Closes #2398 - adds missing don't show again (#2431)
Jan 27, 2021
d541388
Decorate branch name with some detail so they become distinguishable …
Jan 28, 2021
c21c1ef
Updates to latest GitLens apis (#2429)
Jan 28, 2021
eb3f58d
Dropdowns missing all entries after push to brach (#2437)
Jan 29, 2021
8efc163
Creating PR pulls in wrong title as a default, fixes #2435
Jan 29, 2021
af775a0
Adds new create PR icon (#2445)
Feb 1, 2021
dc402c9
Fixes missing create PR icon (#2447)
Feb 2, 2021
19a9bd4
Remove unused package.nls.json to get back to under 25 files for web …
Feb 3, 2021
15766a9
Use commit instead of branch name for default PR title on unpublished…
Feb 3, 2021
30ade76
Use merge base as ref instead of base branch for comparing changes (#…
Feb 4, 2021
55065db
Update to version 0.23 (#2452)
Feb 4, 2021
4352b3a
PR: Using inputbox warnings as showing errors is not accessible (#2451)
Feb 4, 2021
3068cc8
Terminology: Change "in GitHub" to be "on GitHub" (#2453)
Feb 4, 2021
d0b7664
prevent description box resize from being too small (#2433)
TylerLeonhardt Feb 4, 2021
455e303
Rename "All" to "All Open" (#2441)
Feb 4, 2021
c8d74ba
Add action to open the description page from the focused mode view (#…
Feb 5, 2021
d4bf558
Updates Create PR icon to codicon (#2457)
Feb 5, 2021
8971cfe
No focus indicator when tabbing over the "Create as draft" checkbox (…
Feb 8, 2021
0349891
Update README (#2466)
Feb 8, 2021
1d31bcf
Render resolved conversations as collapsed on description page (#2471)
Feb 8, 2021
2580873
Some SVGs on the description page have the wrong fill color (#2467)
Feb 8, 2021
9ce2969
Resolved comments should not show expanded (#2481)
Feb 9, 2021
355e778
Add refresh button the focused pull request view (#2484)
Feb 10, 2021
6c10231
Update version to 0.23.1
Feb 11, 2021
497a631
Change icon to more representative icon (#2294)
KaiSforza Feb 11, 2021
f9a2a56
Separate view containers for PR and issues list and the active pull r…
Feb 11, 2021
449c6b5
Show warning when both nightly and stable versions are enabled (#2485)
Feb 11, 2021
85f8ef1
Add experimentation service (#2488)
Feb 12, 2021
7138f26
Fix comparison. API returns undefined instead of null (#2494)
IllusionMH Feb 16, 2021
2a0fc3d
Exclude Activity Bar icon from ignored files (#2496)
IllusionMH Feb 16, 2021
020ffda
Revert "Exclude Activity Bar icon from ignored files (#2496)"
Feb 16, 2021
44d2728
Use codicon instead of svg for activity bar icon
Feb 16, 2021
66e9b48
[Nightly] Opening PR description page from tree not working when PR i…
Feb 17, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified .readme/demo.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## 0.23.1

### Fixes

- Update the new "Create Pull Request" icon to be a sharper image.

## 0.23.0

### Changes
Expand Down
12 changes: 5 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
> Review and manage your GitHub pull requests and issues directly in VS Code

This extension allows you to review and manage GitHub pull requests and issues in Visual Studio Code. The support includes:
- Authenticating and connecting VS Code to GitHub.
- Authenticating and connecting VS Code to GitHub. **Note**: GitHub Enterprise is not supported
- Listing and browsing PRs from within VS Code.
- Reviewing PRs from within VS Code with in-editor commenting.
- Validating PRs from within VS Code with easy checkouts.
Expand All @@ -21,13 +21,11 @@ This extension allows you to review and manage GitHub pull requests and issues i
# Getting Started
It's easy to get started with GitHub Pull Requests for Visual Studio Code. Simply follow these steps to get started.

1. Make sure you have VSCode version 1.27.0 or higher.
1. Download the extension from [the marketplace](https://aka.ms/vscodepr-download).
1. Reload VS Code after the installation (click the reload button next to the extension).
1. Open your desired GitHub repository.
1. If you're using version 0.5.0 of the extension or higher, a new viewlet should be added to the bottom of the activity bar. For older versions, the `GitHub Pull Requests` treeview will appear in the SCM Viewlet.
1. Install the extension from within VS Code or download it from [the marketplace](https://aka.ms/vscodepr-download).
1. Open your desired GitHub repository in VS Code.
1. A new viewlet will appear on the activity bar which shows a list of pull requests and issues.
1. Use the button on the viewlet to sign in to GitHub.
1. You may need to configure the `githubPullRequests.remotes` setting, by default the extension will look for PRs for `origin` and `upstream`. If you have different remotes, add them to the remotes list.
1. A notification should appear asking you to sign in to GitHub; follow the directions to authenticate.
1. You should be good to go!

# Configuring the extension
Expand Down
2 changes: 1 addition & 1 deletion documentation/IssueFeatures.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ You can also create an issue from a text selection by running the **Create Issue

# Commands

There are two new commands for easily creating GitHub permalinks. The **Copy GitHub Permalink** command will take the text you have selected and make a git hub permalink. The **Open Permalink in GitHub** command creates the same permalink, but also opens the link in your browser.
There are two new commands for easily creating GitHub permalinks. The **Copy GitHub Permalink** command will take the text you have selected and make a git hub permalink. The **Open Permalink on GitHub** command creates the same permalink, but also opens the link in your browser.

# Inline Completion Suggestions

Expand Down
114 changes: 65 additions & 49 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
},
"enableProposedApi": true,
"preview": true,
"version": "0.22.0",
"version": "0.23.1",
"publisher": "GitHub",
"engines": {
"vscode": "^1.53.0"
"vscode": "^1.53.2"
},
"categories": [
"Other"
Expand Down Expand Up @@ -59,6 +59,7 @@
}
},
"githubPullRequests.pullRequestTitle": {
"deprecationMessage": "The pull request title now uses the same defaults as GitHub, and can be edited before create.",
"type": "string",
"enum": [
"commit",
Expand All @@ -76,6 +77,7 @@
"description": "The title used when creating pull requests."
},
"githubPullRequests.pullRequestDescription": {
"deprecationMessage": "The pull request description now uses the same defaults as GitHub, and can be edited before create.",
"type": "string",
"enum": [
"template",
Expand Down Expand Up @@ -362,7 +364,12 @@
{
"id": "github-pull-requests",
"title": "GitHub",
"icon": "resources/icons/pull-request.png"
"icon": "$(github)"
},
{
"id": "github-pull-request",
"title": "GitHub Pull Request",
"icon": "$(git-pull-request)"
}
]
},
Expand All @@ -374,31 +381,20 @@
"when": "ReposManagerStateContext == NeedsAuthentication",
"icon": "resources/icons/pull-request.png"
},
{
"id": "prStatus:github",
"name": "Changes In Pull Request",
"when": "github:inReviewMode",
"icon": "resources/icons/pull-request.png",
"visibility": "visible"
},
{
"id": "pr:github",
"name": "Pull Requests",
"when": "ReposManagerStateContext != NeedsAuthentication && !github:focusedReview && !github:createPullRequest",
"when": "ReposManagerStateContext != NeedsAuthentication",
"icon": "resources/icons/pull-request.png"
},
{
"id": "github:activePullRequest",
"type": "webview",
"name": "Active Pull Request",
"when": "github:focusedReview"
},
{
"id": "issues:github",
"name": "Issues",
"when": "ReposManagerStateContext != NeedsAuthentication && !github:focusedReview &&!github:createPullRequest",
"when": "ReposManagerStateContext != NeedsAuthentication",
"icon": "resources/icons/issues.png"
},
}
],
"github-pull-request": [
{
"id": "github:createPullRequest",
"type": "webview",
Expand All @@ -411,20 +407,27 @@
"name": "Compare Changes",
"when": "github:createPullRequest",
"visibility": "visible"
},
{
"id": "prStatus:github",
"name": "Changes In Pull Request",
"when": "github:inReviewMode",
"icon": "resources/icons/pull-request.png",
"visibility": "visible"
},
{
"id": "github:activePullRequest",
"type": "webview",
"name": "Active Pull Request",
"when": "github:focusedReview"
}
]
},
"commands": [
{
"command": "pr.create",
"title": "Create Pull Request",
"icon": "$(plus)",
"category": "GitHub Pull Requests"
},
{
"command": "pr.createDraft",
"title": "Create Draft Pull Request",
"icon": "$(plus)",
"icon": "$(git-pull-request-create)",
"category": "GitHub Pull Requests"
},
{
Expand Down Expand Up @@ -459,8 +462,8 @@
"category": "GitHub Pull Requests"
},
{
"command": "pr.openPullRequestInGitHub",
"title": "Open Pull Request in GitHub",
"command": "pr.openPullRequestOnGitHub",
"title": "Open Pull Request on GitHub",
"category": "GitHub Pull Requests",
"icon": "$(globe)"
},
Expand All @@ -470,8 +473,8 @@
"category": "GitHub Pull Requests"
},
{
"command": "pr.openFileInGitHub",
"title": "Open File in GitHub",
"command": "pr.openFileOnGitHub",
"title": "Open File on GitHub",
"category": "GitHub Pull Requests"
},
{
Expand Down Expand Up @@ -499,7 +502,8 @@
"command": "pr.openDescription",
"title": "View Pull Request Description",
"category": "GitHub Pull Requests",
"when": "github:inReviewMode"
"when": "github:inReviewMode",
"icon": "$(note)"
},
{
"command": "pr.openDescriptionToTheSide",
Expand Down Expand Up @@ -603,7 +607,7 @@
"command": "pr.deleteComment",
"title": "Delete Comment",
"category": "GitHub Pull Requests",
"icon": "$(close)"
"icon": "$(trash)"
},
{
"command": "pr.finishReview",
Expand All @@ -621,6 +625,12 @@
"title": "Configure Remotes...",
"category": "GitHub Pull Requests"
},
{
"command": "pr.refreshActivePullRequest",
"title": "Refresh",
"category": "GitHub Pull Requests",
"icon": "$(refresh)"
},
{
"command": "issue.createIssueFromSelection",
"title": "Create Issue From Selection",
Expand All @@ -643,7 +653,7 @@
},
{
"command": "issue.openGithubPermalink",
"title": "Open Permalink in GitHub",
"title": "Open Permalink on GitHub",
"category": "GitHub Issues"
},
{
Expand Down Expand Up @@ -763,12 +773,7 @@
{
"view": "github:compareChanges",
"when": "github:noUpstream",
"contents": "The current branch has no upstream remote\n[Publish branch](command:git.publish)"
},
{
"view": "github:compareChanges",
"when": "github:noCommitDifference",
"contents": "The are no commits between the base branch and the current branch"
"contents": "The comparing branch has no upstream remote\n[Publish branch](command:git.publish)"
}
],
"keybindings": [
Expand Down Expand Up @@ -817,10 +822,6 @@
"command": "pr.create",
"when": "gitOpenRepositoryCount != 0 && github:authenticated"
},
{
"command": "pr.createDraft",
"when": "gitOpenRepositoryCount != 0 && github:authenticated"
},
{
"command": "pr.merge",
"when": "gitOpenRepositoryCount != 0 && github:inReviewMode"
Expand All @@ -830,15 +831,15 @@
"when": "gitOpenRepositoryCount != 0 && github:inReviewMode"
},
{
"command": "pr.openPullRequestInGitHub",
"command": "pr.openPullRequestOnGitHub",
"when": "gitOpenRepositoryCount != 0 && github:inReviewMode"
},
{
"command": "pr.refreshDescription",
"when": "gitOpenRepositoryCount != 0 && github:inReviewMode"
},
{
"command": "pr.openFileInGitHub",
"command": "pr.openFileOnGitHub",
"when": "false"
},
{
Expand Down Expand Up @@ -1016,6 +1017,10 @@
{
"command": "issue.goToLinkedCode",
"when": "false"
},
{
"command": "pr.refreshActivePullRequest",
"when": "false"
}
],
"view/title": [
Expand Down Expand Up @@ -1060,9 +1065,19 @@
"group": "navigation@1"
},
{
"command": "pr.openPullRequestInGitHub",
"command": "pr.refreshActivePullRequest",
"when": "view == github:activePullRequest && github:hasGitHubRemotes",
"group": "navigation"
"group": "navigation@1"
},
{
"command": "pr.openDescription",
"when": "view == github:activePullRequest && github:hasGitHubRemotes",
"group": "navigation@2"
},
{
"command": "pr.openPullRequestOnGitHub",
"when": "view == github:activePullRequest && github:hasGitHubRemotes",
"group": "navigation@3"
}
],
"view/item/context": [
Expand All @@ -1087,7 +1102,7 @@
"group": "pullrequest@2"
},
{
"command": "pr.openPullRequestInGitHub",
"command": "pr.openPullRequestOnGitHub",
"when": "view == pr:github && viewItem =~ /pullrequest|description/",
"group": "pullrequest@3"
},
Expand All @@ -1097,7 +1112,7 @@
"group": "pullrequest@4"
},
{
"command": "pr.openFileInGitHub",
"command": "pr.openFileOnGitHub",
"when": "view =~ /(pr|prStatus):github/ && viewItem =~ /filechange/"
},
{
Expand Down Expand Up @@ -1424,6 +1439,7 @@
"tunnel": "0.0.6",
"uuid": "^3.3.3",
"vscode-extension-telemetry": "^0.1.3",
"vscode-tas-client": "^0.1.17",
"vsls": "^0.3.967"
},
"optionalDependencies": {
Expand Down
11 changes: 0 additions & 11 deletions package.nls.json

This file was deleted.

3 changes: 2 additions & 1 deletion src/api/api.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/

import { Uri, Event, Disposable } from 'vscode';
import { APIState } from '../typings/git';
import { APIState, PublishEvent } from '../typings/git';

export interface InputBox {
value: string;
Expand Down Expand Up @@ -270,6 +270,7 @@ export interface IGit {
// Used by the actual git extension to indicate it has finished initializing state information
readonly state?: APIState;
readonly onDidChangeState?: Event<APIState>;
readonly onDidPublish?: Event<PublishEvent>;
}

export interface API {
Expand Down
7 changes: 6 additions & 1 deletion src/api/api1.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import * as vscode from 'vscode';
import { API, IGit, Repository } from './api';
import { TernarySearchTree } from '../common/utils';
import { APIState } from '../typings/git';
import { APIState, PublishEvent } from '../typings/git';

export class GitApiImpl implements API, IGit, vscode.Disposable {
private static _handlePool: number = 0;
Expand Down Expand Up @@ -42,6 +42,8 @@ export class GitApiImpl implements API, IGit, vscode.Disposable {
readonly onDidCloseRepository: vscode.Event<Repository> = this._onDidCloseRepository.event;
private _onDidChangeState = new vscode.EventEmitter<APIState>();
readonly onDidChangeState: vscode.Event<APIState> = this._onDidChangeState.event;
private _onDidPublish = new vscode.EventEmitter<PublishEvent>();
readonly onDidPublish: vscode.Event<PublishEvent> = this._onDidPublish.event;

private _disposables: vscode.Disposable[];
constructor() {
Expand All @@ -57,6 +59,9 @@ export class GitApiImpl implements API, IGit, vscode.Disposable {
if (provider.onDidChangeState) {
this._disposables.push(provider.onDidChangeState(e => this._onDidChangeState.fire(e)));
}
if (provider.onDidPublish) {
this._disposables.push(provider.onDidPublish(e => this._onDidPublish.fire(e)));
}

provider.repositories.forEach(repository => {
this._onDidOpenRepository.fire(repository);
Expand Down
Loading