Commit graph

322 commits

Author SHA1 Message Date
Corey Johnson
c3c3058b96 Merge remote-tracking branch 'origin/master' into merge-interactive-merge 2020-05-20 08:30:17 -07:00
Corey Johnson
1eedfe18bb Update default text 2020-05-20 08:26:34 -07:00
Mislav Marohnić
767521c055 Stop providing AuthLogin from context
The login name of the authenticated user will be readily available only
if authentication info comes from the config file. With other upcoming
authentication modes (for example, the GITHUB_TOKEN environment
variable), the token is the only piece of information we got, so we
would need to additionally query for the login name.

Since `issue status` and `pr status` are the only commands that need the
name of the authenticated user right now, have those commands explicitly
query for the login name. This results in an additional API query, but
simplifies Context implementation and future authentication approaches.
2020-05-20 17:09:13 +02:00
Mislav Marohnić
fb63efcf05 Avoid crash around "DISMISSED" or "PENDING" reviewer states 2020-05-20 14:59:40 +02:00
Corey Johnson
9185bf9a77 Return an error 2020-05-19 13:52:22 -07:00
Corey Johnson
5c113d02c8 Big M 2020-05-19 13:39:36 -07:00
Corey Johnson
96e3d79f5e add "try again" text 2020-05-19 13:39:31 -07:00
Corey Johnson
6666adbdce Deal with merge conflicts 2020-05-19 11:29:00 -07:00
Corey Johnson
d209c0be01 Allow pr urls 2020-05-19 11:04:43 -07:00
Corey Johnson
6eab3751d0
Update command/pr.go
Co-authored-by: Billy Griffin <5091167+billygriffin@users.noreply.github.com>
2020-05-18 14:39:43 -07:00
Corey Johnson
9721f75b2b
Update command/pr.go
Co-authored-by: Billy Griffin <5091167+billygriffin@users.noreply.github.com>
2020-05-18 14:39:29 -07:00
Corey Johnson
b42f5527fd Remove hot dog 2020-05-18 13:27:23 -07:00
Corey Johnson
78bc7260e0 Add closed test 2020-05-18 13:08:57 -07:00
Corey Johnson
0b0070e725 Add "already marked" test 2020-05-18 13:03:43 -07: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
vilmibm
c8c807b954 pass apiClient to determineBaseRepo
Our code had an unspoken assumption that only one apiClient is created
during the course of a command. Violating this assumption is fine in
almost all cases, but not when we need to do a re-auth to add a new
oauth scope to a user's token.

There is likely a more elegant solution to the problem but until then
this changes determineBaseRepo to use an existing apiClient.
2020-05-15 15:29:33 -05:00
Corey Johnson
90664792b6 Fix message 2020-05-15 10:42:58 -07:00
Corey Johnson
c645fd5ae5 Better errors around branch deletion 2020-05-15 10:33:54 -07:00
Corey Johnson
848dd44443 Delete branch of PR, not the current branch 2020-05-15 08:51:37 -07:00
Corey Johnson
587dd4d797 a better name 2020-05-15 08:09:27 -07:00
Corey Johnson
d41778493b Only look for enabled flags 2020-05-15 08:09:08 -07:00
Corey Johnson
a107558583 Default is now false 2020-05-15 08:05:12 -07:00
Corey Johnson
4d539f937e Return err 2020-05-15 08:05:05 -07: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
6732ac01c9 Fix var
Co-Authored-By: Nate Smith <vilmibm@neongrid.space>
2020-05-12 09:55:34 -07:00
Corey Johnson
24dece9418 Name flag delete-branch
Co-Authored-By: Nate Smith <vilmibm@neongrid.space>
2020-05-12 09:45:22 -07:00
Corey Johnson
214be16d42 Add test for mutually exclusive flags
Co-Authored-By: Nate Smith <vilmibm@neongrid.space>
2020-05-12 09:30:19 -07:00
Corey Johnson
f0cd830170 Fix merge flag
Co-Authored-By: Nate Smith <vilmibm@neongrid.space>
2020-05-12 09:22:37 -07:00
Corey Johnson
2328dffd97 Add test
Co-Authored-By: Nate Smith <vilmibm@neongrid.space>
2020-05-12 09:11:15 -07:00
Corey Johnson
fabbfe1da6 Add flag for deleting branch
Co-Authored-By: Nate Smith <vilmibm@neongrid.space>
2020-05-12 08:58:38 -07:00
Corey Johnson
9187efdc92 Merge remote-tracking branch 'origin/master' into merge-interactive-merge 2020-05-12 08:53:09 -07:00
Corey Johnson
326b678b24 Add delete branch
Co-Authored-By: Nate Smith <vilmibm@neongrid.space>
2020-05-12 08:51:22 -07: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
Corey Johnson
b9c4a76687 Update usage docs 2020-05-08 11:20:00 -07: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
Corey Johnson
58663dccfd Better description 2020-05-07 10:31:05 -07:00
Corey Johnson
5b78d47306 Use stdout 2020-05-07 10:30:59 -07:00
Corey Johnson
4b2f14d939 Use PR if given 2020-05-07 10:30:51 -07:00
Corey Johnson
1ea38af79c Fix merge usage syntax 2020-05-07 10:30:31 -07:00
Corey Johnson
2041f0ab1b Fix usage syntax 2020-05-07 10:30:23 -07:00
Corey Johnson
bcf41fd5e7 Fix sentence case 2020-05-07 10:30:14 -07:00
Corey Johnson
1de57db74d Fix lint error 2020-05-06 11:27:41 -07:00
Corey Johnson
5a04679535 Remove debug output 2020-05-06 11:21:05 -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
0aca0eff1f Add merge code 2020-05-05 11:35:27 -07:00