lix-project/lix
20
58
Fork 31
Code Issues 363 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Add flags to disallow dirty Git trees and to turn off warnings

Browse source
This commit is contained in:
Eelco Dolstra 2019-09-20 14:29:49 +02:00
parent 99e8e58f2d
commit 68e0f23edc
4 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/libexpr/eval.hh
View file

@ -377,10 +377,16 @@ struct EvalSettings : Config
"Prefixes of URIs that builtin functions such as fetchurl and fetchGit are allowed to fetch."}; "Prefixes of URIs that builtin functions such as fetchurl and fetchGit are allowed to fetch."};
Setting<bool> traceFunctionCalls{this, false, "trace-function-calls", Setting<bool> traceFunctionCalls{this, false, "trace-function-calls",
"Emit log messages for each function entry and exit at the 'vomit' log level (-vvvv)"}; "Emit log messages for each function entry and exit at the 'vomit' log level (-vvvv)."};
Setting<std::string> flakeRegistry{this, "https://raw.githubusercontent.com/NixOS/flake-registry/master/flake-registry.json", "flake-registry", Setting<std::string> flakeRegistry{this, "https://raw.githubusercontent.com/NixOS/flake-registry/master/flake-registry.json", "flake-registry",
"Path or URI of the global flake registry."}; "Path or URI of the global flake registry."};
Setting<bool> allowDirty{this, true, "allow-dirty",
"Whether to allow dirty Git/Mercurial trees."};
Setting<bool> warnDirty{this, true, "warn-dirty",
"Whether to warn about dirty Git/Mercurial trees."};
}; };
extern EvalSettings evalSettings; extern EvalSettings evalSettings;

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

@ -480,9 +480,10 @@ ResolvedFlake resolveFlake(EvalState & state, const FlakeRef & topRef, HandleLoc
if (!(lockFile == oldLockFile)) { if (!(lockFile == oldLockFile)) {
if (allowedToWrite(handleLockFile)) { if (allowedToWrite(handleLockFile)) {
if (auto refData = std::get_if<FlakeRef::IsPath>(&topRef.data)) { if (auto refData = std::get_if<FlakeRef::IsPath>(&topRef.data)) {
if (lockFile.isDirty()) if (lockFile.isDirty()) {
warn("will not write lock file of flake '%s' because it has a dirty input", topRef); if (evalSettings.warnDirty)
else { warn("will not write lock file of flake '%s' because it has a dirty input", topRef);
} else {
lockFile.write(refData->path + (topRef.subdir == "" ? "" : "/" + topRef.subdir) + "/flake.lock"); lockFile.write(refData->path + (topRef.subdir == "" ? "" : "/" + topRef.subdir) + "/flake.lock");
// Hack: Make sure that flake.lock is visible to Git, so it ends up in the Nix store. // Hack: Make sure that flake.lock is visible to Git, so it ends up in the Nix store.

6
src/libexpr/primops/fetchGit.cc
View file

@ -47,7 +47,11 @@ GitInfo exportGit(ref<Store> store, std::string uri,
/* This is an unclean working tree. So copy all tracked /* This is an unclean working tree. So copy all tracked
files. */ files. */
warn("Git tree '%s' is dirty", uri); if (!evalSettings.allowDirty)
throw Error("Git tree '%s' is dirty", uri);
if (evalSettings.warnDirty)
warn("Git tree '%s' is dirty", uri);
GitInfo gitInfo; GitInfo gitInfo;
gitInfo.ref = "HEAD"; gitInfo.ref = "HEAD";

6
src/libexpr/primops/fetchMercurial.cc
View file

@ -36,7 +36,11 @@ HgInfo exportMercurial(ref<Store> store, const std::string & uri,
/* This is an unclean working tree. So copy all tracked /* This is an unclean working tree. So copy all tracked
files. */ files. */
printTalkative("copying unclean Mercurial working tree '%s'", uri); if (!evalSettings.allowDirty)
throw Error("Mercurial tree '%s' is unclean", uri);
if (evalSettings.warnDirty)
warn("Mercurial tree '%s' is unclean", uri);
HgInfo hgInfo; HgInfo hgInfo;
hgInfo.rev = "0000000000000000000000000000000000000000"; hgInfo.rev = "0000000000000000000000000000000000000000";