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

Introduce StoreReferences and ContentAddressWithReferences #3746

Merged
merged 59 commits into from
Apr 17, 2023
Merged

Introduce StoreReferences and ContentAddressWithReferences #3746

merged 59 commits into from
Apr 17, 2023

Commits on Jun 25, 2020

  1. Pull out PathReferences super class

    @Ericson2314
    Ericson2314 committed Jun 25, 2020
    Configuration menu
    Copy the full SHA
    1722ae6 View commit details
    Browse the repository at this point in the history

  2. WIP: store separate hasValidPath bool

    @Ericson2314
    Ericson2314 committed Jun 25, 2020
    Configuration menu
    Copy the full SHA
    71e4c9c View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2020

  1. Backport fix from NixOS#3754 branch

    @Ericson2314
    Ericson2314 committed Jun 29, 2020
    Configuration menu
    Copy the full SHA
    a9c0ea3 View commit details
    Browse the repository at this point in the history

  2. Fix some things in remote store

    @Ericson2314
    Ericson2314 committed Jun 29, 2020
    Configuration menu
    Copy the full SHA
    70ed47c View commit details
    Browse the repository at this point in the history

  3. Fix nar info parsing

    @Ericson2314
    Ericson2314 committed Jun 29, 2020
    Configuration menu
    Copy the full SHA
    6683406 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2020

  1. Merge remote-tracking branch 'upstream/master' into path-info

    @Ericson2314
    Ericson2314 committed Aug 1, 2020
    Configuration menu
    Copy the full SHA
    0e9e599 View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2020

  1. Merge remote-tracking branch 'upstream/master' into path-info

    @Ericson2314
    Ericson2314 committed Aug 4, 2020
    Configuration menu
    Copy the full SHA
    36dd792 View commit details
    Browse the repository at this point in the history

  2. Remove stray tabs

    @Ericson2314
    Ericson2314 committed Aug 4, 2020
    Configuration menu
    Copy the full SHA
    e61061c View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2020

  1. Merge remote-tracking branch 'upstream/master' into path-info

    @Ericson2314
    Ericson2314 committed Sep 23, 2020
    Configuration menu
    Copy the full SHA
    45ca7c3 View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2020

  1. Merge remote-tracking branch 'upstream/master' into path-info

    @Ericson2314
    Ericson2314 committed Oct 6, 2020
    Configuration menu
    Copy the full SHA
    dae4409 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2020

  1. Use PathReferences more widely

    @Ericson2314
    Ericson2314 committed Oct 7, 2020
    Configuration menu
    Copy the full SHA
    f8d562c View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2020

  1. Merge remote-tracking branch 'upstream/master' into path-info

    @Ericson2314
    Ericson2314 committed Oct 12, 2020
    Configuration menu
    Copy the full SHA
    a0f369a View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2020

  1. Organize content-address.hh a bit better

    @Ericson2314
    Ericson2314 committed Oct 13, 2020
    Configuration menu
    Copy the full SHA
    39c11c5 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master' into path-info

    @Ericson2314
    Ericson2314 committed Oct 13, 2020
    Configuration menu
    Copy the full SHA
    34b3bfa View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2020

  1. Fix conditions for ca-references

    @Ericson2314
    Ericson2314 committed Oct 15, 2020
    Configuration menu
    Copy the full SHA
    10e81bf View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2021

  1. Merge remote-tracking branch 'upstream/master' into path-info

    @Ericson2314
    Ericson2314 committed Feb 25, 2021
    Configuration menu
    Copy the full SHA
    ca09948 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2021

  1. Merge remote-tracking branch 'upstream/master' into path-info

    @Ericson2314
    Ericson2314 committed Feb 27, 2021
    Configuration menu
    Copy the full SHA
    f0ad29a View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2021

  1. Merge branch 'master' into path-info

    @Ericson2314
    Ericson2314 committed Apr 5, 2021
    Configuration menu
    Copy the full SHA
    e12308d View commit details
    Browse the repository at this point in the history

  2. Merge commit '9dfb97c987d8b9d6a3d15f016e40f22f91deb764' into path-info

    @Ericson2314
    Ericson2314 committed Apr 5, 2021
    Configuration menu
    Copy the full SHA
    d5cef6c View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/master' into path-info

    @Ericson2314
    Ericson2314 committed Apr 5, 2021
    Configuration menu
    Copy the full SHA
    1b6cf0d View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2021

  1. Merge remote-tracking branch 'upstream/master' into path-info

    @Ericson2314
    Ericson2314 committed Sep 30, 2021
    Configuration menu
    Copy the full SHA
    f4f3203 View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2021

  1. Merge remote-tracking branch 'upstream/master' into path-info

    @Ericson2314
    Ericson2314 committed Oct 1, 2021
    Configuration menu
    Copy the full SHA
    13b6b64 View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2022

  1. Merge remote-tracking branch 'upstream/master' into path-info

    @Ericson2314
    Ericson2314 committed Mar 10, 2022
    Configuration menu
    Copy the full SHA
    8ba0895 View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2022

  1. Merge remote-tracking branch 'upstream/master' into path-info

    @Ericson2314
    Ericson2314 committed Mar 25, 2022
    Configuration menu
    Copy the full SHA
    0dc2974 View commit details
    Browse the repository at this point in the history

  2. Fill in missing comparison operators for content addresses

    @Ericson2314
    Ericson2314 committed Mar 25, 2022
    Configuration menu
    Copy the full SHA
    2c21cb6 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2022

  1. Slight cleanups

    @Ericson2314
    Ericson2314 committed Apr 19, 2022
    Configuration menu
    Copy the full SHA
    13c6691 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master' into path-info

    @Ericson2314
    Ericson2314 committed Apr 19, 2022
    Configuration menu
    Copy the full SHA
    55caef3 View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2023

  1. Merge remote-tracking branch 'upstream/master' into path-info

    @Ericson2314
    Ericson2314 committed Jan 6, 2023
    Configuration menu
    Copy the full SHA
    e9fc1e4 View commit details
    Browse the repository at this point in the history

  2. Make formatting consistent

    @Ericson2314
    Ericson2314 committed Jan 6, 2023
    Configuration menu
    Copy the full SHA
    8623143 View commit details
    Browse the repository at this point in the history

  3. Use named field initialization for references

    @Ericson2314
    Ericson2314 committed Jan 6, 2023
    Configuration menu
    Copy the full SHA
    6a16825 View commit details
    Browse the repository at this point in the history

  4. Optimize ValidPathInfo construction a bit better

    @Ericson2314
    Ericson2314 committed Jan 6, 2023
    Configuration menu
    Copy the full SHA
    9cfa78e View commit details
    Browse the repository at this point in the history

  5. Do big rename to clean up code 

    - `PathReferences` -> `References`

- `PathReferences<StorePath>` -> `StoreReference`

- `references` -> `others`

- `hasSelfReference` -> `self`

And get rid of silly subclassing
    @Ericson2314
    Ericson2314 committed Jan 6, 2023
    Configuration menu
    Copy the full SHA
    46e942f View commit details
    Browse the repository at this point in the history

  6. Fix perl bindings

    @Ericson2314
    Ericson2314 committed Jan 6, 2023
    Configuration menu
    Copy the full SHA
    91617f8 View commit details
    Browse the repository at this point in the history

Commits on Jan 13, 2023

  1. Move new ValidPathInfo methods to path-info.cc 

    We'll move the old ones separately, so as not to clutter the diff.
    @Ericson2314
    Ericson2314 committed Jan 13, 2023
    Configuration menu
    Copy the full SHA
    2e7be46 View commit details
    Browse the repository at this point in the history

Commits on Jan 14, 2023

  1. Merge remote-tracking branch 'upstream/master' into path-info

    @Ericson2314
    Ericson2314 committed Jan 14, 2023
    Configuration menu
    Copy the full SHA
    056cc1c View commit details
    Browse the repository at this point in the history

  2. Make ValidPathInfo have plain StorePathSet references like before 

    This change can wait for another PR.
    @Ericson2314
    Ericson2314 committed Jan 14, 2023
    Configuration menu
    Copy the full SHA
    b3d9123 View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2023

  1. Merge remote-tracking branch 'upstream/master' into path-info

    @Ericson2314
    Ericson2314 committed Jan 23, 2023
    Configuration menu
    Copy the full SHA
    c67e0cc View commit details
    Browse the repository at this point in the history

  2. Don't add StorePathDescriptor for now 

    We don't need it yet, we can add it back later.
    @Ericson2314
    Ericson2314 committed Jan 23, 2023
    Configuration menu
    Copy the full SHA
    4540e7b View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2023

  1. Merge branch 'small-storePath-cleanups' into path-info

    @Ericson2314
    Ericson2314 committed Jan 30, 2023
    Configuration menu
    Copy the full SHA
    adb3608 View commit details
    Browse the repository at this point in the history

  2. Shrink diff in two places 

    Stuff crept in there.
    @Ericson2314
    Ericson2314 committed Jan 30, 2023
    Configuration menu
    Copy the full SHA
    974a983 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'small-storePath-cleanups' into path-info

    @Ericson2314
    Ericson2314 committed Jan 30, 2023
    Configuration menu
    Copy the full SHA
    79b078a View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'upstream/master' into path-info

    @Ericson2314
    Ericson2314 committed Jan 30, 2023
    Configuration menu
    Copy the full SHA
    b6c9875 View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2023

  1. Merge remote-tracking branch 'upstream/master' into path-info

    @Ericson2314
    Ericson2314 committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    4341473 View commit details
    Browse the repository at this point in the history

  2. Shrink diff in one place

    @Ericson2314
    Ericson2314 committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    0983a0b View commit details
    Browse the repository at this point in the history

  3. Undo style change 

    `&` without space before is far more common on this codebase than I
thought, so it is not worth changing just this one file. Maybe we will
adopt a formatter someday but until then this is fine.
    @Ericson2314
    Ericson2314 committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    db759b1 View commit details
    Browse the repository at this point in the history

  4. Put back TODO 

    I don't think the `narHash` is in need of documentation more than the
other undocumented fields, but regardless this change has nothing to do
with that field and so we should leave the comment as is.
    @Ericson2314
    Ericson2314 committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    59d3175 View commit details
    Browse the repository at this point in the history

  5. Remove some designated initializers 

    With the switch to C++20, the rules became more strict, and we can no
longer initialize base classes. Make them comments instead.

(BTW
https://www.open-std.org/jtc1/sc22/wg21/docs/papers/2021/p2287r1.html
this offers some new syntax for this use-case. Hopefully this will be
adopted and we can eventually use it.)
    @Ericson2314
    Ericson2314 committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    ee9eb83 View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2023

  1. Merge branch 'master' into path-info

    @Ericson2314
    Ericson2314 committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    87ca462 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2023

  1. Fix typo in the method name

    @Ericson2314
    Ericson2314 committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    c36b584 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master' into path-info

    @Ericson2314
    Ericson2314 committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    d12f57c View commit details
    Browse the repository at this point in the history

  3. Clarify store path grammar and improve comment on makeType

    @Ericson2314
    Ericson2314 committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    123b11f View commit details
    Browse the repository at this point in the history

  4. Revert "Remove some designated initializers" 

    This reverts commit ee9eb83.
    @Ericson2314
    Ericson2314 committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    85bb865 View commit details
    Browse the repository at this point in the history

  5. No inheritance for TextInfo and FixedOutputInfo

    @Ericson2314
    Ericson2314 committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    d381248 View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2023

  1. Merge remote-tracking branch 'upstream/master' into path-info 

    Also improve content-address.hh API docs.
    @Ericson2314
    Ericson2314 committed Mar 30, 2023
    Configuration menu
    Copy the full SHA
    aa99005 View commit details
    Browse the repository at this point in the history

  2. Fix warning

    @Ericson2314
    Ericson2314 committed Mar 30, 2023
    Configuration menu
    Copy the full SHA
    a6d00a7 View commit details
    Browse the repository at this point in the history

  3. Use "raw pattern" for content address types 

    We weren't because this ancient PR predated it!

This is actually a new version of the pattern which addresses some
issues identified in NixOS#7479.
    @Ericson2314
    Ericson2314 committed Mar 30, 2023
    Configuration menu
    Copy the full SHA
    c51d554 View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2023

  1. Add comparison methods for content addresses

    @Ericson2314
    Ericson2314 committed Apr 1, 2023
    Configuration menu
    Copy the full SHA
    5d56e2d View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2023

  1. Merge remote-tracking branch 'upstream/master' into path-info

    @Ericson2314
    Ericson2314 committed Apr 8, 2023
    Configuration menu
    Copy the full SHA
    fd21f9d View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2023

  1. Explain various .self = false, 

    Co-authored-by: Robert Hensing <[email protected]>
    @Ericson2314 @roberth
    Ericson2314 and roberth authored Apr 17, 2023
    Configuration menu
    Copy the full SHA
    537e871 View commit details
    Browse the repository at this point in the history