This repository was archived by the owner on Jun 21, 2023. It is now read-only.
File diff should compare against "merge base" not current state of the PR's base branch #1008
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
We need to compare the file from when it originally branched, not from the current state of the branch.
It will fall back to using the base if the merge base can't be found (this can happen if the PR branch doesn't exist in the local repo). This needs to be fiixed.
Use 'refs/pull/{PR}/head' because it's defined in current repo (so don't want to add a new remote).
The PR head is now being fetched so should be available in local repo.
Abstract away interactions with LibGit2Sharp.
jcansdale
commented
Jun 12, 2017
| { | ||
| [Export(typeof(IGitClient))] | ||
| [PartCreationPolicy(CreationPolicy.Shared)] | ||
| [NullGuard(ValidationFlags.None)] |
There was a problem hiding this comment.
Not sure if I still need this.
There was a problem hiding this comment.
Leave it on there, NullGuard being enabled causes more problems than it solves IMO and we will hopefully remove it soon.
grokys
approved these changes
Jun 12, 2017
| try | ||
| { | ||
| // Can't use Assert.Throws because ExtractDiffFiles is async. | ||
| await ExtractDiffFiles(baseSha, baseFileContent, headSha, headFileContent, mergeBaseSha, mergeBaseFileContent, |
There was a problem hiding this comment.
Can't you use Assert.ThrowsAsync here?
| { | ||
| // Can't use Assert.Throws because ExtractDiffFiles is async. | ||
| await ExtractDiffFiles(baseSha, baseFileContent, headSha, headFileContent, baseSha, baseFileContent, | ||
| fileName, checkedOut); |
There was a problem hiding this comment.
It looks like you can indeed. I hadn't noticed Assert.ThrowsAsync before. Thanks for the tip!
suo
added a commit
to pytorch/pytorch
that referenced
this pull request
Oct 28, 2019
…hing" Okay, my last fix was wrong because it turns out that the base SHA is computed at PR time using the actual repo's view of the base ref, not the user's. So if the user doesn't rebase on top of the latest master before putting up the PR, the diff thing is wrong anyway. This PR fixes the issue by not relying on any of these API details and just getting the merge-base of the base and head refs, which should guarantee we are diffing against the right thing. This solution taken from github/VisualStudio#1008 Differential Revision: [D18172391](https://our.internmc.facebook.com/intern/diff/D18172391)
suo
added a commit
to pytorch/pytorch
that referenced
this pull request
Oct 28, 2019
…hing" Okay, my last fix was wrong because it turns out that the base SHA is computed at PR time using the actual repo's view of the base ref, not the user's. So if the user doesn't rebase on top of the latest master before putting up the PR, the diff thing is wrong anyway. This PR fixes the issue by not relying on any of these API details and just getting the merge-base of the base and head refs, which should guarantee we are diffing against the right thing. This solution taken from github/VisualStudio#1008 Differential Revision: [D18172391](https://our.internmc.facebook.com/intern/diff/D18172391)
suo
added a commit
to pytorch/pytorch
that referenced
this pull request
Oct 28, 2019
…hing" Okay, my last fix was wrong because it turns out that the base SHA is computed at PR time using the actual repo's view of the base ref, not the user's. So if the user doesn't rebase on top of the latest master before putting up the PR, the diff thing is wrong anyway. This PR fixes the issue by not relying on any of these API details and just getting the merge-base of the base and head refs, which should guarantee we are diffing against the right thing. This solution taken from github/VisualStudio#1008 Differential Revision: [D18172391](https://our.internmc.facebook.com/intern/diff/D18172391)
This was referenced Oct 28, 2019
Closed
suo
added a commit
to pytorch/pytorch
that referenced
this pull request
Oct 28, 2019
…hing" Okay, my last fix was wrong because it turns out that the base SHA is computed at PR time using the actual repo's view of the base ref, not the user's. So if the user doesn't rebase on top of the latest master before putting up the PR, the diff thing is wrong anyway. This PR fixes the issue by not relying on any of these API details and just getting the merge-base of the base and head refs, which should guarantee we are diffing against the right thing. This solution taken from github/VisualStudio#1008 Differential Revision: [D18172391](https://our.internmc.facebook.com/intern/diff/D18172391)
suo
added a commit
to pytorch/pytorch
that referenced
this pull request
Oct 28, 2019
…hing" Okay, my last fix was wrong because it turns out that the base SHA is computed at PR time using the actual repo's view of the base ref, not the user's. So if the user doesn't rebase on top of the latest master before putting up the PR, the diff thing is wrong anyway. This PR fixes the issue by not relying on any of these API details and just getting the merge-base of the base and head refs, which should guarantee we are diffing against the right thing. This solution taken from github/VisualStudio#1008 Differential Revision: [D18172391](https://our.internmc.facebook.com/intern/diff/D18172391) ghstack-source-id: 90e1fad Pull Request resolved: #28798
suo
added a commit
to pytorch/pytorch
that referenced
this pull request
Oct 28, 2019
…hing" Okay, my last fix was wrong because it turns out that the base SHA is computed at PR time using the actual repo's view of the base ref, not the user's. So if the user doesn't rebase on top of the latest master before putting up the PR, the diff thing is wrong anyway. This PR fixes the issue by not relying on any of these API details and just getting the merge-base of the base and head refs, which should guarantee we are diffing against the right thing. This solution taken from github/VisualStudio#1008 Differential Revision: [D18172391](https://our.internmc.facebook.com/intern/diff/D18172391)
facebook-github-bot
pushed a commit
to pytorch/pytorch
that referenced
this pull request
Oct 28, 2019
Summary: Pull Request resolved: #28788 Okay, my last fix was wrong because it turns out that the base SHA is computed at PR time using the actual repo's view of the base ref, not the user's. So if the user doesn't rebase on top of the latest master before putting up the PR, the diff thing is wrong anyway. This PR fixes the issue by not relying on any of these API details and just getting the merge-base of the base and head refs, which should guarantee we are diffing against the right thing. This solution taken from github/VisualStudio#1008 Test Plan: Imported from OSS Differential Revision: D18172391 Pulled By: suo fbshipit-source-id: 491a50119194508b2eefa5bd39fe813ca85f27b1
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 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.
The PR's base branch might well have moved on since the PR was originally created. The PR head should be compared against the merge base between the PR base and head.
This means at most one fetch is required before the PR files can be explored without hitting the network again. 😄
Fixes #1007