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.

Sign up for GitHub

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

Use StorePathDescriptor much more wildly #68

Merged
merged 45 commits into from
Jul 22, 2020
Merged

Use StorePathDescriptor much more wildly #68

merged 45 commits into from
Jul 22, 2020

Conversation

Ericson2314
Copy link
Member

This is a manual backport of changes from ipfs-develop, plus some new stuff for the rewritten libfetchers.

Ericson2314 and others added 30 commits June 19, 2020 19:32
@Ericson2314
WIP: Make Hash always store a valid hash type
20799a5
@meditans
WIP bug fixing
e7a1411
@Ericson2314
WIP: Make Hash always store a valid hash type
507aa48
@meditans
More bug fixing
73ac003
@meditans
Merge branch 'hash-always-has-type' of github.com:obsidiansystems/nix…
3dc10f7 
… into hash-always-has-type
@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
Merge remote-tracking branch 'upstream/master' into hash-always-has-type
98e5d1a
@Ericson2314
Fix and clean up hash parser
ec3a857
@meditans
Fix test suite
8d51d38
@Ericson2314
Merge remote-tracking branch 'upstream/master' into hash-always-has-type
987a4a0
@Ericson2314
Merge branch 'hash-always-has-type' of github.com:obsidiansystems/nix…
a83566e 
… into better-ca-parse-errors
@meditans
Create the spitPrefix function in parser.hh
7ba0fae
@meditans
Factor the prefix splitting in content-address
77b51f4
@meditans
Factor the prefix splitting in hash
a1f66d1
@meditans
WIP initial design
b798efb
@meditans
Fixed build, we still have test errors
c2e7f7a
@meditans
Correct FIXMEs in libfetchers
274a813
@meditans
Keep the previous name, for diffing
6faeec3
@meditans
Remove unused import
d63a5de
@meditans
Inline Hash::init()
c8c4bcf
@meditans
Rename two hash constructors to proper functions
263ccdd
@meditans
Fix test suite
343d156
@meditans
Inline newFunction
27c8029
@meditans
Get rid of the std::pair
f61bc45
@meditans
Rename fromSRI to parseSRI for constistency
9462d8a
@meditans
Inline and simplify in parseAnyPrefixed
36cbc74
@meditans
Abstract common parsing functionality
ea48e3a
@meditans
Write the implementation for parseNonSRIUnprefixed
b6b10b1
@meditans
Tighten parsing for drv files and pathinfo
1fc835a
@Ericson2314
Fix Narinfo corruption detection bug
1be279a 
The aim of this check was just to ensure each key occurs once.
Ericson2314 and others added 15 commits July 2, 2020 21:47
@Ericson2314
Merge branch 'hash-always-has-type' into HEAD
2f93d9f
@Ericson2314
Move getParsedTypeAndSRI to a more suitable location
a7cd742 
Also mark it static
@Ericson2314
Have splitPrefix and splitPrefixTo parser helpers
13796be
@Ericson2314
Merge branch 'master' of github.com:NixOS/nix into hash-always-has-type
dbffd30
@Ericson2314
Merge branch 'hash-always-has-type' of github.com:obsidiansystems/nix…
3134db1 
… into better-ca-parse-errors
@Ericson2314
Fix Perl
d291be4
@Ericson2314
Fix Perl, again...
d4250fe
@meditans
Merge branch 'master' of github.com:NixOS/nix into better-ca-parse-er…
0f05a36 
…rors
@Ericson2314
Merge branch 'master' of github.com:NixOS/nix into better-ca-parse-er…
323d51a 
…rors
@Ericson2314
Merge remote-tracking branch 'upstream/master' into hash-always-has-type
4415765
@Ericson2314
Merge branch 'hash-always-has-type' into better-ca-parse-errors
c466cb2
@Ericson2314
Merge commit 'c466cb2091b7a382aba1739c0320f2b6c0a04c1e' into store-pa…
f8a1403 
…th-or-ca-reconcile
@Ericson2314
Use StorePathDescriptor more widely
ecf65a6
@Ericson2314
Merge branch 'store-path-or-ca' of github.com:obsidiansystems/nix int…
f4918ec 
…o store-path-or-ca-reconcile
@Ericson2314
Fix issues with store path descriptor round trip
c9f83f2
@Ericson2314 Ericson2314 merged commit c4b0184 into store-path-or-ca Jul 22, 2020
@Ericson2314 Ericson2314 deleted the store-path-or-ca-reconcile branch July 22, 2020 14:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Ericson2314 @meditans