1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 06:31:14 +02:00

Revert "Get rid of unicode quotes (#1140)"

This reverts commit f78126bfd6. There
really is no need for such a massive change...
This commit is contained in:
Eelco Dolstra 2016-11-26 00:37:43 +01:00
parent f78126bfd6
commit 215b70f51e
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
96 changed files with 670 additions and 670 deletions

View file

@ -8,7 +8,7 @@ namespace nix {
Path exportGit(ref<Store> store, const std::string & uri, const std::string & rev)
{
if (!isUri(uri))
throw EvalError(format("'%s' is not a valid URI") % uri);
throw EvalError(format("%s is not a valid URI") % uri);
Path cacheDir = getCacheDir() + "/nix/git";
@ -17,7 +17,7 @@ Path exportGit(ref<Store> store, const std::string & uri, const std::string & re
runProgram("git", true, { "init", "--bare", cacheDir });
}
Activity act(*logger, lvlInfo, format("fetching Git repository '%s'") % uri);
Activity act(*logger, lvlInfo, format("fetching Git repository %s") % uri);
std::string localRef = "pid-" + std::to_string(getpid());
Path localRefFile = cacheDir + "/refs/heads/" + localRef;
@ -28,7 +28,7 @@ Path exportGit(ref<Store> store, const std::string & uri, const std::string & re
unlink(localRefFile.c_str());
debug(format("got revision '%s'") % commitHash);
debug(format("got revision %s") % commitHash);
// FIXME: should pipe this, or find some better way to extract a
// revision.
@ -45,7 +45,7 @@ Path exportGit(ref<Store> store, const std::string & uri, const std::string & re
static void prim_fetchgit(EvalState & state, const Pos & pos, Value * * args, Value & v)
{
// FIXME: cut&paste from fetch().
if (state.restricted) throw Error("'fetchgit' is not allowed in restricted mode");
if (state.restricted) throw Error("fetchgit is not allowed in restricted mode");
std::string url;
std::string rev = "master";
@ -63,11 +63,11 @@ static void prim_fetchgit(EvalState & state, const Pos & pos, Value * * args, Va
else if (name == "rev")
rev = state.forceStringNoCtx(*attr.value, *attr.pos);
else
throw EvalError(format("unsupported argument '%1%' to 'fetchgit', at %3%") % attr.name % attr.pos);
throw EvalError(format("unsupported argument %1% to fetchgit, at %3%") % attr.name % attr.pos);
}
if (url.empty())
throw EvalError(format("'url' argument required, at %1%") % pos);
throw EvalError(format("url argument required, at %1%") % pos);
} else
url = state.forceStringNoCtx(*args[0], pos);