Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve hash parsing and errors #3730

Merged
merged 43 commits into from Aug 5, 2020
Merged

Improve hash parsing and errors #3730

merged 43 commits into from Aug 5, 2020

Conversation

Ericson2314
Copy link
Member

  • Ensure hash is in form <algo>-<prefix> and not SRI.

  • Better errors if something goes wrong

  • std::string_view for no coppying

@Ericson2314
Improve content address parsing
55d4bd6 
 - Ensure hash is in form <algo>-<prefix> and not SRI.

 - Better errors if something goes wrong

 - string_view for no coppying
@Ericson2314 Ericson2314 changed the title Improve content address parsing Improve content address parsing and errors Jun 22, 2020
@Ericson2314 Ericson2314 mentioned this pull request Jun 23, 2020
Merged
@Ericson2314 Ericson2314 changed the title Improve content address parsing and errors WIP: Improve content address parsing and errors -- contains #3738 Jun 29, 2020
@Ericson2314
Copy link
Member Author

WIP because will also fix some libfetchers FIXMEs.

@Ericson2314 Ericson2314 changed the title WIP: Improve content address parsing and errors -- contains #3738 Improve content address parsing and errors -- contains #3738 Jul 2, 2020
@Ericson2314 Ericson2314 changed the title Improve content address parsing and errors -- contains #3738 Improve hash parsing and errors -- contains #3738 Jul 2, 2020
@Ericson2314 Ericson2314 changed the title WIP: Improve hash parsing and errors -- contains #3738 Semi-WIP: Improve hash parsing and errors -- contains #3738 Jul 16, 2020
@Ericson2314 Ericson2314 changed the title Semi-WIP: Improve hash parsing and errors -- contains #3738 Improve hash parsing and errors -- contains #3738 Jul 16, 2020
edolstra
edolstra reviewed Jul 20, 2020
View reviewed changes
src/libutil/parser.hh Outdated Show resolved Hide resolved
edolstra
edolstra reviewed Jul 20, 2020
View reviewed changes
src/libutil/hash.cc Outdated Show resolved Hide resolved
@Ericson2314
Copy link
Member Author

OK, fixed both.

@Ericson2314
Copy link
Member Author

Fixed some more conflicts

@Ericson2314
Copy link
Member Author

Ah, it is already fixed on this branch.

@Ericson2314
Copy link
Member Author

Conflicts fixed.

@Ericson2314 Ericson2314 changed the base branch from master to 0.5-release July 27, 2020 17:37
@Ericson2314 Ericson2314 changed the base branch from 0.5-release to master July 27, 2020 17:37
@Ericson2314
Copy link
Member Author

@edolstra wiggled the metadata so GitHub would recompute the diff, and this PR is actually readable.

@Ericson2314
Copy link
Member Author

OK this should be ready.

@Ericson2314 Ericson2314 changed the title Improve hash parsing and errors -- contains #3738 Improve hash parsing and errors Jul 31, 2020
@edolstra edolstra merged commit b91dc7e into NixOS:master Aug 5, 2020
@Ericson2314 Ericson2314 deleted the better-ca-parse-errors branch August 5, 2020 14:33
@ldesgoui ldesgoui mentioned this pull request Aug 1, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@edolstra edolstra edolstra left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@Ericson2314 @edolstra @meditans