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

Fix diffLockFiles()

Browse source
This commit is contained in:
Eelco Dolstra 2020-03-27 16:15:50 +01:00
parent 7abe3bde8a
commit 3fa1e7dace
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/libexpr/flake/lockfile.cc
View file

@ -96,8 +96,6 @@ StorePath LockedNode::computeStorePath(Store & store) const
std::shared_ptr<Node> Node::findInput(const InputPath & path) std::shared_ptr<Node> Node::findInput(const InputPath & path)
{ {
assert(!path.empty());
auto pos = shared_from_this(); auto pos = shared_from_this();
for (auto & elem : path) { for (auto & elem : path) {
@ -275,32 +273,33 @@ InputPath parseInputPath(std::string_view s)
path.push_back(elem); path.push_back(elem);
} }
if (path.empty())
throw Error("flake input path is empty");
return path; return path;
} }
static void flattenLockFile( static void flattenLockFile(
std::shared_ptr<const Node> node, std::shared_ptr<const Node> node,
const InputPath & prefix, const InputPath & prefix,
std::unordered_set<std::shared_ptr<const Node>> & done,
std::map<InputPath, std::shared_ptr<const LockedNode>> & res) std::map<InputPath, std::shared_ptr<const LockedNode>> & res)
{ {
// FIXME: handle cycles if (!done.insert(node).second) return;
for (auto &[id, input] : node->inputs) { for (auto &[id, input] : node->inputs) {
auto inputPath(prefix); auto inputPath(prefix);
inputPath.push_back(id); inputPath.push_back(id);
if (auto lockedInput = std::dynamic_pointer_cast<const LockedNode>(input)) if (auto lockedInput = std::dynamic_pointer_cast<const LockedNode>(input))
res.emplace(inputPath, lockedInput); res.emplace(inputPath, lockedInput);
flattenLockFile(input, inputPath, res); flattenLockFile(input, inputPath, done, res);
} }
} }
std::string diffLockFiles(const LockFile & oldLocks, const LockFile & newLocks) std::string diffLockFiles(const LockFile & oldLocks, const LockFile & newLocks)
{ {
std::unordered_set<std::shared_ptr<const Node>> done;
std::map<InputPath, std::shared_ptr<const LockedNode>> oldFlat, newFlat; std::map<InputPath, std::shared_ptr<const LockedNode>> oldFlat, newFlat;
flattenLockFile(oldLocks.root, {}, oldFlat); flattenLockFile(oldLocks.root, {}, done, oldFlat);
flattenLockFile(newLocks.root, {}, newFlat); done.clear();
flattenLockFile(newLocks.root, {}, done, newFlat);
auto i = oldFlat.begin(); auto i = oldFlat.begin();
auto j = newFlat.begin(); auto j = newFlat.begin();