Commit graph

104 commits

Author SHA1 Message Date
Mislav Marohnić
86eacc3789 Enable unwrapping api.NotFoundError 2020-07-21 13:59:05 +02:00
Mislav Marohnić
305cd290ee Fix pr checkout <owner>:<branch> when it matches the default branch
First, consolidate the functionality between `pr merge` and `pr
checkout` that resolves the default branch name of the base repo. With
an added bonus, the new approach avoids an API request when one isn't
necessary.

Then, ensure that checking out 3rd-party PRs will result in local branch
name such as `<owner>/<branch>` when the head branch of the repository
matches the default branch of the base repository. We already have had
code in place to take care of this, but it only took effect in the `pr
checkout <number>`-style invocation.
2020-07-15 15:35:42 +02:00
Mislav Marohnić
f4c4ce0b0a Add names to GraphQL queries made over shurcooL adapter 2020-07-07 17:53:40 +02:00
Mislav Marohnić
a7806a3e78 Add names to queries made over our homegrown GraphQL adapter 2020-07-07 17:53:40 +02:00
Mislav Marohnić
1ca3d171e6 Tweak HTTP 422 handling when deleting branches 2020-06-30 19:21:39 +02:00
Pavel Borzenkov
3afec6f90a api: gracefully handle already deleted remote refs
If a GitHub repo is configured to automatically delete branches after PR
is merged, `gh pr merge` fails with error like:

failed to delete remote branch: ... (422): 'Reference does not exist'

Gracefully handle such case and don't report the error.

Signed-off-by: Pavel Borzenkov <pavel.borzenkov@gmail.com>
2020-06-27 19:10:42 +03:00
Mislav Marohnić
e084a4563f Fix pr checkout OWNER:BRANCH when maintainer can modify
We did not use to request the necessary GraphQL fields to determine
whether the PR in question can be modified by maintainers (i.e. pushed
back to).
2020-06-22 19:36:55 +02:00
Corey Johnson
ee2b38df68
Merge pull request #1020 from cli/pr-lookup-v2
Consistent PR lookup interface
2020-06-04 10:42:55 -07:00
Corey Johnson
4c75c8bccc Reset base branch when URL is used 2020-06-03 14:34:13 -07:00
Mislav Marohnić
d026d6af2d Use githubv4.MarkPullRequestReadyForReviewInput
This is available now that we've bumped githubv4
2020-05-28 15:38:46 +02:00
Corey Johnson
a7e8d6fba8 Make PullRequestDiff take a pr 2020-05-27 10:10:21 -07:00
Corey Johnson
4b03cb112c Update test stubs 2020-05-27 09:21:02 -07:00
Corey Johnson
8d1f2745a4 wip 2020-05-26 16:35:35 -07:00
Corey Johnson
909e177a74 remove mergeable from queries that don't need it 2020-05-26 08:20:43 -07:00
Corey Johnson
9c48e2da14 Delete the branch 2020-05-22 15:25:25 -07:00
Corey Johnson
9c88cd67ee Whoops 2020-05-22 15:21:51 -07:00
Corey Johnson
9113092f5c Delete via api 2020-05-22 15:19:39 -07:00
Corey Johnson
c3c3058b96 Merge remote-tracking branch 'origin/master' into merge-interactive-merge 2020-05-20 08:30:17 -07:00
Nate Smith
45dec1b3e0
Merge pull request #962 from cli/pr-diff
pr diff
2020-05-19 14:11:36 -05:00
Corey Johnson
6666adbdce Deal with merge conflicts 2020-05-19 11:29:00 -07:00
vilmibm
c98b0924dc properly handle REST errors 2020-05-19 11:58:49 -05:00
vilmibm
aaebdfc46f working with gross colorize hack + no pager 2020-05-18 16:49:51 -05:00
Corey Johnson
922b6e06e0 Can be marked ready for review 2020-05-18 12:42:16 -07:00
Corey Johnson
fad9f24f39 Make reopen work 2020-05-18 11:11:13 -07:00
Mislav Marohnić
c225d379a9 Preserve CODEOWNERS reviewers in pr create
When reviewers were requested on a PR, they would apparently
overwrite the current set of reviewers. A fresh PR will already have
reviewers if it was assigned some by CODEOWNERS rules.

The fix is to only ever add additional reviewers and not overwrite the
entire set.
2020-05-13 12:09:59 +02:00
Corey Johnson
ad3a5903b2
Merge pull request #873 from cli/the-merge-dubai
Add support for `gh pr merge`
2020-05-12 10:18:54 -07:00
Corey Johnson
9187efdc92 Merge remote-tracking branch 'origin/master' into merge-interactive-merge 2020-05-12 08:53:09 -07:00
Nate Smith
c7f7bfc328
Merge pull request #787 from cli/issue-pr-create-metadata
Add flags to add additional metadata to `issue/pr create`
2020-05-08 15:04:15 -05:00
Nate Smith
5ba3baa3c8
Merge pull request #762 from doi-t/reviewers-in-pr-view
Add Reviewers to pr view in CLI
2020-05-08 14:46:08 -05:00
Nate Smith
77ed118022
Merge pull request #880 from cli/pr-status-crash
Fix `pr status -R` crash with closed PR on the default branch
2020-05-08 14:23:51 -05:00
Corey Johnson
43e15130f1 Use a var 2020-05-08 11:37:45 -07:00
Mislav Marohnić
d0f168f4c3 Merge remote-tracking branch 'origin/master' into issue-pr-create-metadata 2020-05-08 17:46:17 +02:00
vilmibm
c40f064baa sigh 2020-05-07 14:58:00 -05:00
Mislav Marohnić
93c61a83b2 Fix pr status -R crash with closed PR on the default branch
At the time we have a reference to `baseRepo`, we might still not have
contacted the API nor obtained any information about the default branch
for the repository. This expands the `PullRequests()` query to always
report the default branch so we may choose how to render entries that
belong on the current branch.
2020-05-07 20:53:03 +02:00
vilmibm
d81e622700 lightest weight reviewing
this commit add very basic non-interactive PR reviewing. You can either
review the "current" or a passed PR (number or URL) as approved, changes
requested, or commented via CLI flags.
2020-05-07 13:30:34 -05:00
Corey Johnson
5810acf6ac Use correct struct 2020-05-07 10:29:56 -07:00
Corey Johnson
8c85e14bac Make it work without a PR number 2020-05-06 11:19:00 -07:00
Corey Johnson
8681e7a7b6 Make squash and rebase work 2020-05-05 15:09:02 -07:00
Corey Johnson
c0831d4c4f Add merge api call 2020-05-05 11:56:45 -07:00
Corey Johnson
5cc60c669e Take in a pointer 2020-05-04 10:19:54 -07:00
Corey Johnson
0bb1d2018a Add code to reopen 2020-05-01 12:00:13 -07:00
Corey Johnson
19f6c69854 Actually make it work 2020-04-30 11:27:11 -07:00
Corey Johnson
f9a55f4d8e Add close pull request code 2020-04-30 11:24:43 -07:00
Mislav Marohnić
c6d8a4c151 Fix mutations 2020-04-27 16:42:53 +02:00
Mislav Marohnić
42baf4c8c5 Support org projects and team reviewers 2020-04-27 14:09:05 +02:00
Toshiya Doi
d70358ea34 Support GitHub Team in requested reviewers 2020-04-22 21:58:01 +09:00
Mislav Marohnić
39c4a5bc1b Remove unnecessary nil check 2020-04-17 20:29:18 +02:00
Mislav Marohnić
d3a89b8744 Expand issue create metadata flags to pr create
- Includes support `pr create --reviewer <login>`
- Hide "Preview in browser" menu option when any metadata are set
2020-04-17 20:23:57 +02:00
Toshiya Doi
2df5281f2f Merge branch 'master' into reviewers-in-pr-view 2020-04-10 04:46:05 +09:00
Toshiya Doi
6223a2c198 Puts completed reviews before review requests and sort reviewer names alphabetically 2020-04-10 01:16:43 +09:00