Commit graph

259 commits

Author SHA1 Message Date
Corey Johnson
1eedfe18bb Update default text 2020-05-20 08:26:34 -07: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
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
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
Mislav Marohnić
1834d8cfd5 Tweak syntax in issue/pr close docs
This makes it consistent with other subcommands under `issue/pr`.
2020-05-05 13:32:42 +02:00
Nate Smith
1a1fc64fe4
Merge pull request #842 from foad/df-805-hide-closed-default
Hide closed/merged PRs from default branch
2020-05-04 20:17:53 -05:00
Daniel Foad
e7e3a4f9b1
pr comments 2020-05-04 23:47:47 +01:00
Corey Johnson
fef11b3489 Merged prs return error 2020-05-04 10:44:20 -07:00
Corey Johnson
2f075fca73 Return an error if the pr was already merged 2020-05-04 10:25:38 -07:00
Corey Johnson
5cc60c669e Take in a pointer 2020-05-04 10:19:54 -07:00
Corey Johnson
1e88226b2b Add space 2020-05-04 10:16:30 -07:00
Corey Johnson
083693bc05 Update usage string 2020-05-04 10:15:47 -07:00
Corey Johnson
f7be93b135 use less words 2020-05-04 10:11:24 -07:00
Corey Johnson
1ee31db033 Add "merged" message 2020-05-04 10:10:03 -07:00
Corey Johnson
846425fe5e simplified boolean comparison 2020-05-01 14:16:49 -07:00
Corey Johnson
922352753a Add merged exit 2020-05-01 14:08:30 -07:00
Corey Johnson
bc623a7a23 Make it green 2020-05-01 12:07:23 -07:00