mirror of
https://github.com/NixOS/nix.git
synced 2025-11-28 13:11:00 +01:00
Merge pull request #14582 from NixOS/ref-to-reference
libfetchers: Convert ref<Store> -> Store &
This commit is contained in:
commit
77982c55b2
27 changed files with 119 additions and 119 deletions
|
|
@ -433,7 +433,7 @@ struct GitInputScheme : InputScheme
|
|||
return res;
|
||||
}
|
||||
|
||||
void clone(const Settings & settings, ref<Store> store, const Input & input, const std::filesystem::path & destDir)
|
||||
void clone(const Settings & settings, Store & store, const Input & input, const std::filesystem::path & destDir)
|
||||
const override
|
||||
{
|
||||
auto repoInfo = getRepoInfo(input);
|
||||
|
|
@ -779,7 +779,7 @@ struct GitInputScheme : InputScheme
|
|||
}
|
||||
|
||||
std::pair<ref<SourceAccessor>, Input>
|
||||
getAccessorFromCommit(const Settings & settings, ref<Store> store, RepoInfo & repoInfo, Input && input) const
|
||||
getAccessorFromCommit(const Settings & settings, Store & store, RepoInfo & repoInfo, Input && input) const
|
||||
{
|
||||
assert(!repoInfo.workdirInfo.isDirty);
|
||||
|
||||
|
|
@ -953,7 +953,7 @@ struct GitInputScheme : InputScheme
|
|||
}
|
||||
|
||||
std::pair<ref<SourceAccessor>, Input>
|
||||
getAccessorFromWorkdir(const Settings & settings, ref<Store> store, RepoInfo & repoInfo, Input && input) const
|
||||
getAccessorFromWorkdir(const Settings & settings, Store & store, RepoInfo & repoInfo, Input && input) const
|
||||
{
|
||||
auto repoPath = repoInfo.getPath().value();
|
||||
|
||||
|
|
@ -1037,7 +1037,7 @@ struct GitInputScheme : InputScheme
|
|||
}
|
||||
|
||||
std::pair<ref<SourceAccessor>, Input>
|
||||
getAccessor(const Settings & settings, ref<Store> store, const Input & _input) const override
|
||||
getAccessor(const Settings & settings, Store & store, const Input & _input) const override
|
||||
{
|
||||
Input input(_input);
|
||||
|
||||
|
|
@ -1059,7 +1059,7 @@ struct GitInputScheme : InputScheme
|
|||
return {accessor, std::move(final)};
|
||||
}
|
||||
|
||||
std::optional<std::string> getFingerprint(ref<Store> store, const Input & input) const override
|
||||
std::optional<std::string> getFingerprint(Store & store, const Input & input) const override
|
||||
{
|
||||
auto makeFingerprint = [&](const Hash & rev) {
|
||||
return rev.gitRev() + (getSubmodulesAttr(input) ? ";s" : "") + (getExportIgnoreAttr(input) ? ";e" : "")
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue