Add :branch placeholder for API calls
#1515
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mislav
suggested changes
Aug 12, 2020
pkg/cmd/api/api.go
Outdated
| @@ -298,12 +301,22 @@ func fillPlaceholders(value string, opts *ApiOptions) (string, error) { | |||
| return value, err | |||
| } | |||
|
|
|||
| var branch string | |||
| if strings.Contains(value, ":branch") { | |||
There was a problem hiding this comment.
There's a subtle bug here: the placeholderRE matches only :branch\b (notice the word boundary), but strings.Contains matches ":branch" even when it's not on a word boundary.
So I would move the branch lookup logic to the below case ":branch" block
pkg/cmd/api/api.go
Outdated
| IO: f.IOStreams, | ||
| HttpClient: f.HttpClient, | ||
| BaseRepo: f.BaseRepo, | ||
| CurrentBranch: git.CurrentBranch, |
There was a problem hiding this comment.
Instead of git.CurrentBranch, you can pass f.Branch, since this is already what a cmdutil.Factory provides and allows the current branch to be mocked easier in tests
Also, improve the handling for the branch placeholder
fsmiamoto
force-pushed
the
branch-substitute
branch
from
b707ca6
to
bba2d6d
Compare
|
@mislav |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As discussed in #1288, this PR allows for the use of the
:branchplaceholder on theapicommand.The placeholder is substituted with the current git branch name.
Closes #1288