nrabulinski/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Separate dstStore path from srcStore path

Browse source
This commit is contained in:
Matthew Bauer 2020-06-12 14:27:28 -05:00
parent 2f2ac850b5
commit 9077b9e6b2
1 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/libstore/store-api.cc
View file

@ -649,15 +649,24 @@ void copyPaths(ref<Store> srcStore, ref<Store> dstStore, const StorePathSet & st
processGraph<Path>(pool, processGraph<Path>(pool,
PathSet(missing.begin(), missing.end()), PathSet(missing.begin(), missing.end()),
[&](const Path & storePath) { [&](const Path & storePathS) {
if (dstStore->isValidPath(dstStore->parseStorePath(storePath))) { auto storePath = srcStore->parseStorePath(storePathS);
auto info = srcStore->queryPathInfo(storePath);
auto storePathForDst = storePath.clone();
if (hasPrefix(info->ca, "fixed:"))
{
FileIngestionMethod ingestionMethod { info->ca.compare(6, 2, "r:") == 0 };
Hash hash(std::string(info->ca, ingestionMethod == FileIngestionMethod::Recursive ? 8 : 6));
storePathForDst = dstStore->makeFixedOutputPath(ingestionMethod, hash, storePath.name());
}
if (dstStore->isValidPath(storePathForDst)) {
nrDone++; nrDone++;
showProgress(); showProgress();
return PathSet(); return PathSet();
} }
auto info = srcStore->queryPathInfo(srcStore->parseStorePath(storePath));
bytesExpected += info->narSize; bytesExpected += info->narSize;
act.setExpected(actCopyPath, bytesExpected); act.setExpected(actCopyPath, bytesExpected);
@ -667,9 +676,18 @@ void copyPaths(ref<Store> srcStore, ref<Store> dstStore, const StorePathSet & st
[&](const Path & storePathS) { [&](const Path & storePathS) {
checkInterrupt(); checkInterrupt();
auto storePath = dstStore->parseStorePath(storePathS); auto storePath = srcStore->parseStorePath(storePathS);
auto info = srcStore->queryPathInfo(storePath);
if (!dstStore->isValidPath(storePath)) { auto storePathForDst = storePath.clone();
if (hasPrefix(info->ca, "fixed:"))
{
FileIngestionMethod ingestionMethod { info->ca.compare(6, 2, "r:") == 0 };
Hash hash(std::string(info->ca, ingestionMethod == FileIngestionMethod::Recursive ? 8 : 6));
storePathForDst = dstStore->makeFixedOutputPath(ingestionMethod, hash, storePath.name());
}
if (!dstStore->isValidPath(storePathForDst)) {
MaintainCount<decltype(nrRunning)> mc(nrRunning); MaintainCount<decltype(nrRunning)> mc(nrRunning);
showProgress(); showProgress();
try { try {