This repository has been archived by the owner on Sep 9, 2020. It is now read-only.
Address mixup between bzr revisions and semver suffixes #869
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
This commit addresses an issue where the godep importer would confuse semver suffixes for being bzr revisions. Now we have stricter checks on the bzr revision checks which will be able to distinguish between semver with a suffix and a bzr revision. The new check enforces bzr revisions to contain an @ symbol. Closes golang#827.
|
Thanks for your pull request. It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA). 📝 Please visit https://cla.developers.google.com/ to sign. Once you've signed, please reply here (e.g.
|
|
I signed it! |
|
CLAs look good, thanks! |
Closed
carolynvs
suggested changes
Jul 21, 2017
| @@ -479,7 +479,7 @@ func (sm *SourceMgr) InferConstraint(s string, pi ProjectIdentifier) (Constraint | |||
| // Next, try for bzr, which has a three-component GUID separated by | |||
| // dashes. There should be two, but the email part could contain | |||
| // internal dashes | |||
| if strings.Count(s, "-") >= 2 { | |||
| if strings.Contains(s, "@") && strings.Count(s, "-") >= 2 { | |||
internal/gps/source_manager_test.go
Outdated
| @@ -24,10 +24,16 @@ func TestSourceManager_InferConstraint(t *testing.T) { | |||
| t.Fatal(err) | |||
| } | |||
|
|
|||
| svs, err := NewSemverConstraintIC(">=0.12.0, <=12.0.0-de4dcafe0") | |||
There was a problem hiding this comment.
nit: Let's change this to NewSemverConstraintIC("v0.12.0-12-de4dcafe0").
|
Thanks for the review, @carolynvs. I'll address your comments. |
|
@carolynvs I have addressed your comment in commit a2c11c7 🙇 |
carolynvs
approved these changes
Jul 22, 2017
|
@sebdah Thank you for the fix! 🎉 💖 |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
What does this do / why do we need it?
This PR handles the case in the
godep_importerwhere the imported dependency is referencing a semantic version with a suffix. E.g.Will now become:
What should your reviewer look out for in this PR?
As per my understanding it is fine to assume that
bzrrevisions contain@symbols. But I'm not abzruser so I'm half guessing (with some reading on the Internet) that it's valid.Do you need help or clarification on anything?
I think I've gotten what I needed in #827.
There was a comment in the code that I modified that was a bit too long. I have wrapped it. Don't know if you'd like to keep such things out of the PR. Let me know and I can drop that commit, no biggie 😄 .
Which issue(s) does this PR fix?
fixes #827