nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-22 18:29:36 +01:00
Code Activity

libutil: Fix copyRecursive and use for nix flake clone

Browse source 
The use of sourceToSink is an unnecessary serialization bottleneck.
While we are at it, fix the copyRecursive implementation to actually copy
the whole directory. It wasn't used for anything prior, but now it has a use
and accompanying tests for flake clone.
This commit is contained in:
Sergei Zimmerman 2025-11-21 00:21:23 +03:00
parent 5caebab63a
commit 6d0f4fa666
No known key found for this signature in database
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/libfetchers/fetchers.cc
View file

@ -495,9 +495,9 @@ void InputScheme::clone(
Activity act(*logger, lvlTalkative, actUnknown, fmt("copying '%s' to %s...", input2.to_string(), destDir));
auto source = sinkToSource([&](Sink & sink) { accessor->dumpPath(CanonPath::root, sink); });
restorePath(destDir, *source);
RestoreSink sink(/*startFsync=*/false);
sink.dstPath = destDir;
copyRecursive(*accessor, CanonPath::root, sink, CanonPath::root);
}
std::optional<ExperimentalFeature> InputScheme::experimentalFeature() const

1
src/libutil/fs-sink.cc
View file

@ -37,7 +37,6 @@ void copyRecursive(SourceAccessor & accessor, const CanonPath & from, FileSystem
sink.createDirectory(to, [&](FileSystemObjectSink & dirSink, const CanonPath & relDirPath) {
for (auto & [name, _] : accessor.readDirectory(from)) {
copyRecursive(accessor, from / name, dirSink, relDirPath / name);
break;
}
});
break;