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

Shrink diff in two places

Browse source 
Stuff crept in there.
This commit is contained in:
John Ericson 2023-01-30 09:59:55 -05:00
parent adb3608034
commit 974a983351
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/libstore/content-address.cc
View file

@ -17,8 +17,9 @@ std::string makeFileIngestionPrefix(FileIngestionMethod m)
return ""; return "";
case FileIngestionMethod::Recursive: case FileIngestionMethod::Recursive:
return "r:"; return "r:";
default:
throw Error("impossible, caught both cases");
} }
assert(false);
} }
std::string makeFixedOutputCA(FileIngestionMethod method, const Hash & hash) std::string makeFixedOutputCA(FileIngestionMethod method, const Hash & hash)

14
src/libstore/make-content-addressed.cc
View file

@ -31,12 +31,14 @@ std::map<StorePath, StorePath> makeContentAddressed(
for (auto & ref : oldInfo->references) { for (auto & ref : oldInfo->references) {
if (ref == path) if (ref == path)
refs.self = true; refs.self = true;
auto i = remappings.find(ref); else {
auto replacement = i != remappings.end() ? i->second : ref; auto i = remappings.find(ref);
// FIXME: warn about unremapped paths? auto replacement = i != remappings.end() ? i->second : ref;
if (replacement != ref) { // FIXME: warn about unremapped paths?
rewrites.insert_or_assign(srcStore.printStorePath(ref), srcStore.printStorePath(replacement)); if (replacement != ref) {
refs.others.insert(std::move(replacement)); rewrites.insert_or_assign(srcStore.printStorePath(ref), srcStore.printStorePath(replacement));
refs.others.insert(std::move(replacement));
}
} }
} }