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

fetchgit -> fetchGit

Browse source 
Almost all other primops are camelCase so no reason not to use that
here.
This commit is contained in:
Eelco Dolstra 2017-10-30 10:25:08 +01:00
parent 23ce4b3393
commit 049322702b
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/manual/release-notes/rl-1.12.xml
View file

@ -184,7 +184,7 @@
</listitem>
<listitem>
<para><function>builtins.fetchgit</function>.
<para><function>builtins.fetchGit</function>.
(38539b943a060d9cdfc24d6e5d997c0885b8aa2f)</para>
</listitem>

8
src/libexpr/primops/fetchgit.cc
View file

@ -88,10 +88,10 @@ Path exportGit(ref<Store> store, const std::string & uri,
return storePath;
}
static void prim_fetchgit(EvalState & state, const Pos & pos, Value * * args, Value & v)
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 ref = "master";
@ -118,7 +118,7 @@ static void prim_fetchgit(EvalState & state, const Pos & pos, Value * * args, Va
else if (n == "name")
name = state.forceStringNoCtx(*attr.value, *attr.pos);
else
throw EvalError("unsupported argument '%s' to 'fetchgit', at %s", attr.name, *attr.pos);
throw EvalError("unsupported argument '%s' to 'fetchGit', at %s", attr.name, *attr.pos);
}
if (url.empty())
@ -132,6 +132,6 @@ static void prim_fetchgit(EvalState & state, const Pos & pos, Value * * args, Va
mkString(v, storePath, PathSet({storePath}));
}
static RegisterPrimOp r("__fetchgit", 1, prim_fetchgit);
static RegisterPrimOp r("fetchGit", 1, prim_fetchGit);
}