Compare full head label for determining current PR #566
Conversation
This file contains hidden or 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
Previously only the `currentPRHeadRef` was compared to `pr.HeadLabel()` when determining current PR in `status` command. This handles cross-repo "Current PR" detection.
|
It might also be useful, for forked repos, to see the current user if there is no PR, like so: I can add that as well if you want! |
mislav
suggested changes
Mar 2, 2020
| if edge.Node.HeadLabel() == currentPRHeadRef { | ||
| currentPRHeadLabel := currentPRHeadRef | ||
| if edge.Node.IsCrossRepository { | ||
| currentPRHeadLabel = fmt.Sprintf("%s:%s", currentUsername, currentPRHeadRef) |
There was a problem hiding this comment.
I don't think this is the right solution. The currentPRHeadRef value was already supposed to be prefixed with OWNER: in case that the branch is pushed to a fork
Lines 384 to 386 in 704ce31
This doesn't happen, and I suspect that it might be because the main command uses determineBaseRepo() to find out the base repository, but prSelectorForCurrentBranch() uses ctx.BaseRepo(), which can (confusingly) return different results.
I have opened #567 to explore an alternate avenue of fixing this; I would appreciate a review!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
I took a look at #561, it wouldn't work for any branch name (regardless of a dot) in forked repos. Traced it to here,
pr.HeadLabel()was compared tocurrentPRHeadRefwhich for cross repo PRs would berista404:test-branch == test-branch. Now it's compared to the full label. Tested it in forked and my own repos.Closes #561