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

Check 'follows' inputs

Browse source
This commit is contained in:
Eelco Dolstra 2020-06-11 23:34:02 +02:00
parent d15c20efd5
commit 7db879e65e
3 changed files with 51 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/libexpr/flake/flake.cc
View file

@ -469,12 +469,15 @@ LockedFlake lockFlake(
if (!updatesUsed.count(i))
warn("the flag '--update-input %s' does not match any input", printInputPath(i));
/* Check 'follows' inputs. */
newLockFile.check();
debug("new lock file: %s", newLockFile);
/* Check whether we need to / can write the new lock file. */
if (!(newLockFile == oldLockFile)) {
auto diff = diffLockFiles(oldLockFile, newLockFile);
auto diff = LockFile::diff(oldLockFile, newLockFile);
if (lockFlags.writeLockFile) {
if (auto sourcePath = topRef.input.getSourcePath()) {

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

@ -238,21 +238,29 @@ InputPath parseInputPath(std::string_view s)
return path;
}
static void flattenLockFile(
std::shared_ptr<const Node> node,
const InputPath & prefix,
std::unordered_set<std::shared_ptr<const Node>> & done,
std::map<InputPath, Node::Edge> & res)
std::map<InputPath, Node::Edge> LockFile::getAllInputs() const
{
if (!done.insert(node).second) return;
std::unordered_set<std::shared_ptr<Node>> done;
std::map<InputPath, Node::Edge> res;
for (auto &[id, input] : node->inputs) {
auto inputPath(prefix);
inputPath.push_back(id);
res.emplace(inputPath, input);
if (auto child = std::get_if<0>(&input))
flattenLockFile(*child, inputPath, done, res);
}
std::function<void(const InputPath & prefix, std::shared_ptr<Node> node)> recurse;
recurse = [&](const InputPath & prefix, std::shared_ptr<Node> node)
{
if (!done.insert(node).second) return;
for (auto &[id, input] : node->inputs) {
auto inputPath(prefix);
inputPath.push_back(id);
res.emplace(inputPath, input);
if (auto child = std::get_if<0>(&input))
recurse(inputPath, *child);
}
};
recurse({}, root);
return res;
}
std::ostream & operator <<(std::ostream & stream, const Node::Edge & edge)
@ -275,13 +283,10 @@ static bool equals(const Node::Edge & e1, const Node::Edge & e2)
return false;
}
std::string diffLockFiles(const LockFile & oldLocks, const LockFile & newLocks)
std::string LockFile::diff(const LockFile & oldLocks, const LockFile & newLocks)
{
std::unordered_set<std::shared_ptr<const Node>> done;
std::map<InputPath, Node::Edge> oldFlat, newFlat;
flattenLockFile(oldLocks.root, {}, done, oldFlat);
done.clear();
flattenLockFile(newLocks.root, {}, done, newFlat);
auto oldFlat = oldLocks.getAllInputs();
auto newFlat = newLocks.getAllInputs();
auto i = oldFlat.begin();
auto j = newFlat.begin();
@ -309,6 +314,22 @@ std::string diffLockFiles(const LockFile & oldLocks, const LockFile & newLocks)
return res;
}
void LockFile::check()
{
auto inputs = getAllInputs();
for (auto & [inputPath, input] : inputs) {
if (auto follows = std::get_if<1>(&input)) {
if (!follows->empty() && !get(inputs, *follows))
throw Error("input '%s' follows a non-existent input '%s'",
printInputPath(inputPath),
printInputPath(*follows));
}
}
}
void check();
std::string printInputPath(const InputPath & path)
{
return concatStringsSep("/", path);

9
src/libexpr/flake/lockfile.hh
View file

@ -67,6 +67,13 @@ struct LockFile
bool operator ==(const LockFile & other) const;
std::shared_ptr<Node> findInput(const InputPath & path);
std::map<InputPath, Node::Edge> getAllInputs() const;
static std::string diff(const LockFile & oldLocks, const LockFile & newLocks);
/* Check that every 'follows' input target exists. */
void check();
};
std::ostream & operator <<(std::ostream & stream, const LockFile & lockFile);
@ -75,6 +82,4 @@ InputPath parseInputPath(std::string_view s);
std::string printInputPath(const InputPath & path);
std::string diffLockFiles(const LockFile & oldLocks, const LockFile & newLocks);
}