For most development teams, the final step in the development process is a pull request. Even if your team has decided to use CodeStream's feedback requests as a replacement for, and not just a precursor to, your end-of-cycle PR-based code reviews, CodeStream allows you to keep all of that workflow right in your IDE.
There are three elements of CodeStream's pull-request integration, and the following table outlines which code-hosting services are supported for each.
|Create a pull request||GitHub, GitHub Enterprise, GitLab, GitLab Self-Managed, Bitbucket, Bitbucket Server|
|Create a pull request across forks||GitHub, GitHub Enterprise, GitLab, GitLab Self-Managed|
|Review and edit a pull request||GitHub, GitHub Enterprise, GitLab, GitLab Self-Managed|
|Display pull request comments as code annotations||GitHub, GitLab, Bitbucket|
Open a pull request at any time by clicking on the "+" button at the top of the
CodeStream pane, or the "+" button in the header of the Pull Requests
section. You can also use a keyboard shortcut (
p on a Mac... and you can use
m if you're a GitLab user). CodeStream even
provides you with different options (tree view, list view, diff hunks) for
reviewing your changes before opening the pull request.
With a single click you can name the pull request based on the last commit message, the branch name, or, if you started work by selecting a ticket, the ticket title. If you have a ticket selected, you can also explicitly tie the ticket to the pull request, and CodeStream will include a link to the ticket in the pull request's description. Before submitting the pull request you can even review your changes by clicking on any of the files listed below the form.
To create a pull request across forks, click on the "compare across forks" link at the top of the page and the form will update to allow you to select both the base and head repositories.
You can also create a pull request from within a CodeStream feedback request. Once the feedback request has been approved, you’ll see an option to open a pull request at the top.
Before you can create a pull request you’ll need to make sure that any changes included in the feedback request have been committed and pushed. Also, if the feature branch you’re working on doesn’t have a remote tracking branch you’ll be given the option to set that as part of creating the pull request.
When you create a pull request from a feedback request, CodeStream connect's the dots between the two by adding a link to the pull request to the feedback request.
And by adding a link to the feedback request, along with information about who did the review and when, in the description of the pull request.
The ability to review pull requests is currently not available for Bitbucket.
Regardless of where the pull request was created, you can edit, review, and even merge it, right from CodeStream. We've essentially brought GitHub and GitLab right into your IDE, so there's zero learning curve. If you know how to work with pull requests on GitHub or GitLab, you'll know how to do it in CodeStream as well.
Edit a GitHub pull request's details, such as reviewers, assignees and labels.
For a GitLab merge request, you can use edit mode (via the dropdown at the top of the page) or use the sidebar.
By default, you can only add a single reviewer and a single assignee to a GitLab merge request. If your organization supports multiple reviewers and assignees, click the gear menu in the heading of the Merge Requests section of the CodeStream pane to enable this.
Review the conversation and add comments, with the ability to @mention your collaborators.
View the changes, add comments, and submit a review.
Of course, we did improve upon the GitHub/GitLab experience in a couple of important ways. On GitHub and GitLab you can only view the changes as a series of "diff hunks". CodeStream provides that view as well, but if you'd prefer to see the changes in the context of the full file, and not just the lines that changed, you can use either List View or Tree View. Just select the code you want to comment on, and then click on the Comment button (or select Comment from the context menu).
When commenting you can either add a single comment, or start a review.
Another difference is that CodeStream allows you to comment on lines of code that haven't changed. You can select ANY lines of code in the diff, and not just those that are part of the changeset. Note that these comments are added as a "single comment" to the pull request and aren't part of any review you may have in progress.
All the power of GitHub pull requests and GitLab merge requests, and then some, right in your IDE.
Once the pull request has been approved and the code has been merged that's usually the end of life for any comments in that pull request. Although there is often useful information in those comments, that may have long-term value, they are rarely seen again. CodeStream gives those comments a second life by displaying them alongside the blocks of code that they refer to.
To have pull request comments displayed as annotions in your codemarks, as well as in the Codemarks section of the CodeStream pane, click on the gear icon in that section and check the box to "Show comments from pull requests". When you first check that box, if you haven’t already authenticated with your code-hosting service you’ll be prompted to do so.
Comments from merged PRs will appear next to the blocks of code they refer to. Comments from open PRs will also be included if you are on a relevant branch. For example, if the open PR is a request to merge the feature/foo branch into master, you’ll see comments from that PR if you are checked out to either feature/foo or master, but not when you’re on any other branch.
As the code evolves, the location of each comment is automatically updated so that it remains linked to the block of code it refers to.
Note that PR comments for a given file are updated roughly every 30 minutes, so new comments may not appear right away. You can force an update by restarting your IDE.