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
Mislav Marohnić
96fa6e7830
Merge remote-tracking branch 'origin' into success-icon-consistency
2021-01-22 23:56:54 +01:00
Nate Smith
6e2c1b33b0
Merge pull request #2224 from divbhasin/1190-limit-merge-methods
...
#1190 - limit merge methods
2021-01-22 14:23:23 -08:00
Mislav Marohnić
06cf2c9f81
Merge remote-tracking branch 'origin' into cmd-stub-new
2021-01-22 16:31:29 +01:00
Nate Smith
4d28c79192
Merge pull request #2810 from ptxmac/ptx/pr-merge-body
...
Add body argument to `pr merge` command.
2021-01-21 15:25:42 -08:00
vilmibm
6decf4384f
simplify slightly, add tests
2021-01-21 15:18:08 -08:00
Sam Coe
f09b8a8e78
Add mergeMethodSurvey test
2021-01-21 14:58:10 -08:00
Sam Coe
7cc2975a98
Fix tests
2021-01-21 14:42:42 -08:00
Mislav Marohnić
fc77cbc964
Deprecate test.ExpectLines
...
For asserting command output, exact string matches are preferred in most cases. In cases when a pattern match is needed, the test can use regexp ad hoc.
2021-01-18 23:25:45 +01:00
Mislav Marohnić
bf4bc1511f
Migrate to new cmd stubber in merge tests
2021-01-18 20:15:40 +01:00
Mislav Marohnić
683ebee6ef
Consistently use green success icon
...
For operations such as closing an issue or merging a PR, we would
display the success icon (a checkmark) in red and magenta colors,
respectively, to reflect the latest state of the record operated on
(red: closed; magenta: merged).
This was always confusing to me, seeing it both in code and in the UI,
because I'm instinctively thinking that it's a bug and have to remind
myself that it's by design.
2021-01-18 19:57:38 +01:00
Mislav Marohnić
6e5a90821c
pr merge: handle case when a cross-repo PR was already merged
...
In this case, do not ever offer to delete the branch.
2021-01-18 19:49:20 +01:00
Mislav Marohnić
66546e2245
When pr merge --delete-branch flag is supplied, avoid prompting for it
2021-01-18 18:10:20 +01:00
Devon Romanko
df31fae9c6
remove prompt for deleting branches on pr merge in interactive mode when -d flag is passed
2021-01-15 17:34:00 -05:00
Devon Romanko
2c35eb04ff
address pr comments
2021-01-15 16:54:46 -05:00
Devon Romanko
85e0e44920
Add prompt to delete local branch when attempting to merge a PR that is already merged
2021-01-15 07:25:24 -05:00
Zach Boyle
1135e5e3ed
set delete-branch merge flag default to false ( #2466 )
...
Co-authored-by: Divya Ramanathan <ramanad@umich.edu>
2020-11-26 11:54:28 +01:00
Mislav Marohnić
89529674f9
Restore backwards compatibility in scripted pr merge
2020-10-16 18:27:12 +00:00
Mislav Marohnić
7d317a81be
Merge pull request #1622 from ShubhankarKG/prMergeConfirmations
...
PR Merge confirmations
2020-10-16 20:17:54 +02:00
vilmibm
1073c97409
review feedback
2020-09-11 11:36:24 -05:00
vilmibm
c0fc31f7d5
use CanPrompt in commands
2020-09-10 12:13:48 -05:00
Mislav Marohnić
d77a8c2e61
Scope pr merge commit headline to only squash method
2020-09-07 22:27:27 +02:00
ShubhankarKG
05a39b732a
Fix tests
2020-09-04 18:58:15 +05:30
Mislav Marohnić
c21caf5b2b
Disallow pr -R flag for commands that operate on the current branch
...
If the `--repo` flag is specified, then the user intends to select a
repository other than the current one. In that case, it doesn't make
sense to fall back to detecting the PR belonging to the current branch,
so throw a descriptive error instead.
2020-08-27 16:30:34 +02:00
Mislav Marohnić
e024184c6f
Fix pr merge test
2020-08-04 15:13:36 +02:00
Mislav Marohnić
7cc74c5bb6
Isolate pr merge command
2020-07-31 19:07:16 +02:00
