Sam
a49654970c
Merge pull request #3024 from cli/normalize-pr-commands
...
Normalize pr command arguments
2021-02-26 10:31:06 -08:00
Mislav Marohnić
823514022d
Merge pull request #3036 from cli/pr-merge-no-commits
...
Avoid crash in `pr merge` when the pull request has no commits
2021-02-26 13:08:27 +01:00
Mislav Marohnić
e4ce0d76aa
Merge pull request #3022 from ganboonhong/pr-edit-branch
...
Add `pr edit --base` to change the base branch of a PR
2021-02-24 15:57:50 +01:00
Mislav Marohnić
0f85304e3e
Avoid crash in pr merge when verifying whether a PR had diverged
...
A PR is not guaranteed to have commits, it seems, so add a guard against
assuming that there is always a head commit.
2021-02-24 14:37:29 +01:00
Gowtham Munukutla
56ead91702
Add helper function to validate exact args in cmdutil
2021-02-24 15:49:40 +05:30
Sam Coe
34da59777b
Revert close and reopen changes
2021-02-23 13:24:48 -08:00
Sam Coe
9d062ed8fc
Normalize pr command arguments
2021-02-23 09:17:35 -08:00
boonhong
732e919a83
Add pr edit --base to change the base branch of a PR
2021-02-24 00:15:04 +08:00
Mislav Marohnić
a90997ec95
pr merge: avoid prompting to enter editor after editing phase is chosen
...
When user chooses "Edit commit message", open the editor immediately
instead of showing an additional prompt to open the editor.
2021-02-17 18:47:17 +01:00
Mislav Marohnić
70d4786e37
Merge pull request #2988 from cli/strict-status-checks-base
...
pr status: fix checking branch protection rules on the base branch
2021-02-17 18:13:15 +01:00
Mislav Marohnić
05421db404
pr status: fix checking branch protection rules on the base branch
...
Instead of checking branch protection rules on the main branch of the
repository, branch protection rules for a specific PR should be checked
on its base branch, since not all PRs are based on the main branch.
Additionally, do not display "Up to date" if the actual merge status
reported from the server was "UNKNOWN" or "DIRTY", since in those cases
"Up to date" could be false information.
2021-02-17 18:04:49 +01:00
Mislav Marohnić
3b117e6c3c
Merge pull request #2539 from divyaramanathan/issue-create-template
...
Implementing issue template GraphQL API call
2021-02-17 17:59:42 +01:00
Mislav Marohnić
3a0a8c4e25
Add tests for templateManager
2021-02-17 17:35:04 +01:00
Mislav Marohnić
0cd5744398
Un-export HasAPI leaky abstraction
2021-02-17 17:08:50 +01:00
Mislav Marohnić
ebc5d01942
Merge remote-tracking branch 'origin' into auto-merge
2021-02-17 15:25:25 +01:00
Mislav Marohnić
203397baf9
Add tests for pr merge --auto/--disable-auto
2021-02-17 15:24:52 +01:00
Mislav Marohnić
ddddd95d73
Allow pr merge --body '' to prevent having the default body applied
2021-02-17 14:38:33 +01:00
Mislav Marohnić
12cf8ef65b
Separately query viewerMergeBodyText for GHE compatibility
...
GHE versions 2.22 and older will not have this GraphQL field. Avoid the
resulting error and have the command proceeed with empty text as the
default.
2021-02-17 14:06:27 +01:00
Mislav Marohnić
2b36b09abf
Update wording for auto-merge confirmation
...
Co-authored-by: Amanda Pinsker <ampinsk@github.com>
2021-02-17 12:30:04 +01:00
Nate Smith
c2c211dbed
Merge pull request #2952 from redreceipt/up-to-date
...
Adds Branch Up to Date Status
2021-02-16 12:50:28 -06:00
Mislav Marohnić
3b650a8c56
Fix typo
2021-02-16 16:28:23 +01:00
Mislav Marohnić
57abe45b96
Let the server choose the commit subject for squashed merge
...
For single-commit PRs, the commit subject will be the subject of the
head commit and the PR number. For multi-commit PRs, the commit subject
will be the PR title and PR number. Instead of trying to replicate this
logic client-side, omit the `commitHeadline` param and let the server
apply defaults appropriately.
Reverts https://github.com/cli/cli/pull/1627
2021-02-16 16:17:37 +01:00
Mislav Marohnić
67bfedd56b
Add pr merge --auto
2021-02-16 16:01:22 +01:00
Cristian Dominguez
f75bd7280f
Pre-populate default merge commit message if no body was provided
2021-02-16 16:01:22 +01:00
Sam Coe
4ea8d25b85
Fix tests and polish
2021-02-16 15:59:44 +01:00
Cristian Dominguez
d57cb56945
Allow editing commit msg when squash merging a PR
2021-02-16 15:59:06 +01:00
Sam Coe
4fdf28d8a4
Change behavior of slice flags for issue edit and pr edit commands
2021-02-12 14:42:21 -08:00
Sam Coe
a47ee660a7
Pr edit command
2021-02-12 10:08:44 -08:00
Sam
4109af9b49
Merge pull request #2915 from cli/issue-edit
...
Edit issue command
2021-02-12 09:50:11 -08:00
Michael Neeley
9be9229a48
adds strict status checks
2021-02-12 08:51:47 -05:00
Michael Neeley
0d55f8648c
adds merge state status
2021-02-11 16:27:23 -05:00
Mislav Marohnić
83bb1bfd9d
Port pr create to new templates implementation
2021-02-10 18:20:57 +01:00
Mislav Marohnić
3ddd93793c
Port issue create to using templates API
2021-02-10 17:32:00 +01:00
Sam Coe
b366802aa1
Edit issue command
2021-02-04 10:54:34 -08:00
Mislav Marohnić
47baf8fb10
pr create: explain how to link an issue
2021-02-03 22:17:31 +01:00
Mislav Marohnić
051fbbc1e1
Merge remote-tracking branch 'origin' into dpromanko/remove-set-cmd-prepare
2021-01-28 22:00:08 +01:00
Mislav Marohnić
88c27934a1
Update some stubs to be closer to how git behaves
2021-01-28 21:58:45 +01:00
Devon Romanko
2964895a77
fix test behavior changes from migration to run.Stub
2021-01-27 18:46:29 -05:00
Sam Coe
52bdcad8ea
Do not display minimized comments
2021-01-27 08:14:46 -08:00
Devon Romanko
cb897fd7e2
remove unused errorStub from 'pr checkout' test
2021-01-27 08:04:57 -05:00
Devon Romanko
a04e0ece71
use Stub instead of SetPrepareCmd in 'pr checkout' tests
2021-01-27 07:53:21 -05:00
Devon Romanko
45bc1d787c
use Stub instead of SetPrepareCmd in 'pr view' tests
2021-01-27 07:23:49 -05:00
Devon Romanko
2eed1593ce
use Stub instead of SetPrepareCmd in 'pr list' tests
2021-01-26 08:15:13 -05:00
Sam Coe
3f172ad991
Add contional and tests
2021-01-25 13:27:32 -08:00
zamasu
e4b9f7cb8c
Alert unpushed commits when merging a pull request
2021-01-25 12:04:32 -08:00
Sam
8125cd5911
Merge pull request #2117 from fsmiamoto/checkout-detached-head
...
Add flag for using detached HEAD to `pr checkout`
2021-01-25 11:29:36 -08:00
Sam Coe
cec3aa294e
Support detach head for pr checkout
2021-01-25 11:22:33 -08:00
Mislav Marohnić
70c4cbf240
Merge remote-tracking branch 'origin' into success-icon-consistency
2021-01-25 14:57:04 +01:00
Mislav Marohnić
f46bab256c
Rename to SuccessIconWithColor
2021-01-25 14:56:39 +01:00
Mislav Marohnić
8cba14b564
💅 cleanup command stub assertions
2021-01-25 13:13:36 +01:00