STACKITGit/cli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1667 commits 87 branches 0 tags 160 MiB
Commit graph

292 commits

Author SHA1 Message Date
Mislav Marohnić
ab0e43c6c8 Merge remote-tracking branch 'origin/master' into auth-from-env 2020-05-27 11:44:19 +02:00
Amanda Pinsker
93dab323fa
Fix typo 2020-05-26 09:50:03 -07:00
Corey Johnson
3122696140
Merge pull request #982 from cli/remote-delete 
Remote delete
 2020-05-26 09:10:12 -07:00
Corey Johnson
be5fc07928
Merge pull request #899 from cli/merge-interactive-merge 
Interactive merge
 2020-05-26 08:33:47 -07:00
Corey Johnson
b27df3410a Don't delete remote or local branches for forks 2020-05-26 08:07:18 -07:00
Corey Johnson
9a290d7f43 Change interactive merge language 2020-05-22 15:30:05 -07:00
Corey Johnson
9113092f5c Delete via api 2020-05-22 15:19:39 -07:00
Corey Johnson
ff97fc138d Still delete remote branch if repo flag is used 2020-05-22 15:12:48 -07:00
Corey Johnson
e643765027 Merge remote-tracking branch 'origin/merge-interactive-merge' into remote-delete 2020-05-22 15:09:29 -07:00
Corey Johnson
858cd705ab Update name 2020-05-22 15:07:39 -07:00
Corey Johnson
b2c1b12bee Don't delete branch if the repo flag is used 2020-05-22 14:39:53 -07:00
Corey Johnson
41e67aa3e7 Fix typo 2020-05-22 10:04:02 -07:00
Mislav Marohnić
1f3725c94d Use @me to avoid having to look up current user in pr status 2020-05-22 15:58:57 +02:00
Corey Johnson
80bdd1e071 print error 2020-05-20 14:36:09 -07:00
Corey Johnson
904c541d2d Only delete local branch if it exists 2020-05-20 14:19:44 -07:00
Corey Johnson
a303dabc5d Add remote deletion 2020-05-20 13:47:29 -07:00
Corey Johnson
46a1e3cd53 Remove convertRepoInterfaceToRepository 2020-05-20 11:19:31 -07:00
Corey Johnson
5d99c56456 combine conditionals 2020-05-20 09:21:59 -07:00
Corey Johnson
b4783dd192 don't always switch to the default branch 2020-05-20 09:00:39 -07:00
Corey Johnson
76368f92ee Return error 2020-05-20 08:32:08 -07:00
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